diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-10 09:30:59 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-10 09:30:59 +0200 |
| commit | 2f76d6383550f790ed3ceef6fbe7b61e9d344282 (patch) | |
| tree | 24a429071f1c0965b2559e72e6247d88df0789d0 /include | |
| parent | edada2b7869d9565b4534114b6ed171e588185f6 (diff) | |
| parent | e2e7bee3cca6f2ffc88aee9c94066e117e7a682b (diff) | |
| download | volse-hubzilla-2f76d6383550f790ed3ceef6fbe7b61e9d344282.tar.gz volse-hubzilla-2f76d6383550f790ed3ceef6fbe7b61e9d344282.tar.bz2 volse-hubzilla-2f76d6383550f790ed3ceef6fbe7b61e9d344282.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/zid.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/zid.php b/include/zid.php index 08d8f061b..ce9f70385 100644 --- a/include/zid.php +++ b/include/zid.php @@ -296,12 +296,13 @@ function owt_init($token) { $_SESSION['DNT'] = 1; } - $arr = array('xchan' => $hubloc, 'url' => \App::query_string, 'session' => $_SESSION); + $arr = array('xchan' => $hubloc, 'url' => \App::$query_string, 'session' => $_SESSION); call_hooks('magic_auth_success',$arr); \App::set_observer($hubloc); require_once('include/security.php'); \App::set_groups(init_groups_visitor($_SESSION['visitor_id'])); - info(sprintf( t('Welcome %s. Remote authentication successful.'),$hubloc['xchan_name'])); + if(! get_config('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']); |