From e0d50facf0d5ab48402d64cf1ea40335fd7c415d Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Mon, 4 Apr 2022 16:31:22 +0900 Subject: [PATCH] Fixed some codes to avoid warnings with some php74 environment. --- pandora_console/include/functions_api.php | 6 +++--- pandora_console/include/functions_visual_map.php | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 92263e0764..8f4651c00e 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -14530,7 +14530,7 @@ function api_set_add_element_service($thrash1, $thrash2, $other, $thrash3) $id_service_child = 0; $agent_id = $element['id']; if (!agents_check_access_agent($agent_id, 'AR')) { - continue; + continue 2; } break; @@ -14539,7 +14539,7 @@ function api_set_add_element_service($thrash1, $thrash2, $other, $thrash3) $id_service_child = 0; $id_agente_modulo = $element['id']; if (!agents_check_access_agent(modules_get_agentmodule_agent($id_agente_modulo), 'AR')) { - continue; + continue 2; } break; @@ -14554,7 +14554,7 @@ function api_set_add_element_service($thrash1, $thrash2, $other, $thrash3) $id_service_child ); if ($service_group === false || !check_acl($config['id_user'], $service_group, 'AD')) { - continue; + continue 2; } break; } diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 9e43dd27f3..fb34cab437 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -862,7 +862,7 @@ function visual_map_print_item( ); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); - continue; + break; } } @@ -967,7 +967,7 @@ function visual_map_print_item( ); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); - continue; + break; } } @@ -1113,7 +1113,7 @@ function visual_map_print_item( ['id' => $layoutData['id_metaconsole']] ); if (metaconsole_load_external_db($connection) != NOERR) { - continue; + break; } } @@ -1411,7 +1411,7 @@ function visual_map_print_item( if (!empty($id_metaconsole)) { $connection = db_get_row_filter('tmetaconsole_setup', $id_metaconsole); if (metaconsole_load_external_db($connection) != NOERR) { - continue; + break; } } @@ -1719,7 +1719,7 @@ function visual_map_print_item( ['id' => $layoutData['id_metaconsole']] ); if (metaconsole_load_external_db($connection) != NOERR) { - continue; + break; } } @@ -2173,7 +2173,7 @@ function visual_map_print_item( ); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); - continue; + break; } } @@ -3299,7 +3299,7 @@ function visual_map_get_status_element($layoutData) ); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); - continue; + break; } } @@ -3385,7 +3385,7 @@ function visual_map_get_status_element($layoutData) ); if (metaconsole_load_external_db($connection) != NOERR) { // ui_print_error_message ("Error connecting to ".$server_name); - continue; + break; } }