diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 13e3f2c38c..60bffeb27f 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -349,7 +349,7 @@ echo ''; const id = table_hover[0].id; const classes = $(`#${id}`).attr('class'); - if (id === 'icon_about') { + if (id === 'icon_about' || id === 'icon_about_operation') { return; } diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index d7a464491d..4878333071 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -458,8 +458,9 @@ function menu_print_menu(&$menu) ($main['sec2'] ?? null), ] ) === false + || $mainsec === 'about_operation' ) { - if ($count_sub_access > 0) { + if ($count_sub_access > 0 || $mainsec === 'about_operation') { // If any susection have access but main section not, we change main link to first subsection found $main['sec2'] = $first_sub_sec2; } else { @@ -484,7 +485,7 @@ function menu_print_menu(&$menu) if ($menuTypeClass === 'collapsed') { $div = '
'; } else { - if ($id === 'about') { + if ($id === 'about' || $id === 'about_operation') { $div = ''.$main['text'].''; } else { $div = ''.$main['text'].''; @@ -861,12 +862,18 @@ function menu_pepare_acl_select_data($pages, $sec) if (is_ajax()) { $about = (bool) get_parameter('about'); + $about_operation = (bool) get_parameter('about_operation'); if ($about) { global $config; global $pandora_version; global $build_version; $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; + $timestamp = strtotime($license_expiry_date); + if ($timestamp < time() || enterprise_installed() === false) { + $license_expired = true; + } include_once $config['homedir'].'/include/class/Diagnostics.class.php'; $d = new Diagnostics; @@ -954,14 +961,28 @@ if (is_ajax()) {'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'
'.__('MR version').' MR'.$config['MR'].'
-Build'.$build_version.'
-'.__('Support expires').''.$license_expiry_date.'
'; +Build'.$build_version.'
'; + if (enterprise_installed() === true) { + $dialog .= ''.__('Support expires').''.$license_expiry_date.'
'; + } + + if ($license_expired === false) { + $dialog .= ''.__('This system has official support, warranty and official updates.').'
'; + } else if (enterprise_installed() === true) { + $dialog .= ''.__('This system has no active support contract, and has no support, upgrades or warranty.').'
'; + $dialog .= ''.__('Contact Pandora FMS for expand your support contract.').'
'; + } else { + $dialog .= ''.__('The OpenSource version has no support or warranty of any kind.').'
'; + $dialog .= ''.__('Contact Pandora FMS for official support contract.').'
'; + } if (((bool) check_acl($config['id_user'], 0, 'PM') === true) && (is_metaconsole() === false)) { $dialogButtons = []; @@ -1004,7 +1025,7 @@ if (is_ajax()) {Trademark and copyright 2004 - '.date('Y').' Pandora FMS. All rights reserved
+Trademark and copyright 2004 - '.date('Y').' Pandora FMS. All rights reserved
+
+ |
+
+ '.$product_name.'+'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').' +'.__('MR version').' MR'.$config['MR'].' +Build'.$build_version.' '; + if (enterprise_installed() === true) { + $dialog .= ''.__('Support expires').''.$license_expiry_date.' '; + } + + if ($license_expired === false) { + $dialog .= ''.__('This system has official support, warranty and official updates.').' '; + } else if (enterprise_installed() === true) { + $dialog .= ''.__('This system has no active support contract, and has no support, upgrades or warranty.').' '; + $dialog .= ''.__('Contact Pandora FMS for expand your support contract.').' '; + } else { + $dialog .= ''.__('The OpenSource version has no support or warranty of any kind.').' '; + $dialog .= ''.__('Contact Pandora FMS for official support contract.').' '; + } + + $dialog .= ' |
+
---|
Trademark and copyright 2004 - '.date('Y').' Pandora FMS. All rights reserved
+