|
|
@@ -25,11 +25,10 @@ if ($rsubnet == 0) { $subnet_filter = ''; } else {
|
|
|
|
|
|
$enabled_filter='';
|
|
|
if ($enabled>0) {
|
|
|
- if ($enabled===2) { $enabled_filter = ' and User_auth.enabled=1'; }
|
|
|
- if ($enabled===1) { $enabled_filter = ' and User_auth.enabled=0'; }
|
|
|
+ if ($enabled===2) { $enabled_filter = ' and (User_auth.enabled=1 and User_list.enabled=1)'; }
|
|
|
+ if ($enabled===1) { $enabled_filter = ' and (User_auth.enabled=0 or User_list.enabled=0)'; }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
if (isset($_POST['ip'])) { $f_ip = $_POST['ip']; }
|
|
|
if (!isset($f_ip) and isset($_SESSION[$page_url]['ip'])) { $f_ip=$_SESSION[$page_url]['ip']; }
|
|
|
if (!isset($f_ip)) { $f_ip=''; }
|