small fixes

html/admin/devices/index-tree-simple.php

@@ -21,7 +21,7 @@ foreach ($hash as $device) {
     }
 }
 
-$dSQL = 'SELECT * FROM devices WHERE deleted=0 '.$filter.' '.$sort_sql;
+$dSQL = 'SELECT * FROM devices WHERE deleted=0';
 $switches = get_records_sql($db_link,$dSQL);
 $dev_hash = NULL;
 foreach ($switches as $row) {

html/admin/devices/index-tree.php

@@ -34,7 +34,7 @@ foreach ($hash as $device) {
     }
 }
 
-$dSQL = 'SELECT * FROM devices WHERE deleted=0 '.$filter.' '.$sort_sql;
+$dSQL = 'SELECT * FROM devices WHERE deleted=0';
 $switches = get_records_sql($db_link,$dSQL);
 $dev_hash = NULL;
 foreach ($switches as $row) {

html/admin/devices/switchstatus.php

@@ -77,12 +77,12 @@ if ($switch['snmp_version']>0) {
 	    global $cisco_modules;
             if ($switch['snmp_version'] == 2) {
 	        $modules_oids = snmp2_real_walk($switch['ip'], $switch['community'], $cisco_modules);
-	    }
+	        }
             if ($switch['snmp_version'] == 1) {
 	        $modules_oids = snmprealwalk($switch['ip'], $switch['community'], $cisco_modules);
+	        }
 	    }
-	}
-    } else { $snmp_ok = 0; }
+        } else { $snmp_ok = 0; }
 
     print "<table class=\"data\" cellspacing=\"1\" cellpadding=\"4\">\n";
     print "<tr>\n";

html/admin/iplist/index.php

@@ -74,6 +74,7 @@ if ($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=''; }
 $_SESSION[$page_url]['ip']=$f_ip;
 
 $ip_where = '';

html/admin/reports/authday.php

@@ -79,7 +79,7 @@ while (list ($u_router_id, $udata, $uin, $uout, $pin, $pout) = mysqli_fetch_arra
     $sum_out += $uout;
 }
 print "<tr align=center align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
-print "<td class=\"data\"><b>" . userinfo9 . "</b></td>\n";
+print "<td class=\"data\"><b>" . $title_itog . "</b></td>\n";
 print "<td class=\"data\"><b> </b></td>\n";
 print "<td class=\"data\"><b>" . fbytes($sum_in) . "</b></td>\n";
 print "<td class=\"data\"><b>" . fbytes($sum_out) . "</b></td>\n";

html/inc/common.php

@@ -480,16 +480,18 @@ function print_loglevel_select($item_name, $value)
 function reencodeurl($url) {
 $url_arr = explode('?', $url);
 $fpage = $url_arr[0];
-$params = $url_arr[1];
-$params_arr = explode('&', $params);
-$new_params = '';
-foreach ($params_arr as $row) {
-    $param = explode ('=',$row);
-    $key = $param[0]; 
-    $value = urlencode(urldecode($param[1]));
-    $new_params.="&".$key."=".$value;
-    }
-$new_params = preg_replace('/^&/','',$new_params);
+if (isset($url_arr[1])) {
+    $params = $url_arr[1];
+    $params_arr = explode('&', $params);
+    $new_params = '';
+    foreach ($params_arr as $row) {
+        $param = explode ('=',$row);
+        $key = $param[0]; 
+        $value = urlencode(urldecode($param[1]));
+        $new_params.="&".$key."=".$value;
+        }
+    $new_params = preg_replace('/^&/','',$new_params);
+    } else { $new_params='='; }
 if ($new_params === '=') { $new_url = $fpage; } else { $new_url = $fpage."?".$new_params; }
 return $new_url;
 }
@@ -1099,7 +1101,7 @@ function get_device_by_auth($db, $id)
 {
     $d_sql = "SELECT id FROM devices WHERE user_id=$id and deleted=0";
     $f_dev = get_record_sql($db,$d_sql);
-    return $f_dev[id];
+    return $f_dev['id'];
 }
 
 function print_auth_port($db, $port_id)
