diff options
| author | Mario <mario@mariovavti.com> | 2024-07-06 11:05:22 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-07-06 11:05:22 +0000 |
| commit | 45275910e606a02b12393714ea3b0409da440d61 (patch) | |
| tree | 10b2d173d58cb930f8df28fe75af73dd4974c08c /include/zid.php | |
| parent | 0c1d0f7498661fb34dcca6f3c6566e757af310a7 (diff) | |
| parent | c04e781926a78e514cdf211fa24930a331149072 (diff) | |
| download | volse-hubzilla-45275910e606a02b12393714ea3b0409da440d61.tar.gz volse-hubzilla-45275910e606a02b12393714ea3b0409da440d61.tar.bz2 volse-hubzilla-45275910e606a02b12393714ea3b0409da440d61.zip | |
Merge branch '9.2RC'master
Diffstat (limited to 'include/zid.php')
| -rw-r--r-- | include/zid.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/zid.php b/include/zid.php index b38457d99..159a3b834 100644 --- a/include/zid.php +++ b/include/zid.php @@ -1,5 +1,6 @@ <?php +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Verify; @@ -37,10 +38,16 @@ function is_matrix_url($url) { * @return string */ function zid($s, $address = '') { - if (!$s || strpos($s,'zid=')) + if (!$s || strpos($s,'zid=')) { return $s; + } $m = parse_url($s); + + if (!is_array($m)) { + return $s; + } + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); if($fragment !== false) $s = str_replace('#' . $fragment,'',$s); @@ -406,7 +413,7 @@ function owt_init($token) { App::set_observer($hubloc); require_once('include/security.php'); App::set_groups(init_groups_visitor($_SESSION['visitor_id'])); - if(! get_config('system', 'hide_owa_greeting')) + if(! Config::Get('system', 'hide_owa_greeting')) info(sprintf( t('OpenWebAuth: %1$s welcomes %2$s'),App::get_hostname(), $hubloc['xchan_name'])); logger('OpenWebAuth: auth success from ' . $hubloc['xchan_addr']); |