diff options
| author | Mario <mario@mariovavti.com> | 2022-10-10 18:05:26 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-10 18:05:26 +0000 |
| commit | ef2448e17e742e7dcef458993bce1e0a29756aa7 (patch) | |
| tree | d23c62753abbb42e7bb742f2d44d09321b6f2eee /include/auth.php | |
| parent | 6ab65519a0fc3e55ad5f32ce1641190ef609a4e2 (diff) | |
| parent | 99a5cf1ad4660a31af6c03e5a1abc3d374f82c78 (diff) | |
| download | volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.tar.gz volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.tar.bz2 volse-hubzilla-ef2448e17e742e7dcef458993bce1e0a29756aa7.zip | |
Merge branch '7.8RC'7.8
Diffstat (limited to 'include/auth.php')
| -rw-r--r-- | include/auth.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/auth.php b/include/auth.php index 07b8e2971..4f4d26a6c 100644 --- a/include/auth.php +++ b/include/auth.php @@ -189,7 +189,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && call_hooks('logging_out', $args); - if($_SESSION['delegate'] && $_SESSION['delegate_push']) { + if(isset($_SESSION['delegate']) && isset($_SESSION['delegate_push'])) { $_SESSION = $_SESSION['delegate_push']; info( t('Delegation session ended.') . EOL); } @@ -280,8 +280,8 @@ else { // handle a fresh login request - $password = $_POST['main_login_password'] ?? $_POST['modal_login_password']; - $username = $_POST['main_login_username'] ?? $_POST['modal_login_username']; + $password = $_POST['main_login_password'] ?? $_POST['modal_login_password'] ?? ''; + $username = $_POST['main_login_username'] ?? $_POST['modal_login_username'] ?? ''; if($password) $encrypted = hash('whirlpool', trim($password)); @@ -337,7 +337,7 @@ else { // (i.e. expire when the browser is closed), even when there's a time expiration // on the cookie - $remember = $_POST['main_login_remember'] ?? $_POST['modal_login_remember']; + $remember = $_POST['main_login_remember'] ?? $_POST['modal_login_remember'] ?? false; if($remember) { $_SESSION['remember_me'] = 1; |