From 2ef57919a1cf1127ea49e2104fabd66014618f3a Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 8 Apr 2021 11:28:01 +0200 Subject: [PATCH 01/14] Avoiding clickjacking --- pandora_console/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/index.php b/pandora_console/index.php index 09cbdb7962..1add9babbe 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -220,7 +220,8 @@ echo ''."\n"; // This starts the page head. In the callback function, // $page['head'] array content will be processed into the head. ob_start('ui_process_page_head'); - +// Avoid clickjacking. +header('X-Frame-Options: SAMEORIGIN'); // Enterprise main. enterprise_include_once('index.php'); From bdbfe81f3155926f81c5acd295f4837113f13928 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 13 Apr 2021 12:24:35 +0200 Subject: [PATCH 02/14] Fixed id_agente_modulo in sql condiction --- pandora_console/operation/agentes/status_monitor.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index ee20c2d8c1..a6811c1856 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -244,6 +244,10 @@ if ($ag_modulename != '') { $sql_conditions .= " AND tagente_modulo.nombre LIKE '%".$ag_modulename."%'"; } +if ($id_module) { + $sql_conditions .= sprintf(' AND tagente_modulo.id_agente_modulo = \'%d\'', $id_module); +} + if ($module_option !== 0) { if ($module_option == 1) { // Only enabled From fa7ca4d77bf518a4816c90d5a09c2336185260e7 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 13 Apr 2021 12:52:11 +0200 Subject: [PATCH 03/14] Added function for use templates in emails --- .../include/functions_reporting.php | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 947218a7a9..e82bac98ce 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -42,6 +42,7 @@ require_once $config['homedir'].'/include/functions_users.php'; enterprise_include_once('include/functions_reporting.php'); enterprise_include_once('include/functions_metaconsole.php'); enterprise_include_once('include/functions_inventory.php'); +enterprise_include_once('include/functions_cron.php'); require_once $config['homedir'].'/include/functions_forecast.php'; require_once $config['homedir'].'/include/functions_ui.php'; require_once $config['homedir'].'/include/functions_netflow.php'; @@ -13948,3 +13949,69 @@ function reporting_module_histogram_graph($report, $content, $pdf=0) return reporting_check_structure_content($return); } + + +/** + * Email template for sending reports. + * + * @param string $subjectEmail Subject of email. + * @param string $bodyEmail Body of email. + * @param string $scheduled Id of schedule report. + * @param string $reportName Report name. + * @param string $email Serialized list of destination emails. + * @param array $attachments Attachments. + * + * @return void + */ +function reporting_email_template( + string $subjectEmail='', + string $bodyEmail='', + string $scheduled='', + string $reportName='', + string $email='', + array $attachments=null +) { + // Subject. + $subject = (empty($subjectEmail) === true) ? '[Pandora] '.__('Reports') : $subjectEmail; + // Body. + if (empty($bodyEmail) === true) { + $body = __('Greetings').','; + $body .= '

'; + $body .= __('Attached to this email there\'s a PDF file of the').' '; + $body .= $scheduled.' '.__('report'); + $body .= ' "'.$reportName.'"'; + $body .= '

'; + $body .= __('Generated at').' '.date('Y/m/d H:i:s'); + $body .= '

'; + $body .= __('Thanks for your time.'); + $body .= '

'; + $body .= __('Best regards, Pandora FMS'); + $body .= '

'; + $body .= ''.__('This is an automatically generated email from Pandora FMS, please do not reply.').''; + } else { + $bodyEmail = str_replace( + [ + "\r\n", + "\r", + ' ', + ], + "\n", + $bodyEmail + ); + + $body = '

'.implode("

\n

", explode("\n", $bodyEmail)).'

