diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-21 14:10:45 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-21 14:10:45 +0000 |
| commit | 6ebc8de14cec13bcfe37b7e21e28137a2db2ce24 (patch) | |
| tree | f8b2f033dd4618076612fd52d449377b359a65fa /phpBB/includes | |
| parent | 413cd7bf0369d6cf88f5b8d3171f2f019a95cd03 (diff) | |
| download | forums-6ebc8de14cec13bcfe37b7e21e28137a2db2ce24.tar forums-6ebc8de14cec13bcfe37b7e21e28137a2db2ce24.tar.gz forums-6ebc8de14cec13bcfe37b7e21e28137a2db2ce24.tar.bz2 forums-6ebc8de14cec13bcfe37b7e21e28137a2db2ce24.tar.xz forums-6ebc8de14cec13bcfe37b7e21e28137a2db2ce24.zip | |
bah, various issues, assign lang to this->lang via pointer(?)
git-svn-id: file:///svn/phpbb/trunk@2962 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 3b4f5df354..18bd69f4ea 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -24,7 +24,7 @@ class session var $session_id = ''; var $data = array(); var $browser = ''; - var $user_ip = ''; + var $ip = ''; var $page = ''; var $load; @@ -388,6 +388,7 @@ class user extends session { include($this->lang_path . 'lang_admin.' . $phpEx); } + $this->lang = &$lang; /* if ( is_array($lang_set) ) @@ -759,7 +760,7 @@ class auth // Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. function login($username, $password, $autologin = false) { - global $board_config, $session, $phpEx; + global $board_config, $user, $phpEx; $method = trim($board_config['auth_method']); @@ -770,14 +771,13 @@ class auth $method = 'login_' . $method; if ( function_exists($method) ) { - if ( !($user = $method($username, $password)) ) + if ( !($login = $method($username, $password)) ) { return false; } $autologin = ( isset($autologin) ) ? md5($password) : ''; - - return ( $user['user_active'] ) ? $session->create($user['user_id'], $autologin) : false; + return ( $login['user_active'] ) ? $user->create($login['user_id'], $autologin) : false; } } |