web: added save netflow field for device

html/admin/customers/control-options.php

@@ -83,7 +83,7 @@ print_control_submenu($page_url);
 
             <?php
             $descr_field = "description." . HTML_LANG;
-            $config_sql = "SELECT `config`.`id`,`option_id`,`option_name`,`value`,`type`,`" . $descr_field . "`,`min_value`,`max_value` FROM `config`,`config_options` WHERE `config`.`option_id`=`config_options`.`id` ORDER BY `option_name`";
+            $config_sql = "SELECT `config`.`id`,`option_id`,`option_name`,`value`,`type`,`" . $descr_field . "`,`min_value`,`max_value` FROM `config`,`config_options` WHERE `config`.`option_id`=`config_options`.`id` AND `config_options`.`draft`=0 ORDER BY `option_name`";
             $t_config = mysqli_query($db_link, $config_sql);
             while ($row = mysqli_fetch_array($t_config)) {
                 print "<tr align=center>\n";

html/admin/devices/editdevice.php

@@ -83,6 +83,7 @@ if (isset($_POST["editdevice"]) and isset($id)) {
         }
     if (isset($_POST["f_protocol"])) { $new['protocol'] = $_POST["f_protocol"]*1; }
     if (isset($_POST["f_control_port"])) { $new['control_port'] = $_POST["f_control_port"]*1; }
+    if (isset($_POST["f_save_netflow"])) { $new['netflow_save'] = $_POST["f_save_netflow"]*1; }
     //discovery
     if (isset($_POST["f_discovery"])) { $new['discovery'] = $_POST["f_discovery"]; }
     //nagios
@@ -187,11 +188,11 @@ if ($device['device_type']<=2) {
     print "<td class='data'><input type='text' name='f_control_port' value=".$device['control_port']."></td>\n";
     print "</tr>";
     //snmp settings & discovery & nagios
-    print "<tr><td>".WEB_snmp_version."</td><td>".WEB_network_discovery."</td><td>".WEB_nagios."</td><td></td></tr>";
+    print "<tr><td>".WEB_snmp_version."</td><td>".WEB_network_discovery."</td><td>".WEB_nagios."</td><td>".WEB_device_save_netflow."</td></tr>";
     print "<tr><td class='data'>"; print_snmp_select('f_snmp_version', $device['snmp_version']); print "</td>\n";
     print "<td class='data'>"; print_qa_select('f_discovery', $device['discovery']); print "</td>\n";
     print "<td class='data'>"; print_qa_select('f_nagios', $device['nagios']); print "</td>\n";
-    print "<td class='data'></td>\n";
+    print "<td class='data'>"; print_qa_select('f_save_netflow', $device['netflow_save']); print "</td>\n";
     print "</tr>";
     if ($device['snmp_version'] ==3) {
         print "<tr><td>".WEB_snmp_v3_user_ro."</td><td>".WEB_snmp_v3_user_rw."</td><td>".WEB_snmp_v3_ro_password."</td><td>".WEB_snmp_v3_rw_password."</td><td></td>";

html/inc/common.php

@@ -1567,11 +1567,11 @@ function get_port($db, $port_id)
 function print_option_select($db, $option_name)
 {
     print "<select name=\"$option_name\">\n";
-    $t_option = mysqli_query($db, "SELECT id,option_name FROM config_options WHERE uniq=0 order by option_name");
+    $t_option = mysqli_query($db, "SELECT id,option_name FROM config_options WHERE uniq=0 AND draft=0 order by option_name");
     while (list($f_id, $f_name) = mysqli_fetch_array($t_option)) {
         print "<option value=$f_id>$f_name</option>";
     }
-    $t_option = mysqli_query($db, "SELECT id,option_name FROM config_options WHERE uniq=1 and id not in (select option_id FROM config) order by option_name");
+    $t_option = mysqli_query($db, "SELECT id,option_name FROM config_options WHERE draft=0 AND uniq=1 AND id NOT IN (select option_id FROM config where draft=0) order by option_name");
     while (list($f_id, $f_name) = mysqli_fetch_array($t_option)) {
         print "<option value=$f_id>$f_name</option>";
     }

html/inc/languages/english.php

@@ -352,6 +352,7 @@ define("WEB_device_mac_by_oid","Mac by snmp");
 define("WEB_device_mac_table","Show mac table");
 define("WEB_device_walk_port_list","Port Walk");
 define("WEB_device_port_count","Ports");
+define("WEB_device_save_netflow","Save Netflow");
 
 /* editport */
 define("WEB_device_port_number","Port N");

html/inc/languages/russian.php

@@ -351,6 +351,7 @@ define("WEB_device_mac_by_oid","Mac by snmp");
 define("WEB_device_mac_table","Show mac table");
 define("WEB_device_walk_port_list","Port Walk");
 define("WEB_device_port_count","Портов");
+define("WEB_device_save_netflow","Сохранять Netflow");
 
 /* editport */
 define("WEB_device_port_number","Порт N");