'; + } + + // Extract list of emails. + $destinationEmails = explode(',', io_safe_output($email)); + foreach ($destinationEmails as $destination) { + $destination = trim($destination); + + // Skip the empty 'to'. + if (empty($destination) === false) { + send_email_attachment($destination, $body, $subject, $attachments); + } else { + db_pandora_audit('ERROR:', 'Cron jobs mail, empty destination email.'); + } + } +} From 256d4333c6ed99838c6bd7f99ef451562fc895a4 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 16 Apr 2021 15:36:12 +0200 Subject: [PATCH 04/14] Fixed encoding ampersand on mail alerts --- pandora_server/lib/PandoraFMS/Core.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 40cd75f4d9..19aaeb8228 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1322,6 +1322,9 @@ sub pandora_execute_action ($$$$$$$$$;$) { my $cid_data = "CID_IMAGE"; my $dataname = "CID_IMAGE.png"; + # Decode ampersand. Used for macros with encoded names. + $field3 =~ s/&/&/g; + if (defined($data) && $data =~ /^data:image\/png;base64, /) { # macro _data_ substitution in case is image. $attach_data_as_image = 1; From a05c5cf55514bf0f566651b622c2c93b7708d3e0 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 20 Apr 2021 11:46:33 +0200 Subject: [PATCH 05/14] #6618 Added random name css --- pandora_console/include/styles/pandora.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 740e5c6053..850842cb1e 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -8500,3 +8500,8 @@ div.stat-win-spinner img { .font_11pt { font-size: 11pt; } + +.checkbox-random-name { + width: 100px !important; + margin-left: 20px; +} From 998ad91b69d79fb991b9ad692687c9c17d277ad2 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Wed, 21 Apr 2021 11:07:20 +0200 Subject: [PATCH 06/14] Fixed errors diagnostic --- pandora_console/include/class/Diagnostics.class.php | 8 ++++++-- pandora_console/include/styles/diagnostics.css | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index d1bb2c3572..6a6b888b08 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -286,7 +286,11 @@ class Diagnostics extends Wizard $return .= ''; } - return false; + if ($this->pdf === true) { + return $return; + } else { + return false; + } } @@ -1599,7 +1603,7 @@ class Diagnostics extends Wizard } } - return true; + return $result; } diff --git a/pandora_console/include/styles/diagnostics.css b/pandora_console/include/styles/diagnostics.css index 17109ed57f..6591adabff 100644 --- a/pandora_console/include/styles/diagnostics.css +++ b/pandora_console/include/styles/diagnostics.css @@ -19,6 +19,7 @@ .dataTables_wrapper { min-height: 150px; + margin-bottom: 20px; } .datatables-td-title { From 25867a0fd7ace97404106e29432e444aa4342b96 Mon Sep 17 00:00:00 2001 From: marcos Date: Wed, 5 May 2021 09:36:16 +0200 Subject: [PATCH 07/14] fixed visual error black theme --- pandora_console/include/styles/pandora_black.css | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 49d669fd0d..7b4b74c6ba 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -387,7 +387,6 @@ table#diagnostic_info tbody td div { color: #fff; } -.ui-widget-content.ui-autocomplete, .ui-widget-content.ui-autocomplete a { color: #333; } From 256750bcb00395425394f2d61280eea302c5dae9 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Wed, 5 May 2021 09:51:21 +0200 Subject: [PATCH 08/14] fixed bug in file attachment --- .../incidents/dashboard_detail_integriaims_incident.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php index c4d7cb8617..d534df5902 100644 --- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php +++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php @@ -159,7 +159,9 @@ if ($upload_file && ($_FILES['userfile']['name'] != '')) { $filecontent = base64_encode(file_get_contents($_FILES['userfile']['tmp_name'])); - $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', ';'); + $filename = str_replace(' ', '+', $filename); + + $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', '|;|'); // API method returns '0' string if success. $file_added = ($result_api_call === '0') ? true : false; @@ -485,4 +487,4 @@ $(document).ready (function () { }); }); - \ No newline at end of file + From d358fd894d24eec265dcaa69621975c484dca859 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Wed, 5 May 2021 11:03:32 +0200 Subject: [PATCH 09/14] minor change in integria ims setup --- pandora_console/godmode/setup/setup_integria.php | 2 +- pandora_console/include/functions_integriaims.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php index 9e63fb3639..2488647ecd 100644 --- a/pandora_console/godmode/setup/setup_integria.php +++ b/pandora_console/godmode/setup/setup_integria.php @@ -282,7 +282,7 @@ $table_remote->data['integria_pass'] = $row; // Integria hostname. $row = []; -$row['name'] = __('API Hostname'); +$row['name'] = __('URL to Integria IMS setup').ui_print_help_tip(__('Full URL to your Integria IMS setup (e.g., http://192.168.1.20/integria, https://support.mycompany.com).'), true); $row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true); $table_remote->data['integria_hostname'] = $row; diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php index 436e189a9d..c117b679e5 100644 --- a/pandora_console/include/functions_integriaims.php +++ b/pandora_console/include/functions_integriaims.php @@ -188,7 +188,7 @@ function integria_api_call($api_hostname, $user, $user_pass, $api_pass, $operati } // Build URL for API request. - $url = $api_hostname.'/integria/include/api.php'; + $url = $api_hostname.'/include/api.php'; // ob_start(); // $out = fopen('php://output', 'w'); From aa4769d331cbf0e5d034f713be6379154e6f70f9 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Wed, 5 May 2021 13:02:53 +0200 Subject: [PATCH 10/14] minor changes --- .../godmode/setup/setup_integria.php | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php index 9e63fb3639..f68c7f3e76 100644 --- a/pandora_console/godmode/setup/setup_integria.php +++ b/pandora_console/godmode/setup/setup_integria.php @@ -329,22 +329,20 @@ $row['control'] = html_print_input_text( true, false, false -).ui_print_help_icon('alert_macros', true); +); $table_alert_settings->data['custom_response_incident_title'] = $row; // Alert incident description. $row = []; -$row['name'] = __('Description'); -$row['control'] = html_print_input_text( +$row['name'] = __('Ticket body'); +$row['control'] = html_print_textarea( 'incident_content', + 7, + 25, $config['incident_content'], '', - 50, - 100, - true, - false, - false -).ui_print_help_icon('alert_macros', true); + true +); $table_alert_settings->data['custom_response_incident_content'] = $row; // Alert default group. @@ -452,22 +450,21 @@ $row['control'] = html_print_input_text( true, false, false -).ui_print_help_icon('response_macros', true); +); $table_cr_settings->data['custom_response_incident_title'] = $row; // Custom response incident description. $row = []; -$row['name'] = __('Description'); -$row['control'] = html_print_input_text( +$row['name'] = __('Ticket body'); +$row['control'] = html_print_textarea( 'cr_incident_content', + 7, + 25, $config['cr_incident_content'], '', - 50, - 100, - true, - false, - false -).ui_print_help_icon('response_macros', true); + true +); + $table_cr_settings->data['custom_response_incident_content'] = $row; // Custom response default group. @@ -599,7 +596,7 @@ if ($has_connection != false) { // Form alert default settings. echo '
'; echo '
'; - echo ''.__('Alert default values').''; + echo ''.__('Alert default values').' '.ui_print_help_icon('alert_macros', true).''; html_print_table($table_alert_settings); @@ -609,7 +606,7 @@ if ($has_connection != false) { // Form custom response default settings. echo '
'; echo '
'; - echo ''.__('Event custom response default values').''; + echo ''.__('Event custom response default values').' '.ui_print_help_icon('alert_macros', true).''; html_print_table($table_cr_settings); From f4e0e9f799ba3c46294eff96d64aea1399f565e8 Mon Sep 17 00:00:00 2001 From: Kike Date: Fri, 7 May 2021 14:04:29 +0200 Subject: [PATCH 11/14] Issue with custom agent installation --- pandora_agents/unix/pandora_agent_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 344dc88a15..6a3232d63c 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -152,8 +152,8 @@ uninstall () { fi # Stops the agent on uninstall - if [ -f $PANDORA_BASE/etc/init.d/pandora_agent_daemon ]; then - $PANDORA_BASE/etc/init.d/pandora_agent_daemon stop 12> /dev/null + if [ -f /etc/init.d/pandora_agent_daemon ]; then + /etc/init.d/pandora_agent_daemon stop 12> /dev/null else echo "$PANDORA_BASE/etc/init.d/pandora_agent_daemon not found to stop agent" fi From 6bdd983755debc4f412a0b813e1d4195f7e4873c Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 11 May 2021 01:00:46 +0200 Subject: [PATCH 12/14] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 534ff5be19..76acd4b169 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.754-210510 +Version: 7.0NG.754-210511 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 81ffd301d3..ba8ff1c9f9 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.754-210510" +pandora_version="7.0NG.754-210511" 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/pandora_agent b/pandora_agents/unix/pandora_agent index 2702989549..b904a3bc42 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.754'; -use constant AGENT_BUILD => '210510'; +use constant AGENT_BUILD => '210511'; # 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 57f18f62f0..8984992513 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.754 -%define release 210510 +%define release 210511 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 e1895fe5d9..2124636e4f 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.754 -%define release 210510 +%define release 210511 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 1c40d15a32..e2fe704edb 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210510" +PI_BUILD="210511" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index cb2afa514a..39f0e0ea99 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210510} +{210511} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 467d3d6a04..5df547c181 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.754(Build 210510)") +#define PANDORA_VERSION ("7.0NG.754(Build 210511)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 15756ba8f0..84320d0433 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.754(Build 210510))" + VALUE "ProductVersion", "(7.0NG.754(Build 210511))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index dc9a610360..ca82b95067 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.754-210510 +Version: 7.0NG.754-210511 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 9c76d31b44..6d9f92c008 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.754-210510" +pandora_version="7.0NG.754-210511" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 23fcfe8a3c..1cd5f34cd9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210510'; +$build_version = 'PC210511'; $pandora_version = 'v7.0NG.754'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 877216b9a1..cbd529980a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index f8c3e4efb5..35726363dd 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.754 -%define release 210510 +%define release 210511 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9b74a4cce8..8fc4aece9f 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.754 -%define release 210510 +%define release 210511 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 7202d3c8d2..be07ace396 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210510" +PI_BUILD="210511" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index a1e0360b4f..a601c8a258 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.754 PS210510"; +my $version = "7.0NG.754 PS210511"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a8d5e47d7e..78815064ac 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.754 PS210510"; +my $version = "7.0NG.754 PS210511"; # save program name for logging my $progname = basename($0); From 9c234eef8542febb8165a49bde2327b773be5b8b Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 11 May 2021 13:48:09 +0000 Subject: [PATCH 13/14] Ent 7087 mensaje duplicado en los test mails --- pandora_console/godmode/setup/setup_general.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 50733b2727..f611b14b7f 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -641,8 +641,8 @@ echo ''.__('Mail configuration').''; $table_mail_test->width = '100%'; $table_mail_test->class = 'databox filters'; $table_mail_test->data = []; - $table_mail_test->style[0] = 'font-weight: bold'; - $table_mail_test->colspan[1][0] = 2; + $table_mail_test->style[0] = 'font-weight: bold;'; + $table_mail_test->style[1] = 'font-weight: bold;display: flex;height: 54px;align-items: center;'; $table_mail_test->data[0][0] = __('Address'); $table_mail_test->data[0][1] = html_print_input_text( @@ -661,7 +661,9 @@ echo ''.__('Mail configuration').''; '', 'class="sub next"', true - ).'  Email could not be sent'; + ); + + $table_mail_test->data[1][1] = '  Email could not be sent'; echo ''; } @@ -703,6 +705,9 @@ function show_email_test(id) { } function perform_email_test () { + $('#email_test_sent_message').hide(); + $('#email_test_failure_message').hide(); + var test_address = $('#text-email_test_address').val(); $.ajax({ @@ -713,12 +718,15 @@ function perform_email_test () { success: function(data) { if (parseInt(data) === 1) { $('#email_test_sent_message').show(); + $('#email_test_failure_message').hide(); } else { $('#email_test_failure_message').show(); + $('#email_test_sent_message').hide(); } }, error: function() { $('#email_test_failure_message').show(); + $('#email_test_sent_message').hide(); }, }); } From b9398604f6304993aacc9e2cea311eb7433f0977 Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 11 May 2021 13:49:40 +0000 Subject: [PATCH 14/14] Fixed visual bug on event modal event responses --- pandora_console/include/functions_events.php | 2 +- pandora_console/include/javascript/pandora_events.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index e36e2f16e3..eee8fc093d 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3792,7 +3792,7 @@ function events_page_responses($event, $childrens_ids=[]) $('.params_rows').remove(); $('#responses_table') - .append('".__('Description')."'+description+''); + .append('".__('Description')."'+description+''); if (params.length == 1 && params[0] == '') { return; diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 0304fcc080..b5d684324c 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -48,6 +48,8 @@ function show_event_dialog(event, dialog_page, result) { resizable: true, draggable: true, modal: true, + minWidth: 710, + minHeight: 600, close: function() { $("#refrcounter").countdown("resume"); $("div.vc-countdown").countdown("resume");