diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index 3022070bbd..eb20b095f1 100644 --- a/pandora_agents/pc/AIX/pandora_agent.conf +++ b/pandora_agents/pc/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, AIX version +# Version 7.0NG.723, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index f02ed5d074..93b3cdb927 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, FreeBSD Version +# Version 7.0NG.723, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf index f84bce9f77..41d482d6d3 100644 --- a/pandora_agents/pc/HP-UX/pandora_agent.conf +++ b/pandora_agents/pc/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, HP-UX Version +# Version 7.0NG.723, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index 79d8bb8e28..534718ad29 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, GNU/Linux +# Version 7.0NG.723, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf index 372477a38b..e4d585a062 100644 --- a/pandora_agents/pc/NT4/pandora_agent.conf +++ b/pandora_agents/pc/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, GNU/Linux +# Version 7.0NG.723, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf index a0515edf7e..ddce174eed 100644 --- a/pandora_agents/pc/SunOS/pandora_agent.conf +++ b/pandora_agents/pc/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, Solaris Version +# Version 7.0NG.723, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 049e95ba35..1b3ea967ac 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2010 Artica Soluciones Tecnologicas -# Version 7.0NG.722 +# Version 7.0NG.723 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf index edf8253d42..0d6558aa12 100644 --- a/pandora_agents/shellscript/aix/pandora_agent.conf +++ b/pandora_agents/shellscript/aix/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.722, AIX version +# Version 7.0NG.723, AIX version # General Parameters # ================== diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf index 147de81c02..7478d64f27 100644 --- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.722 +# Version 7.0NG.723 # FreeBSD/IPSO version # Licenced under GPL licence, 2003-2007 Sancho Lerena diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf index c46db65c34..4f3694a530 100644 --- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf +++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.722, HPUX Version +# Version 7.0NG.723, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index fcc0ac412f..374a998426 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722 +# Version 7.0NG.723 # Licensed under GPL license v2, # (c) 2003-2010 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 2b4a90b2f3..3de4952d24 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722 +# Version 7.0NG.723 # Licensed under GPL license v2, # (c) 2003-2009 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index e1476e40cc..8cfc4f51aa 100644 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722 +# Version 7.0NG.723 # Licensed under GPL license v2, # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf index a87e711a5b..d962b005e4 100644 --- a/pandora_agents/shellscript/solaris/pandora_agent.conf +++ b/pandora_agents/shellscript/solaris/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.722, Solaris version +# Version 7.0NG.723, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 30ba7e3649..6fb838938d 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, AIX version +# Version 7.0NG.723, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1949c24f0c..12cd910618 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180523 +Version: 7.0NG.723 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 70747174ed..48b07403e0 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180523" +pandora_version="7.0NG.723" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf index 558a657412..2a03683bd8 100644 --- a/pandora_agents/unix/Darwin/pandora_agent.conf +++ b/pandora_agents/unix/Darwin/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, GNU/Linux +# Version 7.0NG.723, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index 5300a3c81c..c1eb8072e6 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, FreeBSD Version +# Version 7.0NG.723, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index 2522f3f853..3cf05b23eb 100644 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, HP-UX Version +# Version 7.0NG.723, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 141ab9963f..607bdc9d3c 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, GNU/Linux +# Version 7.0NG.723, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf index aff62ba017..846ced852c 100644 --- a/pandora_agents/unix/NT4/pandora_agent.conf +++ b/pandora_agents/unix/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, GNU/Linux +# Version 7.0NG.723, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index ed4185441d..d67e9bd6c3 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, NetBSD Version +# Version 7.0NG.723, NetBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index ddcbe9710e..b6197225dd 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.722, Solaris Version +# Version 7.0NG.723, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 218a50fc32..f7102647a6 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,8 +41,8 @@ my $Sem = undef; # Semaphore used to control the number of threads my $ThreadSem = undef; -use constant AGENT_VERSION => '7.0NG.722'; -use constant AGENT_BUILD => '180523'; +use constant AGENT_VERSION => '7.0NG.723'; +use constant AGENT_BUILD => '180528'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 27a0919bbd..6d96a816cb 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.722 -%define release 180523 +%define version 7.0NG.723 +%define release 1 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index eb75470502..d9e10622e3 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.722 -%define release 180523 +%define version 7.0NG.723 +%define release 1 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 313b8a9695..e88cea3849 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -9,8 +9,8 @@ # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # ********************************************************************** -PI_VERSION="7.0NG.722" -PI_BUILD="180523" +PI_VERSION="7.0NG.723" +PI_BUILD="180528" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 185002e369..70e1ae25f6 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2017 Artica Soluciones Tecnologicas -# Version 7.0NG.722 +# Version 7.0NG.723 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1acc9af3b7..e0364cec84 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -3,7 +3,7 @@ AllowLanguageSelection {Yes} AppName -{Pandora FMS Windows Agent v7.0NG.722} +{Pandora FMS Windows Agent v7.0NG.723} ApplicationID {17E3D2CF-CA02-406B-8A80-9D31C17BD08F} @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180523} +{180528} ViewReadme {Yes} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-<%Version%>-Setup<%Ext%>} +{<%AppName%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ca79433773..db590470c2 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.722(Build 180523)") +#define PANDORA_VERSION ("7.0NG.723(Build 180528)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 596622603d..bdafd13a3d 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.722(Build 180523))" + VALUE "ProductVersion", "(7.0NG.723(Build 180528))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c1489b58f9..15bb19a021 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180523 +Version: 7.0NG.723 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 762e1fe921..d0130bab1c 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.722-180523" +pandora_version="7.0NG.723" package_pear=0 package_pandora=1 diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index b3e9fff95f..b8b7481786 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -49,7 +49,7 @@ if (isset ($_GET["loginhash"])) { $public_hash = get_parameter('hash', false); // Check user -if ($public_hash === false) { +if ($public_hash == false) { check_login(); } else { enterprise_include_once('include/functions_dashboard.php'); diff --git a/pandora_console/extensions/api_checker.php b/pandora_console/extensions/api_checker.php index 6aecf21073..24f7bc31ed 100755 --- a/pandora_console/extensions/api_checker.php +++ b/pandora_console/extensions/api_checker.php @@ -101,7 +101,7 @@ function extension_api_checker() { $table->data[] = $row; $row = array(); - $row[] = __("Pandora Console URL"); + $row[] = __("%s Console URL", get_product_name()); $row[] = html_print_input_text('pandora_url', $pandora_url, '', 50, 255, true); $table->data[] = $row; diff --git a/pandora_console/extensions/db_status.php b/pandora_console/extensions/db_status.php index d184850a34..84cf67022d 100755 --- a/pandora_console/extensions/db_status.php +++ b/pandora_console/extensions/db_status.php @@ -180,10 +180,10 @@ function extension_db_check_tables_differences($connection_test, $diff_tables = array_diff($tables_test, $tables_system); ui_print_result_message( - empty($diff_tables), - __('Successful the DB Pandora has all tables'), - __('Pandora DB could not retrieve all tables. The missing tables are (%s)', - implode(", ", $diff_tables))); + !empty($diff_tables), + __('Success! %s DB contains all tables', get_product_name()), + __('%s DB could not retrieve all tables. The missing tables are (%s)', + get_product_name(), implode(", ", $diff_tables))); if (!empty($diff_tables)) { foreach ($diff_tables as $table) { diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 114c3bf709..4bcaeac702 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -134,7 +134,13 @@ function dbmgr_extension_main () { ui_print_page_header (__('Database interface'), "images/gm_db.png", false, false, true); echo '
'; - echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that you can damage your Pandora FMS installation if you don't know exactly what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used only by experienced users with a depth knowledge of Pandora FMS internals."; + echo __("This is an advanced extension to interface with %s database directly from WEB console + using native SQL sentences. Please note that you can damage your %s installation + if you don't know exactly what are you are doing, + this means that you can severily damage your setup using this extension. + This extension is intended to be used only by experienced users + with a depth knowledge of %s internals.", + get_product_name(), get_product_name(), get_product_name()); echo '
'; echo "
"; diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index 8357c96113..7495c54600 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -167,6 +167,7 @@ function mainInsertData() { $params['use_hidden_input_idagent'] = true; $params['print_hidden_input_idagent'] = true; $params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent'; + $params['hidden_input_idagent_value'] = $id_agente; $table->data[0][1] = ui_print_agent_autocomplete_input($params); diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php index 2f18a569d4..a223f6aa96 100644 --- a/pandora_console/extensions/net_tools.php +++ b/pandora_console/extensions/net_tools.php @@ -313,23 +313,23 @@ function godmode_net_tools() { $table->data = array(); $table->data[0][0] = __("Traceroute path"); - $table->data[0][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the traceroute system.'), true); + $table->data[0][0] .= ui_print_help_tip(__('If empty, %s will search the traceroute system.', get_product_name()), true); $table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true); $table->data[1][0] = __("Ping path"); - $table->data[1][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the ping system.'), true); + $table->data[1][0] .= ui_print_help_tip(__('If empty, %s will search the ping system.', get_product_name()), true); $table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true); $table->data[2][0] = __("Nmap path"); - $table->data[2][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the nmap system.'), true); + $table->data[2][0] .= ui_print_help_tip(__('If empty, %s will search the nmap system.', get_product_name()), true); $table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true); $table->data[3][0] = __("Dig path"); - $table->data[3][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the dig system.'), true); + $table->data[3][0] .= ui_print_help_tip(__('If empty, %s will search the dig system', get_product_name()), true); $table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true); $table->data[4][0] = __("Snmpget path"); - $table->data[4][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the snmpget system.'), true); + $table->data[4][0] .= ui_print_help_tip(__('If empty, %s will search the snmpget system.', get_product_name()), true); $table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true); echo '
'; diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php index 4241018a16..71cf847fa5 100644 --- a/pandora_console/extensions/pandora_logs.php +++ b/pandora_console/extensions/pandora_logs.php @@ -69,7 +69,7 @@ function pandoralogs_extension_main () { ui_print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" ); - echo "

