diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
| commit | 794c5749696c9fa2595ed3a1d7c836a0d984e11c (patch) | |
| tree | 37aab2f0f965ddcaeb1d26af753095f59a6e025c /phpBB/includes/classes/session.php | |
| parent | 7aced345c5a2871f6eddfe316297b4ff9a0ebb76 (diff) | |
| download | forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.gz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.bz2 forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.xz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.zip | |
remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/classes/session.php')
| -rw-r--r-- | phpBB/includes/classes/session.php | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/phpBB/includes/classes/session.php b/phpBB/includes/classes/session.php index e5f4bd8e0c..04840fff55 100644 --- a/phpBB/includes/classes/session.php +++ b/phpBB/includes/classes/session.php @@ -58,21 +58,6 @@ abstract class phpbb_session public $system = NULL; /** - * @var bool Is true if the user is a logged in registered user - */ - public $is_registered = false; - - /** - * @var bool Is true if the user is logged in and a search engine/bot - */ - public $is_bot = false; - - /** - * @var bool Is true if user is founder - */ - public $is_founder = false; - - /** * @var array Extra url parameter to append to every URL in phpBB */ public $extra_url = array(); @@ -304,6 +289,7 @@ abstract class phpbb_session else { $this->is_registered = true; + $this->is_guest = false; $this->is_founder = $this->data['user_type'] == phpbb::USER_FOUNDER; } @@ -824,6 +810,7 @@ abstract class phpbb_session { $this->setup('ucp'); $this->is_registered = $this->is_bot = $this->is_founder = false; + $this->is_guest = true; // Set as a precaution to allow login_box() handling this case correctly as well as this function not being executed again. define('IN_CHECK_BAN', 1); @@ -1113,6 +1100,7 @@ abstract class phpbb_session $this->is_registered = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == phpbb::USER_NORMAL || $this->data['user_type'] == phpbb::USER_FOUNDER)) ? true : false; $this->is_bot = (!$this->is_registered && $this->data['user_id'] != ANONYMOUS) ? true : false; $this->is_founder = $this->data['user_type'] == phpbb::USER_FOUNDER; + $this->is_guest = (!$this->is_registered && $this->data['user_id'] == ANONYMOUS) ? true : false; $this->data['user_lang'] = basename($this->data['user_lang']); return true; |