s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 14:10:28 +01:00
Code Issues Projects Releases Wiki Activity

bugfix systemhealth db version

Browse Source
This commit is contained in:
OpenXE 2023-06-01 14:15:11 +02:00
parent d9ff872a98
commit bf10c0d807
1 changed files with 1009 additions and 1006 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/pages/systemhealth.php
View File

@ -133,7 +133,6 @@ class Systemhealth {
$cmd = $this->app->Secure->GetGET('cmd'); $cmd = $this->app->Secure->GetGET('cmd');
if($cmd === 'reset') { if($cmd === 'reset') {
$id = $this->app->Secure->GetPOST('id'); $id = $this->app->Secure->GetPOST('id');
try { try {
$this->service->resetStatus($id); $this->service->resetStatus($id);
$status = 1; $status = 1;
@ -141,6 +140,7 @@ class Systemhealth {
catch(Exception $e) { catch(Exception $e) {
$status = 0; $status = 0;
} }
$this->fillEntries();
header('Content-Type: application/json'); header('Content-Type: application/json');
echo json_encode(['status' => $status]); echo json_encode(['status' => $status]);
$this->app->ExitXentral(); $this->app->ExitXentral();
@ -461,9 +461,9 @@ class Systemhealth {
public function fillEntries() public function fillEntries()
{ {
$phpVersion = substr(PHP_VERSION,0,3); $phpVersion = substr(PHP_VERSION,0,3);
if($phpVersion < 7.2) { if($phpVersion < 8) {
$status = 'warning'; $status = 'warning';
$phpVersion = 'Ab Xentral 20.2 benötigen Sie mind. PHP 7.2 (aktuell '.$phpVersion $phpVersion = 'OpenXE benötigt mind. PHP 8 (aktuell '.$phpVersion
.'). <a href="https://xentral.com/akademie-faq/systemvoraussetzungen-hd-ich-erhalte-den-hinweis-die-fehlermeldung-ab-xentral-20-1-benotigen-sie-min-php-7-2-aktuell-was-ist-zu-tun" target="_blank">Hilfe</a>'; .'). <a href="https://xentral.com/akademie-faq/systemvoraussetzungen-hd-ich-erhalte-den-hinweis-die-fehlermeldung-ab-xentral-20-1-benotigen-sie-min-php-7-2-aktuell-was-ist-zu-tun" target="_blank">Hilfe</a>';
} }
else { else {
@ -483,7 +483,10 @@ class Systemhealth {
} }
elseif($dbType === 'mariadb') { elseif($dbType === 'mariadb') {
$status = 'warning'; $status = 'warning';
if($dbVersion >= 10.2) {
$dbVersionArr = explode('.',$dbVersion);
if($dbVersionArr[0] >= 10 && !($dbVersionArr[1] < 2)) {
$status = 'ok'; $status = 'ok';
} }
$mysqlVersion = 'MariaDB '.$dbVersion; $mysqlVersion = 'MariaDB '.$dbVersion;
@ -503,7 +506,7 @@ class Systemhealth {
//@todo select version() >= 10.2 mariadb + update.php prüfung //@todo select version() >= 10.2 mariadb + update.php prüfung
$this->changeStatus('database', 'db_version', $status, $mysqlVersion); $this->changeStatus('database', 'db_version', $status, $mysqlVersion);
if($status === 'warning') { if($status === 'warning') {
$mysqlVersion = 'Ab Xentral 20.2 benötigen Sie mind. MySQL 5.7 / MariaDb 10.2 (aktuell '.$mysqlVersion $mysqlVersion = 'OpenXE benötigt mind. MySQL 5.7 / MariaDb 10.2 (aktuell '.$mysqlVersion
.'). <a href="https://xentral.com/akademie-faq/systemvoraussetzungen-hd-ich-erhalte-den-hinweis-die-fehlermeldung-ab-xentral-20-1-benotigen-sie-min-mysql-5-7-aktuell-was-muss-ich-tun" target="_blank">Hilfe</a>'; .'). <a href="https://xentral.com/akademie-faq/systemvoraussetzungen-hd-ich-erhalte-den-hinweis-die-fehlermeldung-ab-xentral-20-1-benotigen-sie-min-mysql-5-7-aktuell-was-muss-ich-tun" target="_blank">Hilfe</a>';
} }
$this->changeStatus('database', 'db_version_min', $status, $mysqlVersion); $this->changeStatus('database', 'db_version_min', $status, $mysqlVersion);