فهرست منبع

web: cosmetic changes

root 1 سال پیش
والد
کامیت
336da68ce4
4فایلهای تغییر یافته به همراه27 افزوده شده و 5 حذف شده
  1. 21 3
      html/admin/iplist/auto_rules.php
  2. 2 2
      html/inc/common.php
  3. 2 0
      html/inc/languages/english.php
  4. 2 0
      html/inc/languages/russian.php

+ 21 - 3
html/admin/iplist/auto_rules.php

@@ -57,7 +57,7 @@ if (!empty($f_rule)) { $rule_filter = ' AND `rule` LIKE "'.$f_rule.'%"'; }
 
 $rule_filters = '';
 if (!empty($target_filter) or !empty($type_filter) or !empty($rule_filter)) {
-    $rule_filters='WHERE 1'.$target_filter.$type_filter.$rule_filter;
+    $rule_filters='WHERE id '.$target_filter.$type_filter.$rule_filter;
     }
 
 fix_auth_rules($db_link);
@@ -81,7 +81,8 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 <td align=right><input type="submit" onclick="return confirm('<?php echo WEB_msg_delete; ?>?')" name="removeRule" value="<?php echo WEB_btn_delete; ?>"></td>
 </tr>
 <?php
-$t_auth_rules = get_records_sql($db_link,"SELECT * FROM auth_rules $rule_filters ORDER BY id LIMIT $start,$displayed");
+$rulesSQL = "SELECT * FROM auth_rules $rule_filters ORDER BY id LIMIT $start,$displayed";
+$t_auth_rules = get_records_sql($db_link,$rulesSQL);
 foreach ( $t_auth_rules as $row ) {
     print "<tr align=center>\n";
     print "<td class=\"data\" style='padding:0'><input type=checkbox name=f_id[] value=".$row["id"]." ></td>\n";
@@ -106,7 +107,24 @@ foreach ( $t_auth_rules as $row ) {
 ?>
 </table>
 </form>
+
+<script>
+document.getElementById('rule_target').addEventListener('change', function(event) {
+  const buttonApply = document.getElementById('btn_filter');
+  buttonApply.click();
+});
+document.getElementById('rule_type').addEventListener('change', function(event) {
+  const buttonApply = document.getElementById('btn_filter');
+  buttonApply.click();
+});
+document.getElementById('rows').addEventListener('change', function(event) {
+  const buttonApply = document.getElementById('btn_filter');
+  buttonApply.click();
+});
+
+</script>
+
 <?php
 print_navigation($page_url,$page,$displayed,$count_records[0],$total);
-require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php"); 
+require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.simple.php"); 
 ?>

+ 2 - 2
html/inc/common.php

@@ -1189,8 +1189,8 @@ function print_rule_target_select($qa_name, $qa_value)
         $qa_value = 0;
     }
     print_select_item('-', 0, $qa_value);
-    print_select_item(WEB_msg_IP, 1, $qa_value);
-    print_select_item(WEB_cell_ou, 2, $qa_value);
+    print_select_item(WEB_rules_target_user, 1, $qa_value);
+    print_select_item(WEB_rules_target_group, 2, $qa_value);
     print "</select>\n";
 }
 

+ 2 - 0
html/inc/languages/english.php

@@ -433,6 +433,8 @@ define("WEB_ou_new_rule","New rule");
 
 /* auto rules */
 define("WEB_rules_target","User/Group");
+define("WEB_rules_target_user","User");
+define("WEB_rules_target_group","Group");
 define("WEB_rules_search_target","Rule target");
 define("WEB_rules_search_type","Rule type");
 define("WEB_rules_type_subnet","Subnet");

+ 2 - 0
html/inc/languages/russian.php

@@ -433,6 +433,8 @@ define("WEB_ou_new_rule","Новое правило");
 
 /* auto rules */
 define("WEB_rules_target","Юзер/группа");
+define("WEB_rules_target_user","Пользователь");
+define("WEB_rules_target_group","Группа");
 define("WEB_rules_search_target","Назначение правила");
 define("WEB_rules_search_type","Тип правила");
 define("WEB_rules_type_subnet","Подсеть");