Просмотр исходного кода

bugfix:
- fixed mistake in stat-sync
- fixed remove user in web

root 4 лет назад
Родитель
Сommit
9b1c482ad9
2 измененных файлов с 8 добавлено и 6 удалено
  1. 7 5
      html/admin/users/index.php
  2. 1 1
      scripts/stat-sync.pl

+ 7 - 5
html/admin/users/index.php

@@ -65,11 +65,13 @@ if (isset($_POST["remove"])) {
             $login = get_record($db_link,"User_list","id='$val'");
             LOG_INFO($db_link, "Delete device for user id: $val");
             $device= get_record($db_link,"devices","user_id='$val'");
-            unbind_ports($db_link, $device['id']);
-            run_sql($db_link, "DELETE FROM connections WHERE device_id=".$device['id']);
-            run_sql($db_link, 'DELETE FROM device_l3_interfaces WHERE device_id='.$device['id']);
-            run_sql($db_link, "DELETE FROM device_ports WHERE device_id=".$device['id']);
-            delete_recrod($db_link, "devices", "id=".$device['id']);
+	    if (!empty($device)) {
+                unbind_ports($db_link, $device['id']);
+	        run_sql($db_link, "DELETE FROM connections WHERE device_id=".$device['id']);
+    	        run_sql($db_link, "DELETE FROM device_l3_interfaces WHERE device_id=".$device['id']);
+    		run_sql($db_link, "DELETE FROM device_ports WHERE device_id=".$device['id']);
+                delete_recrod($db_link, "devices", "id=".$device['id']);
+		}
             LOG_WARNING($db_link,"Удалён пользователь id: $val login: ".$login['login']."\r\n");
             run_sql($db_link,"UPDATE User_auth SET deleted=1 WHERE user_id=$val");
             delete_record($db_link, "User_list", "id=$val");

+ 1 - 1
scripts/stat-sync.pl

@@ -90,7 +90,7 @@ if (!$pid) {
         if ($urgent_sync) {
             my $changed = get_record_sql($hdb,"SELECT COUNT(*) as c_count from User_auth WHERE changed=1");
 	    if ($changed->{"c_count"}>0) {
-                log_info("Found changed records: $changed->{'c_count}");
+                log_info("Found changed records: ".$changed->{'c_count'});
     	        my %result=do_exec_ref($HOME_DIR."/sync_mikrotik.pl");
     	        if ($result{status} ne 0) { log_error("Error sync status at gateways"); }
     	    	}