" . __('Use this tool to view your Pandora FMS logfiles directly on the console') . "

"; + echo "

" . __('Use this tool to view your %s logfiles directly on the console', get_product_name()) . "

"; echo "

" . __('You can choose the amount of information shown in general setup (Log size limit in system logs viewer extension), ' . $config['max_log_size'] * 1000 . 'B at the moment') . "

"; diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index 8807fbe153..3efa7ff183 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -16,6 +16,8 @@ function pluginreg_extension_main () { global $config; + + check_login(); if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) { db_pandora_audit("ACL Violation", "Trying to access Setup Management"); @@ -31,10 +33,10 @@ function pluginreg_extension_main () { echo ''; echo '
'; echo '

' . __("Plugin registration") . '

'; - echo '

' . - __("This extension makes registration of server plugins more easy. - Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). - Please refer to documentation on how to obtain and use Pandora FMS Server Plugins. + echo '

' . + __("This extension makes registering server plugins an easier task. + Here you can upload a server plugin in .pspz zipped format. + Please refer to the official documentation on how to obtain and use Server Plugins.

You can get more plugins in our Public Resource Library ") . '

'; // Upload form echo ""; diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index 0f0fdf6990..e8cac701bb 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -63,12 +63,12 @@ function pandora_realtime_graphs () { $table->style['snmp_oid'] = 'font-weight: bold;'; $table->data = array (); - $graph_fields['cpu_load'] = __('Pandora Server CPU'); - $graph_fields['pending_packets'] = __('Pandora Server Pending packets'); - $graph_fields['disk_io_wait'] = __('Pandora Server Disk IO Wait'); - $graph_fields['apache_load'] = __('Pandora Server Apache load'); - $graph_fields['mysql_load'] = __('Pandora Server MySQL load'); - $graph_fields['server_load'] = __('Pandora Server load'); + $graph_fields['cpu_load'] = __('%s Server CPU', get_product_name()); + $graph_fields['pending_packets'] = __('Pending packages from %s Server', get_product_name()); + $graph_fields['disk_io_wait'] = __('%s Server Disk IO Wait', get_product_name()); + $graph_fields['apache_load'] = __('%s Server Apache load', get_product_name()); + $graph_fields['mysql_load'] = __('%s Server MySQL load', get_product_name()); + $graph_fields['server_load'] = __('%s Server load', get_product_name()); $graph_fields['snmp_interface'] = __('SNMP Interface throughput'); $graph = get_parameter('graph', 'cpu_load'); diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php index 4bdc7d2046..3e6ba7f540 100755 --- a/pandora_console/extensions/resource_exportation.php +++ b/pandora_console/extensions/resource_exportation.php @@ -338,8 +338,9 @@ function resource_exportation_extension_main() { ui_print_page_header (__('Resource exportation'), "images/extensions.png", false, "", true, "" ); echo "
"; - echo __("This extension makes exportation of resource template more easy. " . - "Here you can export as a resource template in Pandora FMS 3.x format (.ptr). "); + echo __("This extension makes exportation of resource template more easy.") . + " " . + __("You can export resource templates in .ptr format."); echo "
"; echo "

"; diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index a4dff69997..9158876901 100755 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -855,11 +855,12 @@ function resource_registration_extension_main() { } echo "
"; - printf(__("This extension makes registration of resource template more easy. " . - "Here you can upload a resource template in Pandora FMS 3.x format (.ptr). " . - "Please refer to documentation on how to obtain and use Pandora FMS resources. " . - "

You can get more resurces in our Public Resource Library") , - "http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en"); + echo __("This extension makes registering resource templates easier.") . " " . + __("Here you can upload a resource template in .ptr format.") . " " . + __("Please refer to our documentation for more information on how to obtain and use %s resources.", get_product_name()) . " " . + "

" . + __("You can get more resurces in our Public Resource Library") + ; echo "
"; echo "

"; diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql new file mode 100644 index 0000000000..65bbe43c7d --- /dev/null +++ b/pandora_console/extras/mr/16.sql @@ -0,0 +1,9 @@ +START TRANSACTION; + +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); + +UPDATE talert_actions SET name='Monitoring Event' WHERE name='Pandora FMS Event'; + +COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index e3572edb04..436081f2b1 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1123,6 +1123,7 @@ UPDATE talert_actions SET `field4` = 'integria', `field9` = 'admin', `field10` = '_alert_description_' WHERE `id` = 4 AND `id_alert_command` = 11; +UPDATE talert_actions SET name='Monitoring Event' WHERE name='Pandora FMS Event'; ALTER TABLE talert_actions ADD COLUMN `field11` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field12` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT ""; @@ -1160,6 +1161,9 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720'); diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php index 66d6e36b09..ea5d1d97e5 100644 --- a/pandora_console/general/alert_enterprise.php +++ b/pandora_console/general/alert_enterprise.php @@ -93,15 +93,17 @@ switch ($tipo) { case "helpmodal": - echo __("This is the online help for Pandora FMS console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.

