فهرست منبع

change logging for remove user ip

rajven 3 سال پیش
والد
کامیت
0edcb6ef90

+ 2 - 4
html/admin/iplist/doubles.php

@@ -9,10 +9,8 @@ if (isset($_POST["removeauth"])) {
         if ($val) {
                 run_sql($db_link, 'DELETE FROM connections WHERE auth_id='.$val);
                 run_sql($db_link, 'DELETE FROM User_auth_alias WHERE auth_id='.$val);
-                $auth["deleted"] = 1;
-                $changes = get_diff_rec($db_link,"User_auth","id='$val'", '', 0);
-                if (!empty($changes)) { LOG_WARNING($db_link,"Удалён адрес доступа: \r\n $changes"); }
-                update_record($db_link, "User_auth", "id=" . $val, $auth);
+                $changes=delete_record($db_link, "User_auth", "id=" . $val);
+                if (!empty($changes)) { LOG_WARNING($db_link,"Remove user ip: \r\n $changes"); }
                 }
             }
     header("Location: " . $_SERVER["REQUEST_URI"]);

+ 1 - 3
html/admin/iplist/index.php

@@ -22,10 +22,8 @@ if (isset($_POST["removeauth"])) {
         if ($val) {
                 run_sql($db_link, 'DELETE FROM connections WHERE auth_id='.$val);
                 run_sql($db_link, 'DELETE FROM User_auth_alias WHERE auth_id='.$val);
-                $auth["deleted"] = 1;
-                $changes = get_diff_rec($db_link,"User_auth","id='$val'", '', 0);
+                $changes=delete_record($db_link, "User_auth", "id=" . $val);
                 if (!empty($changes)) { LOG_WARNING($db_link,"Remove user ip: \r\n $changes"); }
-                update_record($db_link, "User_auth", "id=" . $val, $auth);
                 }
             }
     header("Location: " . $_SERVER["REQUEST_URI"]);

+ 0 - 1
html/admin/users/editauth.php

@@ -3,7 +3,6 @@ require_once($_SERVER['DOCUMENT_ROOT'] . "/inc/auth.php");
 require_once($_SERVER['DOCUMENT_ROOT'] . "/inc/languages/" . HTML_LANG . ".php");
 require_once($_SERVER['DOCUMENT_ROOT'] . "/inc/idfilter.php");
 
-
 $msg_error = "";
 
 $old_auth_info = get_record_sql($db_link, "SELECT * FROM User_auth WHERE id=" . $id);

+ 2 - 4
html/admin/users/edituser.php

@@ -164,10 +164,8 @@ if (isset($_POST["removeauth"])) {
         if ($val) {
             run_sql($db_link, 'DELETE FROM connections WHERE auth_id='.$val);
             run_sql($db_link, 'DELETE FROM User_auth_alias WHERE auth_id='.$val);
-            $auth["deleted"] = 1;
-            $changes = get_diff_rec($db_link,"User_auth","id='$val'", '', 0);
-            if (!empty($changes)) { LOG_WARNING($db_link,"Removed ip from login: ".$user_info["login"].": \r\n $changes",$val); }
-            update_record($db_link, "User_auth", "id=" . $val, $auth);
+            $changes=delete_record($db_link, "User_auth", "id=" . $val);
+            if (!empty($changes)) { LOG_WARNING($db_link,"Remove user ".$user_info["login"]." ip: \r\n ".$changes); }
         }
     }
     header("Location: " . $_SERVER["REQUEST_URI"]);

+ 2 - 2
html/admin/users/index.php

@@ -71,9 +71,9 @@ if (isset($_POST["remove"])) {
     foreach ($fid as $key => $val) {
         if ($val) {
             $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'");
 	        if (!empty($device)) {
+                LOG_INFO($db_link, "Delete device for 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']);
@@ -83,7 +83,7 @@ if (isset($_POST["remove"])) {
             run_sql($db_link,"DELETE FROM auth_rules WHERE user_id=$val");
             run_sql($db_link,"UPDATE User_auth SET deleted=1 WHERE user_id=$val");
             delete_record($db_link, "User_list", "id=$val");
-            LOG_WARNING($db_link,"Удалён пользователь id: $val login: ".$login['login']."\r\n");
+            LOG_WARNING($db_link,"Deleted user id: $val login: ".$login['login']."\r\n");
     	    }
 	}
     header("Location: " . $_SERVER["REQUEST_URI"]);

+ 1 - 0
html/inc/common.php

@@ -3004,6 +3004,7 @@ function delete_record($db, $table, $filter)
         if (!$sql_result) { LOG_ERROR($db, "DELETE Request: $new_sql : ".mysqli_error($db)); return; }
         }
     LOG_VERBOSE($db, "Delete FROM table $table WHERE $filter $changed_log");
+    return $changed_log;
 }
 
 function insert_record($db, $table, $newvalue)