Some cleanup

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
index a48d7c590cd602c00beafc373edb231ba43ceec3..0295ad7f0057e094fae5999e006eda77e77cd510 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
@@ -1,8 +1,9 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscriptionEditor;
+use wcf\data\paid\subscription\PaidSubscriptionList;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractForm;
 use wcf\system\exception\UserInputException;
@@ -10,7 +11,6 @@ use wcf\system\language\I18nHandler;
 use wcf\system\payment\method\PaymentMethodHandler;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\data\paid\subscription\PaidSubscriptionList;
 
 /**
  * Shows the paid subscription add form.
@@ -35,7 +35,7 @@ class PaidSubscriptionAddForm extends AbstractForm {
        
        /**
         * @see \wcf\page\AbstractPage::$templateName
-       */
+        */
        public $templateName = 'paidSubscriptionAdd';
        
        /**

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
index d2a04aa13ad8eaa7ce76f96d370d9a647a596201..f1d4b6b7ade2dec1a74aa7eed0f4dfc7298d6271 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\acp\form;
 use wcf\form\AbstractForm;
-use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\paid\subscription\PaidSubscriptionAction;
+use wcf\data\paid\subscription\PaidSubscriptionList;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\language\I18nHandler;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\data\paid\subscription\PaidSubscriptionList;
 
 /**
  * Shows the paid subscription edit form.

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
index f5671118cf194c607008f630111881b62b089609..e4433419c30170b3a560c4208734e72d84b0573c 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
@@ -1,15 +1,15 @@
 <?php
 namespace wcf\acp\form;
+use wcf\data\paid\subscription\user\PaidSubscriptionUser;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\user\User;
 use wcf\form\AbstractForm;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
-use wcf\system\exception\PermissionDeniedException;
-use wcf\util\StringUtil;
-use wcf\data\user\User;
-use wcf\data\paid\subscription\user\PaidSubscriptionUser;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
 use wcf\util\DateUtil;
+use wcf\util\StringUtil;
 
 /**
  * Shows the user subscription add form.

diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
index dc80fddade7ab554338e01172b047433e24bba36..f10a24869aee3f45eafc7789f792062741920190 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
@@ -2,8 +2,8 @@
 namespace wcf\acp\page;
 use wcf\page\SortablePage;
 use wcf\util\StringUtil;
-use wcf\system\WCF;
 use wcf\system\cache\builder\PaidSubscriptionCacheBuilder;
+use wcf\system\WCF;
 
 /**
  * Shows the list of paid subscription transactions.

diff --git a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
index ca0883aaed3985d4128eac32aaa74bcc39cd54a6..dcd7ccfd32eda26d02de59028294ccea558b74fc 100644 (file)
--- a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
@@ -42,7 +42,7 @@ class PaidSubscription extends DatabaseObject {
                        // check supported currencies
                        if (!in_array($this->currency, $paymentMethod->getSupportedCurrencies())) continue;
                        
-                       $buttons[] = $paymentMethod->getPurchaseButton($this->cost, $this->currency, WCF::getLanguage()->get($this->title), $objectTypeID . ':' . WCF::getUser()->userID . ':' . $this->subscriptionID , LinkHandler::getInstance()->getLink('PaidSubscriptionReturn'), LinkHandler::getInstance()->getLink(), $this->isRecurring, $this->subscriptionLength, $this->subscriptionLengthUnit);
+                       $buttons[] = $paymentMethod->getPurchaseButton($this->cost, $this->currency, WCF::getLanguage()->get($this->title), $objectTypeID . ':' . WCF::getUser()->userID . ':' . $this->subscriptionID, LinkHandler::getInstance()->getLink('PaidSubscriptionReturn'), LinkHandler::getInstance()->getLink(), $this->isRecurring, $this->subscriptionLength, $this->subscriptionLengthUnit);
                }
                
                return $buttons;

diff --git a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
index c9503b9f46908a69375987fda17fc4c5cf7fa39f..2f72294a5e711fdb84a20102a38224dc5df9cb43 100644 (file)
--- a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\data\paid\subscription\transaction\log;
-use wcf\data\DatabaseObject;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\paid\subscription\PaidSubscription;
 use wcf\data\user\User;
+use wcf\data\DatabaseObject;
 use wcf\system\WCF;
 
 /**

diff --git a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
index cfc5c4dd3dbfc102893642c9d2cbb86de7ea9b90..caa3ecbff94039b449279d92a082ef7fe0554951 100644 (file)
--- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\paid\subscription\user;
 use wcf\data\paid\subscription\PaidSubscription;
 use wcf\data\user\group\UserGroup;
-use wcf\data\user\UserAction;
 use wcf\data\user\User;
+use wcf\data\user\UserAction;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\exception\UserInputException;
 use wcf\util\DateUtil;

diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
index f9aa379583f6f0582966e284c598c6bf7e292fd6..21e4870eebc5eff0ed6d2da6408c336fa1ceca5e 100644 (file)
--- a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
+++ b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\page;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 use wcf\system\cache\builder\PaidSubscriptionCacheBuilder;
 use wcf\system\menu\user\UserMenu;
 use wcf\system\WCF;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 
 /**
  * Shows a list of the available paid subscriptions.

diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
index d6ff4f6b3dda8a70c9ebb0cb912234a718640093..eade0a880dbfc7a3a360be446e53a794ffe1241b 100644 (file)
--- a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
+++ b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
@@ -12,7 +12,7 @@ use wcf\system\WCF;
  * @subpackage page
  * @category   Community Framework
  */
