diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 2d198c6891..6d34280ae7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.756-210819 +Version: 7.0NG.756-210825 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 f17315dbba..d52f64ce27 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.756-210819" +pandora_version="7.0NG.756-210825" 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 b2d3e6c5cb..ef6329833e 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.756'; -use constant AGENT_BUILD => '210819'; +use constant AGENT_BUILD => '210825'; # 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 1f4925f550..acf5905524 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.756 -%define release 210819 +%define release 210825 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 1f72c3c981..c6fcbf5d5b 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.756 -%define release 210819 +%define release 210825 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 a92631215b..1339215955 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.756" -PI_BUILD="210819" +PI_BUILD="210825" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8568e018e6..af397425a0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210819} +{210825} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e20300d63f..a2004dbab0 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.756 Build 210819") +#define PANDORA_VERSION ("7.0NG.756 Build 210825") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 0ae8f2bf98..7e4d4160c7 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.756(Build 210819))" + VALUE "ProductVersion", "(7.0NG.756(Build 210825))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5f3c727672..c1b423fc77 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.756-210819 +Version: 7.0NG.756-210825 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 222e37a218..325046e3ad 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.756-210819" +pandora_version="7.0NG.756-210825" package_pear=0 package_pandora=1 diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 057f9f4b8a..1462c717d7 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -38,7 +38,7 @@ if (isset($config['id_user']) === false) { $(document).ready(function(){ var menuType_value = ""; - if (menuType_value === 'classic') { + if (menuType_value === '' || menuType_value === 'classic') { $('ul.submenu').css('left', '214px'); } else{ diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index bffe894931..433a2c45e3 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -5159,7 +5159,6 @@ function addSLARow() { $("input[name=id_agent_failover]").val(''); $("input[name=id_server]").val(''); $("input[name=agent_sla]").val(''); - $("input[name=agent_sla]").css("background","url('') right center no-repeat") $("input[name=agent_failover]").val(''); $("#id_agent_module_sla").empty(); $("#id_agent_module_sla").attr('disabled', 'true'); diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php index 7030d60189..a3eca5e9a7 100644 --- a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php +++ b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php @@ -666,6 +666,7 @@ class Client $target = __('console update %d', $request['version']); } + // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found curl_setopt( $ch, CURLOPT_PROGRESSFUNCTION, diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index f21c38b561..c85ec25a27 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -100,7 +100,7 @@ $update_profile = (bool) get_parameter('update_profile'); $id_profile = (int) get_parameter('id'); $is_management_allowed = true; -if (is_management_allowed() === false) { +if (is_metaconsole() === false && is_management_allowed() === false) { $is_management_allowed = false; ui_print_warning_message( __( diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index fadb9f13f4..fc4564e0e8 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -129,7 +129,7 @@ switch ($sortField) { break; default: - // Not possible. + // Nothing to do. break; } break; @@ -153,7 +153,7 @@ switch ($sortField) { break; default: - // Not possible. + // Nothing to do. break; } break; @@ -177,7 +177,7 @@ switch ($sortField) { break; default: - // Not possible. + // Nothing to do. break; } break; @@ -395,7 +395,7 @@ $table->data[0][4] = html_print_submit_button( ); $is_management_allowed = true; -if (is_management_allowed() === false) { +if (is_metaconsole() === false && is_management_allowed() === false) { $is_management_allowed = false; ui_print_warning_message( __( @@ -585,11 +585,11 @@ foreach ($info as $user_id => $user_info) { $cont++; // Manual pagination due the complicated process of the ACL data. - if ($cont <= $offset) { + if ($cont <= $offset && $search !== true) { continue; } - if ($cont > ($limit + $offset)) { + if ($cont > ($limit + $offset) && $search !== true) { break; } @@ -820,6 +820,9 @@ foreach ($info as $user_id => $user_info) { $data[6] .= ''; // Delete button not in this mode. } + } else { + $data[6] .= ''; + // Delete button not in this mode. } } diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 6e9f30c07b..e099df93a4 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -2359,12 +2359,17 @@ class ConsoleSupervisor $message_conf_cron .= __('Please, make sure process is not locked.'); } + $url = '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'; + if (is_metaconsole() === true) { + $url = '__url__index.php?sec=extensions&sec2=enterprise/extensions/cron'; + } + $this->notify( [ 'type' => 'NOTIF.CRON.CONFIGURED', 'title' => __('DiscoveryConsoleTasks is not configured.'), 'message' => __($message_conf_cron), - 'url' => '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist', + 'url' => $url, ] ); } else { diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d8e69b475e..97e298776c 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 = 'PC210819'; +$build_version = 'PC210825'; $pandora_version = 'v7.0NG.756'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 45fbcf1077..12bfc692d5 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1585,7 +1585,7 @@ function enterprise_include($filename, $variables=[]) extract($variables); } - include $filepath; + include_once $filepath; return true; } diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 9f28d0e7d6..482883f9e1 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -39,11 +39,14 @@ if (is_ajax() === true && empty(get_parameter('menuType')) === false) { /** * Prints a complete menu structure. * - * @param array Menu structure to print. + * @param array $menu Menu structure to print. + * + * @return void */ function menu_print_menu(&$menu) { global $config; + global $menuTypeClass; static $idcounter = 0; echo '
'; @@ -108,7 +111,7 @@ function menu_print_menu(&$menu) $submenu = false; - if ($_SESSION['menu_type'] === 'classic') { + if ($menuTypeClass === 'classic') { $classes = [ 'menu_icon', 'no_hidden_menu', @@ -120,12 +123,12 @@ function menu_print_menu(&$menu) ]; } - if (isset($main['sub'])) { + if (isset($main['sub']) === true) { $classes[] = ''; $submenu = true; } - if (!isset($main['refr'])) { + if (isset($main['refr']) === false) { $main['refr'] = 0; } @@ -409,23 +412,14 @@ function menu_print_menu(&$menu) // Print out the first level. $output .= '
  • '; - // onclick="location.href=\'index.php?sec='.$mainsec.'&sec2='.$main["sec2"].($main["refr"] ? '&refr='.$main["refr"] : '').'\'">'; - $length = strlen(__($main['text'])); - $padding_top = ( $length >= 18) ? 6 : 12; - if ($_SESSION['menu_type'] === 'classic') { - $output .= '
    '.$main['text'].'
    '; - } else { - $output .= '
    '.$main['text'].'
    '; - } + $output .= sprintf('
    %s
    ', $menuTypeClass, $main['text']); - // Add the notification ball if defined - if (isset($main['notification'])) { + // Add the notification ball if defined. + if (isset($main['notification']) === true) { $output .= '
    '.$main['notification'].'
    '; } - $padding_top = 0; - $length = 0; if ($submenu_output != '') { // WARNING: IN ORDER TO MODIFY THE VISIBILITY OF MENU'S AND SUBMENU'S (eg. with cookies) YOU HAVE TO ADD TO THIS ELSEIF. DON'T MODIFY THE CSS. if ($visible || in_array('selected', $classes)) { @@ -436,10 +430,7 @@ function menu_print_menu(&$menu) $visible = false; } - // $output .= '