Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan

This commit is contained in:
José González 2021-08-25 10:27:56 +02:00
commit 357b47a6d5
42 changed files with 308 additions and 96 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.756-210819 Version: 7.0NG.756-210825
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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.756-210819" pandora_version="7.0NG.756-210825"
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

View File

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

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.756 %define version 7.0NG.756
%define release 210819 %define release 210825
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.756 %define version 7.0NG.756
%define release 210819 %define release 210825
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.756" PI_VERSION="7.0NG.756"
PI_BUILD="210819" PI_BUILD="210825"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{210819} {210825}
ViewReadme ViewReadme
{Yes} {Yes}

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.756 Build 210819") #define PANDORA_VERSION ("7.0NG.756 Build 210825")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.756-210819 Version: 7.0NG.756-210825
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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.756-210819" pandora_version="7.0NG.756-210825"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -38,7 +38,7 @@ if (isset($config['id_user']) === false) {
$(document).ready(function(){ $(document).ready(function(){
var menuType_value = "<?php echo $_SESSION['menu_type']; ?>"; var menuType_value = "<?php echo $_SESSION['menu_type']; ?>";
if (menuType_value === 'classic') { if (menuType_value === '' || menuType_value === 'classic') {
$('ul.submenu').css('left', '214px'); $('ul.submenu').css('left', '214px');
} }
else{ else{

View File

@ -5159,7 +5159,6 @@ function addSLARow() {
$("input[name=id_agent_failover]").val(''); $("input[name=id_agent_failover]").val('');
$("input[name=id_server]").val(''); $("input[name=id_server]").val('');
$("input[name=agent_sla]").val(''); $("input[name=agent_sla]").val('');
$("input[name=agent_sla]").css("background","url('<?php echo $autocompleteImage; ?>') right center no-repeat")
$("input[name=agent_failover]").val(''); $("input[name=agent_failover]").val('');
$("#id_agent_module_sla").empty(); $("#id_agent_module_sla").empty();
$("#id_agent_module_sla").attr('disabled', 'true'); $("#id_agent_module_sla").attr('disabled', 'true');

View File

@ -666,6 +666,7 @@ class Client
$target = __('console update %d', $request['version']); $target = __('console update %d', $request['version']);
} }
// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found
curl_setopt( curl_setopt(
$ch, $ch,
CURLOPT_PROGRESSFUNCTION, CURLOPT_PROGRESSFUNCTION,

View File

@ -100,7 +100,7 @@ $update_profile = (bool) get_parameter('update_profile');
$id_profile = (int) get_parameter('id'); $id_profile = (int) get_parameter('id');
$is_management_allowed = true; $is_management_allowed = true;
if (is_management_allowed() === false) { if (is_metaconsole() === false && is_management_allowed() === false) {
$is_management_allowed = false; $is_management_allowed = false;
ui_print_warning_message( ui_print_warning_message(
__( __(

View File

@ -129,7 +129,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -153,7 +153,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -177,7 +177,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -395,7 +395,7 @@ $table->data[0][4] = html_print_submit_button(
); );
$is_management_allowed = true; $is_management_allowed = true;
if (is_management_allowed() === false) { if (is_metaconsole() === false && is_management_allowed() === false) {
$is_management_allowed = false; $is_management_allowed = false;
ui_print_warning_message( ui_print_warning_message(
__( __(
@ -585,11 +585,11 @@ foreach ($info as $user_id => $user_info) {
$cont++; $cont++;
// Manual pagination due the complicated process of the ACL data. // Manual pagination due the complicated process of the ACL data.
if ($cont <= $offset) { if ($cont <= $offset && $search !== true) {
continue; continue;
} }
if ($cont > ($limit + $offset)) { if ($cont > ($limit + $offset) && $search !== true) {
break; break;
} }
@ -820,6 +820,9 @@ foreach ($info as $user_id => $user_info) {
$data[6] .= ''; $data[6] .= '';
// Delete button not in this mode. // Delete button not in this mode.
} }
} else {
$data[6] .= '';
// Delete button not in this mode.
} }
} }

View File

@ -2359,12 +2359,17 @@ class ConsoleSupervisor
$message_conf_cron .= __('Please, make sure process is not locked.'); $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( $this->notify(
[ [
'type' => 'NOTIF.CRON.CONFIGURED', 'type' => 'NOTIF.CRON.CONFIGURED',
'title' => __('DiscoveryConsoleTasks is not configured.'), 'title' => __('DiscoveryConsoleTasks is not configured.'),
'message' => __($message_conf_cron), 'message' => __($message_conf_cron),
'url' => '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist', 'url' => $url,
] ]
); );
} else { } else {

View File

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

View File

@ -1585,7 +1585,7 @@ function enterprise_include($filename, $variables=[])
extract($variables); extract($variables);
} }
include $filepath; include_once $filepath;
return true; return true;
} }

View File

@ -39,11 +39,14 @@ if (is_ajax() === true && empty(get_parameter('menuType')) === false) {
/** /**
* Prints a complete menu structure. * 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) function menu_print_menu(&$menu)
{ {
global $config; global $config;
global $menuTypeClass;
static $idcounter = 0; static $idcounter = 0;
echo '<div class="menu">'; echo '<div class="menu">';
@ -108,7 +111,7 @@ function menu_print_menu(&$menu)
$submenu = false; $submenu = false;
if ($_SESSION['menu_type'] === 'classic') { if ($menuTypeClass === 'classic') {
$classes = [ $classes = [
'menu_icon', 'menu_icon',
'no_hidden_menu', 'no_hidden_menu',
@ -120,12 +123,12 @@ function menu_print_menu(&$menu)
]; ];
} }
if (isset($main['sub'])) { if (isset($main['sub']) === true) {
$classes[] = ''; $classes[] = '';
$submenu = true; $submenu = true;
} }
if (!isset($main['refr'])) { if (isset($main['refr']) === false) {
$main['refr'] = 0; $main['refr'] = 0;
} }
@ -409,23 +412,14 @@ function menu_print_menu(&$menu)
// Print out the first level. // Print out the first level.
$output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">'; $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
// onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
$length = strlen(__($main['text']));
$padding_top = ( $length >= 18) ? 6 : 12;
if ($_SESSION['menu_type'] === 'classic') { $output .= sprintf('<div id="title_menu" class="title_menu_%s">%s</div>', $menuTypeClass, $main['text']);
$output .= '<div id="title_menu" class="title_menu_classic">'.$main['text'].'</div>';
} else {
$output .= '<div id="title_menu" class="title_menu_collapsed">'.$main['text'].'</div>';
}
// Add the notification ball if defined // Add the notification ball if defined.
if (isset($main['notification'])) { if (isset($main['notification']) === true) {
$output .= '<div class="notification_ball">'.$main['notification'].'</div>'; $output .= '<div class="notification_ball">'.$main['notification'].'</div>';
} }
$padding_top = 0;
$length = 0;
if ($submenu_output != '') { 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. // 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)) { if ($visible || in_array('selected', $classes)) {
@ -436,10 +430,7 @@ function menu_print_menu(&$menu)
$visible = false; $visible = false;
} }
// $output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'">'; $output .= sprintf('<ul id="subicon_%s" class="submenu">%s</ul>', $id, $submenu_output);
$output .= '<ul id="subicon_'.$id.'" class="submenu">';
$output .= $submenu_output;
$output .= '</ul>';
} }
$config['count_main_menu']++; $config['count_main_menu']++;

View File

@ -2559,12 +2559,19 @@ function reporting_html_last_value($table, $item, $pdf=0)
'Y-m-d H:i:s', 'Y-m-d H:i:s',
$item['data']['utimestamp'] $item['data']['utimestamp']
); );
$table_data->data[1][2] = remove_right_zeros(
number_format( if (is_numeric($item['data']['datos']) === true) {
$item['data']['datos'], $dataDatos = remove_right_zeros(
$config['graph_precision'] number_format(
) $item['data']['datos'],
); $config['graph_precision']
)
);
} else {
$dataDatos = trim($item['data']['datos']);
}
$table_data->data[1][2] = $dataDatos;
switch ($item['data']['estado']) { switch ($item['data']['estado']) {
case AGENT_MODULE_STATUS_CRITICAL_BAD: case AGENT_MODULE_STATUS_CRITICAL_BAD:

View File

@ -4438,19 +4438,27 @@ function ui_print_standard_header(
true true
); );
// Create the header. // Create the header.
$output = ui_print_page_header( if (is_metaconsole() === true) {
$title, $output = ui_meta_print_header(
$icon, $title,
true, false,
$help, $options
$godmode, );
$options, } else {
false, $output = ui_print_page_header(
'', $title,
GENERIC_SIZE_TEXT, $icon,
'', true,
$headerInformation->printHeader(true) $help,
); $godmode,
$options,
false,
'',
GENERIC_SIZE_TEXT,
'',
$headerInformation->printHeader(true)
);
}
if ($return !== true) { if ($return !== true) {
echo $output; echo $output;

View File

@ -396,9 +396,20 @@ class ModuleValueWidget extends Widget
$output .= '<div class="container-icon">'; $output .= '<div class="container-icon">';
// Div value. // Div value.
$output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;">'; $output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
$output .= remove_right_zeros(
number_format($data_module, $config['graph_precision']) if (is_numeric($data_module) === true) {
); $dataDatos = remove_right_zeros(
number_format(
$data_module,
$config['graph_precision']
)
);
} else {
$dataDatos = trim($data_module);
}
$output .= $dataDatos;
$output .= '</div>'; $output .= '</div>';
if (empty($label) === false) { if (empty($label) === false) {

View File

@ -418,6 +418,9 @@ ul li {
.menu_full_classic .title_menu_classic { .menu_full_classic .title_menu_classic {
display: flex !important; display: flex !important;
} }
.menu_icon_collapsed {
background-position: 50% 50%;
}
.menu_full_collapsed .title_menu_collapsed { .menu_full_collapsed .title_menu_collapsed {
display: none !important; display: none !important;
@ -474,15 +477,3 @@ ul li {
.header_table_collapsed { .header_table_collapsed {
padding-left: 80px; /* 60 + 35 */ padding-left: 80px; /* 60 + 35 */
} }
.title_menu_classic {
display: flex;
}
.title_menu_collapsed {
display: none;
}
.menu_icon_collapsed {
background-position: 50% 50%;
}

View File

@ -0,0 +1,178 @@
/*
* ---------------------------------------------------------------------
* - Notifications
* ---------------------------------------------------------------------
*/
#meta_total_container #header_discovery {
padding-left: 10px;
}
.notification-ball {
border-radius: 50%;
width: 24px;
height: 24px;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
color: #fff;
font-weight: bold;
}
.notification-ball.notification-ball-new-messages:hover {
box-shadow: 0 0 3px #888;
}
.notification-ball-no-messages {
background-color: #82b92e;
cursor: pointer;
}
.notification-ball-new-messages {
background-color: #e63c52;
}
#notification-wrapper {
background: white;
border: #a5a5a5 solid 1px;
z-index: 900000;
position: absolute;
width: 550px;
margin-top: -5px;
border-radius: 5px;
}
#notification-wrapper::before {
content: "";
display: block;
position: absolute;
width: 0px;
height: 0;
border-color: transparent;
border-width: 12px;
border-style: solid;
bottom: 100%;
left: calc(58% - 7px);
margin-left: -12px;
border-bottom-color: white;
}
#notification-wrapper-inner {
max-height: 400px;
overflow: auto;
}
#notification-wrapper-shadow {
height: 100%;
width: 100%;
background: #111;
position: fixed;
z-index: 9009;
top: 0;
opacity: 0.3;
}
.notification-item {
background: whitesmoke;
height: 100px;
margin: 7px;
border: #e4e4e4 solid 1px;
display: flex;
flex-flow: row nowrap;
align-items: center;
padding: 5px;
}
.notification-item:hover {
border: #ccc solid 1px;
text-decoration: none;
}
.notification-item > * {
padding-left: 15px;
pointer-events: none;
}
.notification-item > img {
width: 75px;
}
.notification-info {
width: 87%;
display: flex;
flex-flow: column nowrap;
overflow: hidden;
max-height: 83px;
line-height: 1.4em;
}
.notification-item img {
max-width: 100%;
max-height: 100%;
}
.notification-title {
margin: 0;
}
h4.notification-title {
font-size: 13px;
color: #3f3f3f;
text-transform: none;
}
.notification-subtitle,
.color-black-grey {
color: #373737;
}
.global-config-notification-title {
display: flex;
flex-direction: row;
align-items: center;
}
.global-config-notification-title h2 {
margin-left: 10px;
}
.global-config-notification-checkboxes :first-child {
font-weight: bold;
}
.global-config-notification-selectors {
display: flex;
flex-direction: row;
margin-bottom: 10px;
}
.global-config-notification-selectors h4 {
margin: 0;
}
.global-config-notification-single-selector,
.global_config_notifications_dialog_add select {
display: flex;
width: 100%;
padding: 0 10px;
}
.global-config-notification-single-selector :first-child,
.global-config-notification-single-selector :first-child select {
width: 99%;
}
.global-config-notification-single-selector :last-child,
.global_config_notifications_dialog_add_wrapper {
flex-direction: column;
display: flex;
justify-content: flex-end;
}
.global_config_notifications_dialog_add {
display: flex;
flex-direction: row;
margin: 8px;
}
.global_config_notifications_two_ways_form_arrows {
display: flex;
flex-flow: column;
justify-content: center;
margin: 0 5px;
}
.global_config_notifications_two_ways_form_arrows img {
margin: 15px 0;
}

View File

@ -129,7 +129,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.756'; $version = '7.0NG.756';
$build = '210819'; $build = '210825';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

View File

@ -29,9 +29,9 @@
// Begin. // Begin.
global $config; global $config;
require_once 'include/functions_users.php'; require_once $config['homedir'].'/include/functions_users.php';
require_once 'include/functions_groups.php'; require_once $config['homedir'].'/include/functions_groups.php';
require_once 'include/functions_io.php'; require_once $config['homedir'].'/include/functions_io.php';
// Parse parameters. // Parse parameters.
$send_mes = (bool) get_parameter('send_mes', false); $send_mes = (bool) get_parameter('send_mes', false);
@ -82,6 +82,10 @@ $buttons['create_message'] = [
]; ];
// Header. // Header.
if (is_metaconsole() === true) {
enterprise_hook('open_meta_frame');
}
ui_print_standard_header( ui_print_standard_header(
__('Compose message'), __('Compose message'),
'images/email_mc.png', 'images/email_mc.png',
@ -400,3 +404,6 @@ html_print_div(
echo '</form>'; echo '</form>';
echo $jsOutput; echo $jsOutput;
if (is_metaconsole() === true) {
enterprise_hook('close_meta_frame');
}

View File

@ -27,10 +27,10 @@
*/ */
// Begin. // Begin.
require_once 'include/functions_messages.php';
global $config; global $config;
require_once $config['homedir'].'/include/functions_messages.php';
$delete_msg = get_parameter('delete_message', 0); $delete_msg = get_parameter('delete_message', 0);
$multiple_delete = get_parameter('multiple_delete', 0); $multiple_delete = get_parameter('multiple_delete', 0);
$show_sent = (bool) get_parameter('show_sent', false); $show_sent = (bool) get_parameter('show_sent', false);
@ -68,6 +68,10 @@ $buttons['create_message'] = [
]; ];
if (is_ajax() === false) { if (is_ajax() === false) {
if (is_metaconsole() === true) {
enterprise_hook('open_meta_frame');
}
// Header. // Header.
ui_print_standard_header( ui_print_standard_header(
$tabSelectedMessage, $tabSelectedMessage,
@ -300,6 +304,10 @@ echo "<div class='float-right'>";
html_print_submit_button(__('Create message'), 'create', false, 'class="sub next mrgn_right_5px"'); html_print_submit_button(__('Create message'), 'create', false, 'class="sub next mrgn_right_5px"');
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
if (is_ajax() !== true && is_metaconsole() === true) {
enterprise_hook('close_meta_frame');
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -235,7 +235,7 @@ if (is_metaconsole() === true) {
} }
$is_management_allowed = true; $is_management_allowed = true;
if (is_management_allowed() === false) { if (is_metaconsole() === false && is_management_allowed() === false) {
$is_management_allowed = false; $is_management_allowed = false;
ui_print_warning_message( ui_print_warning_message(
__( __(

View File

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

View File

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

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.756 %define version 7.0NG.756
%define release 210819 %define release 210825
%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

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.756-210819 Version: 7.0NG.756-210825
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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.756-210819" pandora_version="7.0NG.756-210825"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

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.756"; my $pandora_version = "7.0NG.756";
my $pandora_build = "210819"; my $pandora_build = "210825";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

View File

@ -235,6 +235,9 @@ sub get_console_api_url ($$) {
$pa_config->{"console_api_url"} = 'http://127.0.0.1/pandora_console/' . $include_api; $pa_config->{"console_api_url"} = 'http://127.0.0.1/pandora_console/' . $include_api;
logger($pa_config, "Assuming default path for API url: " . $pa_config->{"console_api_url"}, 3); logger($pa_config, "Assuming default path for API url: " . $pa_config->{"console_api_url"}, 3);
} else { } else {
if ($console_api_url !~ /\/$/) {
$console_api_url .= '/';
}
$pa_config->{"console_api_url"} = $console_api_url . $include_api; $pa_config->{"console_api_url"} = $console_api_url . $include_api;
} }
} }

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.756"; my $pandora_version = "7.0NG.756";
my $pandora_build = "210819"; my $pandora_build = "210825";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.756 %define version 7.0NG.756
%define release 210819 %define release 210825
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.756 %define version 7.0NG.756
%define release 210819 %define release 210825
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

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

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.756 Build 210819"; my $version = "7.0NG.756 Build 210825";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

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.756 Build 210819"; my $version = "7.0NG.756 Build 210825";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);