diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 18154e77d1..7beac50ccf 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.773.3-230911 +Version: 7.0NG.773.3-230912 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 dbab591923..d012b85016 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.773.3-230911" +pandora_version="7.0NG.773.3-230912" 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 fa3b8f9367..a25a1e2726 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.773.3'; -use constant AGENT_BUILD => '230911'; +use constant AGENT_BUILD => '230912'; # 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 6f97360a50..793c4b7a5c 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 0ac08dac92..a97626bf35 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 5b4e2d4e79..1a138ad952 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 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 25412f5b46..c78bcc9ef3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.773.3" -PI_BUILD="230911" +PI_BUILD="230912" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9790408008..02f1f93cfb 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230911} +{230912} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6cf333dfc6..1fb34a2390 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.773.3 Build 230911") +#define PANDORA_VERSION ("7.0NG.773.3 Build 230912") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 1e4b922b17..4ac3e23077 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.773.3(Build 230911))" + VALUE "ProductVersion", "(7.0NG.773.3(Build 230912))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6716bed635..0426ee9669 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.773.3-230911 +Version: 7.0NG.773.3-230912 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 673a815b0c..d6189fe011 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.773.3-230911" +pandora_version="7.0NG.773.3-230912" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 68f2e1dfe2..6379f86d3a 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -1025,6 +1025,27 @@ $table_font->data[$row][] = html_print_label_input_block( ); $row++; +$table_font->data[$row][] = html_print_label_input_block( + __('Truncate agent text at end'), + html_print_checkbox_switch( + 'truncate_agent_at_end', + 1, + $config['truncate_agent_at_end'], + true + ) +); + +$table_font->data[$row][] = html_print_label_input_block( + __('Truncate module text at end'), + html_print_checkbox_switch( + 'truncate_module_at_end', + 1, + $config['truncate_module_at_end'], + true + ) +); +$row++; + $table_font->data[$row][] = html_print_label_input_block( __('Agent size text'), html_print_div( diff --git a/pandora_console/include/ajax/notifications.ajax.php b/pandora_console/include/ajax/notifications.ajax.php new file mode 100644 index 0000000000..36ea95900d --- /dev/null +++ b/pandora_console/include/ajax/notifications.ajax.php @@ -0,0 +1,57 @@ + notifications_set_user_label_status( + $source, + $user, + $label, + $value + ), + ] + ); + + echo $json; + return; +} diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index f6d3767708..7e5e5de1bc 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -703,7 +703,7 @@ class ConsoleSupervisor $total_agents = db_get_value('count(*)', 'tagente'); if ($total_agents >= 200) { - if ($config['agentaccess'] !== 0) { + if ((int) $config['agentaccess'] !== 0) { db_process_sql_update('tconfig', ['value' => 0], ['token' => 'agentaccess']); $this->notify( [ diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 2ed341bafb..4213b5a5c1 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 = 'PC230911'; +$build_version = 'PC230912'; $pandora_version = 'v7.0NG.773.3'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index de796b30ca..affca6e446 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1257,6 +1257,10 @@ function config_update_config() $error_update[] = __('Default line menu items for the Services'); } + if (config_update_value('truncate_agent_at_end', get_parameter('truncate_agent_at_end'), true) === false) { + $error_update[] = __('Truncate agent text at end'); + } + if (config_update_value('agent_size_text_small', get_parameter('agent_size_text_small'), true) === false) { $error_update[] = __('Agent size text'); } @@ -1265,6 +1269,10 @@ function config_update_config() $error_update[] = __('Agent size text'); } + if (config_update_value('truncate_module_at_end', get_parameter('truncate_module_at_end'), true) === false) { + $error_update[] = __('Truncate module text at end'); + } + if (config_update_value('module_size_text_small', get_parameter('module_size_text_small'), true) === false) { $error_update[] = __('Module size text'); } @@ -3509,6 +3517,10 @@ function config_process_config() config_update_value('display_item_frame', 1); } + if (!isset($config['truncate_agent_at_end'])) { + config_update_value('truncate_agent_at_end', 0); + } + if (!isset($config['agent_size_text_small'])) { config_update_value('agent_size_text_small', 18); } @@ -3517,6 +3529,10 @@ function config_process_config() config_update_value('agent_size_text_medium', 50); } + if (!isset($config['truncate_module_at_end'])) { + config_update_value('truncate_module_at_end', 0); + } + if (!isset($config['module_size_text_small'])) { config_update_value('module_size_text_small', 25); } diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index fe47857e33..e82fca400b 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -701,6 +701,7 @@ function modules_update_agent_module( } // Disable action requires a special function + $result = false; if (isset($values['disabled'])) { $result_disable = modules_change_disabled($id, $values['disabled']); @@ -709,7 +710,9 @@ function modules_update_agent_module( $result_disable = true; } - $result = @db_process_sql_update('tagente_modulo', $values, $where); + if (empty($values) === false) { + $result = @db_process_sql_update('tagente_modulo', $values, $where); + } if ($result == false) { if ($result_disable === ERR_GENERIC) { diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php index 60a8e6bce0..b9393ce1c4 100644 --- a/pandora_console/include/functions_notifications.php +++ b/pandora_console/include/functions_notifications.php @@ -635,6 +635,12 @@ function notifications_get_user_label_status($source, $user, $label) array_keys(users_get_groups($user)), array_keys(notifications_get_group_sources_for_select($source['id'])) ); + + // Clean default common groups error for mesagges. + if ($common_groups[0] === 0) { + unset($common_groups[0]); + } + // No group found, return no permissions. $value = empty($common_groups) ? false : $source[$label]; return notifications_build_user_enable_return($value, false); @@ -760,9 +766,10 @@ function notifications_print_global_source_configuration($source) } // Generate the title. - $html_title = "
"; + $html_title = '

'.$source['description'].'

'; + $html_title .= "
"; $html_title .= html_print_switch($switch_values); - $html_title .= '

'.$source['description'].'

'; + $html_title .= '

'.__('Enable user configuration').'

'; $html_title .= '
'; // Generate the html for title. diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index a869b939b3..86e679c920 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -99,23 +99,27 @@ function ui_print_truncate_text( $forced_title=false ) { global $config; - + $truncate_at_end = false; if (is_string($numChars)) { switch ($numChars) { case 'agent_small': $numChars = $config['agent_size_text_small']; + $truncate_at_end = (bool) $config['truncate_agent_at_end']; break; case 'agent_medium': $numChars = $config['agent_size_text_medium']; + $truncate_at_end = (bool) $config['truncate_agent_at_end']; break; case 'module_small': $numChars = $config['module_size_text_small']; + $truncate_at_end = (bool) $config['truncate_module_at_end']; break; case 'module_medium': $numChars = $config['module_size_text_medium']; + $truncate_at_end = (bool) $config['truncate_module_at_end']; break; case 'description': @@ -147,27 +151,35 @@ function ui_print_truncate_text( // '/2' because [...] is in the middle of the word. $half_length = intval(($numChars - 3) / 2); - // Depending on the strange behavior of mb_strimwidth() itself, - // the 3rd parameter is not to be $numChars but the length of - // original text (just means 'large enough'). - $truncateText2 = mb_strimwidth( - $text_html_decoded, - (mb_strlen($text_html_decoded, 'UTF-8') - $half_length), - mb_strlen($text_html_decoded, 'UTF-8'), - '', - 'UTF-8' - ); + if ($truncate_at_end === true) { + // Recover the html entities to avoid XSS attacks. + $truncateText = ($text_has_entities) ? io_safe_input(substr($text_html_decoded, 0, $numChars)) : substr($text_html_decoded, 0, $numChars); + if (strlen($text_html_decoded) > $numChars) { + $truncateText .= '...'; + } + } else { + // Depending on the strange behavior of mb_strimwidth() itself, + // the 3rd parameter is not to be $numChars but the length of + // original text (just means 'large enough'). + $truncateText2 = mb_strimwidth( + $text_html_decoded, + (mb_strlen($text_html_decoded, 'UTF-8') - $half_length), + mb_strlen($text_html_decoded, 'UTF-8'), + '', + 'UTF-8' + ); - $truncateText = mb_strimwidth( - $text_html_decoded, - 0, - ($numChars - $half_length), - '', - 'UTF-8' - ); + $truncateText = mb_strimwidth( + $text_html_decoded, + 0, + ($numChars - $half_length), + '', + 'UTF-8' + ); - // Recover the html entities to avoid XSS attacks. - $truncateText = ($text_has_entities) ? io_safe_input($truncateText).$suffix.io_safe_input($truncateText2) : $truncateText.$suffix.$truncateText2; + // Recover the html entities to avoid XSS attacks. + $truncateText = ($text_has_entities) ? io_safe_input($truncateText).$suffix.io_safe_input($truncateText2) : $truncateText.$suffix.$truncateText2; + } if ($showTextInTitle) { if ($style === null) { diff --git a/pandora_console/install.php b/pandora_console/install.php index 57f2150e00..7dfe66de42 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
module_name) === false) { - $tmp->module_name = io_safe_output($tmp->module_name); - if (strlen($tmp->module_name) >= 20) { - $tmp->module_name = ui_print_truncate_text( - $tmp->module_name, - 20, - false, - true, - false, - '…', - true, - true, - ); - } + $tmp->module_name = ui_print_truncate_text( + $tmp->module_name, + 'module_medium', + false, + true, + false, + '…', + true, + true, + ); } if (empty($tmp->comments) === false) { @@ -564,19 +561,16 @@ if (is_ajax() === true) { } } - $tmp->agent_name = io_safe_output($tmp->agent_name); - if (strlen($tmp->agent_name) >= 10) { - $tmp->agent_name = ui_print_truncate_text( - $tmp->agent_name, - 10, - false, - true, - false, - '…', - true, - true, - ); - } + $tmp->agent_name = ui_print_truncate_text( + $tmp->agent_name, + 'agent_small', + false, + true, + false, + '…', + true, + true, + ); $tmp->id_extra = io_safe_output($tmp->id_extra); if (strlen($tmp->id_extra) >= 10) { @@ -944,7 +938,8 @@ if (is_ajax() === true) { // Module name. $tmp->id_agentmodule = $tmp->module_name; - if (strlen($tmp->id_agentmodule) >= 10) { + /* + if (strlen($tmp->id_agentmodule) >= 10) { $tmp->id_agentmodule = ui_print_truncate_text( $tmp->id_agentmodule, 10, @@ -955,7 +950,7 @@ if (is_ajax() === true) { true, true, ); - } + }*/ // Options. // Show more. diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index e9430b8eca..f84ecdb699 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -216,7 +216,7 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) { $options['view'] = [ 'active' => true, 'text' => ''.html_print_image( - 'images/eye.png', + 'images/see-details@svg.svg', true, [ 'title' => __('View report'), diff --git a/pandora_console/operation/search_agents.getdata.php b/pandora_console/operation/search_agents.getdata.php index ea63506fa4..bdeea391a1 100644 --- a/pandora_console/operation/search_agents.getdata.php +++ b/pandora_console/operation/search_agents.getdata.php @@ -15,6 +15,7 @@ global $config; enterprise_include_once('include/functions_policies.php'); require_once $config['homedir'].'/include/functions_users.php'; +require_once $config['homedir'].'/include/functions_reporting.php'; $searchAgents = get_parameter('search_agents', 0); $stringSearchSQL = get_parameter('stringSearchSQL'); diff --git a/pandora_console/operation/users/user_edit_notifications.php b/pandora_console/operation/users/user_edit_notifications.php index 309439dfe7..77ef1caebe 100644 --- a/pandora_console/operation/users/user_edit_notifications.php +++ b/pandora_console/operation/users/user_edit_notifications.php @@ -36,33 +36,11 @@ require_once $config['homedir'].'/include/functions_notifications.php'; $headerTitle = __('User notifications'); require $config['homedir'].'/operation/users/user_edit_header.php'; -if (get_parameter('change_label', 0)) { - $label = get_parameter('label', ''); - $source = get_parameter('source', 0); - $user = get_parameter('user', ''); - $value = get_parameter('value', 0) ? 1 : 0; - - // Update the label value. - ob_clean(); - echo json_encode( - [ - 'result' => notifications_set_user_label_status( - $source, - $user, - $label, - $value - ), - ] - ); - return; -} - - echo '
-
'.__('Enable').'
-
'.__('Also receive an email').'
+
'.__('Console notifications').'
+
'.__('E-mail notifications').'
'; $sources = notifications_get_all_sources(); @@ -109,13 +87,12 @@ html_print_input_hidden('id_user', $id); event.preventDefault(); var check = document.getElementById(event.target.id); if (check === null) return; - var match = /notifications-user-([0-9]+)-label-(.*)/ .exec(event.target.id); - jQuery.post ("ajax.php", { - "page" : "operation/users/user_edit_notifications", + //"page" : "operation/users/user_edit_notifications", + "page" : 'include/ajax/notifications.ajax', "change_label" : 1, "label" : match[2], "source" : match[1], @@ -148,4 +125,5 @@ html_print_input_hidden('id_user', $id); ); } }()); + diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index 02d34d75ab..2af345741a 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index 1aa3522894..92807c8818 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index f4de16d2e6..75db0582ee 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/vendor/composer/platform_check.php b/pandora_console/vendor/composer/platform_check.php index b168ddd5d9..21111b57c6 100644 --- a/pandora_console/vendor/composer/platform_check.php +++ b/pandora_console/vendor/composer/platform_check.php @@ -16,7 +16,32 @@ if ($issues) { if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); } elseif (!headers_sent()) { - echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; + require_once __DIR__.'/../../include/functions_ui.php'; + + $url = str_replace('/var/www/html/', '', __DIR__); + $url = str_replace('/vendor/composer', '', $url); + + echo ''; + ?> + + + + '; + echo '
'; + echo '

Composer detected issues in your platform:

'; + echo '
'; + echo sprintf( + 'PandoraFMS requires PHP 8.0 to work properly and the version %s has been detected. Please update the PHP version of the system. More info %s. The latest version with PHP 7.4 support is PandoraFMS 767 hope LTS.', + PHP_VERSION, + 'here' + ); + echo '
'; } } trigger_error( diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 8578d180d2..0efae4b7db 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.773.3-230911 +Version: 7.0NG.773.3-230912 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 7a00f41d00..c66c73e8f3 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/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.773.3-230911" +pandora_version="7.0NG.773.3-230912" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 0db56b57ef..a4e453304d 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -46,7 +46,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.773.3"; -my $pandora_build = "230911"; +my $pandora_build = "230912"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 990789a3fe..f95258a768 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -34,7 +34,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.773.3"; -my $pandora_build = "230911"; +my $pandora_build = "230912"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 35598b9d3b..30c49df05c 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b6057f3043..fc1b267948 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.773.3 -%define release 230911 +%define release 230912 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 4d00bab1ec..a7cb37298a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.773.3" -PI_BUILD="230911" +PI_BUILD="230912" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index cce277b372..c151f4fdf0 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.773.3 Build 230911"; +my $version = "7.0NG.773.3 Build 230912"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 4342cafe6d..956a5bf3ee 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.773.3 Build 230911"; +my $version = "7.0NG.773.3 Build 230912"; # save program name for logging my $progname = basename($0);