";
@@ -857,55 +857,55 @@ function showFormDBSlave() {
* @return void
**/
function showFormAPI() {
- global $CFG_GLPI;
+ global $CFG_GLPI;
- if (!self::canView()) {
- return;
+ if (!self::canView()) {
+ return;
}
$inline_doc_api = trim($CFG_GLPI['url_base_api'], '/')."/";
$form = [
- 'action' => Toolbox::getItemTypeFormURL(__CLASS__),
- 'method' => 'post',
- 'content' => [
- __('API') => [
- 'visible' => true,
- 'inputs' => [
- __('URL of the API') => [
- 'name' => 'url_base_api',
- 'type' => 'text',
- 'size' => 80,
- 'value' => $CFG_GLPI["url_base_api"],
- 'col_lg' => 6,
+ 'action' => Toolbox::getItemTypeFormURL(__CLASS__),
+ 'method' => 'post',
+ 'content' => [
+ __('API') => [
+ 'visible' => true,
+ 'inputs' => [
+ __('URL of the API') => [
+ 'name' => 'url_base_api',
+ 'type' => 'text',
+ 'size' => 80,
+ 'value' => $CFG_GLPI["url_base_api"],
+ 'col_lg' => 6,
],
__('Enable Rest API') => [
- 'name' => 'enable_api',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["enable_api"],
- 'col_lg' => 6,
+ 'name' => 'enable_api',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["enable_api"],
+ 'col_lg' => 6,
],
'' => $CFG_GLPI['enable_api'] ? [
- 'content' => "".__("API inline Documentation").""
+ 'content' => "".__("API inline Documentation").""
] : [],
]
],
__('Authentication') => [
- 'visible' => true,
- 'inputs' => [
- __('Enable login with credentials') => [
- 'name' => 'enable_api_login_credentials',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["enable_api_login_credentials"]
+ 'visible' => true,
+ 'inputs' => [
+ __('Enable login with credentials') => [
+ 'name' => 'enable_api_login_credentials',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["enable_api_login_credentials"]
],
__('Enable login with external token') => [
- 'name' => 'enable_api_login_external_token',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["enable_api_login_external_token"]
+ 'name' => 'enable_api_login_external_token',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["enable_api_login_external_token"]
],
[
- 'name' => 'update',
- 'type' => 'hidden',
- 'value' => 1
+ 'name' => 'update',
+ 'type' => 'hidden',
+ 'value' => 1
]
]
],
@@ -915,12 +915,12 @@ function showFormAPI() {
renderTwigForm($form);
$buttons = [
- 'apiclient.form.php' => __('Add API client'),
+ 'apiclient.form.php' => __('Add API client'),
];
Html::displayTitle("",
- self::getTypeName(Session::getPluralNumber()),
- "",
- $buttons);
+ self::getTypeName(Session::getPluralNumber()),
+ "",
+ $buttons);
Search::show("APIClient");
}
@@ -929,173 +929,173 @@ function showFormAPI() {
* Print the config form for connections
*
* @return void
- **/
+ **/
function showFormHelpdesk() {
- global $CFG_GLPI;
+ global $CFG_GLPI;
- if (!self::canView()) {
- return;
+ if (!self::canView()) {
+ return;
}
$canedit = Config::canUpdate();
for ($index=0; $index<=100; $index += 10) {
- $sizes[$index*1048576] = sprintf(__('%s Mio'), $index);
+ $sizes[$index*1048576] = sprintf(__('%s Mio'), $index);
}
$sizes[0] = __('No import');
$urgencynames = [
- 1 => Ticket::getUrgencyName(1),
- 2 => Ticket::getUrgencyName(2),
- 3 => Ticket::getUrgencyName(3),
- 4 => Ticket::getUrgencyName(4),
- 5 => Ticket::getUrgencyName(5),
+ 1 => Ticket::getUrgencyName(1),
+ 2 => Ticket::getUrgencyName(2),
+ 3 => Ticket::getUrgencyName(3),
+ 4 => Ticket::getUrgencyName(4),
+ 5 => Ticket::getUrgencyName(5),
];
$headers = [];
$headers['title'] = __('Urgency') . ' / ' . __('Impact');
for ($i=5; $i>0; $i--) {
- ob_start();
- if ($i != 3) {
- renderTwigTemplate('macros/input.twig', [
- 'name' => "_impact_{$i}",
- 'type' => 'checkbox',
- 'value' => ($CFG_GLPI['impact_mask'] & (1<<$i)) >0,
+ ob_start();
+ if ($i != 3) {
+ renderTwigTemplate('macros/input.twig', [
+ 'name' => "_impact_{$i}",
+ 'type' => 'checkbox',
+ 'value' => ($CFG_GLPI['impact_mask'] & (1<<$i)) >0,
]);
} else {
- echo "";
+ echo "";
}
$headers['x'][$i] = Ticket::getImpactName($i) . ob_get_clean();
ob_start();
if ($i != 3) {
- renderTwigTemplate('macros/input.twig', [
- 'name' => "_urgency_{$i}",
- 'type' => 'checkbox',
- 'value' => ($CFG_GLPI['urgency_mask'] & (1<<$i)) >0,
+ renderTwigTemplate('macros/input.twig', [
+ 'name' => "_urgency_{$i}",
+ 'type' => 'checkbox',
+ 'value' => ($CFG_GLPI['urgency_mask'] & (1<<$i)) >0,
]);
} else {
- echo "";
+ echo "";
}
$headers['y'][$i] = Ticket::getUrgencyName($i) . ob_get_clean();
}
$matrix = [];
for ($urgency=1; $urgency<=5; $urgency++) {
- for ($impact=5; $impact>0; $impact--) {
- $pri = round(($urgency+$impact)/2);
+ for ($impact=5; $impact>0; $impact--) {
+ $pri = round(($urgency+$impact)/2);
- if (isset($CFG_GLPI['priority_matrix'][$urgency][$impact])) {
- $pri = $CFG_GLPI['priority_matrix'][$urgency][$impact];
+ if (isset($CFG_GLPI['priority_matrix'][$urgency][$impact])) {
+ $pri = $CFG_GLPI['priority_matrix'][$urgency][$impact];
}
if (($CFG_GLPI['impact_mask'] & (1<<$impact)) != 0
- && ($CFG_GLPI['urgency_mask'] & (1<<$urgency)) != 0) {
- ob_start();
- renderTwigTemplate('macros/input.twig', [
- 'name' => "_matrix_{$urgency}_{$impact}",
- 'type' => 'select',
- 'values' => $urgencynames,
- 'value' => $CFG_GLPI['priority_matrix'][$urgency][$impact]
+ && ($CFG_GLPI['urgency_mask'] & (1<<$urgency)) != 0) {
+ ob_start();
+ renderTwigTemplate('macros/input.twig', [
+ 'name' => "_matrix_{$urgency}_{$impact}",
+ 'type' => 'select',
+ 'values' => $urgencynames,
+ 'value' => $CFG_GLPI['priority_matrix'][$urgency][$impact]
]);
- $content = ob_get_clean();
- $matrix[$urgency][$impact] = [
- 'content' => $content,
- 'style' => "background:" . $_SESSION['glpipriority_'.$pri],
+ $content = ob_get_clean();
+ $matrix[$urgency][$impact] = [
+ 'content' => $content,
+ 'style' => "background:" . $_SESSION['glpipriority_'.$pri],
];
} else {
- $matrix[$urgency][$impact] = [
- 'content' => "",
+ $matrix[$urgency][$impact] = [
+ 'content' => "",
];
}
}
}
$form = [
- 'action' => $canedit ? Toolbox::getItemTypeFormURL('config') : '',
- 'buttons' => [
- $canedit ? [
- 'type' => 'submit',
- 'name' => 'update',
- 'value' => __('Update'),
- 'class' => 'btn btn-secondary'
+ 'action' => $canedit ? Toolbox::getItemTypeFormURL('config') : '',
+ 'buttons' => [
+ $canedit ? [
+ 'type' => 'submit',
+ 'name' => 'update',
+ 'value' => __('Update'),
+ 'class' => 'btn btn-secondary'
] : [],
],
'content' => [
- __('Assistance') => [
- 'visible' => true,
- 'inputs' => [
- __('Limit of the schedules for planning : From') => [
- 'name' => 'planning_begin',
- 'type' => 'time',
- 'value' => $CFG_GLPI["planning_begin"],
- 'col_lg' => 6,
+ __('Assistance') => [
+ 'visible' => true,
+ 'inputs' => [
+ __('Limit of the schedules for planning : From') => [
+ 'name' => 'planning_begin',
+ 'type' => 'time',
+ 'value' => $CFG_GLPI["planning_begin"],
+ 'col_lg' => 6,
],
__('To') => [
- 'name' => 'planning_end',
- 'type' => 'time',
- 'value' => $CFG_GLPI["planning_end"],
- 'col_lg' => 6,
+ 'name' => 'planning_end',
+ 'type' => 'time',
+ 'value' => $CFG_GLPI["planning_end"],
+ 'col_lg' => 6,
],
__('Step for the hours (minutes)') => [
- 'name' => 'time_step',
- 'type' => 'number',
- 'value' => $CFG_GLPI["time_step"],
- 'min' => 1,
- 'max' => 60,
- 'step' => 1,
+ 'name' => 'time_step',
+ 'type' => 'number',
+ 'value' => $CFG_GLPI["time_step"],
+ 'min' => 1,
+ 'max' => 60,
+ 'step' => 1,
],
__('Default file size limit imported by the mails receiver') => [
- 'name' => 'default_mailcollector_filesize_max',
- 'type' => 'select',
- 'values' => $sizes,
- 'value' => $CFG_GLPI["default_mailcollector_filesize_max"],
+ 'name' => 'default_mailcollector_filesize_max',
+ 'type' => 'select',
+ 'values' => $sizes,
+ 'value' => $CFG_GLPI["default_mailcollector_filesize_max"],
],
__('Default heading when adding a document to a ticket') => [
- 'name' => 'documentcategories_id_forticket',
- 'type' => 'select',
- 'values' => getOptionForItems('DocumentCategory'),
- 'value' => $CFG_GLPI["documentcategories_id_forticket"],
- 'actions' => getItemActionButtons(['info', 'add'], 'DocumentCategory'),
+ 'name' => 'documentcategories_id_forticket',
+ 'type' => 'select',
+ 'values' => getOptionForItems('DocumentCategory'),
+ 'value' => $CFG_GLPI["documentcategories_id_forticket"],
+ 'actions' => getItemActionButtons(['info', 'add'], 'DocumentCategory'),
],
__('By default, a software may be linked to a ticket') => [
- 'name' => 'default_software_helpdesk_visible',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["default_software_helpdesk_visible"],
+ 'name' => 'default_software_helpdesk_visible',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["default_software_helpdesk_visible"],
],
__('Keep tickets when purging hardware in the inventory') => [
- 'name' => 'keep_tickets_on_delete',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["keep_tickets_on_delete"],
+ 'name' => 'keep_tickets_on_delete',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["keep_tickets_on_delete"],
],
__('Show personnal information in new ticket form (simplified interface)') => [
- 'name' => 'use_check_pref',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["use_check_pref"],
+ 'name' => 'use_check_pref',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["use_check_pref"],
],
__('Allow anonymous ticket creation (helpdesk.receiver)') => [
- 'name' => 'use_anonymous_helpdesk',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["use_anonymous_helpdesk"],
+ 'name' => 'use_anonymous_helpdesk',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["use_anonymous_helpdesk"],
],
__('Allow anonymous followups (receiver)') => [
- 'name' => 'use_anonymous_followups',
- 'type' => 'checkbox',
- 'value' => $CFG_GLPI["use_anonymous_followups"],
+ 'name' => 'use_anonymous_followups',
+ 'type' => 'checkbox',
+ 'value' => $CFG_GLPI["use_anonymous_followups"],
],
[
- 'type' => 'hidden',
- 'name' => '_matrix',
- 'value' => 1,
+ 'type' => 'hidden',
+ 'name' => '_matrix',
+ 'value' => 1,
],
__('Matrix of calculus for priority') => [
- 'type' => 'twig',
- 'template' => 'matrix.twig',
- 'col_lg' => 12,
- 'col_md' => 12,
- 'headers' => $headers,
- 'matrix' => $matrix,
+ 'type' => 'twig',
+ 'template' => 'matrix.twig',
+ 'col_lg' => 12,
+ 'col_md' => 12,
+ 'headers' => $headers,
+ 'matrix' => $matrix,
]
]
]
@@ -1196,17 +1196,13 @@ function showFormHelpdesk() {
* @return void
**/
function showFormUserPrefs($data = []) {
- global $CFG_GLPI, $DB;
+ global $CFG_GLPI, $DB;
- $oncentral = (Session::getCurrentInterface() == "central");
- $userpref = false;
- $url = Toolbox::getItemTypeFormURL(__CLASS__);
- $rand = mt_rand();
+ $oncentral = (Session::getCurrentInterface() == "central");
+ $userpref = false;
- $canedit = Config::canUpdate();
- $canedituser = Session::haveRight('personalization', UPDATE);
- if (array_key_exists('last_login', $data)) {
- $userpref = true;
+ if (array_key_exists('last_login', $data)) {
+ $userpref = true;
}
echo Html::scriptBlock("
function formatThemes(theme) {
@@ -1253,6 +1249,11 @@ function formatThemes(theme) {
'values' => Dropdown::getLanguages(),
'value' => $data["language"],
],
+ __('Accessibility menu') => [
+ 'type' => 'checkbox',
+ 'name' => 'accessibility_menu',
+ 'value' => $data["accessibility_menu"],
+ ],
__('Date format') => [
'type' => 'select',
'name' => 'date_format',
@@ -1642,55 +1643,55 @@ static function displayPasswordSecurityChecks($field = 'password') {
".Html::jsGetElementByID('password_min_length').".removeClass('red');
}";
if ($CFG_GLPI["password_need_number"]) {
- $needs[] = "".__('Digit')."";
- echo "var numberRegex = new RegExp('[0-9]', 'g');
- if (false == numberRegex.test(pwd.val())) {
- ".Html::jsGetElementByID('password_need_number').".addClass('red');
- ".Html::jsGetElementByID('password_need_number').".removeClass('green');
+ $needs[] = "".__('Digit')."";
+ echo "var numberRegex = new RegExp('[0-9]', 'g');
+ if (false == numberRegex.test(pwd.val())) {
+ ".Html::jsGetElementByID('password_need_number').".addClass('red');
+ ".Html::jsGetElementByID('password_need_number').".removeClass('green');
} else {
- ".Html::jsGetElementByID('password_need_number').".addClass('green');
- ".Html::jsGetElementByID('password_need_number').".removeClass('red');
+ ".Html::jsGetElementByID('password_need_number').".addClass('green');
+ ".Html::jsGetElementByID('password_need_number').".removeClass('red');
}";
}
if ($CFG_GLPI["password_need_letter"]) {
- $needs[] = "".__('Lowercase')."";
- echo "var letterRegex = new RegExp('[a-z]', 'g');
- if (false == letterRegex.test(pwd.val())) {
- ".Html::jsGetElementByID('password_need_letter').".addClass('red');
- ".Html::jsGetElementByID('password_need_letter').".removeClass('green');
+ $needs[] = "".__('Lowercase')."";
+ echo "var letterRegex = new RegExp('[a-z]', 'g');
+ if (false == letterRegex.test(pwd.val())) {
+ ".Html::jsGetElementByID('password_need_letter').".addClass('red');
+ ".Html::jsGetElementByID('password_need_letter').".removeClass('green');
} else {
- ".Html::jsGetElementByID('password_need_letter').".addClass('green');
- ".Html::jsGetElementByID('password_need_letter').".removeClass('red');
+ ".Html::jsGetElementByID('password_need_letter').".addClass('green');
+ ".Html::jsGetElementByID('password_need_letter').".removeClass('red');
}";
}
if ($CFG_GLPI["password_need_caps"]) {
- $needs[] = "".__('Uppercase')."";
- echo "var capsRegex = new RegExp('[A-Z]', 'g');
- if (false == capsRegex.test(pwd.val())) {
- ".Html::jsGetElementByID('password_need_caps').".addClass('red');
- ".Html::jsGetElementByID('password_need_caps').".removeClass('green');
+ $needs[] = "".__('Uppercase')."";
+ echo "var capsRegex = new RegExp('[A-Z]', 'g');
+ if (false == capsRegex.test(pwd.val())) {
+ ".Html::jsGetElementByID('password_need_caps').".addClass('red');
+ ".Html::jsGetElementByID('password_need_caps').".removeClass('green');
} else {
- ".Html::jsGetElementByID('password_need_caps').".addClass('green');
- ".Html::jsGetElementByID('password_need_caps').".removeClass('red');
+ ".Html::jsGetElementByID('password_need_caps').".addClass('green');
+ ".Html::jsGetElementByID('password_need_caps').".removeClass('red');
}";
}
if ($CFG_GLPI["password_need_symbol"]) {
- $needs[] = "".__('Symbol')."";
- echo "var capsRegex = new RegExp('[^a-zA-Z0-9_]', 'g');
- if (false == capsRegex.test(pwd.val())) {
- ".Html::jsGetElementByID('password_need_symbol').".addClass('red');
- ".Html::jsGetElementByID('password_need_symbol').".removeClass('green');
+ $needs[] = "".__('Symbol')."";
+ echo "var capsRegex = new RegExp('[^a-zA-Z0-9_]', 'g');
+ if (false == capsRegex.test(pwd.val())) {
+ ".Html::jsGetElementByID('password_need_symbol').".addClass('red');
+ ".Html::jsGetElementByID('password_need_symbol').".removeClass('green');
} else {
- ".Html::jsGetElementByID('password_need_symbol').".addClass('green');
- ".Html::jsGetElementByID('password_need_symbol').".removeClass('red');
+ ".Html::jsGetElementByID('password_need_symbol').".addClass('green');
+ ".Html::jsGetElementByID('password_need_symbol').".removeClass('red');
}";
}
}
echo "}";
echo '';
if (count($needs)) {
- echo "
";
- printf(__('%1$s: %2$s'), __('Password must contains'), implode(', ', $needs));
+ echo "
";
+ printf(__('%1$s: %2$s'), __('Password must contains'), implode(', ', $needs));
}
}
@@ -1706,65 +1707,65 @@ static function displayPasswordSecurityChecks($field = 'password') {
* @throws PasswordTooWeakException when $display is false and the password does not matches the requirements
*
* @return boolean is password valid?
- **/
+ **/
static function validatePassword($password, $display = true) {
- global $CFG_GLPI;
+ global $CFG_GLPI;
- $ok = true;
- $exception = new PasswordTooWeakException();
- if ($CFG_GLPI["use_password_security"]) {
- if (Toolbox::strlen($password) < $CFG_GLPI['password_min_length']) {
- $ok = false;
- if ($display) {
- Session::addMessageAfterRedirect(__('Password too short!'), false, ERROR);
+ $ok = true;
+ $exception = new PasswordTooWeakException();
+ if ($CFG_GLPI["use_password_security"]) {
+ if (Toolbox::strlen($password) < $CFG_GLPI['password_min_length']) {
+ $ok = false;
+ if ($display) {
+ Session::addMessageAfterRedirect(__('Password too short!'), false, ERROR);
} else {
- $exception->addMessage(__('Password too short!'));
+ $exception->addMessage(__('Password too short!'));
}
}
if ($CFG_GLPI["password_need_number"]
&& !preg_match("/[0-9]+/", $password)) {
- $ok = false;
- if ($display) {
- Session::addMessageAfterRedirect(__('Password must include at least a digit!'),
- false, ERROR);
+ $ok = false;
+ if ($display) {
+ Session::addMessageAfterRedirect(__('Password must include at least a digit!'),
+ false, ERROR);
} else {
- $exception->addMessage(__('Password must include at least a digit!'));
+ $exception->addMessage(__('Password must include at least a digit!'));
}
}
if ($CFG_GLPI["password_need_letter"]
&& !preg_match("/[a-z]+/", $password)) {
- $ok = false;
- if ($display) {
- Session::addMessageAfterRedirect(__('Password must include at least a lowercase letter!'),
- false, ERROR);
+ $ok = false;
+ if ($display) {
+ Session::addMessageAfterRedirect(__('Password must include at least a lowercase letter!'),
+ false, ERROR);
} else {
- $exception->addMessage(__('Password must include at least a lowercase letter!'));
+ $exception->addMessage(__('Password must include at least a lowercase letter!'));
}
}
if ($CFG_GLPI["password_need_caps"]
&& !preg_match("/[A-Z]+/", $password)) {
- $ok = false;
- if ($display) {
- Session::addMessageAfterRedirect(__('Password must include at least a uppercase letter!'),
- false, ERROR);
+ $ok = false;
+ if ($display) {
+ Session::addMessageAfterRedirect(__('Password must include at least a uppercase letter!'),
+ false, ERROR);
} else {
- $exception->addMessage(__('Password must include at least a uppercase letter!'));
+ $exception->addMessage(__('Password must include at least a uppercase letter!'));
}
}
if ($CFG_GLPI["password_need_symbol"]
&& !preg_match("/\W+/", $password)) {
- $ok = false;
- if ($display) {
- Session::addMessageAfterRedirect(__('Password must include at least a symbol!'),
- false, ERROR);
+ $ok = false;
+ if ($display) {
+ Session::addMessageAfterRedirect(__('Password must include at least a symbol!'),
+ false, ERROR);
} else {
- $exception->addMessage(__('Password must include at least a symbol!'));
+ $exception->addMessage(__('Password must include at least a symbol!'));
}
}
}
if (!$ok && !$display) {
- throw $exception;
+ throw $exception;
}
return $ok;
}
@@ -1776,12 +1777,12 @@ static function validatePassword($password, $display = true) {
* - user data cache (apcu / apcu-bc)
*
* @since 9.1
- **/
+ **/
function showPerformanceInformations() {
- $GLPI_CACHE = self::getCache('cache_db', 'core', false);
+ $GLPI_CACHE = self::getCache('cache_db', 'core', false);
- if (!Config::canUpdate()) {
- return false;
+ if (!Config::canUpdate()) {
+ return false;
}
echo "";
@@ -1790,28 +1791,28 @@ function showPerformanceInformations() {
echo " |
| " . __('PHP opcode cache') . " |
|---|
";
$ext = 'Zend OPcache';
if (extension_loaded($ext) && ($info = opcache_get_status(false))) {
- $msg = sprintf(__s('%s extension is installed'), $ext);
- echo "| " . sprintf(__('The "%s" extension is installed'), $ext) . " |
- " . phpversion($ext) . " |
- |
- $msg |
";
-
- // Memory
- $used = $info['memory_usage']['used_memory'];
- $free = $info['memory_usage']['free_memory'];
- $rate = round(100.0 * $used / ($used + $free));
- $max = Toolbox::getSize($used + $free);
- $used = Toolbox::getSize($used);
- echo "| " . _n('Memory', 'Memories', 1) . " |
- " . sprintf(__('%1$s / %2$s'), $used, $max) . " | ";
- Html::displayProgressBar('100', $rate, ['simple' => true,
- 'forcepadding' => false]);
-
- $class = 'info-circle missing';
- $msg = sprintf(__s('%1$s memory usage is too low or too high'), $ext);
- if ($rate > 5 && $rate < 75) {
- $class = 'check-circle ok';
- $msg = sprintf(__s('%1$s memory usage is correct'), $ext);
+ $msg = sprintf(__s('%s extension is installed'), $ext);
+ echo " |
| " . sprintf(__('The "%s" extension is installed'), $ext) . " |
+ " . phpversion($ext) . " |
+ |
+ $msg |
";
+
+ // Memory
+ $used = $info['memory_usage']['used_memory'];
+ $free = $info['memory_usage']['free_memory'];
+ $rate = round(100.0 * $used / ($used + $free));
+ $max = Toolbox::getSize($used + $free);
+ $used = Toolbox::getSize($used);
+ echo "| " . _n('Memory', 'Memories', 1) . " |
+ " . sprintf(__('%1$s / %2$s'), $used, $max) . " | ";
+ Html::displayProgressBar('100', $rate, ['simple' => true,
+ 'forcepadding' => false]);
+
+ $class = 'info-circle missing';
+ $msg = sprintf(__s('%1$s memory usage is too low or too high'), $ext);
+ if ($rate > 5 && $rate < 75) {
+ $class = 'check-circle ok';
+ $msg = sprintf(__s('%1$s memory usage is correct'), $ext);
}
echo " | |
";
@@ -1821,93 +1822,93 @@ function showPerformanceInformations() {
$max = $hits+$miss;
$rate = round($info['opcache_statistics']['opcache_hit_rate']);
echo "| " . __('Hits rate') . " |
- " . sprintf(__('%1$s / %2$s'), $hits, $max) . " | ";
+ | " . sprintf(__('%1$s / %2$s'), $hits, $max) . " | ";
Html::displayProgressBar('100', $rate, ['simple' => true,
- 'forcepadding' => false]);
+ 'forcepadding' => false]);
$class = 'info-circle missing';
$msg = sprintf(__s('%1$s hits rate is low'), $ext);
if ($rate > 90) {
- $class = 'check-circle ok';
- $msg = sprintf(__s('%1$s hits rate is correct'), $ext);
+ $class = 'check-circle ok';
+ $msg = sprintf(__s('%1$s hits rate is correct'), $ext);
}
echo " | |
";
// Restart (1 seems ok, can happen)
$max = $info['opcache_statistics']['oom_restarts'];
echo "| " . __('Out of memory restart') . " |
- $max | ";
+ | $max | ";
$class = 'info-circle missing';
$msg = sprintf(__s('%1$s restart rate is too high'), $ext);
if ($max < 2) {
- $class = 'check-circle ok';
- $msg = sprintf(__s('%1$s restart rate is correct'), $ext);
+ $class = 'check-circle ok';
+ $msg = sprintf(__s('%1$s restart rate is correct'), $ext);
}
echo " | |
";
if ($_SESSION['glpi_use_mode'] == Session::DEBUG_MODE) {
- echo " | ";
- echo '';
- echo " |
";
+ echo " | ";
+ echo '';
+ echo " |
";
}
} else {
- $msg = sprintf(__s('%s extension is not present'), $ext);
- echo "| " . sprintf(__('Installing and enabling the "%s" extension may improve ITSM-NG performance'), $ext) . " |
- $msg |
";
+ $msg = sprintf(__s('%s extension is not present'), $ext);
+ echo "| " . sprintf(__('Installing and enabling the "%s" extension may improve ITSM-NG performance'), $ext) . " |
+ $msg |
";
}
echo "| " . __('User data cache') . " |
|---|
";
$ext = strtolower(get_class($GLPI_CACHE));
$ext = substr($ext, strrpos($ext, '\\')+1);
if (in_array($ext, ['apcu', 'memcache', 'memcached', 'wincache', 'redis'])) {
- $msg = sprintf(__s('The "%s" cache extension is installed'), $ext);
+ $msg = sprintf(__s('The "%s" cache extension is installed'), $ext);
} else {
- $msg = sprintf(__s('"%s" cache system is used'), $ext);
+ $msg = sprintf(__s('"%s" cache system is used'), $ext);
}
echo "| " . $msg . " |
- " . phpversion($ext) . " |
- |
- $msg |
";
+ " . phpversion($ext) . " |
+ |
+ $msg | ";
if ($ext != 'filesystem' && $GLPI_CACHE instanceof AvailableSpaceCapableInterface && $GLPI_CACHE instanceof TotalSpaceCapableInterface) {
- $free = $GLPI_CACHE->getAvailableSpace();
- $max = $GLPI_CACHE->getTotalSpace();
- $used = $max - $free;
- $rate = round(100.0 * $used / $max);
- $max = Toolbox::getSize($max);
- $used = Toolbox::getSize($used);
-
- echo "