From: Alexander Ebert Date: Mon, 15 Dec 2014 01:13:24 +0000 (+0100) Subject: Fixed some issues related to the plugin-store purchase query X-Git-Tag: 2.1.0_Beta_2~39 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93c9c7175b5428037576886aa555850f091cda44;p=GitHub%2FWoltLab%2FWCF.git Fixed some issues related to the plugin-store purchase query --- diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 6ca0b95166..ec3f849708 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -1678,6 +1678,20 @@ WCF.ACP.PluginStore.PurchasedItems.Search = Class.extend({ this._dialog.html(data.returnValues.noResults); this._dialog.wcfDialog('open'); } + else if (data.returnValues.noSSL) { + // PHP was compiled w/o OpenSSL support + if (this._dialog === null) { + this._dialog = $('
').hide().appendTo(document.body); + this._dialog.html(data.returnValues.noSSL).wcfDialog({ + title: WCF.Language.get('wcf.global.error.title') + }); + } + else { + this._dialog.wcfDialog('option', 'title', WCF.Language.get('wcf.global.error.title')); + this._dialog.html(data.returnValues.noSSL); + this._dialog.wcfDialog('open'); + } + } else if (data.returnValues.redirectURL) { // redirect to list of purchased products window.location = data.returnValues.redirectURL; diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index da4f0c01bf..85647d59ed 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -27,7 +27,7 @@ new WCF.ACP.Package.Update.Search(); {/if} - {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->session->getPermission('admin.system.package.canUninstallPackage')} + {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') && $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} new WCF.ACP.PluginStore.PurchasedItems.Search(); {/if} }); diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php index c3668d0bb6..70fd45f324 100644 --- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php @@ -1,6 +1,7 @@ checkPermissions(array('admin.system.package.canInstallPackage', 'admin.system.package.canUpdatePackage')); $this->readString('password', true); $this->readString('username', true); if (empty($this->parameters['username'])) { + $conditions = new PreparedStatementConditionBuilder(); + $conditions->add("serverURL IN (?)", array(array('http://store.woltlab.com/maelstrom/', 'http://store.woltlab.com/typhoon/'))); + $conditions->add("loginUsername <> ''"); + $conditions->add("loginPassword <> ''"); + // check if user has already provided credentials $sql = "SELECT loginUsername, loginPassword FROM wcf".WCF_N."_package_update_server - WHERE serverURL = ?"; + ".$conditions; $statement = WCF::getDB()->prepareStatement($sql, 1); - $statement->execute(array('http://store.woltlab.com/typhoon/')); + $statement->execute($conditions->getParameters()); $row = $statement->fetchArray(); if (!empty($row['loginUsername']) && !empty($row['loginPassword'])) { $this->parameters['password'] = $row['loginPassword']; @@ -59,14 +73,25 @@ class PackageAction extends AbstractDatabaseObjectAction { } } + /** + * Searches for purchased items in the WoltLab Plugin-Store. + * + * @return array + */ public function searchForPurchasedItems() { + if (!HTTPRequest::supportSSL()) { + return array( + 'noSSL' => WCF::getLanguage()->get('wcf.acp.pluginStore.api.noSSL') + ); + } + if (empty($this->parameters['username']) || empty($this->parameters['password'])) { return array( 'template' => $this->renderAuthorizationDialog(false) ); } - $request = new HTTPRequest('https://www.woltlab.com/api/1.0/customer/purchases/list.json', array( + $request = new HTTPRequest('https://api.woltlab.com/1.0/customer/purchases/list.json', array( 'method' => 'POST' ), array( 'username' => $this->parameters['username'], @@ -83,7 +108,7 @@ class PackageAction extends AbstractDatabaseObjectAction { case 200: if (empty($response['products'])) { return array( - 'noResults' => WCF::getLanguage()->get('wcf.acp.pluginstore.purchasedItems.noResults') + 'noResults' => WCF::getLanguage()->get('wcf.acp.pluginStore.purchasedItems.noResults') ); } else { @@ -105,11 +130,17 @@ class PackageAction extends AbstractDatabaseObjectAction { // any other kind of errors default: - throw new SystemException(WCF::getLanguage()->getDynamicVariable('wcf.acp.pluginstore.api.error', array('status' => $code))); + throw new SystemException(WCF::getLanguage()->getDynamicVariable('wcf.acp.pluginStore.api.error', array('status' => $code))); break; } } + /** + * Renders the authentication dialog. + * + * @param boolean $rejected + * @return string + */ protected function renderAuthorizationDialog($rejected) { WCF::getTPL()->assign(array( 'rejected' => $rejected diff --git a/wcfsetup/install/files/lib/util/HTTPRequest.class.php b/wcfsetup/install/files/lib/util/HTTPRequest.class.php index 867eb942bd..c1a02bfc28 100644 --- a/wcfsetup/install/files/lib/util/HTTPRequest.class.php +++ b/wcfsetup/install/files/lib/util/HTTPRequest.class.php @@ -128,6 +128,12 @@ final class HTTPRequest { */ private $statusCode = 0; + /** + * true if PHP supports SSL/TLS + * @var boolean + */ + private static $hasSSLSupport = null; + /** * Constructs a new instance of HTTPRequest. * @@ -601,4 +607,25 @@ final class HTTPRequest { $this->replyBody = ''; $this->statusCode = 0; } + + /** + * Returns true if PHP supports SSL/TLS. + * + * @return boolean + */ + public static function supportSSL() { + if (static::$hasSSLSupport === null) { + static::$hasSSLSupport = false; + + $transports = stream_get_transports(); + foreach ($transports as $transport) { + if (preg_match('~^(ssl(v[23])?|tls(v[0-9\.]+)?)$~', $transport)) { + static::$hasSSLSupport = true; + break; + } + } + } + + return static::$hasSSLSupport; + } } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index f0da942c7e..fbcc1c84f6 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1254,15 +1254,16 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> +
Ihre PHP-Version wurde ohne Unterstützung für OpenSSL kompiliert und kann daher keine sicheren Verbindungen aufbauen, bitte wenden Sie sich an Ihren Anbieter oder System-Administrator um diesen Umstand zu korrigieren.]]> - + - - + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 59da981e67..b8e6ed6c41 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1253,6 +1253,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> +
Your PHP version has been compiled without OpenSSL support required to establish secure connections, please contact your hosting company or system-administrator to resolve this shortcoming.]]>