From 535db603428484d978c6202a89727a6ec7014cae Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 3 Aug 2016 21:49:49 +0200 Subject: [PATCH] Added recommendation for openssl in system requirements --- .../files/lib/system/WCFSetup.class.php | 3 +++ wcfsetup/setup/lang/setup_de.xml | 2 ++ wcfsetup/setup/lang/setup_en.xml | 2 ++ .../template/stepShowSystemRequirements.tpl | 22 +++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 32e17b42bd..ad83714822 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -372,6 +372,9 @@ class WCFSetup extends WCF { $system['memoryLimit']['value'] = ini_get('memory_limit'); $system['memoryLimit']['result'] = $this->compareMemoryLimit(); + // openssl extension + $system['openssl']['result'] = @extension_loaded('openssl'); + WCF::getTPL()->assign([ 'system' => $system, 'nextStep' => 'configureDirectories' diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index fc437e6b77..9680c242fd 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -35,6 +35,8 @@ + + diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index 1e2b0e581b..2d72c00934 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -35,6 +35,8 @@ + + diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl index de9f167fa3..44109156e2 100644 --- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl +++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl @@ -105,6 +105,28 @@ + +
+

{lang}wcf.global.systemRequirements.openSSL{/lang}

+ +
+
+
{lang}wcf.global.systemRequirements.element.recommended{/lang}
+
{lang}wcf.global.systemRequirements.active{/lang}
+
+ +
+
{lang}wcf.global.systemRequirements.element.yours{/lang}
+
+ + {if !$system.openssl.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else} + {lang}wcf.global.systemRequirements.active{/lang} + {/if} + {if !$system.openssl.result}{lang}wcf.global.systemRequirements.openSSL.description{/lang}{/if} +
+
+
+
-- 2.20.1