diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-10 17:48:08 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-10 17:48:08 +0000 |
| commit | c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac (patch) | |
| tree | f5527475e8529720b46e5a22291859660c60a641 /phpBB/login.php | |
| parent | 12828d376e8d51d9c104bf3f97c7242bf29caa1b (diff) | |
| download | forums-c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac.tar forums-c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac.tar.gz forums-c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac.tar.bz2 forums-c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac.tar.xz forums-c75d5d7bf370a3340a00cb6cfaebb2a83515b2ac.zip | |
Various additions and fixes
git-svn-id: file:///svn/phpbb/trunk@3628 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/login.php')
| -rw-r--r-- | phpBB/login.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/login.php b/phpBB/login.php index 41b61df083..135fb4e317 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -32,11 +32,10 @@ $user->setup(); $auth->acl($user->data); // End session management +$redirect = $username = $password = ''; extract($_GET); extract($_POST); -$redirect = (!empty($redirect)) ? $_SERVER['QUERY_STRING'] : ''; - // Do the login/logout/form/whatever if (isset($login) || isset($logout)) { @@ -72,12 +71,14 @@ if (isset($login) || isset($logout)) } // Redirect to wherever we're supposed to go ... - $redirect_url = ($redirect) ? preg_replace('#^.*?redirect=(.*?)&(.*?)$#', '\1' . $SID . '&\2', $redirect) : 'index.'.$phpEx; + $redirect_url = (preg_match('#^redirect=(.*?)$#', $redirect)) ? preg_replace('#^redirect=(.*?)&(.*?)$#', '\1.' . $phpEx . $SID . '&\2', $redirect) : 'index.'.$phpEx . $SID; redirect($redirect_url); } if ($user->data['user_id'] == ANONYMOUS) { + $redirect = (!empty($_SERVER['QUERY_STRING'])) ? preg_replace('#^sid=[a-z0-9]*?&?(redirect=.*?)$#', '\1', $_SERVER['QUERY_STRING']) : ''; + $template->assign_vars(array( 'U_SEND_PASSWORD' => "ucp.$phpEx$SID&mode=sendpassword", 'U_TERMS_USE' => "ucp.$phpEx$SID&mode=terms", |