From b6c3cd5149eaf2ec356e018acd167fae6d0fe8c6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 20 Jun 2023 14:55:12 +0200 Subject: [PATCH 1/7] #11629 netflow group filter all enable --- pandora_console/godmode/netflow/nf_edit_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index 135739c446..c136c1db1d 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -261,8 +261,8 @@ $table->data['first_line'][] = html_print_label_input_block( 'assign_group', $assign_group, '', - '', - -1, + __('All'), + 0, true, false, false, From bc2bd6868934829a8eb7a6047da30171eeeb129a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 21 Jun 2023 13:49:34 +0200 Subject: [PATCH 2/7] #11571 text QR --- pandora_console/godmode/users/user_management.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index b03c79f374..d0a06c81a6 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -764,10 +764,12 @@ $userManagementTable->data['fields_addSettings'][1] .= html_print_div( if (isset($CodeQRTable) === true || isset($apiTokenContent) === true) { // QR Code and API Token advice. + $titleQr = ''.__('Contact details (QR)').''; + $titleApi = '
'.__('API Token credentials').''; html_print_div( [ 'id' => 'api_qrcode_display', - 'content' => $CodeQRTable.$apiTokenContent, + 'content' => $titleQr.$CodeQRTable.$titleApi.$apiTokenContent, ] ); } From 6ef21fc3a1e1e4bbae65e19662ecbe9758a50836 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 11 Jul 2023 13:50:45 +0200 Subject: [PATCH 3/7] #11697 menu display lateral on collapse and tokem --- pandora_console/general/main_menu.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 60bffeb27f..ceef9db595 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -305,6 +305,7 @@ echo ''; table_hover2 = $(this); handsIn2 = 1; openTime2 = new Date().getTime(); + $("#sub" + table_hover2[0].id).attr('style', 'display: none; position: fixed; left: 340px;'); $("#sub" + table_hover2[0].id).show(); if (typeof(table_noHover2) != 'undefined') { if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) { @@ -315,6 +316,7 @@ echo ''; }).mouseleave(function() { var menuType_val = localStorage.getItem("menuType"); if (!click_display && menuType_val === 'collapsed') { + $("#sub" + $(this)[0].id).attr('style', 'display: none;'); table_noHover2 = table_hover2; handsIn2 = 0; setTimeout(function() { From 84df4e11955c67db6378c43db6405ec9fd9e3347 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 1 Aug 2023 11:11:24 +0200 Subject: [PATCH 4/7] #11571 fix for firefox margin api token span --- pandora_console/godmode/users/user_management.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index d57fe419e1..90bf79a50c 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -785,7 +785,7 @@ $userManagementTable->data['fields_addSettings'][1] .= html_print_div( if (isset($CodeQRTable) === true || isset($apiTokenContent) === true) { // QR Code and API Token advice. $titleQr = ''.__('Contact details (QR)').''; - $titleApi = '
'.__('API Token credentials').''; + $titleApi = ''.__('API Token credentials').''; html_print_div( [ 'id' => 'api_qrcode_display', From 3b38824ca775e53c863a32d1035418c57da911fb Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 1 Aug 2023 13:06:43 +0200 Subject: [PATCH 5/7] #11697 arrow left menu collapse --- pandora_console/general/main_menu.php | 8 ++++++++ pandora_console/include/styles/menu.css | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index ceef9db595..9ddc30037a 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -185,6 +185,10 @@ echo ''; $(`#sub${this.id}`).hide(); }) } else if ($('#menu_full').hasClass('menu_full_collapsed')) { + $(".arrow_menu_right").each(function() { + $(this).removeClass('arrow_menu_right'); + $(this).addClass('arrow_menu_down'); + }); localStorage.setItem("menuType", "classic"); $('ul.submenu').css('left', '280px'); var menuType_val = localStorage.getItem("menuType"); @@ -273,6 +277,10 @@ echo ''; $('.menu_icon').mouseenter(function() { var menuType_val = localStorage.getItem("menuType"); if (!click_display && menuType_val === 'collapsed') { + $(".arrow_menu_down").each(function() { + $(this).removeClass('arrow_menu_down'); + $(this).addClass('arrow_menu_right'); + }); table_hover = $(this); handsIn = 1; openTime = new Date().getTime(); diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 537dd90cf2..3639f257a1 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -630,6 +630,12 @@ ul li { z-index: 1; } +.arrow_menu_right { + background: url(../../images/menu/arrow_down_grey.svg) no-repeat 50% 100%; + z-index: 1; + transform: rotate(-0.25turn); +} + .span_selected { color: #1d7874 !important; font-weight: bold !important; From cf1e274456419ea9d5489fa92731f6367e1aff2e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 1 Aug 2023 13:54:48 +0200 Subject: [PATCH 6/7] #11697 fix menu display lateral --- pandora_console/general/main_menu.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 9ddc30037a..92e5e2aff9 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -281,6 +281,10 @@ echo ''; $(this).removeClass('arrow_menu_down'); $(this).addClass('arrow_menu_right'); }); + $(".arrow_menu_up").each(function() { + $(this).removeClass('arrow_menu_up'); + $(this).addClass('arrow_menu_right'); + }); table_hover = $(this); handsIn = 1; openTime = new Date().getTime(); From d3fdb28d056e20758118fbe61ddfea53b8e290c9 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 2 Aug 2023 01:00:29 +0200 Subject: [PATCH 7/7] 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 80a3821568..8d0edd2c56 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230801 +Version: 7.0NG.772-230802 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 6bea6f1f68..77d941633b 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.772-230801" +pandora_version="7.0NG.772-230802" 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 2dfb967438..041b43b1b8 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.772'; -use constant AGENT_BUILD => '230801'; +use constant AGENT_BUILD => '230802'; # 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 4e1d5d73f4..5e397cd329 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.772 -%define release 230801 +%define release 230802 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 da2b6b7fa7..7b10d52dba 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.772 -%define release 230801 +%define release 230802 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 c2c04e866d..7dd4c17020 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230801" +PI_BUILD="230802" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7a88382b36..66ab8026be 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230801} +{230802} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 57d4e2a9fd..87114ed2da 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.772 Build 230801") +#define PANDORA_VERSION ("7.0NG.772 Build 230802") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 1f922a2123..3dd6c88730 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.772(Build 230801))" + VALUE "ProductVersion", "(7.0NG.772(Build 230802))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 66f3140f52..72bb6af9d9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230801 +Version: 7.0NG.772-230802 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 5211fe12bc..92678462df 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.772-230801" +pandora_version="7.0NG.772-230802" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b5e567657e..9c4c9c45f2 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 = 'PC230801'; +$build_version = 'PC230802'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index e641276a4b..617f77bc6a 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 a57b76f25e..f42326f02e 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.772 -%define release 230801 +%define release 230802 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fe7e76af9b..9882563126 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.772 -%define release 230801 +%define release 230802 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 96f3e7b46c..60a4a29728 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230801" +PI_BUILD="230802" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index a7f603c50a..27aa05f8ff 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.772 Build 230801"; +my $version = "7.0NG.772 Build 230802"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f3373b2979..5ff60b54b0 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.772 Build 230801"; +my $version = "7.0NG.772 Build 230802"; # save program name for logging my $progname = basename($0);