Some cleanup

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 8c4adc12a155a8b5373613f49779b0548711991a..05c3ff9184015225e7724e4991e930b35c2c5d54 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -6653,6 +6653,8 @@ WCF.System.Mobile.UX = {
        }
 };
 
+WCF.System.Page = { };
+
 WCF.System.Page.Multiple = Class.extend({
        _cache: { },
        _options: { },

diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index a0bc1fbdb02a8b9a0c48a69929b6a38239228356..14c9232aeb77dbcf3bbbeef1f86a708e06686df1 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -2,7 +2,6 @@
 namespace wcf\acp\page;
 use wcf\page\SortablePage;
 use wcf\system\WCF;
-use wcf\data\package\update\server\PackageUpdateServer;
 
 /**
  * Shows a list of all installed packages.
@@ -56,12 +55,6 @@ class PackageListPage extends SortablePage {
         */
        public $objectListClassName = 'wcf\data\package\PackageList';
        
-       /**
-        * list of WCF major releases covered by existing store update servers
-        * @var array<string>
-        */
-       public $wcfMajorReleases = array();
-       
        /**
         * @see \wcf\page\IPage::readParameters()
         */
@@ -71,20 +64,6 @@ class PackageListPage extends SortablePage {
                if (isset($_GET['packageID'])) $this->packageID = intval($_GET['packageID']);
        }
        
-       /**
-        * @see \wcf\page\IPage::readData()
-        */
-       public function readData() {
-               parent::readData();
-               
-               $updateServers = PackageUpdateServer::getActiveUpdateServers();
-               foreach ($updateServers as $updateServer) {
-                       if (preg_match('~^https?://store.woltlab.com/(maelstrom|typhoon)/$~', $updateServer->serverURL, $matches)) {
-                               $this->wcfMajorReleases[] = $matches[1];
-                       }
-               }
-       }
-       
        /**
         * @see \wcf\page\IPage::assignVariables()
         */
@@ -92,8 +71,7 @@ class PackageListPage extends SortablePage {
                parent::assignVariables();
                
                WCF::getTPL()->assign(array(
-                       'packageID' => $this->packageID,
-                       'wcfMajorReleases' => $this->wcfMajorReleases
+                       'packageID' => $this->packageID
                ));
        }
        

diff --git a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
index caf89b0ce21ce6427688f5f48bdb1e7b8aa2a2bf..3c7f16999f67ee31e37e2fae9ac029b8d3d900c3 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
@@ -1,12 +1,11 @@
 <?php
 namespace wcf\acp\page;
+use wcf\data\package\update\server\PackageUpdateServerList;
+use wcf\data\package\Package;
+use wcf\data\package\PackageCache;
 use wcf\page\AbstractPage;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\data\package\PackageCache;
-use wcf\data\package\Package;
-use wcf\data\package\update\server\PackageUpdateServerList;
 
 /**
  * Shows a list of purchased plugin store items.

diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
index 58caca33c78e6b2394042e1cdddb0de3f067484b..c3668d0bb6eab6f63b8b53fe3fec9642eade8a9d 100644 (file)
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -1,13 +1,11 @@
 <?php
 namespace wcf\data\package;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\HTTPUnauthorizedException;
-use wcf\system\exception\UserInputException;
+use wcf\system\exception\SystemException;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HTTPRequest;
 use wcf\util\JSON;
-use wcf\system\exception\SystemException;
-use wcf\system\request\LinkHandler;
 
 /**
  * Executes package-related actions.