diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-15 17:43:07 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-15 17:43:07 +0000 |
| commit | a47fa4d6cab862a9635f3e30d01ad2740c45a888 (patch) | |
| tree | 10d3ad33badde24948065613ff884cc37ee87781 /phpBB/includes/auth | |
| parent | 8661a45de596e06e89e8fa8f12efb91293780419 (diff) | |
| download | forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.gz forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.bz2 forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.xz forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.zip | |
Remove need for session_ids for "allowed" bots, dump user_founder/user_active in favour of user_type, new user_type, USER_IGNORE
git-svn-id: file:///svn/phpbb/trunk@4603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/auth_apache.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php index d9b00f5435..3a9fa90cd9 100644 --- a/phpBB/includes/auth/auth_apache.php +++ b/phpBB/includes/auth/auth_apache.php @@ -20,7 +20,7 @@ function login_apache(&$username, &$password) if ($php_auth_user && $php_auth_pw) { - $sql = ' user_id, username, user_password, user_passchg, user_email, user_active + $sql = ' user_id, username, user_password, user_passchg, user_email, user_type FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($username) . "'"; $result = $db->sql_query($sql); @@ -28,7 +28,7 @@ function login_apache(&$username, &$password) if ($row = $db->sql_fetchrow($result)) { $db->sql_freeresult($result); - return (empty($row['user_active'])) ? 0 : $row; + return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? 0 : $row; } } diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 927c3ecfe7..998565ede5 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -14,7 +14,7 @@ function login_db(&$username, &$password) { global $db, $config; - $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_active + $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($username) . "'"; $result = $db->sql_query($sql); @@ -24,7 +24,7 @@ function login_db(&$username, &$password) $db->sql_freeresult($result); if (md5($password) == $row['user_password']) { - return (empty($row['user_active'])) ? 0 : $row; + return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? 0 : $row; } } diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index 1b89a02d20..13b3d2b0b1 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -34,7 +34,7 @@ function login_ldap(&$username, &$password) { @ldap_close($ldap); - $sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_active + $sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($username) . "'"; $result = $db->sql_query($sql); @@ -42,7 +42,7 @@ function login_ldap(&$username, &$password) if ($row = $db->sql_fetchrow($result)) { $db->sql_freeresult($result); - return (empty($row['user_active'])) ? 0 : $row; + return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? 0 : $row; } } } |