mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

bah, various issues, assign lang to this->lang via pointer(?)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2962 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-10-21 14:10:45 +00:00
parent 413cd7bf03
commit 6ebc8de14c
6 changed files with 161 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/session.php
View File

@@ -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;
}
}