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

#13312 fixed limit and about message

This commit is contained in:
Daniel Maya 2024-05-16 10:50:12 +02:00
parent fd049264d4
commit 8e967bea36
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/um_client/index.php
View File

@ -91,7 +91,7 @@ if ($license_data !== ENTERPRISE_NOT_HOOK && $license !== 'PANDORA-ENTERPRISE-FR
$limit = db_get_value('count(*)', 'tagente_modulo', 'disabled', 0);
}
if (($limit * 1.1) > $license_data['limit']) {
if ($limit > ($license_data['limit'] * 1.1)) {
ui_print_warning_message(
__(
'You cannot use update manager %s. You are exceding monitoring limits by %s elements. Please update your license or disable enterprise section by moving enterprise directory to another location and try again.',

10
pandora_console/include/functions_menu.php
View File

@ -900,6 +900,7 @@ if (is_ajax()) {
global $config;
global $pandora_version;
global $build_version;
$license = db_get_value_sql('SELECT `value` FROM tupdate_settings WHERE `key` LIKE "customer_key"');
$product_name = io_safe_output(get_product_name());
$license_expiry_date = substr($config['license_expiry_date'], 0, 4).'/'.substr($config['license_expiry_date'], 4, 2).'/'.substr($config['license_expiry_date'], 6, 2);
$license_expired = false;
@ -974,12 +975,14 @@ if (is_ajax()) {
<p><span>'.__('Current package').'</span> '.$config['current_package'].'</p>
<p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>
<p><span>Build</span>'.$build_version.'</p>';
if (enterprise_installed() === true) {
if (enterprise_installed() === true && $license !== 'PANDORA-ENTERPRISE-FREE') {
$dialog .= '<p><span>'.__('Support expires').'</span>'.$license_expiry_date.'</p>';
}
if ($license_expired === false) {
$dialog .= '<p>'.__('This system has official support, warranty and official updates.').'</p>';
} else if ($license === 'PANDORA-ENTERPRISE-FREE') {
$dialog .= '<p><span>'.__('This system has no active support contract.').'</span></p>';
} else if (enterprise_installed() === true) {
$dialog .= '<p><span>'.__('This system has no active support contract, and has no support, upgrades or warranty.').'</span></p>';
$dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for expand your support contract.').'</a></b></p>';
@ -1280,6 +1283,7 @@ if (is_ajax()) {
global $config;
global $pandora_version;
global $build_version;
$license = db_get_value_sql('SELECT `value` FROM tupdate_settings WHERE `key` LIKE "customer_key"');
$product_name = io_safe_output(get_product_name());
$license_expiry_date = substr($config['license_expiry_date'], 0, 4).'/'.substr($config['license_expiry_date'], 4, 2).'/'.substr($config['license_expiry_date'], 6, 2);
$license_expired = false;
@ -1316,12 +1320,14 @@ if (is_ajax()) {
<p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p>
<p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>
<p><span>Build</span>'.$build_version.'</p>';
if (enterprise_installed() === true) {
if (enterprise_installed() === true && $license !== 'PANDORA-ENTERPRISE-FREE') {
$dialog .= '<p><span>'.__('Support expires').'</span>'.$license_expiry_date.'</p>';
}
if ($license_expired === false) {
$dialog .= '<p>'.__('This system has official support, warranty and official updates.').'</p>';
} else if ($license === 'PANDORA-ENTERPRISE-FREE') {
$dialog .= '<p><span>'.__('This system has no active support contract.').'</span></p>';
} else if (enterprise_installed() === true) {
$dialog .= '<p><span>'.__('This system has no active support contract, and has no support, upgrades or warranty.').'</span></p>';
$dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for expand your support contract.').'</a></b></p>';