Remove calls to RemoteFile::supportsSSL()

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index 50c86ec303df579026da4207179dc95f92f85f42..c99cbec5fbe29cdddd31cc8c9f8c399172600097 100644 (file)
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -172,13 +172,6 @@
                                        </dd>
                                </dl>
                                
-                               <dl>
-                                       <dt>{lang}wcf.acp.index.system.php.sslSupport{/lang}</dt>
-                                       <dd>
-                                               {if $server[sslSupport]}{lang}wcf.acp.index.system.php.sslSupport.available{/lang}{else}{lang}wcf.acp.index.system.php.sslSupport.notAvailable{/lang}{/if}
-                                       </dd>
-                               </dl>
-                               
                                {event name='phpFields'}
                        </section>
                {/if}

diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index c0eed71c51894f975fe63f161f1825b865736869..d3bc7ffca972ee69d684096e641fbb26bc2d9430 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@ -9,7 +9,6 @@ use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\builder\OptionCacheBuilder;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\Environment;
-use wcf\system\io\RemoteFile;
 use wcf\system\package\PackageInstallationDispatcher;
 use wcf\system\registry\RegistryHandler;
 use wcf\system\request\LinkHandler;
@@ -51,7 +50,6 @@ class IndexPage extends AbstractPage
             'memoryLimit' => @\ini_get('memory_limit'),
             'upload_max_filesize' => @\ini_get('upload_max_filesize'),
             'postMaxSize' => @\ini_get('post_max_size'),
-            'sslSupport' => RemoteFile::supportsSSL(),
             'innodbFlushLogAtTrxCommit' => $innodbFlushLogAtTrxCommit,
         ];
 

diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
index bcd9dbc3d498f4888524f59b3e6ace85b08ef9a6..d68575bb2b227b8c8635f51bb03193d619ff3d84 100644 (file)
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -5,7 +5,6 @@ namespace wcf\data\package;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\io\RemoteFile;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HTTPRequest;
@@ -91,12 +90,6 @@ class PackageAction extends AbstractDatabaseObjectAction
      */
     public function searchForPurchasedItems()
     {
-        if (!RemoteFile::supportsSSL()) {
-            return [
-                'noSSL' => WCF::getLanguage()->get('wcf.acp.pluginStore.api.noSSL'),
-            ];
-        }
-
         if (empty($this->parameters['username']) || empty($this->parameters['password'])) {
             return [
                 'template' => $this->renderAuthorizationDialog(false),

diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index dfdf9ce9592111f52d56761bd2f64a4ade7dc0cc..35fca80a1d71b110d819513004e48606c2856b43 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -9,7 +9,6 @@ use wcf\system\cache\builder\PackageUpdateCacheBuilder;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\HTTPUnauthorizedException;
 use wcf\system\exception\SystemException;
-use wcf\system\io\RemoteFile;
 use wcf\system\package\validation\PackageValidationException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
@@ -112,10 +111,6 @@ class PackageUpdateDispatcher extends SingletonFactory
 
     protected function getPurchasedVersions()
     {
-        if (!RemoteFile::supportsSSL()) {
-            return;
-        }
-
         $request = new HTTPRequest(
             'https://api.woltlab.com/1.0/customer/license/list.json',
             ['timeout' => 5],

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index fb746643653ac65d9a70a88b498f709f03b51c46..dea94704dc7d95df2f57fa8aff4e7240b6aa6c9d 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -959,9 +959,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
                <item name="wcf.acp.index.system.webserver"><![CDATA[Webserver]]></item>
                <item name="wcf.acp.index.system.php"><![CDATA[PHP]]></item>
                <item name="wcf.acp.index.system.php.version"><![CDATA[PHP-Version]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport"><![CDATA[Unterstützung von SSL-Verbindungen]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport.available"><![CDATA[vorhanden]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport.notAvailable"><![CDATA[nicht vorhanden]]></item>
                <item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL-Version]]></item>
                <item name="wcf.acp.index.system.load"><![CDATA[Aktueller UNIX Load]]></item>
                <item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>
@@ -2112,7 +2109,6 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
        </category>
        <category name="wcf.acp.pluginStore">
                <item name="wcf.acp.pluginStore.api.error"><![CDATA[Fehler {@$status}: Der Server konnte die Anfrage nicht erfolgreich bearbeiten.]]></item>
-               <item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Die Abfrage der erworbenen Produkte aus dem Plugin-Store kann nur über eine sichere Verbindung erfolgen.<br><br>{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} PHP-Version wurde ohne Unterstützung für OpenSSL kompiliert und kann daher keine sicheren Verbindungen aufbauen, bitte {if LANGUAGE_USE_INFORMAL_VARIANT}wende dich an deinen{else}wenden Sie sich an Ihren{/if} Anbieter oder System-Administrator, um diesen Umstand zu korrigieren.]]></item>
                <item name="wcf.acp.pluginStore.authorization"><![CDATA[Autorisierung erforderlich]]></item>
                <item name="wcf.acp.pluginStore.authorization.credentials"><![CDATA[Zugangsdaten]]></item>
                <item name="wcf.acp.pluginStore.authorization.credentials.description"><![CDATA[Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}gib{else}geben Sie{/if} Lizenz- und Seriennummer einer {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Lizenzen auf WoltLab.com ein.]]></item>
@@ -5567,4 +5563,10 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
                <item name="wcf.upload.error.uploadFailed"><![CDATA[Beim Hochladen der Datei ist ein unbekannter Fehler aufgetreten.]]></item>
        </category>
 </import>
+<delete>
+       <item name="wcf.acp.pluginStore.api.noSSL"/>
+       <item name="wcf.acp.index.system.php.sslSupport"/>
+       <item name="wcf.acp.index.system.php.sslSupport.available"/>
+       <item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+</delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c6438d2a99d737b3fd37774f2441fe33f02adeab..3104b694311c61595943f4a2b11fdc85d56477f0 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -938,9 +938,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
                <item name="wcf.acp.index.system.webserver"><![CDATA[Web Server]]></item>
                <item name="wcf.acp.index.system.php"><![CDATA[PHP]]></item>
                <item name="wcf.acp.index.system.php.version"><![CDATA[PHP Version]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport"><![CDATA[SSL Support]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport.available"><![CDATA[available]]></item>
-               <item name="wcf.acp.index.system.php.sslSupport.notAvailable"><![CDATA[not available]]></item>
                <item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL Version]]></item>
                <item name="wcf.acp.index.system.load"><![CDATA[Current UNIX Load]]></item>
                <item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>
@@ -2044,7 +2041,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
        </category>
        <category name="wcf.acp.pluginStore">
                <item name="wcf.acp.pluginStore.api.error"><![CDATA[Error {@$status}: The server was unable to process your request.]]></item>
-               <item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Querying the Plugin-Store to fetch the purchased products requires a secure connection.<br><br>Your PHP version has been compiled without OpenSSL support, it is required to establish secure connections, please contact your hosting company or system-administrator to resolve this shortcoming.]]></item>
                <item name="wcf.acp.pluginStore.authorization"><![CDATA[Authorization Required]]></item>
                <item name="wcf.acp.pluginStore.authorization.credentials"><![CDATA[Credentials]]></item>
                <item name="wcf.acp.pluginStore.authorization.credentials.description"><![CDATA[Please enter the license and serial number of one of your licenses on WoltLab.com.]]></item>
@@ -5569,4 +5565,10 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
                <item name="wcf.upload.error.uploadFailed"><![CDATA[An unknown error occurred during the upload.]]></item>
        </category>
 </import>
+<delete>
+       <item name="wcf.acp.pluginStore.api.noSSL"/>
+       <item name="wcf.acp.index.system.php.sslSupport"/>
+       <item name="wcf.acp.index.system.php.sslSupport.available"/>
+       <item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+</delete>
 </language>