From 1acf212212e80ff888e1879649639464f183764b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 11 May 2022 16:19:15 +0200 Subject: [PATCH] Remove calls to RemoteFile::supportsSSL() --- wcfsetup/install/files/acp/templates/index.tpl | 7 ------- .../install/files/lib/acp/page/IndexPage.class.php | 2 -- .../files/lib/data/package/PackageAction.class.php | 7 ------- .../system/package/PackageUpdateDispatcher.class.php | 5 ----- wcfsetup/install/lang/de.xml | 10 ++++++---- wcfsetup/install/lang/en.xml | 10 ++++++---- 6 files changed, 12 insertions(+), 29 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index 50c86ec303..c99cbec5fb 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -172,13 +172,6 @@ -
-
{lang}wcf.acp.index.system.php.sslSupport{/lang}
-
- {if $server[sslSupport]}{lang}wcf.acp.index.system.php.sslSupport.available{/lang}{else}{lang}wcf.acp.index.system.php.sslSupport.notAvailable{/lang}{/if} -
-
- {event name='phpFields'} {/if} diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php index c0eed71c51..d3bc7ffca9 100755 --- 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 bcd9dbc3d4..d68575bb2b 100644 --- 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 dfdf9ce959..35fca80a1d 100644 --- 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 fb74664365..dea94704dc 100644 --- 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 - - - @@ -2112,7 +2109,6 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen -
{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.]]> @@ -5567,4 +5563,10 @@ Benachrichtigungen auf {PAGE_TITLE|phra + + + + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index c6438d2a99..3104b69431 100644 --- 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 - - - @@ -2044,7 +2041,6 @@ If you have already bought the licenses for the listed apps, th -
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.]]> @@ -5569,4 +5565,10 @@ your notifications on {PAGE_TITLE|phras + + + + + + -- 2.20.1