From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 29 Apr 2014 11:36:22 +0000 (+0200)
Subject: Some cleanup
X-Git-Tag: 2.1.0_Alpha_1~862
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb0f624656f63f0175ebe6aec550da6a685db142;p=GitHub%2FWoltLab%2FWCF.git

Some cleanup
---

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 8c4adc12a1..05c3ff9184 100755
--- 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 a0bc1fbdb0..14c9232aeb 100644
--- 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 caf89b0ce2..3c7f16999f 100644
--- 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 58caca33c7..c3668d0bb6 100644
--- 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.