From bca01b7c857f4503c6bfe57c51d2ab7c2129fe6f Mon Sep 17 00:00:00 2001 From: Charlene Auger Date: Tue, 11 Jul 2023 09:30:16 +0000 Subject: [PATCH 1/4] Update version to 2.12 --- var.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var.php b/var.php index 3c9473324..4fd4c8083 100644 --- a/var.php +++ b/var.php @@ -78,7 +78,7 @@ /** * GUI Version */ -define('GUI_VER_SHOW', '2.11.1'); +define('GUI_VER_SHOW', '2.12.0'); /** * Default GUI language */ From 2e2d34fc665075c3ab4de5c69b2f0801e9bfc048 Mon Sep 17 00:00:00 2001 From: Charlene Auger Date: Wed, 12 Jul 2023 07:47:14 +0000 Subject: [PATCH 2/4] fix(admininfo): fix checkbox with spaces for snmp --- plugins/main_sections/ms_snmp_inventory/ms_snmp_detail.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/main_sections/ms_snmp_inventory/ms_snmp_detail.php b/plugins/main_sections/ms_snmp_inventory/ms_snmp_detail.php index b11da7040..7b31e1e28 100755 --- a/plugins/main_sections/ms_snmp_inventory/ms_snmp_detail.php +++ b/plugins/main_sections/ms_snmp_inventory/ms_snmp_detail.php @@ -136,7 +136,11 @@ if ((isset($temp_field[1]) && isset($info_account_id[$getType][$getId]) && (array_key_exists($temp_field[0] . '_' . $temp_field[1], $info_account_id[$getType][$getId]))) || $temp_field[0] == 'TAG') { //cas of checkbox if (isset($temp_field[2])) { - $data_fields_account[$temp_field[0] . "_" . $temp_field[1]] .= $temp_field[2] . "&&&"; + $temp_field2 = $temp_field; + unset($temp_field2[0]); + unset($temp_field2[1]); + $new_value = implode(' ', $temp_field2); + $data_fields_account[$temp_field[0] . "_" . $temp_field[1]] .= $new_value . "&&&"; } else { $data_fields_account[$field] = $value; } From a203fbe422fe349c0a972db34f4b01ca9dd0f5be Mon Sep 17 00:00:00 2001 From: Charlene Auger Date: Wed, 12 Jul 2023 09:01:49 +0000 Subject: [PATCH 3/4] Add crontab to clean orphan hardware_id --- crontab/cron_clean_orphan.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 crontab/cron_clean_orphan.php diff --git a/crontab/cron_clean_orphan.php b/crontab/cron_clean_orphan.php new file mode 100644 index 000000000..02213fd37 --- /dev/null +++ b/crontab/cron_clean_orphan.php @@ -0,0 +1,33 @@ +#!/usr/bin/php + $values) { + print("[".date("Y-m-d H:i:s"). "] Clean orphan HARDWARE_ID from ".$values["TABLE_NAME"]."\n"); + $countDeletetionRowQuery = "SELECT DISTINCT HARDWARE_ID FROM %s WHERE HARDWARE_ID NOT IN (SELECT ID FROM hardware)"; + $args = array($values["TABLE_NAME"]); + $countDeletetionRow = mysql2_query_secure($countDeletetionRowQuery, $_SESSION['OCS']["readServer"], $args); + + $deleteResult = mysql2_query_secure($values["deletequery"], $_SESSION['OCS']["writeServer"]); + + if($deleteResult) print("[".date("Y-m-d H:i:s"). "] ".$countDeletetionRow->num_rows." orphan HARDWARE_ID has been deleted from ".$values["TABLE_NAME"]."\n"); + else print("[".date("Y-m-d H:i:s"). "] An error occurs when attempt to clean orphan HARDWARE_ID from ".$values["TABLE_NAME"]."\n"); + } +} + +print("[".date("Y-m-d H:i:s"). "] End of process\n"); \ No newline at end of file From d5fd351d8c377584c1d49020df714d3a9fd8230a Mon Sep 17 00:00:00 2001 From: Charlene Auger Date: Wed, 12 Jul 2023 09:11:56 +0000 Subject: [PATCH 4/4] Update typo --- crontab/cron_clean_orphan.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crontab/cron_clean_orphan.php b/crontab/cron_clean_orphan.php index 02213fd37..ee116adba 100644 --- a/crontab/cron_clean_orphan.php +++ b/crontab/cron_clean_orphan.php @@ -9,7 +9,7 @@ $_SESSION['OCS']["writeServer"] = dbconnect(SERVER_WRITE, COMPTE_BASE, PSWD_BASE, DB_NAME, SSL_KEY, SSL_CERT, CA_CERT, SERVER_PORT); $_SESSION['OCS']["readServer"] = dbconnect(SERVER_READ, COMPTE_BASE, PSWD_BASE, DB_NAME, SSL_KEY, SSL_CERT, CA_CERT, SERVER_PORT); -$query = "SELECT CONCAT('DELETE FROM ',TABLE_NAME,\" WHERE HARDWARE_ID NOT IN (SELECT ID FROM hardware);\") as deletequery, TABLE_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '%s' AND COLUMN_NAME='HARDWARE_ID';"; +$query = "SELECT CONCAT('DELETE FROM `',TABLE_NAME,'` WHERE HARDWARE_ID NOT IN (SELECT ID FROM hardware);') as deletequery, TABLE_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '%s' AND COLUMN_NAME='HARDWARE_ID';"; $args = array(DB_NAME); $queryList = mysql2_query_secure($query, $_SESSION['OCS']["readServer"], $args); @@ -19,13 +19,13 @@ if($queryList) { foreach($queryList as $key => $values) { print("[".date("Y-m-d H:i:s"). "] Clean orphan HARDWARE_ID from ".$values["TABLE_NAME"]."\n"); - $countDeletetionRowQuery = "SELECT DISTINCT HARDWARE_ID FROM %s WHERE HARDWARE_ID NOT IN (SELECT ID FROM hardware)"; + $countDeletetionRowQuery = "SELECT DISTINCT HARDWARE_ID FROM `%s` WHERE HARDWARE_ID NOT IN (SELECT ID FROM hardware)"; $args = array($values["TABLE_NAME"]); $countDeletetionRow = mysql2_query_secure($countDeletetionRowQuery, $_SESSION['OCS']["readServer"], $args); - + $deleteResult = mysql2_query_secure($values["deletequery"], $_SESSION['OCS']["writeServer"]); - if($deleteResult) print("[".date("Y-m-d H:i:s"). "] ".$countDeletetionRow->num_rows." orphan HARDWARE_ID has been deleted from ".$values["TABLE_NAME"]."\n"); + if($deleteResult) print("[".date("Y-m-d H:i:s"). "] ".$countDeletetionRow->num_rows." orphan HARDWARE_ID have been deleted from ".$values["TABLE_NAME"]."\n"); else print("[".date("Y-m-d H:i:s"). "] An error occurs when attempt to clean orphan HARDWARE_ID from ".$values["TABLE_NAME"]."\n"); } }