-class PaidSubscriptionReturn extends AbstractPage {
+class PaidSubscriptionReturnPage extends AbstractPage {
        /**
         * @see \wcf\page\AbstractPage::$templateName
         */
@@ -28,4 +28,4 @@ class PaidSubscriptionReturn extends AbstractPage {
                        'message' => WCF::getLanguage()->get('wcf.paidSubscription.returnMessage')
                ));
        }
-}
\ No newline at end of file
+}

diff --git a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
index 3848acce942b06ec32a96be0b16bbfc624b4e49e..8835bd8ea366f0c92c6ce2942061313084a0c68e 100644 (file)
--- a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cronjob;
 use wcf\data\cronjob\Cronjob;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 
 /**
  * Cronjob for a hourly system cleanup.

diff --git a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
index 082c3d850fb473548a580034aef7b23471126abc..542a935460ea050d50164ac1ed9f8578315ea27a 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
@@ -2,8 +2,8 @@
 namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
 use wcf\system\payment\method\PaymentMethodHandler;
+use wcf\system\WCF;
 
 /**
  * Option type implementation for selecting payment methods.

diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index 602ca971bb10577c8687c81a68251d4dad2acabb..8b6268217346d356b6bb1f5e20d773b082a6a024 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -16,7 +16,6 @@ use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\HTTPRequest;
 use wcf\util\XML;
-use wcf\data\package\update\PackageUpdate;
 
 /**
  * Provides functions to manage package updates.

diff --git a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
index 6d05a564164f614e56a79e3bd3120bbf16477543..bf2b11b2276eda509b393a73e7cef6e972062b78 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
+++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
@@ -106,4 +106,4 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
                                </form>';
                }
        }
-}
\ No newline at end of file
+}

diff --git a/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
index 389f83a7a2f9ead81b9555e5537fca83ffa75fcf..1428ddcd67756e6d09dac83ef12624bde65051cd 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
@@ -11,4 +11,4 @@ namespace wcf\system\payment\type;
  * @subpackage system.payment.type
  * @category   Community Framework
  */
-abstract class AbstractPaymentType implements IPaymentType {}
\ No newline at end of file
+abstract class AbstractPaymentType implements IPaymentType {}

diff --git a/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
index f5034f6757653c012b525c8fc579aa613a6a5bcb..9d894c4475ca3da79b51360d63da31401733e775 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
@@ -24,4 +24,4 @@ interface IPaymentType {
         * @param       array           $transactionDetails
         */
        public function processTransaction($paymentMethodObjectTypeID, $token, $amount, $currency, $transactionID, $status, $transactionDetails);
-}
\ No newline at end of file
+}

diff --git a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
index 2eb88ef3e1f28a507e29cee20f2b54a7528c1b17..f48fea916ac1d2c67873fe993952b27f67eacdb0 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
@@ -122,4 +122,4 @@ class PaidSubscriptionPaymentType extends AbstractPaymentType {
                        throw $e;
                }
        }
-}
\ No newline at end of file
+}