Przeglądaj źródła

fix display enabled filter for all ip

rajven 2 lat temu
rodzic
commit
b4f29bce75
2 zmienionych plików z 2 dodań i 57 usunięć
  1. 2 2
      html/admin/iplist/index.php
  2. 0 55
      html/white.css

+ 2 - 2
html/admin/iplist/index.php

@@ -25,8 +25,8 @@ 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)'; }
     }
 
 

+ 0 - 55
html/white.css

@@ -1,55 +0,0 @@
-body                            { font-family: tahoma; font-size: 12pt; color: #181818; margin: 0; background-color: #ffffff; }
-img                             { border: 0; }
-
-table                           { font-family: tahoma; font-size: 12pt; border-spacing: 1px; }
-table.data                      { background-color: #cfcfcf; margin-bottom: 5px; }
-table.info                      { background-color: #f8f2aa; margin-bottom: 5px; }
-
-td                              { padding: 4px; border-bottom: 1px solid #ddd; }
-td.data                         { background-color: #ffffff; }
-td.info                         { background-color: #f8f2aa; }
-td.up                           { background-color: #33ff99; }
-td.down                         { background-color: #ffffff; opacity: .4; }
-td.shutdown                     { background-color: #FF8033; }
-td.error                        { background-color: #ff6666; }
-td.nb                           { background-color: #ffcc99; }
-td.warn                         { background-color: #ffcccc; }
-td.speed10M                     { background-color: #ffff99; }
-td.speed100M                    { background-color: #33cc33; }
-td.speed1G                      { background-color: #58FA82; }
-td.speed10G                     { background-color: #ffcc00; }
-td.crc                          { background-color: #ff6666; }
-
-input                           { font-family: tahoma; padding: 1px; }
-textarea                        { font-family: tahoma; padding: 1px; }
-select                          { font-family: tahoma; width: auto; padding: 0; }
-
-form                            { margin: 0; margin-top: 5px; }
-.cont                           { font-family: tahoma; }
-
-span.num_page_not_link          { border: 1px solid; color: black; padding: 3px; margin-bottom: 1em;}
-
-div.records                     { color: black; margin-bottom: 1em; margin-top: 1em; }
-div.simple                      { margin-bottom: 1em; margin-top: 1em; }
-
-a                               { font-family: tahoma; color: #000000; text-decoration: underline; }
-a.first_page_link               { border: 1px solid green; color: black; background-color: #A5FF33; padding: 3px; margin-bottom: 1em;}
-a:visited                       { color: #000000; text-decoration: underline; }
-a:link                          { color: #000000; text-decoration: underline; }
-a:active                        { color: #ed8b0d; text-decoration: none; }
-a:hover                         { color: #ed8b0d; text-decoration: none; }
-
-#navi                           { position: absolute; font-size: 12pt; top: 15px; left: 190px; }
-#title                          { position: absolute; top: 15px; left: 15px; font-size: 18pt; color: #ed8b0d; }
-#subtitle                       { position: absolute; top: 43px; left: 15px; font-size: 8pt; }
-#submenu                        { position: absolute; top: 55px; left: 20px; }
-#cont                           { position: absolute; top: 70px; left: 15px; background-color: url('img/vr.gif'); background-repeat: repeat-y; background-position: right; }
-#subsubmenu                     { position: absolute; top: 80px; left: 20px; }
-#contsubmenu                    { position: absolute; top: 105px; left: 15px; background-color: url('img/vr.gif'); background-repeat: repeat-y; background-position: right; }
-
-#copyright                      { margin-top: 10px; margin-bottom: 10px; }
-#msg                            { font-size: 18pt; color: black; color: red; }
-
-html                            { margin:0; padding:0; font-size:62.5%; }
-h1                              { font-size:1.8em; }
-.tree                           { overflow:auto; border:0px; }