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/auth/auth_apache.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/auth/auth_apache.php')
| -rw-r--r-- | phpBB/includes/auth/auth_apache.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php index fa41c41de4..97112913cf 100644 --- a/phpBB/includes/auth/auth_apache.php +++ b/phpBB/includes/auth/auth_apache.php @@ -28,11 +28,9 @@ if (!defined('IN_PHPBB')) */ function init_apache() { - global $user; - - if (!isset($_SERVER['PHP_AUTH_USER']) || $user->data['username'] !== $_SERVER['PHP_AUTH_USER']) + if (!isset($_SERVER['PHP_AUTH_USER']) || phpbb::$user->data['username'] !== $_SERVER['PHP_AUTH_USER']) { - return $user->lang['APACHE_SETUP_BEFORE_USE']; + return phpbb::$user->lang['APACHE_SETUP_BEFORE_USE']; } return false; } @@ -42,8 +40,6 @@ function init_apache() */ function login_apache(&$username, &$password) { - global $db; - // do not allow empty password if (!$password) { @@ -136,8 +132,6 @@ function login_apache(&$username, &$password) */ function autologin_apache() { - global $db; - if (!isset($_SERVER['PHP_AUTH_USER'])) { return array(); @@ -192,7 +186,6 @@ function autologin_apache() */ function user_row_apache($username, $password) { - global $db, $user; // first retrieve default group id $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " @@ -214,7 +207,7 @@ function user_row_apache($username, $password) 'user_email' => '', 'group_id' => (int) $row['group_id'], 'user_type' => phpbb::USER_NORMAL, - 'user_ip' => $user->ip, + 'user_ip' => phpbb::$user->ip, ); } |