tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second

Browse Source
This commit is contained in:
Daniel Maya 2023-08-02 09:10:04 +02:00
commit ae22b99835
29 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.772-230801 Version: 7.0NG.772-230802
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # 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." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1031,7 +1031,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.772'; 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 # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.772" PI_VERSION="7.0NG.772"
PI_BUILD="230801" PI_BUILD="230802"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{230801} {230802}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #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_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS" VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" 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" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.772-230801 Version: 7.0NG.772-230802
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.772-230801" pandora_version="7.0NG.772-230802"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

14
pandora_console/general/main_menu.php
View File

@ -185,6 +185,10 @@ echo '</div>';
$(`#sub${this.id}`).hide(); $(`#sub${this.id}`).hide();
}) })
} else if ($('#menu_full').hasClass('menu_full_collapsed')) { } 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"); localStorage.setItem("menuType", "classic");
$('ul.submenu').css('left', '280px'); $('ul.submenu').css('left', '280px');
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
@ -273,6 +277,14 @@ echo '</div>';
$('.menu_icon').mouseenter(function() { $('.menu_icon').mouseenter(function() {
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
if (!click_display && menuType_val === 'collapsed') { if (!click_display && menuType_val === 'collapsed') {
$(".arrow_menu_down").each(function() {
$(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); table_hover = $(this);
handsIn = 1; handsIn = 1;
openTime = new Date().getTime(); openTime = new Date().getTime();
@ -305,6 +317,7 @@ echo '</div>';
table_hover2 = $(this); table_hover2 = $(this);
handsIn2 = 1; handsIn2 = 1;
openTime2 = new Date().getTime(); openTime2 = new Date().getTime();
$("#sub" + table_hover2[0].id).attr('style', 'display: none; position: fixed; left: 340px;');
$("#sub" + table_hover2[0].id).show(); $("#sub" + table_hover2[0].id).show();
if (typeof(table_noHover2) != 'undefined') { if (typeof(table_noHover2) != 'undefined') {
if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) { if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) {
@ -315,6 +328,7 @@ echo '</div>';
}).mouseleave(function() { }).mouseleave(function() {
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
if (!click_display && menuType_val === 'collapsed') { if (!click_display && menuType_val === 'collapsed') {
$("#sub" + $(this)[0].id).attr('style', 'display: none;');
table_noHover2 = table_hover2; table_noHover2 = table_hover2;
handsIn2 = 0; handsIn2 = 0;
setTimeout(function() { setTimeout(function() {

4
pandora_console/godmode/netflow/nf_edit_form.php
View File

@ -261,8 +261,8 @@ $table->data['first_line'][] = html_print_label_input_block(
'assign_group', 'assign_group',
$assign_group, $assign_group,
'', '',
'', __('All'),
-1, 0,
true, true,
false, false,
false, false,

4
pandora_console/godmode/users/user_management.php
View File

@ -784,10 +784,12 @@ $userManagementTable->data['fields_addSettings'][1] .= html_print_div(
if (isset($CodeQRTable) === true || isset($apiTokenContent) === true) { if (isset($CodeQRTable) === true || isset($apiTokenContent) === true) {
// QR Code and API Token advice. // QR Code and API Token advice.
$titleQr = '<span class="font-title-font">'.__('Contact details (QR)').'</span>';
$titleApi = '<span class="font-title-font margin-top-10">'.__('API Token credentials').'</span>';
html_print_div( html_print_div(
[ [
'id' => 'api_qrcode_display', 'id' => 'api_qrcode_display',
'content' => $CodeQRTable.$apiTokenContent, 'content' => $titleQr.$CodeQRTable.$titleApi.$apiTokenContent,
] ]
); );
} }

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC230801'; $build_version = 'PC230802';
$pandora_version = 'v7.0NG.772'; $pandora_version = 'v7.0NG.772';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

6
pandora_console/include/styles/menu.css
View File

@ -630,6 +630,12 @@ ul li {
z-index: 1; 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 { .span_selected {
color: #1d7874 !important; color: #1d7874 !important;
font-weight: bold !important; font-weight: bold !important;

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'> <div style='padding-bottom: 50px'>
<?php <?php
$version = '7.0NG.772'; $version = '7.0NG.772';
$build = '230801'; $build = '230802';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.772-230801 Version: 7.0NG.772-230802
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.772-230801" pandora_version="7.0NG.772-230802"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.772"; my $pandora_version = "7.0NG.772";
my $pandora_build = "230801"; my $pandora_build = "230802";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.772"; my $pandora_version = "7.0NG.772";
my $pandora_build = "230801"; my $pandora_build = "230802";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.772 %define version 7.0NG.772
%define release 230801 %define release 230802
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.772" PI_VERSION="7.0NG.772"
PI_BUILD="230801" PI_BUILD="230802"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.772 Build 230801"; my $version = "7.0NG.772 Build 230802";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.772 Build 230801"; my $version = "7.0NG.772 Build 230802";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);