tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml

This commit is contained in:
fbsanchez 2020-01-29 16:31:14 +01:00
parent c8c2141f83 f8b12d2fdb
commit 668027e794
9 changed files with 36531 additions and 25638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1334,7 +1334,7 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT '';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 34);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 35);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');

BIN
pandora_console/include/languages/es.mo
View File

Binary file not shown.

62151
pandora_console/include/languages/es.po
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/pandoradb_data.sql
View File

@ -109,7 +109,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
('custom_report_front_header', ''),
('custom_report_front_footer', ''),
('MR', 34),
('MR', 35),
('identification_reminder', 1),
('identification_reminder_timestamp', 0),
('current_package_enterprise', '743'),

10
pandora_server/bin/pandora_server
View File

@ -580,14 +580,14 @@ sub main() {
# Only if console_api_url was not defined
if( !defined($Config{"console_api_url"}) ) {
my $console_api_url = pandora_get_tconfig_token ($DBH, 'public_url', '');
my $include_api = 'include/api.php';
# If public_url is empty in database
if ( $console_api_url eq '' ) {
$console_api_url = 'http://localhost/pandora_console/';
logger(\%Config, "Assuming default path for API url: " . $console_api_url, 3);
$Config{"console_api_url"} = 'http://localhost/pandora_console/' . $include_api;
logger(\%Config, "Assuming default path for API url: " . $Config{"console_api_url"}, 3);
} else {
$Config{"console_api_url"} = $console_api_url . $include_api;
}
$Config{"console_api_url"} = $console_api_url . 'include/api.php';
}
# Definition of configuration file

1
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -118,6 +118,7 @@ use XML::Simple;
use HTML::Entities;
use Time::Local;
use Time::HiRes qw(time);
eval "use POSIX::strftime::GNU;1" if ($^O =~ /win/i);
use POSIX qw(strftime);
use threads;
use threads::shared;

1
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -27,6 +27,7 @@ use Thread::Semaphore;
use Time::Local;
use XML::Parser::Expat;
use XML::Simple;
eval "use POSIX::strftime::GNU;1" if ($^O =~ /win/i);
use POSIX qw(setsid strftime);
use IO::Uncompress::Unzip;
use JSON qw(decode_json);

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

@ -22,6 +22,7 @@ use Socket qw(inet_ntoa inet_aton);
use File::Copy;
use Scalar::Util qw(looks_like_number);
use Time::HiRes qw(time);
eval "use POSIX::strftime::GNU;1" if ($^O =~ /win/i);
use POSIX qw(strftime setsid floor);
use MIME::Base64;
use JSON qw(decode_json encode_json);

1
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -19,6 +19,7 @@ package PandoraFMS::Tools;
use warnings;
use Time::Local;
eval "use POSIX::strftime::GNU;1" if ($^O =~ /win/i);
use POSIX qw(setsid strftime);
use POSIX;
use HTML::Entities;