fixed the LIMIT syntax for compatibility with postgres

fixed an old bug with displaying the number of records at the bottom of the table

html/admin/customers/devmodels.php

@@ -146,7 +146,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 <td><input id='remove' type="submit" name='remove' value="<?php echo WEB_btn_delete; ?>"></td>
 </tr>
 <?php
-$t_ou = get_records_sql($db_link,'SELECT * FROM device_models '.$v_filter." ORDER BY vendor_id, model_name LIMIT $start,$displayed");
+$t_ou = get_records_sql($db_link,'SELECT * FROM device_models '.$v_filter." ORDER BY vendor_id, model_name LIMIT $displayed OFFSET $start");
 foreach ($t_ou 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";

html/admin/customers/devvendors.php

@@ -91,7 +91,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 <td><input type="submit" name='save' value="<?php echo WEB_btn_save; ?>"></td>
 </tr>
 <?php
-$t_ou = get_records_sql($db_link,"SELECT * FROM vendors ORDER BY name LIMIT $start,$displayed");
+$t_ou = get_records_sql($db_link,"SELECT * FROM vendors ORDER BY name LIMIT $displayed OFFSET $start");
 foreach ($t_ou 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";

html/admin/devices/index-passive.php

@@ -140,7 +140,7 @@ $sSQL = "SELECT A.id, D.id as dev_id, D.device_type, A.ip, A.mac, A.user_id, L.l
 FROM user_auth A, user_list L, devices D, device_models M, vendors V
 WHERE D.user_id=L.id AND A.ip = D.ip AND D.device_model_id=M.id AND M.vendor_id=V.id AND A.deleted =0
 $u_filter $ip_list_filter $d_filter
-ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+ORDER BY $sort_table.$sort_field $order LIMIT $displayed OFFSET $start";
 
 $users = get_records_sql($db_link,$sSQL);
 foreach ($users as $user) {
@@ -158,7 +158,7 @@ foreach ($users as $user) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 <br>
 <table class="data">

html/admin/devices/portsbyvlan.php

@@ -41,6 +41,6 @@ foreach ($ports_info as $row) {
 }
 ?>
 </table>
-<?php print_navigation($page_url,$page,$displayed,$count_records[0],$total); 
+<?php print_navigation($page_url,$page,$displayed,$count_records,$total); 
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/iplist/auto_rules.php

@@ -81,7 +81,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$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
-$rulesSQL = "SELECT * FROM auth_rules $rule_filters ORDER BY id LIMIT $start,$displayed";
+$rulesSQL = "SELECT * FROM auth_rules $rule_filters ORDER BY id LIMIT $displayed OFFSET $start";
 $t_auth_rules = get_records_sql($db_link,$rulesSQL);
 foreach ( $t_auth_rules as $row ) {
     print "<tr align=center>\n";
@@ -126,6 +126,6 @@ document.getElementById('rows').addEventListener('change', function(event) {
 </script>
 
 <?php
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.simple.php"); 
 ?>

html/admin/iplist/deleted.php

@@ -76,7 +76,7 @@ $sSQL = "SELECT
 user_auth.id, user_auth.ip, user_auth.mac, user_auth.description, user_auth.dns_name, user_auth.dhcp_hostname, 
 user_auth.dhcp_time, user_auth.last_found, user_auth.ts, user_auth.changed_time
 FROM user_auth WHERE user_auth.deleted = 1 $ip_list_filter
-ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+ORDER BY $sort_table.$sort_field $order LIMIT $displayed OFFSET $start";
 $users = get_records_sql($db_link,$sSQL);
 foreach ($users as $user) {
     if (empty($user['last_found']) or $user['last_found'] === '0000-00-00 00:00:00') { $user['last_found'] = ''; }
@@ -98,7 +98,7 @@ foreach ($users as $user) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 <?php
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");

html/admin/iplist/index.php

@@ -223,7 +223,7 @@ ON user_auth.user_id = user_list.id
 LEFT JOIN ou
 ON ou.id=user_list.ou_id
 WHERE user_auth.deleted =0 $ip_list_filter
-ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+ORDER BY $sort_table.$sort_field $order LIMIT $displayed OFFSET $start";
 
 $users = get_records_sql($db_link,$sSQL);
 foreach ($users as $user) {
@@ -282,7 +282,7 @@ foreach ($users as $user) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 <br>
 <table class="data">

html/admin/iplist/nagios.php

@@ -97,7 +97,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 
 $sSQL = "SELECT user_auth.*, user_list.login FROM user_auth, user_list
 WHERE user_auth.user_id = user_list.id AND user_auth.deleted =0 $ip_list_filter
-ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+ORDER BY $sort_table.$sort_field $order LIMIT $displayed OFFSET $start";
 
 $users = get_records_sql($db_link,$sSQL);
 foreach ($users as $user) {
@@ -150,7 +150,7 @@ foreach ($users as $user) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 <br>
 <table class="data">

html/admin/logs/authlog.php

@@ -51,7 +51,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 	</tr>
 <?php
 #speedup paging
-$sSQL = "SELECT ts,customer,message,level FROM worklog as S JOIN (SELECT id FROM worklog WHERE ts>='$date1' AND ts<'$date2' $log_filter ORDER BY id DESC LIMIT $start,$displayed) AS I ON S.id = I.id";
+$sSQL = "SELECT ts,customer,message,level FROM worklog as S JOIN (SELECT id FROM worklog WHERE ts>='$date1' AND ts<'$date2' $log_filter ORDER BY id DESC LIMIT $displayed OFFSET $start) AS I ON S.id = I.id";
 $userlog = get_records_sql($db_link, $sSQL);
 foreach ($userlog as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
@@ -67,6 +67,6 @@ foreach ($userlog as $row) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/detaillog.php

@@ -89,7 +89,7 @@ $gateway_list = get_gateways($db_link);
 <?php
 $fsql = "SELECT A.id, A.auth_id, A.ts, A.router_id, A.proto, A.src_ip, A.src_port, A.dst_ip, A.dst_port, A.bytes, A.pkt FROM traffic_detail as A JOIN (SELECT id FROM traffic_detail 
         WHERE $gateway_filter $ip_where ts>='$date1' AND ts<'$date2'
-        ORDER BY ts ASC LIMIT $start,$displayed) as T ON A.id = T.id ORDER BY $sort_table.$sort_field $order";
+        ORDER BY ts ASC LIMIT $displayed OFFSET $start) as T ON A.id = T.id ORDER BY $sort_table.$sort_field $order";
 $userdata = get_records_sql($db_link, $fsql);
 foreach ($userdata as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
@@ -116,7 +116,7 @@ foreach ($userdata as $row) {
 }
 ?>
 </table>
-<?php print_navigation($page_url,$page,$displayed,$count_records[0],$total); ?>
+<?php print_navigation($page_url,$page,$displayed,$count_records,$total); ?>
 <?php
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/dhcp.php

@@ -77,7 +77,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 <?php
 
 #speedup dhcp log paging
-$sSQL = "SELECT * FROM dhcp_log as D JOIN (SELECT id FROM dhcp_log WHERE ts>='$date1' and ts<'$date2' $dhcp_where ORDER BY id DESC LIMIT $start,$displayed) AS I ON D.id = I.id";
+$sSQL = "SELECT * FROM dhcp_log as D JOIN (SELECT id FROM dhcp_log WHERE ts>='$date1' and ts<'$date2' $dhcp_where ORDER BY id DESC LIMIT $displayed OFFSET $start) AS I ON D.id = I.id";
 $userlog = get_records_sql($db_link, $sSQL);
 
 foreach ($userlog as $row) {
@@ -98,6 +98,6 @@ foreach ($userlog as $row) {
     print "</tr>\n";
     }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/index.php

@@ -48,7 +48,7 @@ $start = ($page * $displayed) - $displayed;
 print_navigation($page_url,$page,$displayed,$count_records,$total);
 
 #speedup paging
-$sSQL = "SELECT * FROM (SELECT * FROM worklog WHERE ts>='$date1' AND ts<'$date2' $log_filter ) AS W ORDER BY ts DESC LIMIT $start,$displayed";
+$sSQL = "SELECT * FROM (SELECT * FROM worklog WHERE ts>='$date1' AND ts<'$date2' $log_filter ) AS W ORDER BY ts DESC LIMIT $displayed OFFSET $start";
 
 ?>
 <br>
@@ -64,6 +64,7 @@ $sSQL = "SELECT * FROM (SELECT * FROM worklog WHERE ts>='$date1' AND ts<'$date2'
 
 <?php
 $userlog = get_records_sql($db_link, $sSQL);
+
 foreach ($userlog as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
     print "<td class=\"data\">" . $row['ts'] . "</td>\n";
@@ -80,6 +81,6 @@ foreach ($userlog as $row) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/ip.php

@@ -53,7 +53,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 
 <?php
 
-$sSQL = "SELECT * FROM user_auth WHERE ts>='$date1' AND ts<'$date2' $ip_where ORDER BY id DESC LIMIT $start,$displayed";
+$sSQL = "SELECT * FROM user_auth WHERE ts>='$date1' AND ts<'$date2' $ip_where ORDER BY id DESC LIMIT $displayed OFFSET $start";
 
 $iplog = get_records_sql($db_link, $sSQL);
 foreach ($iplog as $row) {
@@ -72,6 +72,6 @@ foreach ($iplog as $row) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/mac.php

@@ -46,7 +46,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 
 <?php
 
-$sSQL = "SELECT * FROM mac_history WHERE ts>='$date1' AND ts<'$date2' $mac_where ORDER BY ts DESC LIMIT $start,$displayed";
+$sSQL = "SELECT * FROM mac_history WHERE ts>='$date1' AND ts<'$date2' $mac_where ORDER BY ts DESC LIMIT $displayed OFFSET $start";
 $maclog = get_records_sql($db_link, $sSQL);
 
 foreach ($maclog as $row) {
@@ -62,6 +62,6 @@ foreach ($maclog as $row) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/syslog.php

@@ -50,7 +50,7 @@ if ($page<1) { $page=1; }
 $start = ($page * $displayed) - $displayed; 
 print_navigation($page_url,$page,$displayed,$count_records,$total);
 #speedup pageing
-$sSQL = "SELECT * FROM (SELECT * FROM remote_syslog WHERE ts>='$date1' AND ts<'$date2' $log_filter) as R ORDER BY ts DESC LIMIT $start,$displayed";
+$sSQL = "SELECT * FROM (SELECT * FROM remote_syslog WHERE ts>='$date1' AND ts<'$date2' $log_filter) as R ORDER BY ts DESC LIMIT $displayed OFFSET $start";
 ?>
 
 <br>
@@ -75,6 +75,6 @@ if (!empty($syslog)) {
         }
     }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/logs/unknown.php

@@ -43,7 +43,7 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
 </tr>
 <?php
 
-$sSQL = "SELECT U.mac, U.ts, DP.port, D.device_name FROM unknown_mac AS U, devices AS D, device_ports AS DP  WHERE D.device_type<=2 and U.device_id = D.id  AND U.port_id = DP.id AND U.ts>='$date1' AND U.ts<'$date2' $where_dev ORDER BY U.mac LIMIT $start,$displayed";
+$sSQL = "SELECT U.mac, U.ts, DP.port, D.device_name FROM unknown_mac AS U, devices AS D, device_ports AS DP  WHERE D.device_type<=2 and U.device_id = D.id  AND U.port_id = DP.id AND U.ts>='$date1' AND U.ts<'$date2' $where_dev ORDER BY U.mac LIMIT $displayed OFFSET $start";
 $maclog = get_records_sql($db_link, $sSQL);
 foreach ($maclog as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
@@ -54,6 +54,6 @@ foreach ($maclog as $row) {
     print "</tr>\n";
 }
 print "</table>\n";
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");
 ?>

html/admin/reports/index-full.php

@@ -57,7 +57,7 @@ if ($page<1) { $page=1; }
 $start = ($page * $displayed) - $displayed;
 
 #set sort
-$trafSQL=$trafSQL ." $sort_sql LIMIT $start,$displayed";
+$trafSQL=$trafSQL ." $sort_sql LIMIT $displayed OFFSET $start";
 
 print_navigation($page_url,$page,$displayed,$count_records,$total);
 
@@ -108,7 +108,7 @@ print "</tr>\n";
 </table>
 
 <?php
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 
 <script>

html/admin/reports/userdaydetail.php

@@ -53,7 +53,7 @@ if (!empty($rgateway) and $rgateway>0) { $gateway_filter="(router_id=$rgateway)
 
 $fsql = "SELECT A.proto, A.src_ip, A.src_port, SUM(A.bytes) as tin FROM traffic_detail A
             WHERE $gateway_filter (auth_id='$id') and  ts>='$date1' and ts<'$date2' and (A.dst_ip='$ip_aton')
-            GROUP BY A.src_ip, A.src_port, A.proto ORDER BY tin DESC LIMIT 0,10";
+            GROUP BY A.src_ip, A.src_port, A.proto ORDER BY tin DESC LIMIT 10 OFFSET 0";
 $userdata = get_records_sql($db_link, $fsql);
 foreach ($userdata as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
@@ -83,7 +83,7 @@ foreach ($userdata as $row) {
 <?php
 $fsql = "SELECT A.proto, A.dst_ip, A.dst_port, SUM(A.bytes) as tout FROM traffic_detail A
         WHERE $gateway_filter (auth_id='$id') and  ts>='$date1' and ts<'$date2' and (A.src_ip='$ip_aton')
-        GROUP BY A.dst_ip, A.dst_port, A.proto ORDER BY tout DESC LIMIT 0,10";
+        GROUP BY A.dst_ip, A.dst_port, A.proto ORDER BY tout DESC LIMIT 10 OFFSET 0";
 $userdata = get_records_sql($db_link, $fsql);
 foreach ($userdata as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";

html/admin/reports/userdaydetaillog.php

@@ -79,7 +79,7 @@ $gateway_list = get_gateways($db_link);
 <?php
 $fsql = "SELECT A.id, A.ts, A.router_id, A.proto, A.src_ip, A.src_port, A.dst_ip, A.dst_port, A.bytes, A.pkt FROM traffic_detail as A JOIN (SELECT id FROM traffic_detail 
         WHERE $gateway_filter (auth_id='$id') and  ts>='$date1' and ts<'$date2'
-        ORDER BY ts ASC LIMIT $start,$displayed) as T ON A.id = T.id ORDER BY $sort_table.$sort_field $order";
+        ORDER BY ts ASC LIMIT $displayed OFFSET $start) as T ON A.id = T.id ORDER BY $sort_table.$sort_field $order";
 $userdata = get_records_sql($db_link, $fsql);
 foreach ($userdata as $row) {
     print "<tr align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
@@ -104,7 +104,7 @@ foreach ($userdata as $row) {
 }
 ?>
 </table>
-<?php print_navigation($page_url,$page,$displayed,$count_records[0],$total); ?>
+<?php print_navigation($page_url,$page,$displayed,$count_records,$total); ?>
 <br>
 <?php
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/footer.php");

html/admin/users/editauth.php

@@ -431,7 +431,8 @@ if (empty($auth_info['end_life']) or $auth_info['end_life'] == '0000-00-00 00:00
                 <td></td>
             </tr>
             <tr>
-                <td colspan=3><input type="submit" name="moveauth" value=<?php print WEB_btn_move; ?>><?php print_login_select($db_link, 'f_new_parent', $auth_info['user_id']); ?></td>
+                <td colspan=3><input type="submit" name="moveauth" value=<?php print WEB_btn_move; ?>>
+                <?php print_login_select($db_link, 'f_new_parent', $auth_info['user_id']); ?></td>
                 <?php
                 if ($auth_info['deleted']) {
                     print "<td ><font color=red>" . WEB_deleted . ": " . $auth_info['changed_time'] . "</font></td>";

html/admin/users/index.php

@@ -113,7 +113,7 @@ if ($page<1) { $page=1; }
 $start = ($page * $displayed) - $displayed;
 print_navigation($page_url,$page,$displayed,$count_records,$total);
 
-$sSQL = "SELECT U.id, U.login, U.fio, O.ou_name, U.enabled, U.day_quota, U.month_quota, U.blocked, U.permanent FROM user_list U, ou O WHERE $filter ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+$sSQL = "SELECT U.id, U.login, U.fio, O.ou_name, U.enabled, U.day_quota, U.month_quota, U.blocked, U.permanent FROM user_list U, ou O WHERE $filter ORDER BY $sort_table.$sort_field $order LIMIT $displayed OFFSET $start";
 
 ?>
 
@@ -171,7 +171,7 @@ foreach ($users as $row) {
 </table>
 
 <?php
-print_navigation($page_url,$page,$displayed,$count_records[0],$total);
+print_navigation($page_url,$page,$displayed,$count_records,$total);
 ?>
 
 </form>

html/inc/common.php

@@ -749,7 +749,7 @@ function print_add_dev_interface($db, $device_id, $int_list, $int_name)
     print "&nbsp<select id=\"$int_name\" name=\"$int_name\" >\n";
     $t_int = get_records_sql($db, "SELECT * FROM device_l3_interfaces WHERE device_id=" . $device_id);
     $int_exists = [];
-    if (!empty(t_int)) {
+    if (!empty($t_int)) {
         foreach ($t_int as $interface) {
             $int_exists[$interface['snmpin']] = $interface;
         }
@@ -2955,6 +2955,7 @@ function set_port_for_group($db, $group_id, $place_id, $state)
 
 function get_vendor($db, $mac)
 {
+    if (empty($mac)) { return ''; }
     $mac = mac_dotted($mac);
     $mac5 = substr($mac, 0, 14);
     $mac4 = substr($mac, 0, 11);

html/inc/header.php

@@ -43,7 +43,10 @@ if(check) {
 }
 
 $(document).ready(function() {
-$('.js-select-single').select2();
+$('.js-select-single').select2({
+    width: 'auto',
+    dropdownAutoWidth: true
+});
 });
 </script>