diff options
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/auth_apache.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php index d23b27a7dd..9ff10ccf7d 100644 --- a/phpBB/includes/auth/auth_apache.php +++ b/phpBB/includes/auth/auth_apache.php @@ -96,7 +96,7 @@ function login_apache(&$username, &$password) if ($row) { // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) + if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE) { return array( 'status' => LOGIN_ERROR_ACTIVE, @@ -104,7 +104,7 @@ function login_apache(&$username, &$password) 'user_row' => $row, ); } - + // Successful login... return array( 'status' => LOGIN_SUCCESS, @@ -160,7 +160,7 @@ function autologin_apache() if ($row) { - return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; + return ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE) ? array() : $row; } if (!function_exists('user_add')) @@ -213,7 +213,7 @@ function user_row_apache($username, $password) 'user_password' => phpbb_hash($password), 'user_email' => '', 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, + 'user_type' => phpbb::USER_NORMAL, 'user_ip' => $user->ip, ); } diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 82750936f1..670b16c4e3 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -180,7 +180,7 @@ function login_db(&$username, &$password) } // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) + if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE) { return array( 'status' => LOGIN_ERROR_ACTIVE, diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index 3163153997..797d3c1cbb 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -187,7 +187,7 @@ function login_ldap(&$username, &$password) unset($ldap_result); // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) + if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE) { return array( 'status' => LOGIN_ERROR_ACTIVE, @@ -225,7 +225,7 @@ function login_ldap(&$username, &$password) 'user_password' => phpbb_hash($password), 'user_email' => (!empty($config['ldap_email'])) ? $ldap_result[0][$config['ldap_email']][0] : '', 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, + 'user_type' => phpbb::USER_NORMAL, 'user_ip' => $user->ip, ); |