From 1a6e8c5275bcadbbdafd703bf91a2e44351ee0c0 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 25 Dec 2014 10:57:28 +0100 Subject: [PATCH] Fix code formatting --- .../templates/notificationList.tpl | 2 +- com.woltlab.wcf/templates/wysiwyg.tpl | 2 +- .../files/acp/templates/categoryAdd.tpl | 2 +- .../files/acp/templates/languageAdd.tpl | 2 +- .../files/acp/templates/languageImport.tpl | 2 +- .../acp/templates/languageMultilingualism.tpl | 2 +- .../files/acp/templates/languageServerAdd.tpl | 2 +- .../files/acp/templates/noticeList.tpl | 2 +- wcfsetup/install/files/js/WCF.ImageViewer.js | 4 +-- wcfsetup/install/files/js/WCF.Location.js | 2 +- wcfsetup/install/files/js/WCF.js | 4 +-- .../lib/acp/form/CronjobAddForm.class.php | 2 +- .../lib/acp/form/LanguageExportForm.class.php | 4 +-- .../form/PaidSubscriptionAddForm.class.php | 26 +++++++++---------- .../form/PaidSubscriptionEditForm.class.php | 6 ++--- .../PaidSubscriptionUserAddForm.class.php | 8 +++--- .../files/lib/acp/form/UserAddForm.class.php | 2 +- .../UserContentRevertChangesForm.class.php | 4 +-- .../files/lib/acp/form/UserEditForm.class.php | 2 +- ...bscriptionTransactionLogListPage.class.php | 10 +++---- ...idSubscriptionTransactionLogPage.class.php | 2 +- .../PluginStorePurchasedItemsPage.class.php | 2 +- .../lib/action/PaypalCallbackAction.class.php | 8 +++--- .../lib/data/category/Category.class.php | 2 +- .../files/lib/data/like/LikeAction.class.php | 2 +- .../queue/ModerationQueueAction.class.php | 6 ++--- .../queue/ViewableModerationQueue.class.php | 4 +-- .../files/lib/data/option/Option.class.php | 2 +- .../lib/data/package/PackageAction.class.php | 2 +- .../subscription/PaidSubscription.class.php | 4 +-- .../PaidSubscriptionEditor.class.php | 8 +++--- .../PaidSubscriptionTransactionLog.class.php | 10 +++---- .../user/PaidSubscriptionUser.class.php | 8 +++--- .../user/PaidSubscriptionUserAction.class.php | 4 +-- .../session/virtual/SessionVirtual.class.php | 2 +- .../files/lib/data/sitemap/Sitemap.class.php | 2 +- .../lib/data/style/StyleAction.class.php | 2 +- .../files/lib/data/user/UserAction.class.php | 2 +- .../UserAuthenticationFailure.class.php | 4 +-- .../lib/data/user/avatar/Gravatar.class.php | 2 +- .../lib/data/user/option/UserOption.class.php | 2 +- .../files/lib/form/LoginForm.class.php | 5 ++-- .../form/ModerationActivationForm.class.php | 2 +- .../lib/form/ModerationReportForm.class.php | 2 +- .../lib/form/RegisterActivationForm.class.php | 2 +- .../files/lib/page/EditHistoryPage.class.php | 6 ++--- .../page/PaidSubscriptionListPage.class.php | 4 +-- .../page/PaidSubscriptionReturnPage.class.php | 2 +- .../install/files/lib/system/Regex.class.php | 1 - .../AbstractAttachmentObjectType.class.php | 2 +- .../IAttachmentObjectType.class.php | 2 +- .../lib/system/bbcode/BBCodeParser.class.php | 2 +- .../lib/system/bbcode/MessageParser.class.php | 2 +- .../lib/system/bbcode/PreParser.class.php | 2 +- .../bbcode/SimpleMessageParser.class.php | 16 ++++++------ .../comment/manager/ICommentManager.class.php | 6 ++--- .../ModerationQueueCommentManager.class.php | 2 +- .../system/condition/TimeCondition.class.php | 2 +- .../PaidSubscriptionsDashboardBox.class.php | 2 +- ...SubscriptionsSidebarDashboardBox.class.php | 2 +- .../exporter/AbstractExporter.class.php | 2 +- .../AbstractCommentResponseImporter.class.php | 4 +-- .../lib/system/io/AtomicWriter.class.php | 2 +- ...ractMessageEmbeddedObjectHandler.class.php | 4 +-- ...mentMessageEmbeddedObjectHandler.class.php | 6 ++--- .../IMessageEmbeddedObjectHandler.class.php | 2 +- .../MessageEmbeddedObjectManager.class.php | 2 +- ...uoteMessageEmbeddedObjectHandler.class.php | 6 ++--- .../AbstractModerationQueueHandler.class.php | 2 +- .../queue/ModerationQueueManager.class.php | 12 ++++----- .../lib/system/option/IOptionType.class.php | 2 +- .../PaymentMethodSelectOptionType.class.php | 2 +- .../system/package/PackageArchive.class.php | 2 +- .../PackageInstallationScheduler.class.php | 2 +- .../PackageValidationArchive.class.php | 2 +- .../PackageValidationManager.class.php | 4 +-- .../method/AbstractPaymentMethod.class.php | 4 +-- .../payment/method/IPaymentMethod.class.php | 6 ++--- .../method/PaymentMethodHandler.class.php | 12 ++++----- .../method/PaypalPaymentMethod.class.php | 8 +++--- .../SofortUeberweisungPaymentMethod.class.php | 6 ++--- .../type/AbstractPaymentType.class.php | 2 +- .../payment/type/IPaymentType.class.php | 4 +-- .../PaidSubscriptionPaymentType.class.php | 4 +-- .../search/AbstractSearchEngine.class.php | 6 ++--- .../lib/system/search/ISearchEngine.class.php | 2 +- .../lib/system/search/SearchEngine.class.php | 2 +- .../search/SearchIndexManager.class.php | 2 +- wcfsetup/install/files/style/imageViewer.less | 2 +- wcfsetup/install/lang/de.xml | 2 +- wcfsetup/install/lang/en.xml | 2 +- 91 files changed, 177 insertions(+), 177 deletions(-) diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl index 16b78e7dde..6a948a53ae 100644 --- a/com.woltlab.wcf/templates/notificationList.tpl +++ b/com.woltlab.wcf/templates/notificationList.tpl @@ -63,7 +63,7 @@
{include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl index fbe44d9365..2c6d2c6bde 100644 --- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl +++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl @@ -62,7 +62,7 @@
{@SECURITY_TOKEN_INPUT_TAG} -
+ {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl index 970cbf20f2..88cce63a40 100644 --- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl @@ -48,7 +48,7 @@
{@SECURITY_TOKEN_INPUT_TAG} -
+ {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/noticeList.tpl b/wcfsetup/install/files/acp/templates/noticeList.tpl index 0beec37925..ecb2088bc4 100644 --- a/wcfsetup/install/files/acp/templates/noticeList.tpl +++ b/wcfsetup/install/files/acp/templates/noticeList.tpl @@ -27,7 +27,7 @@ {if $objects|count} -
+
    {foreach from=$objects item='notice'}
  1. diff --git a/wcfsetup/install/files/js/WCF.ImageViewer.js b/wcfsetup/install/files/js/WCF.ImageViewer.js index 5586b39192..f00471eb1a 100644 --- a/wcfsetup/install/files/js/WCF.ImageViewer.js +++ b/wcfsetup/install/files/js/WCF.ImageViewer.js @@ -340,7 +340,7 @@ $.widget('ui.wcfImageViewer', { } this._isOpen = true; - + WCF.System.DisableScrolling.disable(); WCF.System.DisableZoom.disable(); } @@ -1226,7 +1226,7 @@ $.widget('ui.wcfImageViewer', { if (!this._isOpen) { this._isOpen = true; - + WCF.System.DisableScrolling.disable(); WCF.System.DisableZoom.disable(); } diff --git a/wcfsetup/install/files/js/WCF.Location.js b/wcfsetup/install/files/js/WCF.Location.js index f5794b2834..962694ff50 100644 --- a/wcfsetup/install/files/js/WCF.Location.js +++ b/wcfsetup/install/files/js/WCF.Location.js @@ -582,7 +582,7 @@ WCF.Location.GoogleMaps.SuggestionMap = WCF.Location.GoogleMaps.LargeMap.extend( init: function(mapContainerID, mapOptions, actionClassName, locationSearchInputSelector, additionalParameters) { this._super(mapContainerID, mapOptions, actionClassName, locationSearchInputSelector, additionalParameters); - var $locationSuggestionDiv = $('
    ' + WCF.Language.get('wcf.map.showLocationSuggestions') + '
    '); + var $locationSuggestionDiv = $('
    ' + WCF.Language.get('wcf.map.showLocationSuggestions') + '
    '); this._locationSuggestionsButton = $locationSuggestionDiv.find('.googleMapsCustomControl').click($.proxy(this._toggleLocationSuggestions, this)); this._map.controls[google.maps.ControlPosition.TOP_RIGHT].push($locationSuggestionDiv.get(0)); diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 7f7832d3e5..80ac3eb938 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -3047,7 +3047,7 @@ WCF.Action.Toggle = Class.extend({ // bind event listener this._initElements(); - WCF.DOMNodeInsertedHandler.addCallback('WCF.Action.Toggle' + this._className.hashCode(), $.proxy(this._initElements, this)); + WCF.DOMNodeInsertedHandler.addCallback('WCF.Action.Toggle' + this._className.hashCode(), $.proxy(this._initElements, this)); }, /** @@ -11310,7 +11310,7 @@ $.widget('ui.wcfDialog', { // Firefox ignores padding-bottom for elements within an overflowing container if ($.browser.mozilla && !$.browser.mobile) { if ($overflow === 'auto') { - this._content.children('div').css('margin-bottom', this._content.css('padding-bottom')); + this._content.children('div').css('margin-bottom', this._content.css('padding-bottom')); } else { this._content.children('div').css('margin-bottom', false); diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php index 985d7702ae..6b433c3f89 100755 --- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php @@ -132,7 +132,7 @@ class CronjobAddForm extends AbstractForm { try { CronjobUtil::validate($this->startMinute, $this->startHour, $this->startDom, $this->startMonth, $this->startDow); - } + } catch (SystemException $e) { // extract field name $fieldName = ''; diff --git a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php index dbf9ab2ade..8503d1c12c 100644 --- a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php @@ -148,8 +148,8 @@ class LanguageExportForm extends AbstractForm { $row['packageNameLength'] = mb_strlen(WCF::getLanguage()->get($row['packageName'])); $this->packages[] = new Package(null, $row); if ($row['packageNameLength'] > $this->packageNameLength) { - $this->packageNameLength = $row['packageNameLength']; - } + $this->packageNameLength = $row['packageNameLength']; + } } } } diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php index 0295ad7f00..4d0cceb171 100644 --- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php @@ -40,13 +40,13 @@ class PaidSubscriptionAddForm extends AbstractForm { /** * subscription title - * @var string + * @var string */ public $title = ''; /** * subscription description - * @var string + * @var string */ public $description = ''; @@ -64,13 +64,13 @@ class PaidSubscriptionAddForm extends AbstractForm { /** * subscription cost - * @var double + * @var double */ public $cost = 0.0; /** * subscription currency - * @var string + * @var string */ public $currency = 'USD'; @@ -82,13 +82,13 @@ class PaidSubscriptionAddForm extends AbstractForm { /** * subscription length - * @var integer + * @var integer */ public $subscriptionLength = 0; /** * subscription length unit - * @var string + * @var string */ public $subscriptionLengthUnit = ''; @@ -100,31 +100,31 @@ class PaidSubscriptionAddForm extends AbstractForm { /** * list of group ids - * @var array + * @var array */ public $groupIDs = array(); /** * list of excluded subscriptions - * @var array + * @var array */ public $excludedSubscriptionIDs = array(); /** * available user groups - * @var array + * @var array */ public $availableUserGroups = array(); /** * list of available currencies - * @var array + * @var array */ public $availableCurrencies = array(); /** * list of available subscriptions - * @var array + * @var array */ public $availableSubscriptions = array(); @@ -280,14 +280,14 @@ class PaidSubscriptionAddForm extends AbstractForm { /** * Saves i18n values. - * + * * @param \wcf\data\paid\subscription\PaidSubscription $subscription * @param string $columnName */ public function saveI18nValue(PaidSubscription $subscription, $columnName) { if (!I18nHandler::getInstance()->isPlainValue($columnName)) { I18nHandler::getInstance()->save($columnName, 'wcf.paidSubscription.subscription'.$subscription->subscriptionID.($columnName == 'description' ? '.description' : ''), 'wcf.paidSubscription', 1); - + // update database $editor = new PaidSubscriptionEditor($subscription); $editor->update(array( diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php index a07cc3d61a..36518551b2 100644 --- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php @@ -58,7 +58,7 @@ class PaidSubscriptionEditForm extends PaidSubscriptionAddForm { */ public function readData() { parent::readData(); - + if (empty($_POST)) { I18nHandler::getInstance()->setOptions('description', 1, $this->subscription->description, 'wcf.paidSubscription.subscription\d+.description'); I18nHandler::getInstance()->setOptions('title', 1, $this->subscription->title, 'wcf.paidSubscription.subscription\d+'); @@ -153,10 +153,10 @@ class PaidSubscriptionEditForm extends PaidSubscriptionAddForm { */ public function assignVariables() { parent::assignVariables(); - + $useRequestData = (empty($_POST)) ? false : true; I18nHandler::getInstance()->assignVariables($useRequestData); - + WCF::getTPL()->assign(array( 'action' => 'edit', 'subscriptionID' => $this->subscriptionID, diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php index e4433419c3..a83c4ea05f 100644 --- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php @@ -46,19 +46,19 @@ class PaidSubscriptionUserAddForm extends AbstractForm { /** * username - * @var string + * @var string */ public $username = ''; /** * user object - * @var \wcf\data\user\User + * @var \wcf\data\user\User */ public $user = null; /** * subscription end date - * @var string + * @var string */ public $endDate = ''; @@ -155,7 +155,7 @@ class PaidSubscriptionUserAddForm extends AbstractForm { */ public function readData() { parent::readData(); - + if (empty($_POST)) { if ($this->subscription->subscriptionLength) { $d = DateUtil::getDateTimeByTimestamp(TIME_NOW); diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index 367924b446..f3537b9b05 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -273,7 +273,7 @@ class UserAddForm extends UserOptionListForm { if ($this->disableSignatureExpires) { $disableSignatureExpires = strtotime($this->disableSignatureExpires); } - + $data['data']['disableSignature'] = $this->disableSignature; $data['data']['disableSignatureReason'] = $this->disableSignatureReason; $data['data']['disableSignatureExpires'] = $disableSignatureExpires; diff --git a/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php b/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php index a43498ff9c..4af4d6e74c 100644 --- a/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php @@ -19,10 +19,10 @@ use wcf\system\WCF; */ class UserContentRevertChangesForm extends AbstractForm { /** - * @see \wcf\page\AbstractPage::$neededModules + * @see \wcf\page\AbstractPage::$neededModules */ public $neededModules = array('MODULE_EDIT_HISTORY'); - + /** * @see \wcf\page\AbstractPage::$neededPermissions */ diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php index b71c02ac1b..17100bb7ba 100755 --- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php @@ -139,7 +139,7 @@ class UserEditForm extends UserAddForm { else { $this->banExpires = ''; } - + if (isset($_POST['avatarType'])) $this->avatarType = $_POST['avatarType']; if (WCF::getSession()->getPermission('admin.user.canDisableAvatar')) { diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php index da8ec60ddb..06450d3873 100644 --- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php @@ -48,19 +48,19 @@ class PaidSubscriptionTransactionLogListPage extends SortablePage { /** * transaction id - * @var string + * @var string */ public $transactionID = ''; /** * username - * @var string + * @var string */ public $username = ''; /** * subscription id - * @var integer + * @var integer */ public $subscriptionID = 0; @@ -80,7 +80,7 @@ class PaidSubscriptionTransactionLogListPage extends SortablePage { */ protected function initObjectList() { parent::initObjectList(); - + if ($this->transactionID) { $this->objectList->getConditionBuilder()->add('paid_subscription_transaction_log.transactionID LIKE ?', array('%' . $this->transactionID . '%')); } @@ -101,7 +101,7 @@ class PaidSubscriptionTransactionLogListPage extends SortablePage { */ public function assignVariables() { parent::assignVariables(); - + WCF::getTPL()->assign(array( 'transactionID' => $this->transactionID, 'username' => $this->username, diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php index 64901db6ec..892647d26b 100644 --- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php @@ -31,7 +31,7 @@ class PaidSubscriptionTransactionLogPage extends AbstractPage { */ public function readParameters() { parent::readParameters(); - + if (isset($_REQUEST['id'])) $this->logID = intval($_REQUEST['id']); $this->log = new PaidSubscriptionTransactionLog($this->logID); if (!$this->log->logID) { diff --git a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php index 85ca5d3ba3..81847633e7 100644 --- a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php @@ -95,7 +95,7 @@ class PluginStorePurchasedItemsPage extends AbstractPage { $this->productData[$wcfMajorRelease][$packageUpdateID] = array( 'author' => $product['author'], 'authorURL' => $product['authorURL'], - 'package' => $product['package'], + 'package' => $product['package'], 'packageName' => $packageName, 'pluginStoreURL' => $product['pluginStoreURL'], 'version' => array( diff --git a/wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php b/wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php index 7e8ac4775a..8ea931a77e 100644 --- a/wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php +++ b/wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php @@ -8,7 +8,7 @@ use wcf\util\HTTPRequest; /** * Handles Paypal callbacks. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -18,7 +18,7 @@ use wcf\util\HTTPRequest; */ class PaypalCallbackAction extends AbstractAction { /** - * @see \wcf\action\IAction::execute() + * @see \wcf\action\IAction::execute() */ public function execute() { parent::execute(); @@ -43,7 +43,7 @@ class PaypalCallbackAction extends AbstractAction { catch (SystemException $e) { throw new SystemException('connection to paypal.com failed: ' . $e->getMessage()); } - + if (strstr($content, "VERIFIED") === false) { throw new SystemException('request not validated'); } @@ -76,7 +76,7 @@ class PaypalCallbackAction extends AbstractAction { if ($transactionType == 'web_accept' || $transactionType == 'subscr_payment') { if ($paymentStatus == 'Completed') { $status = 'completed'; - } + } } if ($paymentStatus == 'Refunded' || $paymentStatus == 'Reversed') { $status = 'reversed'; diff --git a/wcfsetup/install/files/lib/data/category/Category.class.php b/wcfsetup/install/files/lib/data/category/Category.class.php index 9708a44968..5a6f6974cf 100644 --- a/wcfsetup/install/files/lib/data/category/Category.class.php +++ b/wcfsetup/install/files/lib/data/category/Category.class.php @@ -54,7 +54,7 @@ class Category extends ProcessibleDatabaseObject implements IPermissionObject, I /** * fallback return value used in Category::getPermission() - * @var boolean + * @var boolean */ protected $defaultPermission = false; diff --git a/wcfsetup/install/files/lib/data/like/LikeAction.class.php b/wcfsetup/install/files/lib/data/like/LikeAction.class.php index f26d005961..e32b5d9bbc 100644 --- a/wcfsetup/install/files/lib/data/like/LikeAction.class.php +++ b/wcfsetup/install/files/lib/data/like/LikeAction.class.php @@ -115,7 +115,7 @@ class LikeAction extends AbstractDatabaseObjectAction implements IGroupedUserLis // check permissions if (!WCF::getUser()->userID || !WCF::getSession()->getPermission('user.like.canLike')) { - throw new PermissionDeniedException(); + throw new PermissionDeniedException(); } // check if liking own content but forbidden by configuration diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php index 2cdfb2e849..fe3151a86c 100644 --- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php +++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php @@ -287,15 +287,15 @@ class ModerationQueueAction extends AbstractDatabaseObjectAction { if (empty($this->parameters['visitTime'])) { $this->parameters['visitTime'] = TIME_NOW; } - + if (empty($this->objects)) { $this->readObjects(); } - + foreach ($this->objects as $queue) { VisitTracker::getInstance()->trackObjectVisit('com.woltlab.wcf.moderation.queue', $queue->queueID, $this->parameters['visitTime']); } - + // reset storage UserStorageHandler::getInstance()->reset(array(WCF::getUser()->userID), 'unreadModerationCount'); diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php index 30af9b7f38..e2cf656071 100644 --- a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php +++ b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php @@ -167,12 +167,12 @@ class ViewableModerationQueue extends DatabaseObjectDecorator { /** * Returns true if this queue item is new for the active user. - * + * * @return boolean */ public function isNew() { if ($this->time > max(VisitTracker::getInstance()->getVisitTime('com.woltlab.wcf.moderation.queue'), VisitTracker::getInstance()->getObjectVisitTime('com.woltlab.wcf.moderation.queue', $this->queueID))) return true; - + return false; } } diff --git a/wcfsetup/install/files/lib/data/option/Option.class.php b/wcfsetup/install/files/lib/data/option/Option.class.php index 34358fa870..3c9a4223a1 100644 --- a/wcfsetup/install/files/lib/data/option/Option.class.php +++ b/wcfsetup/install/files/lib/data/option/Option.class.php @@ -196,7 +196,7 @@ class Option extends DatabaseObject { /** * Allows modifications of hidden option. - * + * * @param string $hiddenOption */ public function modifyHiddenOption($hiddenOption) { diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php index 911d181023..0ccb94e0c3 100644 --- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php @@ -77,7 +77,7 @@ class PackageAction extends AbstractDatabaseObjectAction { /** * Searches for purchased items in the WoltLab Plugin-Store. * - * @return array + * @return array */ public function searchForPurchasedItems() { if (!RemoteFile::supportsSSL()) { 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 dcd7ccfd32..7a2b0f31e1 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php @@ -30,7 +30,7 @@ class PaidSubscription extends DatabaseObject { /** * Returns list of purchase buttons. * - * @return array + * @return array */ public function getPurchaseButtons() { $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('com.woltlab.wcf.payment.type', 'com.woltlab.wcf.payment.type.paidSubscription'); @@ -51,7 +51,7 @@ class PaidSubscription extends DatabaseObject { /** * Returns a DateInterval object based on subscription length. * - * @return \DateInterval + * @return \DateInterval */ public function getDateInterval() { return new \DateInterval('P' . $this->subscriptionLength . $this->subscriptionLengthUnit); diff --git a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscriptionEditor.class.php b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscriptionEditor.class.php index 02e9330d68..7a17517137 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscriptionEditor.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscriptionEditor.class.php @@ -23,19 +23,19 @@ class PaidSubscriptionEditor extends DatabaseObjectEditor implements IEditableCa /** * Sets the show order of the subscription. - * + * * @param integer $showOrder */ public function setShowOrder($showOrder = 0) { $newShowOrder = 1; - + $sql = "SELECT MAX(showOrder) FROM wcf".WCF_N."_paid_subscription"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(); $maxShowOrder = $statement->fetchColumn(); if (!$maxShowOrder) $maxShowOrder = 0; - + if (!$showOrder || $showOrder > $maxShowOrder) { $newShowOrder = $maxShowOrder + 1; } @@ -51,7 +51,7 @@ class PaidSubscriptionEditor extends DatabaseObjectEditor implements IEditableCa $newShowOrder = $showOrder; } - + $this->update(array( 'showOrder' => $newShowOrder )); 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 2f72294a5e..d5241b4c0e 100644 --- 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 @@ -29,13 +29,13 @@ class PaidSubscriptionTransactionLog extends DatabaseObject { /** * user object - * @var \wcf\data\user\User + * @var \wcf\data\user\User */ protected $user = null; /** * paid subscription object - * @var \wcf\data\paid\subscription\PaidSubscription + * @var \wcf\data\paid\subscription\PaidSubscription */ protected $subscription = null; @@ -73,20 +73,20 @@ class PaidSubscriptionTransactionLog extends DatabaseObject { /** * Returns the paid subscription of this transaction. - * + * * @return \wcf\data\paid\subscription\PaidSubscription */ public function getSubscription() { if ($this->subscription === null) { $this->subscription = new PaidSubscription($this->subscriptionID); } - + return $this->subscription; } /** * Gets a transaction log entry by transaction id. - * + * * @param integer $paymentMethodObjectTypeID * @param string $transactionID * @return \wcf\data\paid\subscription\transaction\log\PaidSubscriptionTransactionLog diff --git a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php index d1acb2f969..3bc6145144 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php @@ -27,14 +27,14 @@ class PaidSubscriptionUser extends DatabaseObject { /** * paid subscription object - * @var \wcf\data\paid\subscription\PaidSubscription + * @var \wcf\data\paid\subscription\PaidSubscription */ protected $subscription = null; /** * Gets the paid subscription object. * - * @return \wcf\data\paid\subscription\PaidSubscription + * @return \wcf\data\paid\subscription\PaidSubscription */ public function getSubscription() { if ($this->subscription === null) { @@ -46,8 +46,8 @@ class PaidSubscriptionUser extends DatabaseObject { /** * Sets the paid subscription object. - * - * @param \wcf\data\paid\subscription\PaidSubscription $subscription + * + * @param \wcf\data\paid\subscription\PaidSubscription $subscription */ public function setSubscription(PaidSubscription $subscription) { $this->subscription = $subscription; 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 caa3ecbff9..5ede0af902 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php @@ -112,7 +112,7 @@ class PaidSubscriptionUserAction extends AbstractDatabaseObjectAction { } /** - * @see \wcf\data\AbstractDatabaseObjectAction::delete() + * @see \wcf\data\AbstractDatabaseObjectAction::delete() */ public function delete() { $this->revoke(); @@ -176,7 +176,7 @@ class PaidSubscriptionUserAction extends AbstractDatabaseObjectAction { if (empty($this->objects)) { $this->readObjects(); } - + foreach ($this->objects as $subscriptionUser) { if ($subscriptionUser->isActive) { throw new UserInputException('objectIDs'); diff --git a/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php b/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php index 80ed4f309a..e3ff091fe4 100644 --- a/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php +++ b/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php @@ -7,7 +7,7 @@ use wcf\util\UserUtil; /** * Virtual Sessions extend the original session system with a transparent layer. * It's only purpose is to enforce session validation based on IP address and/or user agent. - * + * * The legacy session system does not allow the same user being logged-in more than once * and the same is true for WCF 2.1 unless we break most parts of the API. * In order to solve this, we do allow multiple clients to share the exact same session diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php index cc574c97c0..e2f31c3316 100644 --- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php +++ b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php @@ -57,7 +57,7 @@ class Sitemap extends DatabaseObject { /** * Returns true, if the active user has access to this sitemap. * - * @return boolean + * @return boolean */ public function isAccessible() { // check the options of this item diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php index 68ea12bbe7..3517e6e53c 100644 --- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php @@ -337,7 +337,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction /** * Handles logo upload. - * + * * @return array */ public function uploadLogo() { diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index adf6305fe6..a24ca5c970 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -723,7 +723,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio if (empty($this->objects)) { $this->readObjects(); } - + $disableAvatarExpires = $this->parameters['disableAvatarExpires']; if ($disableAvatarExpires) { $disableAvatarExpires = strtotime($disableAvatarExpires); diff --git a/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php b/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php index 6021d19568..d31a5f821f 100644 --- a/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php +++ b/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php @@ -27,7 +27,7 @@ class UserAuthenticationFailure extends DatabaseObject { /** * Returns the ip address and attempts to convert into IPv4. - * + * * @return string */ public function getIpAddress() { @@ -52,7 +52,7 @@ class UserAuthenticationFailure extends DatabaseObject { /** * Returns the number of authentication failures for given user account. - * + * * @param integer $userID * @return boolean */ diff --git a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php index 34ae68462b..14897ed1cc 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php @@ -129,7 +129,7 @@ class Gravatar extends DefaultAvatar { */ public function getImageTag($size = null) { if ($size === null) $size = $this->size; - + $retinaSize = null; switch ($size) { case 16: diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php index 9d1cafd91a..23f0a87385 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php @@ -162,7 +162,7 @@ class UserOption extends Option { /** * Returns true if this user option can be deleted. - * + * * @return boolean */ public function canDelete() { diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php index d5474fdd25..02fed74513 100644 --- a/wcfsetup/install/files/lib/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/form/LoginForm.class.php @@ -37,10 +37,11 @@ class LoginForm extends \wcf\acp\form\LoginForm { parent::readFormParameters(); if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'register') { - // if the usernamefield is an email, save it as email for the registration + // if the username field is an email, save it as email for the registration if (UserUtil::isValidEmail($this->username)) { WCF::getSession()->register('__email', $this->username); - } else { + } + else { WCF::getSession()->register('__username', $this->username); } WCF::getSession()->update(); diff --git a/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php b/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php index e826fc755d..42dc0a5927 100644 --- a/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php +++ b/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php @@ -22,7 +22,7 @@ class ModerationActivationForm extends AbstractModerationForm { */ public function readParameters() { parent::readParameters(); - + $processor = ModerationQueueManager::getInstance()->getProcessor(null, null, $this->queue->objectTypeID); if (!($processor instanceof IModerationQueueActivationHandler)) { throw new IllegalLinkException(); diff --git a/wcfsetup/install/files/lib/form/ModerationReportForm.class.php b/wcfsetup/install/files/lib/form/ModerationReportForm.class.php index b3dee05dea..b4b735892b 100644 --- a/wcfsetup/install/files/lib/form/ModerationReportForm.class.php +++ b/wcfsetup/install/files/lib/form/ModerationReportForm.class.php @@ -24,7 +24,7 @@ class ModerationReportForm extends AbstractModerationForm { */ public function readParameters() { parent::readParameters(); - + $processor = ModerationQueueManager::getInstance()->getProcessor(null, null, $this->queue->objectTypeID); if (!($processor instanceof IModerationQueueReportHandler)) { throw new IllegalLinkException(); diff --git a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php index d1103dad32..0966f6530d 100644 --- a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php @@ -45,7 +45,7 @@ class RegisterActivationForm extends AbstractForm { */ public function readParameters() { parent::readParameters(); - + if (!empty($_GET['u'])) { $userID = intval($_GET['u']); $this->user = new User($userID); diff --git a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php index 5720cbe9f3..2f846e5318 100644 --- a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php +++ b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php @@ -22,16 +22,16 @@ use wcf\util\StringUtil; */ class EditHistoryPage extends AbstractPage { /** - * @see \wcf\page\AbstractPage::$neededModules + * @see \wcf\page\AbstractPage::$neededModules */ public $neededModules = array('MODULE_EDIT_HISTORY'); /** * DatabaseObjectList object - * @var \wcf\data\DatabaseObjectList + * @var \wcf\data\DatabaseObjectList */ public $objectList = null; - + /** * left / old version id * @var integer diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php index 21e4870eeb..8cb0cff2c5 100644 --- a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php +++ b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php @@ -28,13 +28,13 @@ class PaidSubscriptionListPage extends AbstractPage { /** * list of available paid subscriptions - * @var array + * @var array */ public $subscriptions = array(); /** * list of user subscriptions - * @var \wcf\data\paid\subscription\user\PaidSubscriptionUserList + * @var \wcf\data\paid\subscription\user\PaidSubscriptionUserList */ public $userSubscriptionList = array(); diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php index eac28595ba..e42c9aef7e 100644 --- a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php +++ b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Shows the paid subscription return message. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/Regex.class.php b/wcfsetup/install/files/lib/system/Regex.class.php index 522611368a..017960bf79 100644 --- a/wcfsetup/install/files/lib/system/Regex.class.php +++ b/wcfsetup/install/files/lib/system/Regex.class.php @@ -292,4 +292,3 @@ final class Regex { return $this->regex; } } - diff --git a/wcfsetup/install/files/lib/system/attachment/AbstractAttachmentObjectType.class.php b/wcfsetup/install/files/lib/system/attachment/AbstractAttachmentObjectType.class.php index d99221c632..4fe7493344 100644 --- a/wcfsetup/install/files/lib/system/attachment/AbstractAttachmentObjectType.class.php +++ b/wcfsetup/install/files/lib/system/attachment/AbstractAttachmentObjectType.class.php @@ -17,7 +17,7 @@ use wcf\util\ArrayUtil; abstract class AbstractAttachmentObjectType implements IAttachmentObjectType { /** * cached objects - * @var array<\wcf\data\DatabaseObject> + * @var array<\wcf\data\DatabaseObject> */ protected $cachedObjects = array(); diff --git a/wcfsetup/install/files/lib/system/attachment/IAttachmentObjectType.class.php b/wcfsetup/install/files/lib/system/attachment/IAttachmentObjectType.class.php index f257dfda16..9bc13143cf 100644 --- a/wcfsetup/install/files/lib/system/attachment/IAttachmentObjectType.class.php +++ b/wcfsetup/install/files/lib/system/attachment/IAttachmentObjectType.class.php @@ -84,7 +84,7 @@ interface IAttachmentObjectType { /** * Loads the permissions for given attachments. - * + * * @param array<\wcf\data\attachment\Attachment> $attachments */ public function setPermissions(array $attachments); diff --git a/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php b/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php index f3cf54b77d..2590d38f0f 100644 --- a/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php @@ -547,7 +547,7 @@ class BBCodeParser extends SingletonFactory { /** * Removes code bbcode occurrences in given message. - * + * * @param string $message * @return string */ diff --git a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php index 3d1cc9216f..2b38c2cab6 100644 --- a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php @@ -219,7 +219,7 @@ class MessageParser extends BBCodeParser { /** * Returns a text-only version of given message. - * + * * @param string $message * @return string */ diff --git a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php b/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php index 02e7c5d70b..e0794aa1b9 100644 --- a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php @@ -217,7 +217,7 @@ class PreParser extends SingletonFactory { )?\]) (.*?) (?:\[/\\1\])", Regex::DOT_ALL | Regex::IGNORE_WHITESPACE | Regex::CASE_INSENSITIVE); - + $callback = new Callback(function ($matches) { return StringStack::pushToStringStack($matches[0], 'urlBBCodes'); }); diff --git a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php index f214a573d8..804540f6d1 100644 --- a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php @@ -30,13 +30,13 @@ class SimpleMessageParser extends SingletonFactory { /** * cached URLs - * @var array + * @var array */ protected $cachedURLs = array(); /** * cached e-mails - * @var array + * @var array */ protected $cachedEmails = array(); @@ -164,33 +164,33 @@ class SimpleMessageParser extends SingletonFactory { /** * Returns the hash for an matched URL in the message. - * + * * @param array $matches * @return string */ protected function cacheURLsCallback($matches) { $hash = '@@'.StringUtil::getHash(uniqid(microtime()).$matches[0]).'@@'; $this->cachedURLs[$hash] = $matches[0]; - + return $hash; } /** * Returns the hash for an matched e-mail in the message. - * + * * @param array $matches * @return string */ protected function cacheEmailsCallback($matches) { $hash = '@@'.StringUtil::getHash(uniqid(microtime()).$matches[0]).'@@'; $this->cachedEmails[$hash] = $matches[0]; - + return $hash; } /** * Reinserts cached URLs and e-mails. - * + * * @param string $text * @return string */ @@ -209,7 +209,7 @@ class SimpleMessageParser extends SingletonFactory { $text = str_replace($hash, ''.$email.'', $text); } - + return $text; } diff --git a/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php index b4de3799be..e5c8fdca0c 100644 --- a/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php +++ b/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php @@ -108,15 +108,15 @@ interface ICommentManager { public function updateCounter($objectID, $value); /** - * Returns true, if this comment type supports likes. + * Returns true if this comment type supports likes. * * @return boolean */ public function supportsLike(); /** - * Returns true, if this comment type supports reports. - * + * Returns true if this comment type supports reports. + * * @return boolean */ public function supportsReport(); diff --git a/wcfsetup/install/files/lib/system/comment/manager/ModerationQueueCommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/ModerationQueueCommentManager.class.php index ee316a6414..f8b6941ed0 100644 --- a/wcfsetup/install/files/lib/system/comment/manager/ModerationQueueCommentManager.class.php +++ b/wcfsetup/install/files/lib/system/comment/manager/ModerationQueueCommentManager.class.php @@ -59,7 +59,7 @@ class ModerationQueueCommentManager extends AbstractCommentManager { if (!$this->isAccessible($objectID, true)) { return false; } - + return true; } diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php index 04b3dd6d65..008aff7648 100644 --- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php @@ -96,7 +96,7 @@ HTML; } protected function getTimezoneFieldElement() { - $fieldElement = ''; foreach (DateUtil::getAvailableTimezones() as $timezone) { $fieldElement .= ''; } diff --git a/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsDashboardBox.class.php index d9f3855842..41bf925101 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsDashboardBox.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; class PaidSubscriptionsDashboardBox extends AbstractContentDashboardBox { /** * list of available paid subscriptions - * @var array + * @var array */ public $subscriptions = array(); diff --git a/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsSidebarDashboardBox.class.php index 767c6fe0de..6b999cc4d3 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/PaidSubscriptionsSidebarDashboardBox.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; class PaidSubscriptionsSidebarDashboardBox extends AbstractSidebarDashboardBox { /** * list of available paid subscriptions - * @var array + * @var array */ public $subscriptions = array(); diff --git a/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php b/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php index 54082eea0a..8168994591 100644 --- a/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php +++ b/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php @@ -197,5 +197,5 @@ abstract class AbstractExporter implements IExporter { $row = $statement->fetchArray(); if ($row !== false) return $row['maxID']; return 0; - } + } } diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php index c4fdf6ee1d..80a8ec3e66 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php @@ -38,8 +38,8 @@ class AbstractCommentResponseImporter extends AbstractImporter { $sql = "SELECT responseID FROM wcf".WCF_N."_comment_response - WHERE commentID = ? - ORDER BY responseID ASC"; + WHERE commentID = ? + ORDER BY responseID ASC"; $statement = WCF::getDB()->prepareStatement($sql, 3); $statement->execute(array($response->commentID)); $responseIDs = array(); diff --git a/wcfsetup/install/files/lib/system/io/AtomicWriter.class.php b/wcfsetup/install/files/lib/system/io/AtomicWriter.class.php index 66a83bae4f..d054f7b3bd 100644 --- a/wcfsetup/install/files/lib/system/io/AtomicWriter.class.php +++ b/wcfsetup/install/files/lib/system/io/AtomicWriter.class.php @@ -12,7 +12,7 @@ use wcf\util\FileUtil; * the data was flushed. * * Note: The AtomicWriter only supports a small number of whitelisted (write) operations. - * + * * @author Tim Duesterhus * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/AbstractMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/AbstractMessageEmbeddedObjectHandler.class.php index 9b63f0609f..8d5174a902 100644 --- a/wcfsetup/install/files/lib/system/message/embedded/object/AbstractMessageEmbeddedObjectHandler.class.php +++ b/wcfsetup/install/files/lib/system/message/embedded/object/AbstractMessageEmbeddedObjectHandler.class.php @@ -5,7 +5,7 @@ use wcf\util\ArrayUtil; /** * Provides default implementations for message embedded object handlers. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -39,7 +39,7 @@ abstract class AbstractMessageEmbeddedObjectHandler extends DatabaseObjectDecora /** * Parses given message for specific bbcode parameters. - * + * * @param string $message * @param string $bbcode bbcode name * @return array diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/AttachmentMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/AttachmentMessageEmbeddedObjectHandler.class.php index ade25c57ff..fc7579deb2 100644 --- a/wcfsetup/install/files/lib/system/message/embedded/object/AttachmentMessageEmbeddedObjectHandler.class.php +++ b/wcfsetup/install/files/lib/system/message/embedded/object/AttachmentMessageEmbeddedObjectHandler.class.php @@ -6,7 +6,7 @@ use wcf\util\ArrayUtil; /** * IMessageEmbeddedObjectHandler implementation for attachments. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -16,7 +16,7 @@ use wcf\util\ArrayUtil; */ class AttachmentMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObjectHandler { /** - * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::parseMessage() + * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::parseMessage() */ public function parseMessage($message) { $parsedAttachmentIDs = array_unique(ArrayUtil::toIntegerArray(array_merge(self::getFirstParameters($message, 'attach'), self::getTextParameters($message, 'attach')))); @@ -39,7 +39,7 @@ class AttachmentMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObje } /** - * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::loadObjects() + * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::loadObjects() */ public function loadObjects(array $objectIDs) { $attachmentList = new AttachmentList(); diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/IMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/IMessageEmbeddedObjectHandler.class.php index 607c90b881..6296955fd8 100644 --- a/wcfsetup/install/files/lib/system/message/embedded/object/IMessageEmbeddedObjectHandler.class.php +++ b/wcfsetup/install/files/lib/system/message/embedded/object/IMessageEmbeddedObjectHandler.class.php @@ -3,7 +3,7 @@ namespace wcf\system\message\embedded\object; /** * Default interface of embedded object handler. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php index 393b6b5cf4..1223886c90 100644 --- a/wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php +++ b/wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php @@ -8,7 +8,7 @@ use wcf\system\WCF; /** * Default interface of embedded object handler. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/QuoteMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/QuoteMessageEmbeddedObjectHandler.class.php index 40251b4440..bee75bc753 100644 --- a/wcfsetup/install/files/lib/system/message/embedded/object/QuoteMessageEmbeddedObjectHandler.class.php +++ b/wcfsetup/install/files/lib/system/message/embedded/object/QuoteMessageEmbeddedObjectHandler.class.php @@ -5,7 +5,7 @@ use wcf\data\user\UserProfile; /** * IMessageEmbeddedObjectHandler implementation for quotes. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -15,7 +15,7 @@ use wcf\data\user\UserProfile; */ class QuoteMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObjectHandler { /** - * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::parseMessage() + * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::parseMessage() */ public function parseMessage($message) { $usernames = self::getFirstParameters($message, 'quote'); @@ -30,7 +30,7 @@ class QuoteMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObjectHan } /** - * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::loadObjects() + * @see \wcf\system\message\embedded\object\IMessageEmbeddedObjectHandler::loadObjects() */ public function loadObjects(array $objectIDs) { return UserProfile::getUserProfiles($objectIDs); diff --git a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php index 23d8d41de7..aa43396de9 100644 --- a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php +++ b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php @@ -40,7 +40,7 @@ abstract class AbstractModerationQueueHandler implements IModerationQueueHandler /** * required permission for assigned users - * @var string + * @var string */ protected $requiredPermission = 'mod.general.canUseModeration'; diff --git a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php index 56b04078ee..cc42584a95 100644 --- a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php +++ b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php @@ -242,14 +242,14 @@ class ModerationQueueManager extends SingletonFactory { /** * Returns the count of unread moderation queue items. - * + * * @param boolean $skipCache * @return integer */ public function getUnreadModerationCount($skipCache = false) { // get count $count = UserStorageHandler::getInstance()->getField('unreadModerationCount'); - + // cache does not exist or is outdated if ($count === null || $skipCache) { // force update of non-tracked queues for this user @@ -278,7 +278,7 @@ class ModerationQueueManager extends SingletonFactory { // update storage data UserStorageHandler::getInstance()->update(WCF::getUser()->userID, 'unreadModerationCount', $count); } - + return $count; } @@ -290,17 +290,17 @@ class ModerationQueueManager extends SingletonFactory { $queueList->sqlJoins = "LEFT JOIN wcf".WCF_N."_moderation_queue_to_user moderation_queue_to_user ON (moderation_queue_to_user.queueID = moderation_queue.queueID AND moderation_queue_to_user.userID = ".WCF::getUser()->userID.")"; $queueList->getConditionBuilder()->add("moderation_queue_to_user.queueID IS NULL"); $queueList->readObjects(); - + if (count($queueList)) { $queues = array(); foreach ($queueList as $queue) { if (!isset($queues[$queue->objectTypeID])) { $queues[$queue->objectTypeID] = array(); } - + $queues[$queue->objectTypeID][$queue->queueID] = $queue; } - + foreach ($this->objectTypeNames as $definitionName => $objectTypeIDs) { foreach ($objectTypeIDs as $objectTypeID) { if (isset($queues[$objectTypeID])) { diff --git a/wcfsetup/install/files/lib/system/option/IOptionType.class.php b/wcfsetup/install/files/lib/system/option/IOptionType.class.php index 9925aa351c..b27be6ed6c 100644 --- a/wcfsetup/install/files/lib/system/option/IOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/IOptionType.class.php @@ -72,7 +72,7 @@ interface IOptionType { /** * Returns true if option's label is hidden in search form. - * + * * @return boolean */ public function hideLabelInSearch(); diff --git a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php index 542a935460..3e1d91b7b4 100644 --- a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php @@ -36,7 +36,7 @@ class PaymentMethodSelectOptionType extends AbstractOptionType { if (!is_array($newValue)) { $newValue = array(); } - + $selectOptions = PaymentMethodHandler::getInstance()->getPaymentMethodSelection(); foreach ($newValue as $optionName) { if (!isset($selectOptions[$optionName])) { diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php index 4342867d6c..7c41ae30e3 100644 --- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php @@ -674,7 +674,7 @@ class PackageArchive { uksort($instances, array('wcf\data\package\Package', 'compareVersion')); // get package with highest version number (get last package) - $existingPackages[$packageName] = array_pop($instances); + $existingPackages[$packageName] = array_pop($instances); } } diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php index 623a874e46..5be85eb5a9 100644 --- a/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php @@ -269,7 +269,7 @@ class PackageInstallationScheduler { if ($validateInstallInstructions) { $installInstructions = $archive->getInstallInstructions(); if (empty($installInstructions)) { - throw new SystemException("Package '" . $archive->getLocalizedPackageInfo('packageName') . "' (" . $archive->getPackageInfo('name') . ") does not contain valid installation instructions."); + throw new SystemException("Package '" . $archive->getLocalizedPackageInfo('packageName') . "' (" . $archive->getPackageInfo('name') . ") does not contain valid installation instructions."); } } diff --git a/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php b/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php index d568c6084b..970131e06d 100644 --- a/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php @@ -227,7 +227,7 @@ class PackageValidationArchive implements \RecursiveIterator { /** * Validates install or update instructions against the corresponding PIP, unknown PIPs will be silently ignored. - * + * * @param string $type * @param array $instructions */ diff --git a/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php b/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php index e0f19ab74f..deb032bb1b 100644 --- a/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php +++ b/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php @@ -175,9 +175,9 @@ class PackageValidationManager extends SingletonFactory { /** * Validates an instruction against the corresponding package installation plugin. - * + * * Please be aware that unknown PIPs will silently ignored and cause no error. - * + * * @param \wcf\data\package\PackageArchive $archive * @param string $pip * @param string $instruction diff --git a/wcfsetup/install/files/lib/system/payment/method/AbstractPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/AbstractPaymentMethod.class.php index aff559ade6..a1afe4747a 100644 --- a/wcfsetup/install/files/lib/system/payment/method/AbstractPaymentMethod.class.php +++ b/wcfsetup/install/files/lib/system/payment/method/AbstractPaymentMethod.class.php @@ -3,7 +3,7 @@ namespace wcf\system\payment\method; /** * Abstract implementation of a payment method. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -13,7 +13,7 @@ namespace wcf\system\payment\method; */ abstract class AbstractPaymentMethod implements IPaymentMethod { /** - * @see \wcf\system\payment\method\IPaymentMethod::supportsRecurringPayments() + * @see \wcf\system\payment\method\IPaymentMethod::supportsRecurringPayments() */ public function supportsRecurringPayments() { return false; diff --git a/wcfsetup/install/files/lib/system/payment/method/IPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/IPaymentMethod.class.php index ef71d1492b..9c5d32d3e8 100644 --- a/wcfsetup/install/files/lib/system/payment/method/IPaymentMethod.class.php +++ b/wcfsetup/install/files/lib/system/payment/method/IPaymentMethod.class.php @@ -3,7 +3,7 @@ namespace wcf\system\payment\method; /** * Default interface for payment methods. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -30,12 +30,12 @@ interface IPaymentMethod { * Returns the HTML code of the purchase button. * * @param float $cost - * @param string $currency ISO 4217 code + * @param string $currency ISO 4217 code * @param string $name product/item name * @param string $token custom token * @param string $returnURL * @param string $cancelReturnURL - * @param boolean $isRecurring + * @param boolean $isRecurring * @param integer $subscriptionLength * @param string $subscriptionLengthUnit * diff --git a/wcfsetup/install/files/lib/system/payment/method/PaymentMethodHandler.class.php b/wcfsetup/install/files/lib/system/payment/method/PaymentMethodHandler.class.php index ccf447e2fe..b26b926073 100644 --- a/wcfsetup/install/files/lib/system/payment/method/PaymentMethodHandler.class.php +++ b/wcfsetup/install/files/lib/system/payment/method/PaymentMethodHandler.class.php @@ -6,7 +6,7 @@ use wcf\system\WCF; /** * Handles enabled/available payment methods. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -17,18 +17,18 @@ use wcf\system\WCF; class PaymentMethodHandler extends SingletonFactory { /** * payment methods - * @var array + * @var array */ protected $paymentMethods = array(); /** * payment method object types - * @var array + * @var array */ protected $objectTypes = array(); /** - * @see \wcf\system\SingletonFactory::init() + * @see \wcf\system\SingletonFactory::init() */ protected function init() { $availablePaymentMethods = explode(',', AVAILABLE_PAYMENT_METHODS); @@ -51,7 +51,7 @@ class PaymentMethodHandler extends SingletonFactory { /** * Returns the available payment methods for selection. - * + * * @return array */ public function getPaymentMethodSelection() { @@ -59,7 +59,7 @@ class PaymentMethodHandler extends SingletonFactory { foreach ($this->objectTypes as $objectType) { $selection[$objectType->objectType] = WCF::getLanguage()->get('wcf.payment.'.$objectType->objectType); } - + return $selection; } } 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 487582a3ad..a2bf975f73 100644 --- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php +++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php @@ -6,7 +6,7 @@ use wcf\util\StringUtil; /** * IPaymentMethod implementation for Paypal. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -16,14 +16,14 @@ use wcf\util\StringUtil; */ class PaypalPaymentMethod extends AbstractPaymentMethod { /** - * @see \wcf\system\payment\method\IPaymentMethod::supportsRecurringPayments() + * @see \wcf\system\payment\method\IPaymentMethod::supportsRecurringPayments() */ public function supportsRecurringPayments() { return true; } /** - * @see \wcf\system\payment\method\IPaymentMethod::getSupportedCurrencies() + * @see \wcf\system\payment\method\IPaymentMethod::getSupportedCurrencies() */ public function getSupportedCurrencies() { return array( @@ -56,7 +56,7 @@ class PaypalPaymentMethod extends AbstractPaymentMethod { } /** - * @see \wcf\system\payment\method\IPaymentMethod::getPurchaseButton() + * @see \wcf\system\payment\method\IPaymentMethod::getPurchaseButton() */ public function getPurchaseButton($cost, $currency, $name, $token, $returnURL, $cancelReturnURL, $isRecurring = false, $subscriptionLength = 0, $subscriptionLengthUnit = '') { if ($isRecurring) { diff --git a/wcfsetup/install/files/lib/system/payment/method/SofortUeberweisungPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/SofortUeberweisungPaymentMethod.class.php index 593654e875..68851eb620 100644 --- a/wcfsetup/install/files/lib/system/payment/method/SofortUeberweisungPaymentMethod.class.php +++ b/wcfsetup/install/files/lib/system/payment/method/SofortUeberweisungPaymentMethod.class.php @@ -3,7 +3,7 @@ namespace wcf\system\payment\method; /** * IPaymentMethod implementation for SofortUeberweisung. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -13,7 +13,7 @@ namespace wcf\system\payment\method; */ class SofortUeberweisungPaymentMethod extends AbstractPaymentMethod { /** - * @see \wcf\system\payment\method\IPaymentMethod::getSupportedCurrencies() + * @see \wcf\system\payment\method\IPaymentMethod::getSupportedCurrencies() */ public function getSupportedCurrencies() { return array( @@ -22,7 +22,7 @@ class SofortUeberweisungPaymentMethod extends AbstractPaymentMethod { } /** - * @see \wcf\system\payment\method\IPaymentMethod::getPurchaseButton() + * @see \wcf\system\payment\method\IPaymentMethod::getPurchaseButton() */ public function getPurchaseButton($cost, $currency, $name, $token, $returnURL, $cancelReturnURL, $isRecurring = false, $subscriptionLength = 0, $subscriptionLengthUnit = '') { // @todo 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 1428ddcd67..50e1f88e79 100644 --- a/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php +++ b/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php @@ -3,7 +3,7 @@ namespace wcf\system\payment\type; /** * Abstract implementation of a payment type. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License 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 9d894c4475..e935a497c3 100644 --- a/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php +++ b/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php @@ -3,7 +3,7 @@ namespace wcf\system\payment\type; /** * Default interface for payment types. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -19,7 +19,7 @@ interface IPaymentType { * @param string $token * @param float $amount * @param string $currency - * @param string $transactionID + * @param string $transactionID * @param string $status * @param array $transactionDetails */ 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 9cee94f8fc..bef705eefd 100644 --- a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php +++ b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php @@ -10,7 +10,7 @@ use wcf\system\exception\SystemException; /** * IPaymentType implementation for paid subscriptions. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -20,7 +20,7 @@ use wcf\system\exception\SystemException; */ class PaidSubscriptionPaymentType extends AbstractPaymentType { /** - * @see wcf\system\payment\type\IPaymentType::processTransaction() + * @see wcf\system\payment\type\IPaymentType::processTransaction() */ public function processTransaction($paymentMethodObjectTypeID, $token, $amount, $currency, $transactionID, $status, $transactionDetails) { $userSubscription = $user = $subscription = null; diff --git a/wcfsetup/install/files/lib/system/search/AbstractSearchEngine.class.php b/wcfsetup/install/files/lib/system/search/AbstractSearchEngine.class.php index 348c258626..f2098a8177 100644 --- a/wcfsetup/install/files/lib/system/search/AbstractSearchEngine.class.php +++ b/wcfsetup/install/files/lib/system/search/AbstractSearchEngine.class.php @@ -36,13 +36,13 @@ abstract class AbstractSearchEngine extends SingletonFactory implements ISearchE /** * Manipulates the search term (< and > used as quotation marks): - * + * * - becomes <+test* +foo*> * - becomes <+test* -foo* +bar*> * - becomes <+test* +"foo bar"> - * + * * @see http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html - * + * * @param string $query */ protected function parseSearchQuery($query) { diff --git a/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php b/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php index a6104de905..632ce302e4 100644 --- a/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php +++ b/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php @@ -49,7 +49,7 @@ interface ISearchEngine { /** * Searches for the given string and returns the data of the found messages. - * + * * @param string $q * @param array $objectTypes * @param boolean $subjectOnly diff --git a/wcfsetup/install/files/lib/system/search/SearchEngine.class.php b/wcfsetup/install/files/lib/system/search/SearchEngine.class.php index 7696d996e6..eb056bcb77 100644 --- a/wcfsetup/install/files/lib/system/search/SearchEngine.class.php +++ b/wcfsetup/install/files/lib/system/search/SearchEngine.class.php @@ -86,7 +86,7 @@ class SearchEngine extends SingletonFactory implements ISearchEngine { $this->searchEngine = call_user_func(array($className, 'getInstance')); } - + return $this->searchEngine; } diff --git a/wcfsetup/install/files/lib/system/search/SearchIndexManager.class.php b/wcfsetup/install/files/lib/system/search/SearchIndexManager.class.php index 6912833b12..5c068dbb08 100644 --- a/wcfsetup/install/files/lib/system/search/SearchIndexManager.class.php +++ b/wcfsetup/install/files/lib/system/search/SearchIndexManager.class.php @@ -59,7 +59,7 @@ class SearchIndexManager extends SingletonFactory implements ISearchIndexManager /** * Returns the the object type with the given name. - * + * * @param string $objectType * @return \wcf\data\object\type\ObjectType */ diff --git a/wcfsetup/install/files/style/imageViewer.less b/wcfsetup/install/files/style/imageViewer.less index ebbf9ea40a..4a42c60922 100644 --- a/wcfsetup/install/files/style/imageViewer.less +++ b/wcfsetup/install/files/style/imageViewer.less @@ -482,7 +482,7 @@ } } - &.wcfImageViewerButtonPrevious { + &.wcfImageViewerButtonPrevious { left: 5px; } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 6a059c0cd2..31ed127ec3 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1034,7 +1034,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">Standard-Gravatar-Typ, wenn einer E-Mail kein Gravatar zugeordnet werden kann.]]> - + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 07c1d0cd5c..676b1d4cd9 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1033,7 +1033,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">default Gravatar type used if no matching Gravatar was found.]]> - + -- 2.20.1