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/profile.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/profile.php')
| -rw-r--r-- | phpBB/profile.php | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php index 6c195ad358..5443c5121d 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -26,9 +26,9 @@ include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); // Start session management -$userdata = $session->start(); -$auth->acl($userdata); -$user = new user($userdata); +$user->start(); +$user->setup(); +$auth->acl($user->data); // End session management // Set default email variables @@ -76,17 +76,13 @@ if ( isset($_GET['mode']) || isset($_POST['mode']) ) } else if ( $mode == 'editprofile' || $mode == 'register' ) { - if ( !$userdata['user_id'] && $mode == 'editprofile' ) + if ( !$user->data['user_id'] && $mode == 'editprofile' ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; - header($header_location . "login.$phpEx$SID&redirect=profile.$phpEx&mode=editprofile"); - exit; + redirect("login.$phpEx$SID&redirect=profile.$phpEx&mode=editprofile"); } - else if ( $userdata['user_id'] && $mode == 'register' ) + else if ( $user->data['user_id'] && $mode == 'register' ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; - header($header_location . "index.$phpEx$SID"); - exit; + redirect("index.$phpEx$SID"); } include($phpbb_root_path . 'includes/usercp_register.'.$phpEx); @@ -110,9 +106,7 @@ if ( isset($_GET['mode']) || isset($_POST['mode']) ) } else { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; - header($header_location . "index.$phpEx$SID"); - exit; + redirect("index.$phpEx$SID"); } ?>
\ No newline at end of file |