- Download the official documentation"); + echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.

+ Download the official documentation", + get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']); break; case "noaccess": - echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.

- Please know that all attempts to access this page are recorded in security logs of Pandora System Database'); + echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.

+ Please know that all attempts to access this page are recorded in security logs of %s System Database.', + get_product_name()); break; @@ -111,13 +113,13 @@ switch ($tipo) { echo '

' . - __('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') . + __('The Update Manager client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) . '

' . '

' . __('OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.') . '

' . '

' . - __('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit pandorafms.com') . + __('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in %s Enterprise Edition. For more information visit pandorafms.com', get_product_name()) . '

' ; @@ -125,13 +127,13 @@ switch ($tipo) { echo '

' . - __('The new Update Manager client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') . + __('The new Update Manager client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) . '

' . '

' . - __('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit http://pandorafms.com.') . + __('The Update Manager is one of the most advanced features on the %s Enterprise Edition. For more information visit http://pandorafms.com.', get_product_name()) . '

' . '

' . - __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') . + __('Update Manager sends anonymous information about %s usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.', get_product_name()) . '

' ; } @@ -142,13 +144,13 @@ switch ($tipo) {



* Todos los logotipos pertenecen a marcas registradas"); break; case "massivemodal": - echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information pandorafms.com"); + echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? %s Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information pandorafms.com", get_product_name()); break; case "eventsmodal": - echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level."); + echo __("%s Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.", get_product_name()); break; case "reportingmodal": - echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you."); + echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, %s Enterprise version is for you.", get_product_name()); break; case "visualmodal": echo __("These options are only effective on the Enterprise version."); diff --git a/pandora_console/general/firts_task/custom_graphs.php b/pandora_console/general/firts_task/custom_graphs.php index 2d63aa4382..a951bb4966 100644 --- a/pandora_console/general/firts_task/custom_graphs.php +++ b/pandora_console/general/firts_task/custom_graphs.php @@ -29,9 +29,10 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cu

