diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index 133af5b3f8..d0b5ef5e95 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -280,10 +280,10 @@ function pandora_realtime_graphs() ); html_print_input_hidden('incremental_base', '0'); - echo ''; - echo ''; + echo ''; + echo ''; if ($config['style'] !== 'pandora_black') { - echo ''; + echo ''; } // Store servers timezone offset to be retrieved from js. diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index c78c006a9f..e9dc0e0398 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -25,7 +25,7 @@ echo __('%s help system', get_product_name()); -'; ?> +'; ?> "; +echo ''; // Define a custom action to save the OID selected // in the SNMP browser to the form. diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 2e9ec50479..62701365e5 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -75,13 +75,13 @@ if (check_login(false) === false) { Access denied - - - - - - - + + + + + + +

Access is not granted

@@ -137,31 +137,31 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { Pandora FMS Graph - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + ;'> '; + $output .= '?v='.$config['current_package'].'" type="text/javascript">'; $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } else { ui_require_css_file($select2_css); ui_require_javascript_file('select2.min'); @@ -977,7 +977,7 @@ function html_print_select( false, false ); - $output .= '" type="text/javascript">'; + $output .= '?v='.$config['current_package'].'" type="text/javascript">'; $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } else { ui_require_css_file($select2); ui_require_javascript_file('select2.min'); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index e6cdd3f3ab..72f945cf6e 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2040,7 +2040,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_css = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* @@ -2097,7 +2097,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_js = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* @@ -2142,7 +2142,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_js = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* @@ -4153,7 +4153,7 @@ function ui_print_datatable(array $parameters) false, false ); - $output .= '"/>'; + $output .= '?v='.$config['current_package'].'"/>'; // Load tables.css. $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; if (is_metaconsole() === true) { // Load meta_tables.css. $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } // Load datatables.js. diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 94bb58b260..9ea3abda95 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -51,7 +51,7 @@ function include_javascript_dependencies_flot_graph($return=false, $mobile=false - '; + '; // Chartjs. $output .= ''; diff --git a/pandora_console/index.php b/pandora_console/index.php index 0387928e63..98b3ce716e 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -233,7 +233,7 @@ ob_start('ui_process_page_head'); enterprise_include_once('index.php'); // Load event.css to display the about section dialog with correct styles. -echo ''; +echo ''; echo ' - - - - + + + + + + + + '; +echo ''; ?> @@ -83,13 +83,13 @@ echo ' <?php echo __('%s Realtime Module Graph', get_product_name()); ?> - - - - - - - + + + + + + + '; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } } ?> <?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?> - + '; +echo ''; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } @@ -114,16 +114,16 @@ ui_print_message_dialog( ?> <?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>) - - - - - - - - - - + + + + + + + + + + '; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } echo ''; diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index e8edbae7db..d5321b7a1b 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -45,12 +45,12 @@ ob_start('ui_process_page_head'); enterprise_include('index.php'); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); -echo ''; +echo ''; html_print_input_hidden('homeurl', $config['homeurl']); $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false); -echo ''; +echo ''; // Connection lost alert. ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 062c9419e2..ddf6811930 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -56,7 +56,7 @@ ob_start('ui_process_page_head'); enterprise_include('index.php'); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); -echo ''; +echo ''; require_once 'include/functions_visual_map.php'; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 03ac46b18c..ed6f12fe99 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -51,16 +51,16 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('show_lastalerts','1'), ('style','pandora'), ('graph_image_height', '250'), -('graph_color1', '#1c7973'), -('graph_color2', '#82b92f'), -('graph_color3', '#e82a2a'), -('graph_color4', '#8577cf'), -('graph_color5', '#f5a623'), -('graph_color6', '#14524f'), -('graph_color7', '#024eff'), -('graph_color8', '#18c7c5'), -('graph_color9', '#ec7175'), -('graph_color10', '#c0ccdc'), +('graph_color1', '#1d7773'), +('graph_color2', '#82b92d'), +('graph_color3', '#fa4143'), +('graph_color4', '#c0d7ea'), +('graph_color5', '#f3712a'), +('graph_color6', '#7151cb'), +('graph_color7', '#287ca2'), +('graph_color8', '#42aa8b'), +('graph_color9', '#d54f6b'), +('graph_color10', '#f9c64e'), ('trap2agent', '0'), ('date_format', 'F j, Y, g:i a'), ('event_view_hr', 8), diff --git a/pandora_console/update_manager_client/views/offline.php b/pandora_console/update_manager_client/views/offline.php index ae64d92fde..5d8027725c 100644 --- a/pandora_console/update_manager_client/views/offline.php +++ b/pandora_console/update_manager_client/views/offline.php @@ -27,7 +27,7 @@ * GNU General Public License for more details. * ============================================================================ */ - +global $config; ?> @@ -39,12 +39,12 @@ document.write(' - - + + - +
diff --git a/pandora_console/update_manager_client/views/online.php b/pandora_console/update_manager_client/views/online.php index d588fa8e6e..f60b0f5e52 100644 --- a/pandora_console/update_manager_client/views/online.php +++ b/pandora_console/update_manager_client/views/online.php @@ -27,11 +27,11 @@ * GNU General Public License for more details. * ============================================================================ */ - +global $config; ?> - - + + diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php index 4fffc0f88f..d93d25045a 100644 --- a/pandora_console/update_manager_client/views/register.php +++ b/pandora_console/update_manager_client/views/register.php @@ -28,6 +28,7 @@ * ============================================================================ */ +global $config; $product_name = get_product_name(); ?> @@ -39,8 +40,8 @@ $product_name = get_product_name(); ?> } - - + +