diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 87d52e2174..c6c1a5d4ba 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240412 +Version: 7.0NG.776-240415 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 45277fb8a8..5a5ba493a4 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.776-240412" +pandora_version="7.0NG.776-240415" 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 9c31cb218d..716b7a33d3 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240412'; +use constant AGENT_BUILD => '240415'; # 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 9838d160df..bc946945ea 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.776 -%define release 240412 +%define release 240415 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 42479f4a7a..7b3b86bf3e 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240412 +%define release 240415 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 81ac60c0f1..0ea18b9521 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240412 +%define release 240415 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 46bba8cd43..8ec99fa455 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.776 -%define release 240412 +%define release 240415 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 8baade9231..67d4db51aa 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.776 -%define release 240412 +%define release 240415 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 fac9b76ec9..bb68b0547e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240412" +PI_BUILD="240415" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1c14989430..915940c8f4 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240412} +{240415} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 17e6504bc8..8361ccfafc 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.776 Build 240412") +#define PANDORA_VERSION ("7.0NG.776 Build 240415") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 96fe1e7348..02a4d1a9e5 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.776(Build 240412))" + VALUE "ProductVersion", "(7.0NG.776(Build 240415))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5facf3f8f9..a29cfd48d9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240412 +Version: 7.0NG.776-240415 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 274a7a050b..85a218609f 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.776-240412" +pandora_version="7.0NG.776-240415" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 40c42fd557..649e730155 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -738,7 +738,7 @@ if ($access_console_node === true) { $sub['operation/agentes/exportdata']['id'] = 'export_data'; } - if ((bool) check_acl($config['id_user'], 0, 'PM') === true) { + if ((bool) check_acl($config['id_user'], 0, 'PM') === true || enterprise_hook('enterprise_acl', [$config['id_user'], 'tools', 'operation/extensions', false]) === true) { $sub['godmode/files_repo/files_repo']['text'] = __('File repository'); $sub['godmode/files_repo/files_repo']['id'] = 'file_repository'; } diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php index 0936c40d86..36d7e950a7 100644 --- a/pandora_console/include/class/OrderInterpreter.class.php +++ b/pandora_console/include/class/OrderInterpreter.class.php @@ -426,12 +426,12 @@ class OrderInterpreter extends Wizard echo $this->loadJS(); echo ''; if ($iterator > 10) { - echo '
+ echo '
+ '.$more_results.' '.__('results found').'
'; } if ($iterator === 0) { - echo ''.__('Press enter to search').''; + echo ''.__('Press enter to search').''; } echo '
'; diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 98ae73830b..317a54dcf2 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240412'; +$build_version = 'PC240415'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index eba07feece..856d91575c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1674,6 +1674,12 @@ function events_get_all( } } + if (!$user_is_admin && users_can_manage_group_all('ER') === false) { + if (str_contains($fields[0], 'te.id_grupo') === false) { + $fields[0] .= ', te.id_grupo'; + } + } + if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS || (int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) && $count === false ) { diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index c12f8b9147..0ddc26c102 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -2407,7 +2407,9 @@ $(document).ready(function() { closeOnEscape: true, width: 700, height: 450, - + close: function() { + closeAboutModal(); + }, create: function() { $("#about-tabs").tabs({}); $(".ui-dialog-titlebar").remove(); @@ -2415,7 +2417,6 @@ $(document).ready(function() { $("#about-close").click(function() { $("#about-tabs").dialog("close"); $("div.ui-dialog").remove(); - $("#icon_about").removeClass("selected"); }); } }); @@ -2436,7 +2437,9 @@ $(document).ready(function() { closeOnEscape: true, width: 700, height: 450, - + close: function() { + closeAboutModal(); + }, create: function() { $("#about-tabs").tabs({}); $(".ui-dialog-titlebar").remove(); @@ -2444,7 +2447,6 @@ $(document).ready(function() { $("#about-close").click(function() { $("#about-tabs").dialog("close"); $("div.ui-dialog").remove(); - $("#icon_about_operation").removeClass("selected"); }); } }); @@ -2738,6 +2740,17 @@ function menuTabsShowHide() { } function resizeSearchHeader() { - $(".show_result_interpreter").width($("#keywords").outerWidth() - 12); - $(".show_result_interpreter").css("left", $("#keywords").position().left + 2); + if ($(".show_result_interpreter").width() && $("#keywords").position()) { + $(".show_result_interpreter").width($("#keywords").outerWidth() - 12); + $(".show_result_interpreter").css( + "left", + $("#keywords").position().left + 2 + ); + } +} + +function closeAboutModal() { + $("#icon_about_operation").removeClass("selected"); + $("#icon_about").removeClass("selected"); + $("#icon_about_div").removeClass("selected"); } diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 33515ffb22..acbc96b28c 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -1000,3 +1000,7 @@ input.resize_button { .grid-stack-item-content .visual-console-container-dashboard { text-align: initial; } + +ul.select2-selection__rendered > li.select2-selection__choice { + box-sizing: border-box !important; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 2bfc9010c8..3319dc0f80 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12283,7 +12283,7 @@ ul.tag-editor { cursor: text; font: normal 14px sans-serif; color: #333333; - background: #f6f7fb; + background: var(--secondary-color); line-height: 20px; } diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index b278278e32..8aa0014ee6 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -24,6 +24,7 @@ Description: The default Pandora FMS theme layout --primary-color: #14524f; --primary-color-hover: #14524f; --secondary-color: #222; + --tertiary-color: #333; --text-color: #fff; --text-color-2: #ededed; @@ -758,7 +759,6 @@ div#main_pure { margin-top: 30px; margin-left: 10px; margin-right: 10px; - height: 1000px; width: 98%; position: static; } @@ -1221,13 +1221,13 @@ li > input[type="text"]:not(.search_input), li > input[type="email"], li > input[type="password"] { background-color: transparent; - border: none; + /*border: none; border-radius: 0; border-bottom: 1px solid #ccc; font-weight: inherit; padding: 0px 0px 2px 0px; box-sizing: border-box; - margin-bottom: 4px; + margin-bottom: 4px;*/ } a:hover { @@ -2083,6 +2083,10 @@ li.agent-autocomplete-li-text-color a { color: var(--text-color) !important; } +select option:checked { + background-color: var(--tertiary-color); +} + .basic-chart-widget .flot-base { background-color: unset; } diff --git a/pandora_console/install.php b/pandora_console/install.php index 804c2853f3..6050ade36a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 308fd97fd3..0bf09b57dc 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240412 +%define release 240415 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 5660ee84df..afadb4b1aa 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.776 -%define release 240412 +%define release 240415 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6c79e344e6..b3ba97856b 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240412" +PI_BUILD="240415" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 1427c1bb03..a4df10de9d 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240412"; +my $version = "7.0NG.776 Build 240415"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index c398d6588c..1a0074cc32 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.776 Build 240412"; +my $version = "7.0NG.776 Build 240415"; # save program name for logging my $progname = basename($0);