-

+

diff --git a/pandora_console/general/firts_task/incidents.php b/pandora_console/general/firts_task/incidents.php index 32924ac626..a694874cb3 100644 --- a/pandora_console/general/firts_task/incidents.php +++ b/pandora_console/general/firts_task/incidents.php @@ -33,13 +33,13 @@ if ($incident_w || $incident_m) {

-

+

diff --git a/pandora_console/general/firts_task/map_builder.php b/pandora_console/general/firts_task/map_builder.php index 26409ce803..e9f7451236 100755 --- a/pandora_console/general/firts_task/map_builder.php +++ b/pandora_console/general/firts_task/map_builder.php @@ -33,11 +33,15 @@ if ($vconsoles_write || $vconsoles_manage) {

-

+

diff --git a/pandora_console/general/firts_task/planned_downtime.php b/pandora_console/general/firts_task/planned_downtime.php index 052e12df9c..e8f38d35e9 100644 --- a/pandora_console/general/firts_task/planned_downtime.php +++ b/pandora_console/general/firts_task/planned_downtime.php @@ -26,10 +26,11 @@ ui_require_css_file ('firts_task');

-

+

diff --git a/pandora_console/general/firts_task/tags.php b/pandora_console/general/firts_task/tags.php index 037f7ef2e5..e0069e55c0 100755 --- a/pandora_console/general/firts_task/tags.php +++ b/pandora_console/general/firts_task/tags.php @@ -26,9 +26,9 @@ ui_require_css_file ('firts_task');

-

+

diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index 99cebe8f2d..33c8493e26 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -45,11 +45,11 @@ else{ $build_package_version = $current_package; } -echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"])); +echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config["MR"])); echo '
'; echo ''. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here -echo '
'.__("® Ártica ST").''; +echo '
® '.get_copyright_notice().''; if (isset ($config['debug'])) { $cache_info = array(); diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 975f30bdb1..ac18da48d1 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -31,14 +31,14 @@ config_check(); $custom_logo = 'images/custom_logo/' . $config['custom_logo']; if (!defined ('PANDORA_ENTERPRISE')) { - $logo_title = 'Pandora FMS Opensource'; + $logo_title = get_product_name() . ' Opensource'; $custom_logo = 'images/custom_logo/pandora_logo_head_3.png'; } else { if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) { $custom_logo = ENTERPRISE_DIR . '/' . $custom_logo; } - $logo_title = 'Pandora FMS Enterprise'; + $logo_title = get_product_name() . ' Enterprise'; } echo html_print_image($custom_logo, true, @@ -158,7 +158,7 @@ config_check(); data[0]['clippy'] = '' . html_print_image( @@ -166,8 +166,8 @@ config_check(); true, array("id" => 'clippy', "class" => 'clippy', - "alt" => __('Pandora FMS assistant'), - 'title' => __('Pandora FMS assistant'))) . + "alt" => __('%s assistant', get_product_name()), + 'title' => __('%s assistant', get_product_name()))) . ''; } @@ -307,11 +307,15 @@ config_check(); $table->data[0][3] = $maintenance_img; // Main help icon - $table->data[0][4] = ''.html_print_image("images/header_help.png", - true, array( - "title" => __('Main help'), - "id" => "helpmodal", - "class" => "modalpopup")).''; + if (!$config['disable_help']) { + $table->data[0][4] = + '' . + html_print_image("images/header_help.png", true, array( + "title" => __('Main help'), + "id" => "helpmodal", + "class" => "modalpopup")) . + ''; + } // Logout $table->data[0][5] = ''; diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php index 631d9d5ce1..6e38d4ece0 100644 --- a/pandora_console/general/login_help_dialog.php +++ b/pandora_console/general/login_help_dialog.php @@ -36,10 +36,11 @@ if (is_ajax()) { // Prints help dialog information echo '
'; + __('Welcome to %s', get_product_name()) . '" style="">'; echo '
'; - echo __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora FMS!'); + echo __("If this is your first time using %s, we suggest a few links that'll help you learn more about the software. Monitoring can be overwhelming, but take your time to learn how to harness the power of %s!", + get_product_name(), get_product_name()); echo '
'; echo '
'; @@ -70,11 +71,11 @@ echo '
'; - echo '' . + echo '' . html_print_image('images/documentation.png', true, array("alt" => __('Documentation'), "border" => 0)) . ''; echo '
'; - echo '' . __('Documentation') . ''; + echo '' . __('Documentation') . ''; echo ''; echo ''; echo ''; diff --git a/pandora_console/general/login_identification_wizard.php b/pandora_console/general/login_identification_wizard.php index 1f5cabd740..57b5b63ba3 100644 --- a/pandora_console/general/login_identification_wizard.php +++ b/pandora_console/general/login_identification_wizard.php @@ -138,17 +138,17 @@ if ($email == 'admin@example.com') $email = ''; // Prints accept register license echo '
'; + __('The %s community wizard', get_product_name()) . '" style="">'; echo '
'; echo html_print_image ('images/pandora_circle_big.png', true); echo '
'; echo '
'; - echo __('Stay up to date with the Pandora FMS community') . "."; + echo __('Stay up to date with the %s community', get_product_name()) . "."; echo '
'; echo '
'; - echo '

' . __("When you subscribe to the Pandora FMS Update Manager service, you accept that we register your Pandora instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the Update Manager options") . '.

'; - echo '

' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the newsletter subscription options") . '.

'; + echo '

' . __("When you subscribe to the %s Update Manager service, you accept that we register your %s instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the Update Manager options.", get_product_name(), get_product_name(), get_product_name()) . '

'; + echo '

' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the newsletter subscription options.", get_product_name()) . '

'; echo '
'; echo '
'; @@ -161,7 +161,7 @@ echo '
'; html_print_checkbox('register', 1, false, false, false, 'cursor: \'pointer\''); - echo ' ' .__("Join the Pandora FMS community") . '!
'; + echo ' ' .__('Join the %s community!', get_product_name()) . '!
'; html_print_checkbox('newsletter', 1, false, false, false, 'cursor: \'pointer\''); echo ' ' .__("Subscribe to our newsletter") . ''; echo "
"; @@ -176,7 +176,7 @@ echo '
'; // Print yes or not dialog echo '
'; + __("%s instance identification wizard", get_product_name()) . '" style="">'; echo '
'; echo __("Do you want to continue without any registration") . "?"; echo '
'; diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 7a99ae494c..737148751d 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -50,7 +50,7 @@ if (!isset($login_screen)) { switch ($login_screen) { case 'login': $logo_link = 'http://www.pandorafms.com'; - $logo_title = __('Go to Pandora FMS Website'); + $logo_title = __('Go to %s Website', get_product_name()); break; case 'logout': case 'double_auth': @@ -86,31 +86,39 @@ if (!empty($config['login_background'])) { $background_url = "images/backgrounds/" . $config['login_background']; $login_body_style = "style=\"background-image: url('$background_url');\""; } +// Get the custom icons +$docs_logo = ui_get_docs_logo(); +$support_logo = ui_get_support_logo(); echo '
'; echo '
'; echo '
'; if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) { if(isset ($config['custom_logo'])){ - echo 'pandora_console'; + echo 'monitoring_console'; } else{ - echo 'pandora_console'; + echo 'monitoring_console'; } } else{ - echo 'pandora_console'; + echo 'monitoring_console'; } echo '
'; - echo '