Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/partials/administration.system.info.php')
-rw-r--r--ui/app/partials/administration.system.info.php46
1 files changed, 31 insertions, 15 deletions
diff --git a/ui/app/partials/administration.system.info.php b/ui/app/partials/administration.system.info.php
index 57edd77da06..294586952b9 100644
--- a/ui/app/partials/administration.system.info.php
+++ b/ui/app/partials/administration.system.info.php
@@ -135,39 +135,55 @@ if (array_key_exists('history_pk', $data['system_info']) && !$data['system_info'
// Check DB version.
if ($data['user_type'] == USER_TYPE_SUPER_ADMIN) {
foreach ($data['system_info']['dbversion_status'] as $dbversion) {
- if ($dbversion['flag'] == DB_VERSION_SUPPORTED) {
- continue;
- }
-
switch ($dbversion['flag']) {
case DB_VERSION_LOWER_THAN_MINIMUM:
- $error = _s('Minimum required %1$s database version is %2$s.', $dbversion['database'],
- $dbversion['min_version']
- );
+ $error = _s('Error! Unable to start Zabbix server.').' '.
+ _s('Minimum required %1$s database version is %2$s.', $dbversion['database'],
+ $dbversion['min_version']
+ );
break;
case DB_VERSION_HIGHER_THAN_MAXIMUM:
- $error = _s('Maximum required %1$s database version is %2$s.', $dbversion['database'],
- $dbversion['max_version']
- );
+ $error = _s('Error! Unable to start Zabbix server.').' '.
+ _s('Maximum required %1$s database version is %2$s.', $dbversion['database'],
+ $dbversion['max_version']
+ );
break;
case DB_VERSION_FAILED_TO_RETRIEVE:
- $error = _('Unable to retrieve database version.');
+ $error = _('Warning! Unable to retrieve database version.');
$dbversion['current_version'] = '';
break;
case DB_VERSION_NOT_SUPPORTED_ERROR:
- $error = _s('Error! Unable to start Zabbix server due to unsupported %1$s database server version. Must be at least (%2$s)',
- $dbversion['database'], $dbversion['min_supported_version']
- );
+ $error = _s('Error! Unable to start Zabbix server.').' '.
+ _s('Unsupported %1$s database server version. Must be at least %2$s.', $dbversion['database'],
+ $dbversion['min_supported_version']
+ );
break;
case DB_VERSION_NOT_SUPPORTED_WARNING:
- $error = _s('Warning! Unsupported %1$s database server version. Should be at least (%2$s)',
+ $error = _s('Warning! Unsupported %1$s database server version. Should be at least %2$s.',
$dbversion['database'], $dbversion['min_supported_version']
);
break;
+
+ case DB_VERSION_HIGHER_THAN_MAXIMUM_ERROR:
+ $error = _s('Error! Unable to start Zabbix server.').' '.
+ _s('Unsupported %1$s database server version. Must not be higher than %2$s.',
+ $dbversion['database'], $dbversion['max_version']
+ );
+ break;
+
+ case DB_VERSION_HIGHER_THAN_MAXIMUM_WARNING:
+ $error = _s('Warning! Unsupported %1$s database server version. Should not be higher than %2$s.',
+ $dbversion['database'], $dbversion['max_version']
+ );
+ break;
+
+ case DB_VERSION_SUPPORTED:
+ default:
+ continue 2;
}
$info_table->addRow(