diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-20 19:19:07 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-20 19:19:07 +0000 |
| commit | 0e9f0ac4ecc636336603cc6932ce21a550c7087e (patch) | |
| tree | fbcfca6602b37f80a51fba1d459f94b3d93ca08f /phpBB/login.php | |
| parent | 4887cf1e49daa80a0736d753589c9995d7ddbd4b (diff) | |
| download | forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.gz forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.bz2 forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.xz forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.zip | |
Mostly changes to turn userdata into user->data, lang into user->lang + bitstring 2nd format + inheritance for permission admin and various other updates/fixes/changes ... note that user->lang & user->theme isn't final
git-svn-id: file:///svn/phpbb/trunk@2958 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/login.php')
| -rw-r--r-- | phpBB/login.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/login.php b/phpBB/login.php index ab62485cab..aa424afe72 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -27,9 +27,9 @@ include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); // Set page ID for session management -$userdata = $session->start(); -$auth = new auth($userdata); -$user = new user($userdata); +$user->start(); +$user->setup(); +$auth->acl($user->data); // End session management extract($_GET); @@ -40,7 +40,7 @@ $redirect = (!empty($redirect)) ? $_SERVER['QUERY_STRING'] : ''; // Do the login/logout/form/whatever if ( isset($login) || isset($logout) ) { - if ( isset($login) && !$userdata['user_id'] ) + if ( isset($login) && !$user->data['user_id'] ) { $autologin = ( !empty($autologin) ) ? true : false; @@ -62,9 +62,9 @@ if ( isset($login) || isset($logout) ) message_die(MESSAGE, $message); } } - else if ( $userdata['user_id'] ) + else if ( $user->data['user_id'] ) { - $session->destroy($userdata); + $session->destroy($user->data); } // @@ -74,7 +74,7 @@ if ( isset($login) || isset($logout) ) redirect($redirect_url); } -if ( !$userdata['user_id'] ) +if ( !$user->data['user_id'] ) { $template->assign_vars(array( 'L_ENTER_PASSWORD' => $lang['Enter_password'], |