From 0f0590c23d36c16a9827595f24395ae92fea7983 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 14 Jun 2014 23:17:31 +0200 Subject: [PATCH] Fix code formatting --- .../templates/aclPermissionJavaScript.tpl | 2 +- com.woltlab.wcf/templates/headInclude.tpl | 2 +- com.woltlab.wcf/templates/header.tpl | 2 +- com.woltlab.wcf/templates/usersOnlineList.tpl | 6 +++--- .../acp/style/blueTemptation/individual.less | 8 ++++---- .../acp/templates/aclPermissionJavaScript.tpl | 2 +- .../install/files/acp/templates/userException.tpl | 2 +- wcfsetup/install/files/js/WCF.Like.js | 2 +- wcfsetup/install/files/js/WCF.User.js | 4 ++-- wcfsetup/install/files/js/WCF.js | 15 +++++++-------- .../lib/acp/form/LanguageExportForm.class.php | 2 +- .../files/lib/acp/form/NoticeEditForm.class.php | 2 +- .../files/lib/acp/form/StyleAddForm.class.php | 2 +- .../acp/form/UserOptionSetDefaultsForm.class.php | 2 +- .../lib/acp/page/ExceptionLogViewPage.class.php | 4 ++-- .../install/files/lib/acp/page/StatPage.class.php | 6 +++--- .../files/lib/acp/page/UserListPage.class.php | 2 +- .../lib/action/GravatarDownloadAction.class.php | 2 +- .../files/lib/action/MessageQuoteAction.class.php | 4 ++-- .../lib/data/comment/CommentAction.class.php | 2 +- .../lib/data/cronjob/CronjobAction.class.php | 4 ++-- .../files/lib/data/language/Language.class.php | 2 +- .../files/lib/data/like/LikeAction.class.php | 2 +- .../files/lib/data/style/StyleAction.class.php | 2 +- .../lib/data/user/UserBirthdayAction.class.php | 4 ++-- .../files/lib/data/user/UserProfile.class.php | 4 ++-- .../files/lib/data/user/group/UserGroup.class.php | 2 +- .../install/files/lib/form/LoginForm.class.php | 2 +- .../files/lib/page/CookiePolicyPage.class.php | 2 +- .../files/lib/page/PrivacyPolicyPage.class.php | 2 +- .../cache/builder/ACPMenuCacheBuilder.class.php | 2 +- .../cache/builder/PageMenuCacheBuilder.class.php | 2 +- .../system/cache/source/NoCacheSource.class.php | 2 +- .../box/AbstractSidebarDashboardBox.class.php | 6 +++--- .../FollowingsOnlineSidebarDashboardBox.class.php | 10 +++++----- .../box/MostActiveMembersDashboardBox.class.php | 12 ++++++------ .../box/MostLikedMembersDashboardBox.class.php | 12 ++++++------ .../box/NewestMembersDashboardBox.class.php | 12 ++++++------ .../box/RecentActivityDashboardBox.class.php | 2 +- .../RecentActivitySidebarDashboardBox.class.php | 2 +- .../box/StaffOnlineSidebarDashboardBox.class.php | 10 +++++----- .../box/StatsSidebarDashboardBox.class.php | 12 ++++++------ .../box/TodaysBirthdaysDashboardBox.class.php | 14 +++++++------- ...TodaysFollowingBirthdaysDashboardBox.class.php | 12 ++++++------ .../box/UsersOnlineSidebarDashboardBox.class.php | 6 +++--- .../listener/PreParserAtUserListener.class.php | 4 ++-- .../system/importer/UserOptionImporter.class.php | 2 +- .../install/files/lib/system/io/Zip.class.php | 2 +- .../files/lib/system/label/LabelHandler.class.php | 2 +- .../install/files/lib/system/mail/Mail.class.php | 2 +- .../lib/system/option/AboutMeOptionType.class.php | 4 ++-- .../system/option/BirthdayOptionType.class.php | 2 +- .../lib/system/option/SelectOptionType.class.php | 2 +- .../lib/system/option/TextOptionType.class.php | 2 +- ...cationEventPackageInstallationPlugin.class.php | 2 +- .../UserOptionPackageInstallationPlugin.class.php | 2 +- .../lib/system/request/RequestHandler.class.php | 14 +++++++------- .../search/AbstractSearchableObjectType.class.php | 2 +- .../lib/system/session/SessionHandler.class.php | 8 ++++---- .../stat/AbstractStatDailyHandler.class.php | 6 +++--- .../AttachmentDiskUsageStatDailyHandler.class.php | 6 +++--- .../stat/AttachmentStatDailyHandler.class.php | 4 ++-- .../system/stat/DislikeStatDailyHandler.class.php | 2 +- .../system/stat/LikeStatDailyHandler.class.php | 4 ++-- .../system/stat/UserStatDailyHandler.class.php | 4 ++-- .../lib/system/template/TemplateEngine.class.php | 4 ++-- .../CounterFunctionTemplatePlugin.class.php | 2 +- .../lib/system/user/UserBirthdayCache.class.php | 6 +++--- .../UserNotificationHandler.class.php | 4 ++-- .../worker/StatDailyRebuildDataWorker.class.php | 2 +- .../install/files/lib/util/FileUtil.class.php | 8 ++++---- .../install/files/lib/util/HeaderUtil.class.php | 2 +- wcfsetup/install/files/style/bbcode.less | 2 +- wcfsetup/install/files/style/colorPicker.less | 2 +- wcfsetup/install/files/style/global.less | 4 ++-- wcfsetup/install/files/style/layout.less | 4 ++-- wcfsetup/install/files/style/message.less | 4 ++-- 77 files changed, 167 insertions(+), 168 deletions(-) diff --git a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl index 756e38df73..bb86d0a112 100644 --- a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl +++ b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl @@ -5,7 +5,7 @@ // -{if $allowSpidersToIndexThisPage|empty}{/if} +{if $allowSpidersToIndexThisPage|empty}{/if} {implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{@$__metaTag}{/implode} {event name='metaTags'} diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index ea61c06933..31c26fe760 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -80,7 +80,7 @@ {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'} {@$__sidebar} - {/if} + {/if}
{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl index 6b05ab53d6..3b05477753 100644 --- a/com.woltlab.wcf/templates/usersOnlineList.tpl +++ b/com.woltlab.wcf/templates/usersOnlineList.tpl @@ -126,7 +126,7 @@

{@$user->getFormattedUsername()}{if MODULE_USER_RANK && $user->getUserTitle()} {$user->getUserTitle()}{/if}

- {@$locationData} + {@$locationData}
{@$sessionData} @@ -148,7 +148,7 @@

{if $user->getSpider()->spiderURL}{$user->getSpider()->spiderName}{else}{$user->getSpider()->spiderName}{/if}

- {@$locationData} + {@$locationData}
{@$sessionData} @@ -168,7 +168,7 @@

{lang}wcf.user.guest{/lang}

- {@$locationData} + {@$locationData}
{@$sessionData} diff --git a/wcfsetup/install/files/acp/style/blueTemptation/individual.less b/wcfsetup/install/files/acp/style/blueTemptation/individual.less index 284a1cf210..480dc035f4 100644 --- a/wcfsetup/install/files/acp/style/blueTemptation/individual.less +++ b/wcfsetup/install/files/acp/style/blueTemptation/individual.less @@ -13,7 +13,7 @@ body, .tabularBox, .dialogTitlebar { > a { border-width: 0 !important; - .transition(color, .3s, ease); + .transition(color, .3s, ease); .textShadow(@wcfPageBackgroundColor); &:hover { @@ -678,7 +678,7 @@ select[multiple]:focus { .boxShadowNative(~"0 0 5px" fade(@wcfErrorBackgroundColor, 50%) ~", inset 0 1px 5px rgba(0, 0, 0, .1)"); &:hover, &:focus { - background-color: @wcfInputHoverBackgroundColor; + background-color: @wcfInputHoverBackgroundColor; } } @@ -696,7 +696,7 @@ select[multiple]:focus { .boxShadowNative(~"0 0 5px" fade(@wcfSuccessBackgroundColor, 50%) ~", inset 0 1px 5px rgba(0, 0, 0, .1)"); &:hover, &:focus { - background-color: @wcfInputHoverBackgroundColor; + background-color: @wcfInputHoverBackgroundColor; } } @@ -829,7 +829,7 @@ select[multiple]:focus { /* attachments */ .attachmentThumbnail { .boxShadow(0, 1px, rgba(0, 0, 0, 0.2), 1px); - .transition(box-shadow, .1s); + .transition(box-shadow, .1s); &:hover { .boxShadow(0, 0, @wcfButtonHoverBorderColor, 20px); diff --git a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl index 756e38df73..bb86d0a112 100644 --- a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl +++ b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl @@ -5,7 +5,7 @@ // //{lang}wcf.global.error.backward{/lang}'); + $('#errorMessage').append('
{lang}wcf.global.error.backward{/lang}'); } //]]> diff --git a/wcfsetup/install/files/js/WCF.Like.js b/wcfsetup/install/files/js/WCF.Like.js index 9c3cacec31..122bc342c9 100644 --- a/wcfsetup/install/files/js/WCF.Like.js +++ b/wcfsetup/install/files/js/WCF.Like.js @@ -193,7 +193,7 @@ WCF.Like = Class.extend({ } badge.appendTo($widget); - this._addWidget(containerID, $widget); + this._addWidget(containerID, $widget); }, /** diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index d23e4046e9..cd0c89b3b3 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -1657,13 +1657,13 @@ WCF.User.LikeLoader = Class.extend({ /** * like type - * @var string + * @var string */ _likeType: 'received', /** * like value - * @var integer + * @var integer */ _likeValue: 1, diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 66f6b82ab5..c77798258b 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -40,7 +40,7 @@ arguments[0] = key.replace(/ID$/, '-id'); } break; - } + } } // call jQuery's own data method @@ -1992,9 +1992,8 @@ WCF.LoadingOverlayHandler = { pe.stop(); self._pending = null; - }, 250); + }, 250); } - } }, @@ -6696,7 +6695,7 @@ WCF.System.FlexibleMenu = { $maximumWidth -= parseInt($container.css('padding-left').replace(/px$/, '')) + parseInt($container.css('padding-right').replace(/px$/, '')); // substract paddings from the actual list - $maximumWidth -= parseInt($container.children('ul:eq(0)').css('padding-left').replace(/px$/, '')) + parseInt($container.children('ul:eq(0)').css('padding-right').replace(/px$/, '')); + $maximumWidth -= parseInt($container.children('ul:eq(0)').css('padding-left').replace(/px$/, '')) + parseInt($container.children('ul:eq(0)').css('padding-right').replace(/px$/, '')); if ($currentWidth > $maximumWidth || (this._hasHiddenItems[containerID] && ($currentWidth > $maximumWidth - $dropdownWidth))) { var $menuItems = $menuItems.filter(':not(.active):not(.ui-state-active):visible'); @@ -7540,7 +7539,7 @@ WCF.System.PageNavigation = { /** * Validates the page No input. - * + * * @param Event event */ _keyUp: function(event) { @@ -8248,7 +8247,7 @@ WCF.Upload = Class.extend({ } var self = this; - $.ajax({ + $.ajax({ type: 'POST', url: this._options.url, enctype: 'multipart/form-data', @@ -8461,7 +8460,7 @@ WCF.Upload.Parallel = WCF.Upload.extend({ */ _sendRequest: function(internalFileID, formData) { var self = this; - $.ajax({ + $.ajax({ type: 'POST', url: this._options.url, enctype: 'multipart/form-data', @@ -11097,7 +11096,7 @@ $.widget('ui.wcfPages', { $pageElement.addClass('break'); } if (page != this.options.activePage) { - var $pageLink = $('' + WCF.String.addThousandsSeparator(page) + ''); + var $pageLink = $('' + WCF.String.addThousandsSeparator(page) + ''); $pageElement.append($pageLink); this._bindSwitchPage($pageLink, page); } diff --git a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php index f0730351ce..dbf9ab2ade 100644 --- a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php @@ -63,7 +63,7 @@ class LanguageExportForm extends AbstractForm { * max package name length * @var integer */ - public $packageNameLength = 0; + public $packageNameLength = 0; /** * @see \wcf\page\IPage::readParameters() diff --git a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php index 31702c273d..62c43f812d 100644 --- a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php @@ -40,7 +40,7 @@ class NoticeEditForm extends NoticeAddForm { /** * 1 if the notice will be displayed for all users again - * @var unknown + * @var integer */ public $resetIsDismissed = 0; diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php index 2aff9f404d..c3659ec969 100644 --- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php @@ -203,7 +203,7 @@ class StyleAddForm extends AbstractForm { // read variables with units, e.g. 13px foreach ($this->globals as $variableName) { if (isset($_POST[$variableName]) && is_numeric($_POST[$variableName])) { - if (isset($_POST[$variableName.'_unit']) && in_array($_POST[$variableName.'_unit'], $this->availableUnits)) { + if (isset($_POST[$variableName.'_unit']) && in_array($_POST[$variableName.'_unit'], $this->availableUnits)) { $this->variables[$variableName] = $_POST[$variableName].$_POST[$variableName.'_unit']; } } diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php index bc41246232..5a1fed6ff9 100644 --- a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php @@ -84,7 +84,7 @@ class UserOptionSetDefaultsForm extends AbstractForm { // get changed options $sql = "SELECT optionID, defaultValue FROM wcf".WCF_N."_user_option - WHERE optionID IN (?".str_repeat(', ?', count($optionIDs) - 1).")"; + WHERE optionID IN (?".str_repeat(', ?', count($optionIDs) - 1).")"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute($optionIDs); $optionIDs = $optionValues = array(); diff --git a/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php b/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php index 8585c62fba..11ecfc76e7 100644 --- a/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php @@ -118,8 +118,8 @@ class ExceptionLogViewPage extends MultipleLinkPage { // even items become keys, odd items become values $this->exceptions = call_user_func_array('array_merge', array_map( - function($v) { - return array($v[0] => $v[1]); + function($v) { + return array($v[0] => $v[1]); }, array_chunk($contents, 2) )); diff --git a/wcfsetup/install/files/lib/acp/page/StatPage.class.php b/wcfsetup/install/files/lib/acp/page/StatPage.class.php index 75fce3f37b..e799cd1d83 100644 --- a/wcfsetup/install/files/lib/acp/page/StatPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/StatPage.class.php @@ -28,19 +28,19 @@ class StatPage extends AbstractPage { /** * start date (yyyy-mm-dd) - * @var string + * @var string */ public $startDate = ''; /** * end date (yyyy-mm-dd) - * @var string + * @var string */ public $endDate = ''; /** * available object type - * @var array + * @var array */ public $availableObjectTypes = array(); diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index c0a88e6f96..e5b8da372d 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -40,7 +40,7 @@ class UserListPage extends SortablePage { /** * applies special CSS classes for selected columns - * @var array + * @var array */ public $columnStyling = array( 'registrationDate' => 'columnDate', diff --git a/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php b/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php index e06365b284..ef6883b31b 100644 --- a/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php +++ b/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php @@ -48,7 +48,7 @@ class GravatarDownloadAction extends AbstractAction { throw new IllegalLinkException(); } - if (!empty($_REQUEST['size'])) $this->size = intval($_REQUEST['size']); + if (!empty($_REQUEST['size'])) $this->size = intval($_REQUEST['size']); } /** diff --git a/wcfsetup/install/files/lib/action/MessageQuoteAction.class.php b/wcfsetup/install/files/lib/action/MessageQuoteAction.class.php index 70a3abea69..9d350fb669 100644 --- a/wcfsetup/install/files/lib/action/MessageQuoteAction.class.php +++ b/wcfsetup/install/files/lib/action/MessageQuoteAction.class.php @@ -45,8 +45,8 @@ class MessageQuoteAction extends AJAXProxyAction { AbstractSecureAction::readParameters(); if (isset($_POST['actionName'])) $this->actionName = StringUtil::trim($_POST['actionName']); - if (isset($_POST['getFullQuoteObjectIDs'])) $this->_getFullQuoteObjectIDs = intval($_POST['getFullQuoteObjectIDs']); - if (isset($_POST['objectTypes']) && is_array($_POST['objectTypes'])) $this->objectTypes = ArrayUtil::trim($_POST['objectTypes']); + if (isset($_POST['getFullQuoteObjectIDs'])) $this->_getFullQuoteObjectIDs = intval($_POST['getFullQuoteObjectIDs']); + if (isset($_POST['objectTypes']) && is_array($_POST['objectTypes'])) $this->objectTypes = ArrayUtil::trim($_POST['objectTypes']); if (isset($_POST['quoteIDs'])) { $this->quoteIDs = ArrayUtil::trim($_POST['quoteIDs']); diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php index 37a592a68f..580cacf512 100644 --- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php +++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php @@ -105,7 +105,7 @@ class CommentAction extends AbstractDatabaseObjectAction { $processors[$comment->objectTypeID]->updateCounter($comment->objectID, -1 * ($comment->responses + 1)); $groupCommentIDs[$comment->objectTypeID][] = $comment->commentID; - $commentIDs[] = $comment->commentID; + $commentIDs[] = $comment->commentID; } if (!empty($groupCommentIDs)) { diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php index f098f31388..cdc6d811cd 100644 --- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php @@ -71,7 +71,7 @@ class CronjobAction extends AbstractDatabaseObjectAction implements IToggleActio foreach ($this->objects as $cronjob) { if (!$cronjob->isEditable()) { throw new PermissionDeniedException(); - } + } } } @@ -84,7 +84,7 @@ class CronjobAction extends AbstractDatabaseObjectAction implements IToggleActio foreach ($this->objects as $cronjob) { if (!$cronjob->canBeDisabled()) { throw new PermissionDeniedException(); - } + } } } diff --git a/wcfsetup/install/files/lib/data/language/Language.class.php b/wcfsetup/install/files/lib/data/language/Language.class.php index 5b19c8c664..698dc9ecd5 100644 --- a/wcfsetup/install/files/lib/data/language/Language.class.php +++ b/wcfsetup/install/files/lib/data/language/Language.class.php @@ -140,7 +140,7 @@ class Language extends DatabaseObject { // search language file $filename = WCF_DIR.'language/'.$this->languageID.'_'.$category.'.php'; - if (!@file_exists($filename)) { + if (!@file_exists($filename)) { if ($this->editor === null) { $this->editor = new LanguageEditor($this); } diff --git a/wcfsetup/install/files/lib/data/like/LikeAction.class.php b/wcfsetup/install/files/lib/data/like/LikeAction.class.php index 0bc144d8db..98710e133a 100644 --- a/wcfsetup/install/files/lib/data/like/LikeAction.class.php +++ b/wcfsetup/install/files/lib/data/like/LikeAction.class.php @@ -288,7 +288,7 @@ class LikeAction extends AbstractDatabaseObjectAction implements IGroupedUserLis /** * Loads a list of likes. - * + * * @return array */ public function load() { diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php index 8b1efb38d0..c3120544f0 100644 --- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php @@ -478,7 +478,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction foreach ($this->objects as $style) { if ($style->isDefault) { throw new UserInputException('objectIDs'); - } + } } } diff --git a/wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php b/wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php index 967ff6c181..afb5cf5d20 100644 --- a/wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php @@ -9,7 +9,7 @@ use wcf\system\WCF; /** * Shows a list of user birthdays. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -52,7 +52,7 @@ class UserBirthdayAction extends UserProfileAction implements IGroupedUserListAc $userList->readObjects(); foreach ($userList->getObjects() as $user) { if (!$user->isProtected() && $user->getAge($year) >= 0) { - $users[] = $user; + $users[] = $user; } } diff --git a/wcfsetup/install/files/lib/data/user/UserProfile.class.php b/wcfsetup/install/files/lib/data/user/UserProfile.class.php index f720cecd68..29c0d18e65 100644 --- a/wcfsetup/install/files/lib/data/user/UserProfile.class.php +++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php @@ -776,7 +776,7 @@ class UserProfile extends DatabaseObjectDecorator implements IBreadcrumbProvider /** * Returns true, if the active user has access to the user option with the given name. - * + * * @param string $name * @return boolean */ @@ -787,7 +787,7 @@ class UserProfile extends DatabaseObjectDecorator implements IBreadcrumbProvider /** * Returns the formatted username. - * + * * @return string */ public function getFormattedUsername() { diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php index f358ffcdbf..c5f3708f1f 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php @@ -172,7 +172,7 @@ class UserGroup extends DatabaseObject { foreach ($groupIDs as $groupID) { if (!in_array($groupID, self::$accessibleGroups)) { return false; - } + } } return true; diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php index 1743a3a573..0c221b8ea6 100644 --- a/wcfsetup/install/files/lib/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/form/LoginForm.class.php @@ -4,7 +4,7 @@ use wcf\system\request\LinkHandler; use wcf\system\user\authentication\UserAuthenticationFactory; use wcf\system\WCF; use wcf\util\HeaderUtil; -use wcf\util\UserUtil; +use wcf\util\UserUtil; /** * Shows the user login form. diff --git a/wcfsetup/install/files/lib/page/CookiePolicyPage.class.php b/wcfsetup/install/files/lib/page/CookiePolicyPage.class.php index 3c08da191e..a9855da22a 100644 --- a/wcfsetup/install/files/lib/page/CookiePolicyPage.class.php +++ b/wcfsetup/install/files/lib/page/CookiePolicyPage.class.php @@ -3,7 +3,7 @@ namespace wcf\page; /** * Show the cookie policy. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/page/PrivacyPolicyPage.class.php b/wcfsetup/install/files/lib/page/PrivacyPolicyPage.class.php index 969b8b8b70..9ca1af70a9 100644 --- a/wcfsetup/install/files/lib/page/PrivacyPolicyPage.class.php +++ b/wcfsetup/install/files/lib/page/PrivacyPolicyPage.class.php @@ -3,7 +3,7 @@ namespace wcf\page; /** * Show the privacy policy. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php index 32e639a9fc..bc046f47ca 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php @@ -32,7 +32,7 @@ class ACPMenuCacheBuilder extends AbstractCacheBuilder { /** * @see \wcf\system\cache\builder\AbstractCacheBuilder::rebuild() */ - public function rebuild(array $parameters) { + public function rebuild(array $parameters) { $data = array(); // get "real" menu items diff --git a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php index 72c6968790..f9e37d90e2 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php @@ -16,7 +16,7 @@ class PageMenuCacheBuilder extends AbstractCacheBuilder { /** * @see \wcf\system\cache\builder\AbstractCacheBuilder::rebuild() */ - public function rebuild(array $parameters) { + public function rebuild(array $parameters) { $data = array(); $menuItemList = new PageMenuItemList(); diff --git a/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php index e72bd1fb19..f66ac55d92 100644 --- a/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php @@ -34,7 +34,7 @@ class NoCacheSource implements ICacheSource { unset($this->cache[$key]); } } - } + } } /** diff --git a/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php index dd365e0e32..f89b4ec65a 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php @@ -20,7 +20,7 @@ abstract class AbstractSidebarDashboardBox extends AbstractContentDashboardBox { /** * title link - * @var string + * @var string */ public $titleLink = ''; @@ -32,13 +32,13 @@ abstract class AbstractSidebarDashboardBox extends AbstractContentDashboardBox { if (empty($template)) { return ''; } - + WCF::getTPL()->assign(array( 'box' => $this->box, 'template' => $template, 'titleLink' => $this->titleLink )); - + return WCF::getTPL()->fetch($this->templateName); } } diff --git a/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php index bb91805eca..a2752c8860 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php @@ -1,8 +1,8 @@ getFollowingUsers())) { $this->usersOnlineList = new UsersOnlineList(); @@ -34,7 +34,7 @@ class FollowingsOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { $this->usersOnlineList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** @@ -42,7 +42,7 @@ class FollowingsOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { */ protected function render() { if (empty($this->usersOnlineList) || !count($this->usersOnlineList->getObjects())) { - return ''; + return ''; } WCF::getTPL()->assign(array( diff --git a/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php index 7c182f8aed..d20b9e600e 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php @@ -1,8 +1,8 @@ getData(); @@ -39,14 +39,14 @@ class MostActiveMembersDashboardBox extends AbstractSidebarDashboardBox { $this->userProfileList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** * @see \wcf\system\dashboard\box\AbstractContentDashboardBox::render() */ protected function render() { - if ($this->userProfileList == null) return ''; + if ($this->userProfileList == null) return ''; WCF::getTPL()->assign(array( 'mostActiveMembers' => $this->userProfileList diff --git a/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php index 0f24f83f45..dc60f3d816 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php @@ -1,8 +1,8 @@ getData(); @@ -39,14 +39,14 @@ class MostLikedMembersDashboardBox extends AbstractSidebarDashboardBox { $this->userProfileList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** * @see \wcf\system\dashboard\box\AbstractContentDashboardBox::render() */ protected function render() { - if ($this->userProfileList == null) return ''; + if ($this->userProfileList == null) return ''; WCF::getTPL()->assign(array( 'mostLikedMembers' => $this->userProfileList diff --git a/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php index 2f28d02655..267f1bd8c3 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php @@ -1,8 +1,8 @@ getData(); @@ -39,14 +39,14 @@ class NewestMembersDashboardBox extends AbstractSidebarDashboardBox { $this->userProfileList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** * @see \wcf\system\dashboard\box\AbstractContentDashboardBox::render() */ protected function render() { - if ($this->userProfileList == null) return ''; + if ($this->userProfileList == null) return ''; WCF::getTPL()->assign(array( 'newestMembers' => $this->userProfileList diff --git a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php index 6a9bbc0cbf..2c3b60748c 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php @@ -63,7 +63,7 @@ class RecentActivityDashboardBox extends AbstractContentDashboardBox { // removes orphaned and non-accessable events UserActivityEventHandler::validateEvents($this->eventList); - $this->fetched(); + $this->fetched(); } /** diff --git a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivitySidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivitySidebarDashboardBox.class.php index b994ff9db7..3ea8343198 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivitySidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivitySidebarDashboardBox.class.php @@ -36,7 +36,7 @@ class RecentActivitySidebarDashboardBox extends AbstractSidebarDashboardBox { // removes orphaned and non-accessable events UserActivityEventHandler::validateEvents($this->eventList); - $this->fetched(); + $this->fetched(); } /** diff --git a/wcfsetup/install/files/lib/system/dashboard/box/StaffOnlineSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/StaffOnlineSidebarDashboardBox.class.php index c1e1668672..134ea30880 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/StaffOnlineSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/StaffOnlineSidebarDashboardBox.class.php @@ -1,8 +1,8 @@ usersOnlineList = new UsersOnlineList(); @@ -34,7 +34,7 @@ class StaffOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { $this->usersOnlineList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** @@ -42,7 +42,7 @@ class StaffOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { */ protected function render() { if (empty($this->usersOnlineList) || !count($this->usersOnlineList->getObjects())) { - return ''; + return ''; } WCF::getTPL()->assign(array( diff --git a/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php index a4ee365825..d1fb0c4a12 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php @@ -1,7 +1,7 @@ stats = UserStatsCacheBuilder::getInstance()->getData(); + $this->stats = UserStatsCacheBuilder::getInstance()->getData(); - $this->fetched(); + $this->fetched(); } /** diff --git a/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php index 12676295e8..d2afdc51c8 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php @@ -1,8 +1,8 @@ + * @var array<\wcf\data\user\UserProfile> */ - public $userProfiles = array(); + public $userProfiles = array(); /** * @see \wcf\system\dashboard\box\IDashboardBox::init() */ public function init(DashboardBox $box, IPage $page) { - parent::init($box, $page); + parent::init($box, $page); // get current date $currentDay = DateUtil::format(null, 'm-d'); @@ -52,7 +52,7 @@ class TodaysBirthdaysDashboardBox extends AbstractSidebarDashboardBox { } } - $this->fetched(); + $this->fetched(); } /** @@ -60,7 +60,7 @@ class TodaysBirthdaysDashboardBox extends AbstractSidebarDashboardBox { */ protected function render() { if (empty($this->userProfiles)) { - return ''; + return ''; } WCF::getTPL()->assign(array( diff --git a/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php index 2880b9f1bf..0f3a384c0a 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php @@ -1,8 +1,8 @@ */ - public $userProfiles = array(); + public $userProfiles = array(); /** * @see \wcf\system\dashboard\box\IDashboardBox::init() */ public function init(DashboardBox $box, IPage $page) { - parent::init($box, $page); + parent::init($box, $page); // get current date $currentDay = DateUtil::format(null, 'm-d'); @@ -49,7 +49,7 @@ class TodaysFollowingBirthdaysDashboardBox extends AbstractSidebarDashboardBox { } } - $this->fetched(); + $this->fetched(); } /** @@ -57,7 +57,7 @@ class TodaysFollowingBirthdaysDashboardBox extends AbstractSidebarDashboardBox { */ protected function render() { if (empty($this->userProfiles)) { - return ''; + return ''; } WCF::getTPL()->assign(array( diff --git a/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php index aea8b56d1d..5f701f99ab 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php @@ -27,7 +27,7 @@ class UsersOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { * @see \wcf\system\dashboard\box\IDashboardBox::init() */ public function init(DashboardBox $box, IPage $page) { - parent::init($box, $page); + parent::init($box, $page); if (MODULE_USERS_ONLINE) { $this->usersOnlineList = new UsersOnlineList(); @@ -37,7 +37,7 @@ class UsersOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { $this->usersOnlineList->readObjects(); } - $this->fetched(); + $this->fetched(); } /** @@ -45,7 +45,7 @@ class UsersOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox { */ protected function render() { if (empty($this->usersOnlineList) || !count($this->usersOnlineList->getObjects())) { - return ''; + return ''; } $this->titleLink = LinkHandler::getInstance()->getLink('UsersOnlineList'); diff --git a/wcfsetup/install/files/lib/system/event/listener/PreParserAtUserListener.class.php b/wcfsetup/install/files/lib/system/event/listener/PreParserAtUserListener.class.php index 1b37bc146d..43610bbede 100644 --- a/wcfsetup/install/files/lib/system/event/listener/PreParserAtUserListener.class.php +++ b/wcfsetup/install/files/lib/system/event/listener/PreParserAtUserListener.class.php @@ -78,7 +78,7 @@ class PreParserAtUserListener implements IEventListener { $usernames = array(); foreach ($matches[1] as $match) { $username = self::getUsername($match); - if (!in_array($username, $usernames)) $usernames[] = $username; + if (!in_array($username, $usernames)) $usernames[] = $username; } if (!empty($usernames)) { @@ -88,7 +88,7 @@ class PreParserAtUserListener implements IEventListener { $userList->readObjects(); $users = array(); foreach ($userList as $user) { - $users[mb_strtolower($user->username)] = $user; + $users[mb_strtolower($user->username)] = $user; } $text = $userRegex->replace($text, new Callback(function ($matches) use ($users) { diff --git a/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php index 452bdb7a01..28d524385c 100644 --- a/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php @@ -32,7 +32,7 @@ class UserOptionImporter extends AbstractImporter { /** * list of available user option categories - * @var array + * @var array */ protected $categoryCache = null; diff --git a/wcfsetup/install/files/lib/system/io/Zip.class.php b/wcfsetup/install/files/lib/system/io/Zip.class.php index 8bbb9ff621..9332d5dae0 100644 --- a/wcfsetup/install/files/lib/system/io/Zip.class.php +++ b/wcfsetup/install/files/lib/system/io/Zip.class.php @@ -272,7 +272,7 @@ class Zip extends File implements IArchive { // read headers $header = array(); $header = unpack('vminVersion/vgeneralPurposeBit/vcompression/vmtime/vmdate', $this->read(10)); - if ($header['generalPurposeBit'] & 7 /* 3rd bit */) throw new SystemException('Data Descriptors are not supported'); + if ($header['generalPurposeBit'] & 7 /* 3rd bit */) throw new SystemException('Data Descriptors are not supported'); $second = ($header['mtime'] & 31 /* 5 bits */) * 2; $minute = ($header['mtime'] >> 5) & 63 /* 6 bits */; $hour = ($header['mtime'] >> 11) & 31 /* 5 bits */; diff --git a/wcfsetup/install/files/lib/system/label/LabelHandler.class.php b/wcfsetup/install/files/lib/system/label/LabelHandler.class.php index 63006cc5aa..762fcab5ba 100644 --- a/wcfsetup/install/files/lib/system/label/LabelHandler.class.php +++ b/wcfsetup/install/files/lib/system/label/LabelHandler.class.php @@ -339,7 +339,7 @@ class LabelHandler extends SingletonFactory { /** * Removes all assigned labels for given object ids. - * + * * @param integer $objectTypeID * @param array $objectID */ diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php index 9dac4a0e77..042015052c 100644 --- a/wcfsetup/install/files/lib/system/mail/Mail.class.php +++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php @@ -199,7 +199,7 @@ class Mail { $this->body .= self::$lineEnding; // wrap lines after 70 characters - $this->body .= wordwrap($this->getMessage(), 70); + $this->body .= wordwrap($this->getMessage(), 70); $this->body .= self::$lineEnding.self::$lineEnding; $this->body .= '--'.$this->getBoundary().self::$lineEnding; diff --git a/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php index 34e74a4cdf..e0a01f80f6 100644 --- a/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php @@ -6,7 +6,7 @@ use wcf\system\WCF; /** * Option type implementation for the 'about me' text field. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -20,7 +20,7 @@ class AboutMeOptionType extends MessageOptionType { */ public function validate(Option $option, $newValue) { parent::validate($option, $newValue); - + if (WCF::getSession()->getPermission('user.profile.aboutMeMaxLength') < mb_strlen($newValue)) { throw new UserInputException($option->optionName, 'tooLong'); } diff --git a/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php b/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php index 7ad2d321a1..1a18017823 100644 --- a/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php @@ -32,7 +32,7 @@ class BirthdayOptionType extends DateOptionType { if (empty($newValue)) return; - $timestamp = @strtotime($newValue); + $timestamp = @strtotime($newValue); if ($timestamp > TIME_NOW) { throw new UserInputException($option->optionName, 'validationFailed'); } diff --git a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php index 64629ffcd5..2d766d835c 100644 --- a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php @@ -14,7 +14,7 @@ use wcf\system\WCF; * @category Community Framework */ class SelectOptionType extends RadioButtonOptionType { - protected $allowEmptyValue = false; + protected $allowEmptyValue = false; /** * @see \wcf\system\option\IOptionType::getFormElement() diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php index d16c77ba67..44f1e38e75 100644 --- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php @@ -107,7 +107,7 @@ class TextOptionType extends AbstractOptionType implements ISearchableConditionU if ($option->contentpattern) { if (preg_match('~'.$option->contentpattern.'~', $newValue, $matches)) { unset($matches[0]); - $newValue = implode('', $matches); + $newValue = implode('', $matches); } } diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php index 8021f5bbdf..a2a651b97c 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php @@ -31,7 +31,7 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI /** * preset event ids - * @var array + * @var array */ protected $presetEventIDs = array(); diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php index 354654d676..9954d6c58a 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php @@ -46,7 +46,7 @@ class UserOptionPackageInstallationPlugin extends AbstractOptionPackageInstallat if ($userOptionCategory !== null) { if ($userOptionCategory->packageID != $this->installation->getPackageID()) { throw new SystemException("Cannot override existing category '".$category['categoryName']."'"); - } + } $categoryEditor = new UserOptionCategoryEditor($userOptionCategory); $categoryEditor->update($data); diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php index 83058eaf44..c2bae2546a 100644 --- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php @@ -13,7 +13,7 @@ use wcf\util\HeaderUtil; /** * Handles http requests. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -67,7 +67,7 @@ class RequestHandler extends SingletonFactory { /** * Handles a http request. - * + * * @param string $application * @param boolean $isACPRequest */ @@ -110,7 +110,7 @@ class RequestHandler extends SingletonFactory { /** * Builds a new request. - * + * * @param string $application */ protected function buildRequest($application) { @@ -215,7 +215,7 @@ class RequestHandler extends SingletonFactory { /** * Returns the class data for the active request or null if for the given * configuration no proper class exist. - * + * * @param string $controller * @param string $pageType * @param string $application @@ -245,7 +245,7 @@ class RequestHandler extends SingletonFactory { /** * Returns the active request object. - * + * * @return \wcf\system\request\Request */ public function getActiveRequest() { @@ -254,7 +254,7 @@ class RequestHandler extends SingletonFactory { /** * Returns true if the request is an acp request. - * + * * @return boolean */ public function isACPRequest() { @@ -263,7 +263,7 @@ class RequestHandler extends SingletonFactory { /** * Returns true, if current host mismatches any known domain. - * + * * @return boolean */ public function inRescueMode() { diff --git a/wcfsetup/install/files/lib/system/search/AbstractSearchableObjectType.class.php b/wcfsetup/install/files/lib/system/search/AbstractSearchableObjectType.class.php index b82f8caa66..6a25675f6a 100644 --- a/wcfsetup/install/files/lib/system/search/AbstractSearchableObjectType.class.php +++ b/wcfsetup/install/files/lib/system/search/AbstractSearchableObjectType.class.php @@ -17,7 +17,7 @@ use wcf\system\database\util\PreparedStatementConditionBuilder; abstract class AbstractSearchableObjectType extends AbstractObjectTypeProcessor implements ISearchableObjectType { /** * active main menu item - * @var string + * @var string */ protected $activeMenuItem = ''; diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index e87bbe66a0..828f0370f3 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -122,8 +122,8 @@ class SessionHandler extends SingletonFactory { protected $virtualSession = false; /** - * true, if this is a new session - * @var boolean + * true if this is a new session + * @var boolean */ protected $firstVisit = false; @@ -907,8 +907,8 @@ class SessionHandler extends SingletonFactory { } /** - * Returns true, if this is a new session. - * + * Returns true if this is a new session. + * * @return boolean */ public function isFirstVisit() { diff --git a/wcfsetup/install/files/lib/system/stat/AbstractStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/AbstractStatDailyHandler.class.php index 0616624f1e..38aa4fcec2 100644 --- a/wcfsetup/install/files/lib/system/stat/AbstractStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/AbstractStatDailyHandler.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Abstract implementation of a stat handler. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -32,7 +32,7 @@ abstract class AbstractStatDailyHandler implements IStatDailyHandler { /** * Counts the total number of rows. - * + * * @param integer $date * @param string $tableName * @param string $dateColumnName @@ -48,7 +48,7 @@ abstract class AbstractStatDailyHandler implements IStatDailyHandler { } /** - * @see \wcf\system\stat\IStatDailyHandler::getFormattedCounter() + * @see \wcf\system\stat\IStatDailyHandler::getFormattedCounter() */ public function getFormattedCounter($counter) { return $counter; diff --git a/wcfsetup/install/files/lib/system/stat/AttachmentDiskUsageStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/AttachmentDiskUsageStatDailyHandler.class.php index ffc0c0b1bf..066300065e 100644 --- a/wcfsetup/install/files/lib/system/stat/AttachmentDiskUsageStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/AttachmentDiskUsageStatDailyHandler.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Stat handler implementation for attachment disk usage. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -14,7 +14,7 @@ use wcf\system\WCF; */ class AttachmentDiskUsageStatDailyHandler extends AbstractStatDailyHandler { /** - * @see \wcf\system\stat\IStatDailyHandler::getData() + * @see \wcf\system\stat\IStatDailyHandler::getData() */ public function getData($date) { $sql = "SELECT CEIL(SUM(filesize) / 1000) @@ -38,7 +38,7 @@ class AttachmentDiskUsageStatDailyHandler extends AbstractStatDailyHandler { } /** - * @see \wcf\system\stat\IStatDailyHandler::getFormattedCounter() + * @see \wcf\system\stat\IStatDailyHandler::getFormattedCounter() */ public function getFormattedCounter($counter) { return round($counter / 1000, 2); // return mb diff --git a/wcfsetup/install/files/lib/system/stat/AttachmentStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/AttachmentStatDailyHandler.class.php index 62a801fc85..58206848ec 100644 --- a/wcfsetup/install/files/lib/system/stat/AttachmentStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/AttachmentStatDailyHandler.class.php @@ -3,7 +3,7 @@ namespace wcf\system\stat; /** * Stat handler implementation for attachment stats. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -13,7 +13,7 @@ namespace wcf\system\stat; */ class AttachmentStatDailyHandler extends AbstractStatDailyHandler { /** - * @see \wcf\system\stat\IStatDailyHandler::getData() + * @see \wcf\system\stat\IStatDailyHandler::getData() */ public function getData($date) { return array( diff --git a/wcfsetup/install/files/lib/system/stat/DislikeStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/DislikeStatDailyHandler.class.php index 5837493f84..42be860bb7 100644 --- a/wcfsetup/install/files/lib/system/stat/DislikeStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/DislikeStatDailyHandler.class.php @@ -4,7 +4,7 @@ use wcf\data\like\Like; /** * Stat handler implementation for dislike stats. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/stat/LikeStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/LikeStatDailyHandler.class.php index 89f57cc028..5590c32b67 100644 --- a/wcfsetup/install/files/lib/system/stat/LikeStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/LikeStatDailyHandler.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Stat handler implementation for like stats. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -17,7 +17,7 @@ class LikeStatDailyHandler extends AbstractStatDailyHandler { protected $likeValue = Like::LIKE; /** - * @see \wcf\system\stat\IStatDailyHandler::getData() + * @see \wcf\system\stat\IStatDailyHandler::getData() */ public function getData($date) { $sql = "SELECT COUNT(*) diff --git a/wcfsetup/install/files/lib/system/stat/UserStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/UserStatDailyHandler.class.php index 4ebae6560d..eedd7e1c5e 100644 --- a/wcfsetup/install/files/lib/system/stat/UserStatDailyHandler.class.php +++ b/wcfsetup/install/files/lib/system/stat/UserStatDailyHandler.class.php @@ -3,7 +3,7 @@ namespace wcf\system\stat; /** * Stat handler implementation for user stats. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -13,7 +13,7 @@ namespace wcf\system\stat; */ class UserStatDailyHandler extends AbstractStatDailyHandler { /** - * @see \wcf\system\stat\IStatDailyHandler::getData() + * @see \wcf\system\stat\IStatDailyHandler::getData() */ public function getData($date) { return array( diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php index 221298fd7c..a405665b5e 100755 --- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php +++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php @@ -201,7 +201,7 @@ class TemplateEngine extends SingletonFactory { if (isset($this->v[$variable][$key])) { $this->v[$variable][$key] .= $value[$key]; } - else { + else { $this->v[$variable][$key] = $value[$key]; } } @@ -240,7 +240,7 @@ class TemplateEngine extends SingletonFactory { if (isset($this->v[$variable][$key])) { $this->v[$variable][$key] = $value[$key] . $this->v[$variable][$key]; } - else { + else { $this->v[$variable][$key] = $value[$key]; } } diff --git a/wcfsetup/install/files/lib/system/template/plugin/CounterFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/CounterFunctionTemplatePlugin.class.php index f58796d397..06f1b60998 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/CounterFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/CounterFunctionTemplatePlugin.class.php @@ -50,7 +50,7 @@ class CounterFunctionTemplatePlugin implements IFunctionTemplatePlugin { $result = ''; if ($counter['print']) { $result = $counter['count']; - } + } if ($counter['direction'] == 'down') { $counter['count'] -= $counter['skip']; diff --git a/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php b/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php index cf9f2b6661..fbfc93d34d 100644 --- a/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php +++ b/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php @@ -5,7 +5,7 @@ use wcf\system\SingletonFactory; /** * Manages the user birthday cache. - * + * * @author Marcel Werk * @copyright 2001-2014 WoltLab GmbH * @license GNU Lesser General Public License @@ -16,13 +16,13 @@ use wcf\system\SingletonFactory; class UserBirthdayCache extends SingletonFactory { /** * loaded months - * @var array + * @var array */ protected $monthsLoaded = array(); /** * user birthdays - * @var array + * @var array */ protected $birthdays = array(); diff --git a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php index 867db78d8e..7403bed27a 100644 --- a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php @@ -355,13 +355,13 @@ class UserNotificationHandler extends SingletonFactory { /** * Returns all events for given object type. - * + * * @param string $objectType * @return array<\wcf\system\user\notification\event\IUserNotificationEvent> */ public function getEvents($objectType) { if (!isset($this->availableEvents[$objectType])) return array(); - + return $this->availableEvents[$objectType]; } diff --git a/wcfsetup/install/files/lib/system/worker/StatDailyRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/StatDailyRebuildDataWorker.class.php index e3916b1462..6fd29d720e 100644 --- a/wcfsetup/install/files/lib/system/worker/StatDailyRebuildDataWorker.class.php +++ b/wcfsetup/install/files/lib/system/worker/StatDailyRebuildDataWorker.class.php @@ -28,7 +28,7 @@ class StatDailyRebuildDataWorker extends AbstractRebuildDataWorker { /** * start timestamp - * @var integer + * @var integer */ protected $startDate = 0; diff --git a/wcfsetup/install/files/lib/util/FileUtil.class.php b/wcfsetup/install/files/lib/util/FileUtil.class.php index 5b7ac75765..c5643ebb5d 100644 --- a/wcfsetup/install/files/lib/util/FileUtil.class.php +++ b/wcfsetup/install/files/lib/util/FileUtil.class.php @@ -44,7 +44,7 @@ final class FileUtil { if (strpos($_SERVER['DOCUMENT_ROOT'], 'strato') !== false) { // strato bugfix // create tmp folder in document root automatically - if (!@file_exists($_SERVER['DOCUMENT_ROOT'].'/tmp')) { + if (!@file_exists($_SERVER['DOCUMENT_ROOT'].'/tmp')) { @mkdir($_SERVER['DOCUMENT_ROOT'].'/tmp/', 0777); self::makeWritable($_SERVER['DOCUMENT_ROOT'].'/tmp/'); } @@ -307,14 +307,14 @@ final class FileUtil { if ($dir == '..') { if (end($result) == '..') { $result[] = '..'; - } - else { + } + else { $lastValue = array_pop($result); if ($lastValue === '' || $lastValue === null) { $result[] = '..'; } } - } + } else if ($dir !== '' && $dir != '.') { $result[] = $dir; } diff --git a/wcfsetup/install/files/lib/util/HeaderUtil.class.php b/wcfsetup/install/files/lib/util/HeaderUtil.class.php index 9fdb74df7f..7b9530fd34 100644 --- a/wcfsetup/install/files/lib/util/HeaderUtil.class.php +++ b/wcfsetup/install/files/lib/util/HeaderUtil.class.php @@ -82,7 +82,7 @@ final class HeaderUtil { * Sends no cache headers. */ public static function sendNoCacheHeaders() { - @header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); + @header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); @header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); @header('Cache-Control: no-cache, must-revalidate'); @header('Pragma: no-cache'); diff --git a/wcfsetup/install/files/style/bbcode.less b/wcfsetup/install/files/style/bbcode.less index 6986d4c45f..0c4ef91974 100644 --- a/wcfsetup/install/files/style/bbcode.less +++ b/wcfsetup/install/files/style/bbcode.less @@ -48,7 +48,7 @@ } &:target { - background-color: @wcfHighlightBackgroundColor; + background-color: @wcfHighlightBackgroundColor; } } } diff --git a/wcfsetup/install/files/style/colorPicker.less b/wcfsetup/install/files/style/colorPicker.less index 8c5f91bd3f..d0df9523ab 100644 --- a/wcfsetup/install/files/style/colorPicker.less +++ b/wcfsetup/install/files/style/colorPicker.less @@ -28,7 +28,7 @@ width: 8px; } } -} +} #colorPickerBar { background-image: url('../images/colorPickerBar.png'); diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less index 7293f6ee58..d603615971 100644 --- a/wcfsetup/install/files/style/global.less +++ b/wcfsetup/install/files/style/global.less @@ -39,7 +39,7 @@ a { font-family: FontAwesome !important; font-size: 14px !important; font-weight: normal !important; - font-style: normal !important; + font-style: normal !important; margin-left: 4px; vertical-align: -1px; } @@ -208,7 +208,7 @@ body > iframe[src="about:blank"] { /* fixes fieldset overflow issues */ /* webkit */ fieldset { - min-width: 0; + min-width: 0; } /* firefox */ @-moz-document url-prefix() { diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 6e44193bfc..cda9c70313 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -289,7 +289,7 @@ border-radius: 6px; display: block; - .transition(background-color, .1s); + .transition(background-color, .1s); &:hover { background-color: @wcfContainerHoverBackgroundColor; @@ -1188,7 +1188,7 @@ html[dir="rtl"] { margin-bottom: -@wcfGapSmall; > li { - margin-bottom: @wcfGapSmall; + margin-bottom: @wcfGapSmall; > div { overflow: hidden; diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index 3e437191db..4d9684ab60 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -14,7 +14,7 @@ > .badge.label { top: -2px; } - } + } > small { display: block; @@ -942,7 +942,7 @@ li:nth-child(2n+1) .message { .dislikeButton.active { .icon { - color: rgba(204, 0, 0, 1); + color: rgba(204, 0, 0, 1); } } -- 2.20.1