added comment for user auto rules

CHANGELOG.md

@@ -0,0 +1,94 @@
+# Changelog 2.7.7
+
+- we update the device's management address when the associated authorization record changes. (92e9f4e)
+- added sort device list by ip as ip-address, not string (e44f605)
+- fixed sfp snmp status for port without snmp (41c74cc)
+- bugfix: Fixed the oldest bug for date filters with a start date setting added: Added subnet selection for the dhcp server log (915a7b7)
+- changed sort timestamp to arp record (4b59701)
+- fixed change dns_name field (060ff5a)
+- fixed deleting a user record based on a dhcp event (f5a736c)
+- fixed delete_record function (a4bb764)
+- added setting of the 'permanent' flag from the list of users (ed6c353)
+- upload last mysql schema (a3eeca6)
+- added support for permanent user record rewrited sub for remove user and user auth record (cc51fac)
+- changed log format for sync mikrotik devices (794b5e1)
+- bugfix: fixed edit group rules (3388ae4)
+- fixed show transceiver status by snmp for SNR switches (519a405)
+- added personal filtering instances for each gateway (f4efb1b)
+- filter groups are linked to filtering instances, which allows you to filter traffic between different interfaces of the same router. Example: (01c0972)
+- added the sysctl config to allow icmp ping to an unprivileged user (cdc222b)
+- hide dhcp timestamp if action is empty (96f841a)
+- added install libcrypt-rijndael-perl to manual (dc0ec8c)
+- optimized snmp collector (abe0374)
+- cosmetic changes (3572af6)
+- changed log level warning messages from collector to debug removed No state for switchport status page (d63e210)
+- optimized: prepare router traffic detailization data only if traffic retention is enabled globally (61e23a0)
+- bugfix: fixed the immediate update of the dhcp server configuration. bugfix: fixed name sessionsclean-fpm -> sessionclean-fpm bugfix: fixed readme for usage php-fpm bugfix: fixed perl scripts for hide utf-8 warnings changed: all Eye subsystem perl daemons run from user eye (f868cce)
+- added search form for auto rules page (cae0ec6)
+- the source for creating the address record is displayed in a separate field. (ec35789)
+- optimization of tables during garbage collection is disabled (079e19f)
+- outdated version updates have been removed (1edde3c)
+- added separate timestamp field for arp event (8309d42)
+- added script for generate freeradius huntgroups restored support free network for traffic collector (3c9ad91)
+- web: added several interface improvements nagios: fixed generation of configs for passive devices during snmp polling (1084df5)
+- fixed snmp-uptime nagios plugins (003c254)
+- fixed parameter transmission to snmp plugins nagios (4b05511)
+- added support snmpv3 for nagios subsystem (f7d70e4)
+- fixed create new user by discovery (7e5326f)
+- web: added EOF time for user form (2410da2)
+- added temporary user records in OU (42e4712)
+- added support dhcp relay for mikrotik dhcp server (a52e65b)
+- fixed write snmp (73c0b65)
+- fixed port control by snmp (b47d870)
+- set minmal length for snmp v3 password to 8 (df41423)
+- added snmpv3 to web (f65466d)
+- added support snmpv3 to perl backend (cfb1d63)
+- log entry of Martian packets (not belonging to office networks, but passing through the router) (078c2ad)
+- bugfix: fixed lifetime of collector state variables (eb795c8)
+- bugfix: fixed editing of user bindings to mac or address (3cc7b44)
+- optimized netflow collector (18d43da)
+- bugfix: fixed old bug for parallel calc user quotes (7f181ee)
+- the scroll bar is hidden in the block diagram (bb680c9)
+- Added the display of the switch model to the block diagram (ee9266c)
+- the directory for the pid files is set to /run The netflow collector is launched from the eye user (659e7a8)
+- fixed remote control handling for router synchronization (54d04f9)
+- added config for use php-fpm rewrite provisiong module for switch access bugfix: fixed path for pid file (ba8c7e4)
+- bugfix: fixed call time function (cac1ec5)
+- web: added WAN statistics page (e762590)
+- fixed statistics for new record, created from netflow (339107e)
+- fixed WAN input counters (2e6a1d5)
+- bugfix: fixed datetime field type and field names in sql request (9cd4443)
+- the fixes of the previous commit have been restored (e338fda)
+- added WAN statistics in collector (ad57c02)
+- web: added definition of the ip protocol name by code (b9869b0)
+- web: add search by ip in detail log (502592d)
+- bugfix: fixed header in netflow dump (2388fd4)
+- the netflow is saved in the router's subdirectory (50e6e7e)
+- fixed update DNS by DHCP for domain's computer cosmetic changes (4142b2d)
+- netflow is saved to files in multiples of 10 minutes (5620f7b)
+- web: added save netflow field for device (e8d73f5)
+- added save netflow as csv added verification of the existence of a computer in the AD domain when updating DNS by DHCP request (8fdfc31)
+- bugfix: Fixed the calculation of hourly statistics for several gateways (550bb05)
+- web: bugfix - fixed value for select field (a0d8d31)
+- mail notifications for changing user records are enabled again (4480320)
+- web: removed class.simple.mail upgrade: fixed upgrade script for 2.7.0 (b49c302)
+- bugfix: Fixed the calculation of hourly statistics for several gateways added: A collector has been written for netflow (v5|v9). Now there is no need for an external collector. (59e2a9d)
+- set script path for nagios module (3aa10fc)
+- set nagios device name by dns name for managment ip record (5b28e8f)
+- bugfix: fixed mass change device models (e0e046c)
+- we always update the vlan membership for the port when snmp is available (a898d04)
+- The address and port comments are combined in the output of the switch ports (73160f2)
+- fixed display poe status for sfp port at poe device (1265710)
+- set poe fields variables as array (4b956f9)
+- set default false for poe fields device models (a067d35)
+- allow change predefined models options (d02a00b)
+- added poe field to device models (e846394)
+- fixes in snmp walk for poe oid (d18122f)
+- bugfix: fixed switch status page if device don't support POE (c129a26)
+- changed display information for restarted devices (76b0a8b)
+- added dhcp script for ROS7 in Readme release 2.6.2 (15a70c9)
+- added dhcp script for ROS7 in Readme (a3034e7)
+- If the ip address comment is allowed, fill it out from the user's record (d72d829)
+- removed warning for empty api login sesion (fe9217a)
+- removed warning for empty login session (a38634c)
+- fixed display customer comment (588227f)

