From df7e13ee5a113ab5b3dfff801b6bb40b14d26b96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 11 May 2022 11:26:08 +0200 Subject: [PATCH] Check for 64-bit support in SystemCheckPage --- wcfsetup/install/files/acp/templates/systemCheck.tpl | 12 ++++++++++++ .../files/lib/acp/page/SystemCheckPage.class.php | 9 +++++++++ wcfsetup/install/lang/de.xml | 2 ++ wcfsetup/install/lang/en.xml | 2 ++ 4 files changed, 25 insertions(+) diff --git a/wcfsetup/install/files/acp/templates/systemCheck.tpl b/wcfsetup/install/files/acp/templates/systemCheck.tpl index 39428c345a..dcc8939ff7 100644 --- a/wcfsetup/install/files/acp/templates/systemCheck.tpl +++ b/wcfsetup/install/files/acp/templates/systemCheck.tpl @@ -72,6 +72,18 @@ {lang}wcf.acp.systemCheck.php.version.description{/lang} + + +
{lang}wcf.acp.systemCheck.php.x64{/lang}
+
+ {if $results[php][x64]} + {@$statusOk} {lang}wcf.acp.systemCheck.pass{/lang} + {else} + {@$statusInsufficient} {lang}wcf.acp.systemCheck.notSupported{/lang} + {/if} + {lang}wcf.acp.systemCheck.php.x64.description{/lang} +
+
{lang}wcf.acp.systemCheck.php.extension{/lang}
diff --git a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php index 0357fcf635..36db1aea85 100644 --- a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php @@ -151,6 +151,7 @@ class SystemCheckPage extends AbstractPage 'result' => 'unsupported', 'value' => '0.0.0', ], + 'x64' => false, ], 'status' => [ 'directories' => false, @@ -186,6 +187,7 @@ class SystemCheckPage extends AbstractPage $this->validateMysql(); $this->validatePhpExtensions(); $this->validatePhpMemoryLimit(); + $this->validatePhpX64(); $this->validatePhpVersion(); $this->validatePhpGdSupport(); $this->validateWritableDirectories(); @@ -377,6 +379,13 @@ class SystemCheckPage extends AbstractPage $this->results['status']['php'] = $this->results['status']['php'] && $this->results['php']['memoryLimit']['result']; } + protected function validatePhpX64() + { + $this->results['php']['x64'] = \PHP_INT_SIZE == 8; + + $this->results['status']['php'] = $this->results['status']['php'] && $this->results['php']['x64']; + } + protected function validatePhpVersion() { $phpVersion = \PHP_VERSION; diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index f1c7916fae..235b0c60df 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2817,6 +2817,8 @@ Kein Abschnitt darf leer sein und alle Abschnitten dürfen nur folgende Zeichen + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index a46592b2f2..d8ab6d75d1 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2748,6 +2748,8 @@ If you have already bought the licenses for the listed apps, th + + -- 2.20.1