Removed obsolete safemode check

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index b9de01b9b3711ec81103cc4dbae93ec80c4ecd90..579e37fed37dda1713403c2db8fe9b79edd5bf54 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -355,9 +355,6 @@ class WCFSetup extends WCF {
                // mb string
                $system['mbString']['result'] = extension_loaded('mbstring');
                
-               // safe mode
-               $system['safeMode']['result'] = (FileUtil::getSafeMode() != 1);
-               
                WCF::getTPL()->assign(array(
                        'system' => $system,
                        'nextStep' => 'searchWcfDir'

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index c7bba6e7b0e830d3d51fd3839358b1710dfd50a3..64df5e1a4a7a123a113c2738a4c8f63d06431aae 100644 (file)
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -39,8 +39,6 @@
                <item name="wcf.global.systemRequirements.gdLib.description"><![CDATA[Grafikbearbeitungs-Bibliothek &raquo;gdlib&laquo; ist für die dynamische Generierung von Bildern zuständig. Ohne sie werden einige Funktionalitäten der Software nicht funktionieren.]]></item>
                <item name="wcf.global.systemRequirements.mbString"><![CDATA[Bibliothek für Zeichen mit mehreren Bytes (&raquo;multibyte string&laquo;)]]></item>
                <item name="wcf.global.systemRequirements.mbString.description"><![CDATA[Diese Bibliothek ist für den Betrieb der Software zwingend erforderlich.]]></item>
-               <item name="wcf.global.systemRequirements.safeMode"><![CDATA[Sicherheitseinstellung &raquo;safe mode&laquo; in Skriptsprache &raquo;PHP&laquo;]]></item>
-               <item name="wcf.global.systemRequirements.safeMode.description"><![CDATA[Diese Einstellung muss deaktiviert werden, da ansonsten ein einwandfreier Betrieb der Software nicht gewährleistet ist.]]></item>
                <item name="wcf.global.systemRequirements.active"><![CDATA[aktiviert]]></item>
                <item name="wcf.global.systemRequirements.notActive"><![CDATA[nicht aktiviert]]></item>
                <item name="wcf.global.wcfDir"><![CDATA[Installationsverzeichnis wählen]]></item>

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 4a9bc731bc3a3c53a8b0a794c9d52759ed5a37d2..791a49f7bab3d99f9e84ea22fc19429fa81fdec0 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -39,8 +39,6 @@
                <item name="wcf.global.systemRequirements.gdLib.description"><![CDATA[The graphics-library &quot;GDLib&quot; is needed for the dynamic image generation. Without this library, some features of this software will not be available.]]></item>
                <item name="wcf.global.systemRequirements.mbString"><![CDATA[The multibyte-character library &quot;MBString&quot;]]></item>
                <item name="wcf.global.systemRequirements.mbString.description"><![CDATA[This library is required for a proper operation of the software.]]></item>
-               <item name="wcf.global.systemRequirements.safeMode"><![CDATA[Security option of &quot;Safe Mode&quot; in the &quot;PHP&quot; Script language]]></item>
-               <item name="wcf.global.systemRequirements.safeMode.description"><![CDATA[To guarantee the operation of this software, the &quot;Safe Mode&quot; setting must be disabled.]]></item>
                <item name="wcf.global.systemRequirements.active"><![CDATA[Enabled]]></item>
                <item name="wcf.global.systemRequirements.notActive"><![CDATA[Not enabled]]></item>
                <item name="wcf.global.wcfDir"><![CDATA[Choose the installation-folder]]></item>

diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index c7c369338438a282acf2e009ba6a8df00555e576..b447217c8354d4c73663bb619153b996b52685a8 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -44,17 +44,6 @@
                        
                </fieldset>
                
-               <fieldset>
-                       <legend>{lang}wcf.global.systemRequirements.safeMode{/lang}</legend>
-                       <dl>
-                               <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.notActive{/lang}</dt>
-                               <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.safeMode.result}badgeWarning{else}badgeSuccess{/if}">{if !$system.safeMode.result}{lang}wcf.global.systemRequirements.active{/lang}{else}{lang}wcf.global.systemRequirements.notActive{/lang}{/if}</span>
-                                       {if !$system.safeMode.result}<small>{lang}wcf.global.systemRequirements.safeMode.description{/lang}</small>{/if}
-                               </dd>
-                       </dl>
-               </fieldset>
-               
 </fieldset>
 
 <fieldset>
@@ -86,7 +75,7 @@
 
 <form method="post" action="install.php">      
        <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.mbString.result || !$system.safeMode.result} disabled="disabled"{/if} accesskey="s"/>
+               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.mbString.result} disabled="disabled"{/if} accesskey="s"/>
                <input type="hidden" name="step" value="{@$nextStep}" />
                <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
                <input type="hidden" name="languageCode" value="{@$languageCode}" />