@@ -2242,7 +2244,7 @@ function get_port_poe_state($vendor_id, $port, $ip, $community, $version)
 
     $result = '';
     $c_state = get_snmp($ip, $community, $version, $poe_status);
-    if (isset($c_state)) {
+    if (!empty($c_state)) {
         list ($pattern, $p_state) = explode(':', $c_state);
         if ($vendor_id == 9) {
             if ($p_state == 1) {
@@ -2829,6 +2831,7 @@ function get_record_sql($db, $sql)
         return;
     }
     $record = mysqli_query($db, $sql." LIMIT 1");
+    $result = NULL;
     if ($rec = mysqli_fetch_array($record, MYSQLI_ASSOC)) {
         foreach ($rec as $key => $value) {
 	    if (! isset($value) or $value==='NULL') { $value = ''; }
@@ -3071,7 +3074,7 @@ function get_cacti_graph($host_ip, $port_index)
 
     $host_sql = 'SELECT id FROM host Where hostname="' . $host_ip . '"';
     $tmpArray = mysqli_fetch_array(mysqli_query($cacti_db_link, $host_sql), MYSQLI_ASSOC);
-    if (sizeof($tmpArray)) {
+    if (isset($tmpArray) and sizeof($tmpArray)) {
         foreach ($tmpArray as $key => $value) {
             if ($key == 'id') {
                 $host_id = $value;
@@ -3083,7 +3086,7 @@ function get_cacti_graph($host_ip, $port_index)
 
     $graph_sql = 'SELECT id FROM graph_local Where graph_template_id=2 and host_id="' . $host_id . '" and snmp_index="' . $port_index . '"';
     $tmpArray = mysqli_fetch_array(mysqli_query($cacti_db_link, $graph_sql), MYSQLI_ASSOC);
-    if (sizeof($tmpArray)) {
+    if (isset($tmpArray) and sizeof($tmpArray)) {
         foreach ($tmpArray as $key => $value) {
             if ($key == 'id') {
                 $graph_id = $value;

html/inc/languages/russian.php

@@ -33,6 +33,7 @@ $title_pktout = "OUT, pkt/s";
 $title_maxpktin = "Max IN, pkt/s";
 $title_maxpktout = "Max OUT, pkt/s";
 $title_sum = "Суммарно";
+$title_itog = "Итого";
 
 /* table cell names */
 $cell_login = "Логин";

updates/db-patch-mysql-utf8.sh

@@ -1,13 +1,24 @@
 #!/bin/bash
 
-echo "Run in mysql console:"
+db_name=$1
 
-dbname=$1
+echo -n "Enter password:"
+read db_pass
 
-mysql -u root -p ${dbname} -B -N -e "SHOW TABLES" | awk '{print "SET foreign_key_checks = 0; ALTER TABLE", $1, "CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SET foreign_key_checks = 1; "}' >migration_utf8
-echo "ALTER DATABASE ${dbname} CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;">>migration_utf8
+C_TABLES=$(mysql -u root -p ${db_name} --password=${db_pass} -B -N -e "SHOW TABLES")
 
-mysql -u root -p ${dbname} < migration_utf8
+echo "${C_TABLES}" | awk '{print "SET foreign_key_checks = 0; ALTER TABLE", $1, "CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SET foreign_key_checks = 1; "}' >migration_utf8
+echo "ALTER DATABASE ${db_name} CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;">>migration_utf8
+echo "${C_TABLES}" | while read table; do
+mysql -u root -p ${db_name} --password=${db_pass} -e "show create table ${table}" | sed 's/\\n/\n/g' | egrep -i "[[:space:]]MEDIUMTEXT[[:space:]]" | awk '{ print $1 }' | while read c_field; do
+    echo "ALTER TABLE $table MODIFY $c_field TEXT NULL" >>migration_utf8
+    done
+done
+
+exit
+
+
+mysql -u root -p ${db_name} --password=${db_pass} < migration_utf8
 rm -f migration_utf8
 
 exit