html/admin/iplist/auto_rules.php

@@ -77,7 +77,8 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 <td><input type="checkbox" onClick="checkAll(this.checked);"></td>
 <td><b><?php echo WEB_cell_type; ?></b></td>
 <td><b><?php echo WEB_ou_rule; ?></b></td>
-<td><b><?php echo WEB_rules_target; ?></b></td>
+<td colspan=2><b><?php echo WEB_rules_target; ?></b></td>
+<td><b><?php echo WEB_cell_comment; ?></b></td>
 <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
@@ -102,6 +103,7 @@ foreach ( $t_auth_rules as $row ) {
 	if (!empty($ou_info)) { print "Group: &nbsp"; print_url($ou_info['ou_name'],'/admin/groups/edit_group.php?id='.$ou_info['id']); }
 	}
     print "</td>";
+    print "<td class=\"data\" colspan=2>".$row['comment']."</td>\n";
     print "</tr>\n";
 }
 ?>

html/admin/users/edit_rules.php

@@ -30,10 +30,11 @@ if (isset($_POST['s_save'])) {
             if (intval($_POST['n_id'][$j]) != $save_id) { continue; }
             $new['type'] = $_POST['s_type'][$j]*1;
             $new['rule'] = trim($_POST['s_rule'][$j]);
+            $new['comment'] = trim($_POST['s_comment'][$j]);
             if ($new['type'] ==2) {
                 $new['rule'] = mac_dotted($new['rule']);
                 }
-	    update_auth_rule($db_link,$new['rule'],$new['type'],$save_id);
+	    update_auth_rule($db_link,$new,$save_id);
         }
     }
     header("Location: " . $_SERVER["REQUEST_URI"]);
@@ -69,6 +70,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/header.php");
     <td width=30><b>id</b></td>
     <td><b><?php echo WEB_cell_type; ?></b></td>
     <td><b><?php echo WEB_ou_rule; ?></b></td>
+    <td><b><?php echo WEB_cell_comment; ?></b></td>
     <td><input type="submit" onclick="return confirm('<?php echo WEB_msg_delete; ?>?')" name="s_remove" value="<?php echo WEB_btn_delete; ?>"></td>
 </tr>
 <?php
@@ -79,6 +81,7 @@ foreach ( $t_auth_rules as $row ) {
     print "<td class=\"data\"><input type=\"hidden\" name='n_id[]' value='{$row['id']}'>{$row['id']}</td>\n";
     print "<td class=\"data\">"; print_qa_rule_select("s_type[]","{$row['type']}"); print "</td>\n";
     print "<td class=\"data\"><input type=\"text\" name='s_rule[]' value='{$row['rule']}'></td>\n";
+    print "<td class=\"data\"><input type=\"text\" name='s_comment[]' value='{$row['comment']}'></td>\n";
     print "<td class=\"data\"><button name='s_save[]' value='{$row['id']}'>".WEB_btn_save."</button></td>\n";
     print "</tr>\n";
 }

html/inc/common.php

@@ -2245,10 +2245,10 @@ function add_auth_rule($db, $rule, $type, $user_id)
     return $rule_id;
 }
 
-function update_auth_rule($db, $rule, $type, $rule_id = 0)
+function update_auth_rule($db, $new, $rule_id = 0)
 {
-    $new['type'] = $type;
-    $new['rule'] = $rule;
+    $type = $new['type'];
+    $rule = $new['rule'];
     $auth_rules = get_record_sql($db, "SELECT * FROM auth_rules WHERE rule='" . $rule . "' AND type=" . $type . " AND id<>" . $rule_id);
     if (empty($auth_rules)) {
         $rule_id = update_record($db, "auth_rules", "id=" . $rule_id, $new);