1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

remove global and change $user-> to phpbb::$user->

git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-02-22 15:29:18 +00:00
parent 7aced345c5
commit 794c574969
107 changed files with 3120 additions and 3644 deletions

View File

@@ -57,21 +57,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
*/
@@ -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;