diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php index 430e9a9127..47a5a4b356 100644 --- a/pandora_console/general/alert_enterprise.php +++ b/pandora_console/general/alert_enterprise.php @@ -1,5 +1,13 @@ Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers."); + break; + case "monitoreventsmodal": + echo __("Too much remote modules has been detected on this system. OpenSource version could manage thousands of modules, but performance is limited on high amount of SNMP or ICMP request. Checkout the Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers."); + break; + case "alertagentmodal": + echo __("You have defined a high number of alerts, this may cause you performance problems in the future. In the Enterprise version, you can use event correlation alerts to simplify the alerting system and have easier administration and increased performance."); + break; + default: break; } diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index c624097f18..0b6f3d38ca 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -64,7 +64,7 @@ config_check(); $table->style[8] = $table->style[9] = $table->style['qr'] = - 'width: 22px; text-align:center; height: 22px; padding-right: 9px;'; + 'width: 22px; text-align:center; height: 22px; padding-right: 9px;padding-left: 9px;'; $table->style[7] = 'width: 20px; padding-right: 9px;'; $table->style['searchbar'] = 'width: 180px; min-width: 180px;'; $table->style[11] = 'padding-left: 10px; padding-right: 5px;width: 16px;'; diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index beba4053a2..11eaf4582e 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -89,14 +89,14 @@ echo '
'; echo ''; if (defined ('METACONSOLE')) { - html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); } else if (defined ('PANDORA_ENTERPRISE')) { - html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); } else { - html_print_image ("images/logo_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); - echo "
Community edition"; + html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); +echo "
Community edition"; } echo ''; diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 8c543e7449..933c508e4b 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -203,9 +203,17 @@ $onheader['policies'] = $policiestab; $onheader['snmp'] = $snmptab; $onheader['satellite'] = $satellitetab; +/* Hello there! :) + +We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( + +You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. + +*/ + ui_print_page_header( __('Massive operations') . ' » '. $options[$option], - "images/gm_massive_operations.png", false, "", true, $onheader,true, "massive"); + "images/gm_massive_operations.png", false, "", true, $onheader,true, "massivemodal"); // Checks if the PHP configuration is correctly if ((get_cfg_var("max_execution_time") != 0) diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 2fa34b06c9..8ca2ed9f57 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -38,9 +38,18 @@ if (defined('METACONSOLE')) { $sec = 'advanced'; } else { + + /* Hello there! :) + +We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( + +You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. + +*/ + ui_print_page_header (__('Module management') . ' » ' . __('Network component management'), "", false, - "network_component", true,"sell",true,"module"); + "network_component", true,"sell",true,"modulemodal"); $sec = 'gmodules'; } diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php index 7d51475f63..db6444bdfd 100644 --- a/pandora_console/godmode/modules/manage_network_templates.php +++ b/pandora_console/godmode/modules/manage_network_templates.php @@ -27,7 +27,16 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__('Module management')." » ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true,"",true,"module"); + +/* Hello there! :) + +We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( + +You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. + +*/ + +ui_print_page_header (__('Module management')." » ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true,"",true,"modulemodal"); require_once ('include/functions_network_profiles.php'); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 7d4f76463a..c814975e52 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -173,7 +173,7 @@ $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon(" $table_styles->data[$row][1] = html_print_select( list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login', $config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px'); -$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview_', $open, '', 'class="sub camera"', true,false,$open,'visualmodal'); +$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal'); $row++; diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php index f6c34e07bd..73a1c12e1c 100644 --- a/pandora_console/godmode/update_manager/update_manager.online.php +++ b/pandora_console/godmode/update_manager/update_manager.online.php @@ -84,6 +84,15 @@ echo "