Request license information for purchased package search

Resolves #3910

diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
index 8b994ccc6775eb077c35a5834f6ae4315e716704..bcd9dbc3d498f4888524f59b3e6ace85b08ef9a6 100644 (file)
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -65,7 +65,7 @@ class PackageAction extends AbstractDatabaseObjectAction
 
         if (empty($this->parameters['username'])) {
             $conditions = new PreparedStatementConditionBuilder();
-            $conditions->add("serverURL REGEXP ?", ['^https?://store\.woltlab\.com/']);
+            $conditions->add("serverURL REGEXP ?", ['^https?://update\.woltlab\.com/']);
             $conditions->add("loginUsername <> ''");
             $conditions->add("loginPassword <> ''");
 

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7d42b805e8ed0f66b9af7703539ae2836c32f160..655a61f665b5366e3f54d17f317134db5b27db90 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2097,10 +2097,10 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
                <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} Benutzername und Kennwort für {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} WoltLab.com-Benutzerkonto ein.]]></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>
                <item name="wcf.acp.pluginStore.authorization.credentials.rejected"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Zugangsdaten wurden vom Server abgewiesen, bitte {if LANGUAGE_USE_INFORMAL_VARIANT}überprüfe{else}überprüfen Sie{/if} Benutzername und Kennwort!]]></item>
-               <item name="wcf.acp.pluginStore.authorization.username"><![CDATA[Benutzername]]></item>
-               <item name="wcf.acp.pluginStore.authorization.password"><![CDATA[Kennwort]]></item>
+               <item name="wcf.acp.pluginStore.authorization.username"><![CDATA[Lizenznummer]]></item>
+               <item name="wcf.acp.pluginStore.authorization.password"><![CDATA[Seriennummer]]></item>
                <item name="wcf.acp.pluginStore.authorization.saveCredentials"><![CDATA[Zugangsdaten für aktuelle Sitzung speichern]]></item>
                <item name="wcf.acp.pluginStore.file"><![CDATA[WoltLab® Plugin-Store]]></item>
                <item name="wcf.acp.pluginStore.file.link"><![CDATA[Eintrag im Plugin-Store anzeigen]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 3ee552c92390ccf1f93253369c6c36dcc85febf6..64117afdfef83ca28f9b551f038323f98422baee 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2026,10 +2026,10 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
                <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 your WoltLab.com username and password.]]></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>
                <item name="wcf.acp.pluginStore.authorization.credentials.rejected"><![CDATA[Your provided credentials are invalid, please check your username and password!]]></item>
-               <item name="wcf.acp.pluginStore.authorization.username"><![CDATA[Username]]></item>
-               <item name="wcf.acp.pluginStore.authorization.password"><![CDATA[Password]]></item>
+               <item name="wcf.acp.pluginStore.authorization.username"><![CDATA[License Number]]></item>
+               <item name="wcf.acp.pluginStore.authorization.password"><![CDATA[Serial Number]]></item>
                <item name="wcf.acp.pluginStore.authorization.saveCredentials"><![CDATA[Save credentials for this session only]]></item>
                <item name="wcf.acp.pluginStore.file"><![CDATA[WoltLab® Plugin-Store]]></item>
                <item name="wcf.acp.pluginStore.file.link"><![CDATA[Show listing in the Plugin-Store]]></item>