tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 

fixed warnings php7

See merge request artica/pandorafms!1918
This commit is contained in:
vgilc 2018-10-30 17:47:42 +01:00
parent b1bf1d7b4b 78a1c72eac
commit 94c008bc21
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1869,7 +1869,7 @@ switch ($action) {
break; break;
} }
metaconsole_restore_db_force(); metaconsole_restore_db();
$temp_sort[$report_item['id_rc']] = $element_name; $temp_sort[$report_item['id_rc']] = $element_name;

2
pandora_console/include/ajax/events.php
View File

@ -415,7 +415,7 @@ if ($get_extended_event) {
$custom_data = events_page_custom_data($event); $custom_data = events_page_custom_data($event);
if ($meta) { if ($meta) {
metaconsole_restore_db_force(); metaconsole_restore_db();
} }
$general = events_page_general($event); $general = events_page_general($event);

2
pandora_console/include/functions_events.php
View File

@ -1888,7 +1888,7 @@ function events_get_response_target($event_id, $response_id, $server_id, $histor
); );
if($meta) { if($meta) {
metaconsole_restore_db_force(); metaconsole_restore_db();
} }
} else { } else {
$target = str_replace('_module_address_', __('N/A'), $target); $target = str_replace('_module_address_', __('N/A'), $target);

2
pandora_console/include/functions_groups.php
View File

@ -1228,7 +1228,7 @@ function groups_get_monitors_counter ($group, $agent_filter = array(), $module_f
else else
$module_status = array($module_filter["status"]); $module_status = array($module_filter["status"]);
$status_array = ""; $status_array = array();
foreach ($module_status as $status) { foreach ($module_status as $status) {
switch ($status) { switch ($status) {
case AGENT_MODULE_STATUS_ALL: case AGENT_MODULE_STATUS_ALL:

10
pandora_console/include/functions_visual_map_editor.php
View File

@ -640,7 +640,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
foreach ($form_items as $item => $item_options) { foreach ($form_items as $item => $item_options) {
echo '<tr id="' . $item . '" style="" class="' . implode(' ', $item_options['items']) . '">'; echo '<tr id="' . $item . '" style="" class="' . implode(' ', (array)$item_options['items']) . '">';
echo $item_options['html']; echo $item_options['html'];
echo '</tr>'; echo '</tr>';
} }
@ -721,9 +721,11 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$node_visual_maps = db_get_all_rows_filter("tlayout", array(), array("id", "name")); $node_visual_maps = db_get_all_rows_filter("tlayout", array(), array("id", "name"));
foreach ($node_visual_maps as $node_visual_map) { if(isset($node_visual_maps) && is_array($node_visual_maps)){
$node_visual_map["node_id"] = (int) $server["id"]; foreach ($node_visual_maps as $node_visual_map) {
$visual_maps[] = $node_visual_map; $node_visual_map["node_id"] = (int) $server["id"];
$visual_maps[] = $node_visual_map;
}
} }
metaconsole_restore_db(); metaconsole_restore_db();