From d7f7f6eb94ba3af290a090ef3724f95889ecc8d5 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 15 Jun 2014 10:07:42 +0200 Subject: [PATCH] Fix code formatting --- com.woltlab.wcf/templates/user.tpl | 4 +- .../templates/userBirthdayList.tpl | 2 +- .../acp/style/blueTemptation/individual.less | 39 +++++++++---------- .../acp/templates/languageItemEditDialog.tpl | 2 +- .../files/acp/templates/languageList.tpl | 2 +- .../install/files/acp/templates/userAdd.tpl | 4 +- .../acp/templates/userBulkProcessing.tpl | 18 ++++----- .../files/acp/templates/userSearch.tpl | 2 +- wcfsetup/install/files/js/WCF.js | 6 +-- .../acp/page/SmileyCategoryListPage.class.php | 2 +- .../files/lib/acp/page/StatPage.class.php | 2 +- .../lib/data/comment/CommentAction.class.php | 2 +- .../comment/LikeableCommentProvider.class.php | 4 +- .../comment/ViewableCommentList.class.php | 4 +- .../LikeableCommentResponseProvider.class.php | 4 +- .../cronjob/log/CronjobLogAction.class.php | 2 +- .../files/lib/data/like/LikeAction.class.php | 4 +- .../files/lib/data/user/UserProfile.class.php | 2 +- .../condition/DaysOfWeekCondition.class.php | 2 +- .../system/condition/TimeCondition.class.php | 6 +-- .../condition/UserGroupCondition.class.php | 2 +- .../MostActiveMembersDashboardBox.class.php | 2 +- .../system/database/MySQLDatabase.class.php | 2 +- .../database/PostgreSQLDatabase.class.php | 4 +- .../adapter/ImagickImageAdapter.class.php | 2 +- ...onEventPackageInstallationPlugin.class.php | 2 +- .../files/lib/util/ArrayUtil.class.php | 8 ++-- wcfsetup/install/files/style/colorPicker.less | 2 +- wcfsetup/install/files/style/datePicker.less | 2 +- wcfsetup/install/files/style/dialog.less | 4 +- wcfsetup/install/files/style/layout.less | 10 ++--- wcfsetup/install/files/style/message.less | 2 +- wcfsetup/install/files/style/user.less | 2 +- 33 files changed, 78 insertions(+), 79 deletions(-) diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl index d7cf39a496..6f3656a01c 100644 --- a/com.woltlab.wcf/templates/user.tpl +++ b/com.woltlab.wcf/templates/user.tpl @@ -6,7 +6,7 @@ {include file='headInclude'} - + {event name='javascriptInclude'} {/if} - + {event name='tabMenuContent'} diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl index cedf2189bd..9681e22b6f 100644 --- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl @@ -238,7 +238,7 @@
{lang}wcf.acp.user.sendMail.mail{/lang} - +
@@ -250,7 +250,7 @@ {/if}
- +
@@ -263,7 +263,7 @@ {lang}wcf.acp.user.sendMail.from.description{/lang}
- +
@@ -275,7 +275,7 @@ {/if}
- +
@@ -284,11 +284,11 @@
- +
{lang}wcf.acp.user.exportEmailAddress.format{/lang} - +
@@ -296,14 +296,14 @@
- +
- +
@@ -318,7 +318,7 @@
{lang}wcf.acp.user.groups{/lang} - +
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index e4a8c328be..61bc9a92ef 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -30,7 +30,7 @@
  • {lang}wcf.acp.user.quickSearch.disabled{/lang}
  • {lang}wcf.acp.user.quickSearch.disabledAvatars{/lang}
  • {lang}wcf.acp.user.quickSearch.disabledSignatures{/lang}
    • - + {event name='quickSearchItems'} diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index c77798258b..348c87a010 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -2879,18 +2879,18 @@ WCF.Date.Picker = { 'l': 'DD', 'z': 'o', 'S': '', // English ordinal suffix for the day of the month, 2 characters, will be discarded - + // month 'F': 'MM', 'm': 'mm', 'M': 'M', 'n': 'm', - + // year 'o': 'yy', 'Y': 'yy', 'y': 'y', - + // timestamp 'U': '@' }; diff --git a/wcfsetup/install/files/lib/acp/page/SmileyCategoryListPage.class.php b/wcfsetup/install/files/lib/acp/page/SmileyCategoryListPage.class.php index 0b122aaa15..72f1b8387f 100644 --- a/wcfsetup/install/files/lib/acp/page/SmileyCategoryListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/SmileyCategoryListPage.class.php @@ -21,7 +21,7 @@ class SmileyCategoryListPage extends AbstractCategoryListPage { * @see \wcf\acp\page\AbstractCategoryListPage::$activeMenuItem */ public $objectTypeName = 'com.woltlab.wcf.bbcode.smiley'; - + /** * @see \wcf\acp\page\AbstractCategoryListPage::$pageTitle */ diff --git a/wcfsetup/install/files/lib/acp/page/StatPage.class.php b/wcfsetup/install/files/lib/acp/page/StatPage.class.php index e799cd1d83..6c80448aaa 100644 --- a/wcfsetup/install/files/lib/acp/page/StatPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/StatPage.class.php @@ -66,7 +66,7 @@ class StatPage extends AbstractPage { */ public function assignVariables() { parent::assignVariables(); - + WCF::getTPL()->assign(array( 'endDate' => $this->endDate, 'startDate' => $this->startDate, diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php index 580cacf512..976a198edf 100644 --- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php +++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php @@ -77,7 +77,7 @@ class CommentAction extends AbstractDatabaseObjectAction { * @var \wcf\data\comment\response\CommentResponse */ public $createdResponse = null; - + /** * errors occuring durch the validation of addComment or addResponse * @var array diff --git a/wcfsetup/install/files/lib/data/comment/LikeableCommentProvider.class.php b/wcfsetup/install/files/lib/data/comment/LikeableCommentProvider.class.php index 77973042f0..77b715fd25 100644 --- a/wcfsetup/install/files/lib/data/comment/LikeableCommentProvider.class.php +++ b/wcfsetup/install/files/lib/data/comment/LikeableCommentProvider.class.php @@ -50,7 +50,7 @@ class LikeableCommentProvider extends AbstractObjectTypeProvider implements ILik foreach ($likes as $like) { $commentIDs[] = $like->objectID; } - + // fetch comments $commentList = new CommentList(); $commentList->getConditionBuilder()->add("comment.commentID IN (?)", array($commentIDs)); @@ -67,7 +67,7 @@ class LikeableCommentProvider extends AbstractObjectTypeProvider implements ILik $likeData[$comments[$like->objectID]->objectTypeID][] = $like; } } - + foreach ($likeData as $objectTypeID => $likes) { $objectType = CommentHandler::getInstance()->getObjectType($objectTypeID); if (CommentHandler::getInstance()->getCommentManager($objectType->objectType) instanceof IViewableLikeProvider) { diff --git a/wcfsetup/install/files/lib/data/comment/ViewableCommentList.class.php b/wcfsetup/install/files/lib/data/comment/ViewableCommentList.class.php index e725d4246f..21dd3f11b2 100644 --- a/wcfsetup/install/files/lib/data/comment/ViewableCommentList.class.php +++ b/wcfsetup/install/files/lib/data/comment/ViewableCommentList.class.php @@ -16,13 +16,13 @@ class ViewableCommentList extends CommentList { * @see \wcf\data\DatabaseObjectList::$decoratorClassName */ public $decoratorClassName = 'wcf\data\comment\ViewableComment'; - + /** * Creates a new ViewableCommentList object. */ public function __construct() { parent::__construct(); - + // get avatars if (!empty($this->sqlSelects)) $this->sqlSelects .= ','; $this->sqlSelects .= "user_avatar.*, user_table.*"; diff --git a/wcfsetup/install/files/lib/data/comment/response/LikeableCommentResponseProvider.class.php b/wcfsetup/install/files/lib/data/comment/response/LikeableCommentResponseProvider.class.php index 463796fdb7..2d2fbc08b6 100644 --- a/wcfsetup/install/files/lib/data/comment/response/LikeableCommentResponseProvider.class.php +++ b/wcfsetup/install/files/lib/data/comment/response/LikeableCommentResponseProvider.class.php @@ -57,7 +57,7 @@ class LikeableCommentResponseProvider extends AbstractObjectTypeProvider impleme foreach ($likes as $like) { $responseIDs[] = $like->objectID; } - + // get objects type ids $responses = array(); $conditionBuilder = new PreparedStatementConditionBuilder(); @@ -83,7 +83,7 @@ class LikeableCommentResponseProvider extends AbstractObjectTypeProvider impleme $likeData[$responses[$like->objectID]][] = $like; } } - + foreach ($likeData as $objectTypeID => $likes) { $objectType = CommentHandler::getInstance()->getObjectType($objectTypeID); if (CommentHandler::getInstance()->getCommentManager($objectType->objectType) instanceof IViewableLikeProvider) { diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php index 5a07c953e1..95a7339453 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php @@ -30,7 +30,7 @@ class CronjobLogAction extends AbstractDatabaseObjectAction { public function validateClearAll() { WCF::getSession()->checkPermissions(array('admin.system.canManageCronjob')); } - + /** * Deletes the entire cronjob log. */ diff --git a/wcfsetup/install/files/lib/data/like/LikeAction.class.php b/wcfsetup/install/files/lib/data/like/LikeAction.class.php index 98710e133a..fc2b01fbd0 100644 --- a/wcfsetup/install/files/lib/data/like/LikeAction.class.php +++ b/wcfsetup/install/files/lib/data/like/LikeAction.class.php @@ -308,12 +308,12 @@ class LikeAction extends AbstractDatabaseObjectAction implements IGroupedUserLis if (!$lastLikeTime) { return array(); } - + // parse template WCF::getTPL()->assign(array( 'likeList' => $likeList )); - + return array( 'lastLikeTime' => $lastLikeTime, 'template' => WCF::getTPL()->fetch('userProfileLikeItem') diff --git a/wcfsetup/install/files/lib/data/user/UserProfile.class.php b/wcfsetup/install/files/lib/data/user/UserProfile.class.php index 29c0d18e65..6e67e36a2b 100644 --- a/wcfsetup/install/files/lib/data/user/UserProfile.class.php +++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php @@ -792,7 +792,7 @@ class UserProfile extends DatabaseObjectDecorator implements IBreadcrumbProvider */ public function getFormattedUsername() { $username = StringUtil::encodeHTML($this->username); - + if ($this->userOnlineGroupID) { $group = UserGroup::getGroupByID($this->userOnlineGroupID); if ($group !== null && $group->userOnlineMarking && $group->userOnlineMarking != '%s') { diff --git a/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php b/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php index a95b23736e..61b59641f5 100644 --- a/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php @@ -50,7 +50,7 @@ class DaysOfWeekCondition extends AbstractMultiSelectCondition implements IConte public function showContent(Condition $condition) { $date = DateUtil::getDateTimeByTimestamp(TIME_NOW); $date->setTimezone(WCF::getUser()->getTimeZone()); - + return in_array($date->format('w'), $condition->daysOfWeek); } } diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php index c401ca1333..04b3dd6d65 100644 --- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php @@ -36,7 +36,7 @@ class TimeCondition extends AbstractMultipleFieldsCondition implements IContentC * @var string */ protected $startTime = '00:00'; - + /** * timezone used to evaluate the start/end time * @var string @@ -55,7 +55,7 @@ class TimeCondition extends AbstractMultipleFieldsCondition implements IContentC if ($this->endTime) { $data['endTime'] = $this->endTime; } - + if (!empty($data) && $this->timezone) { $data['timezone'] = $this->timezone; } @@ -101,7 +101,7 @@ HTML; $fieldElement .= ''; } $fieldElement .= ''; - + return $fieldElement; } diff --git a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php index 3e5ad49011..ddc6660b47 100644 --- a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php @@ -87,7 +87,7 @@ class UserGroupCondition extends AbstractMultipleFieldsCondition implements ICon */ public function getData() { $data = array(); - + if (!empty($this->groupIDs)) { $data['groupIDs'] = $this->groupIDs; } 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 d20b9e600e..b578e2e02c 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php @@ -41,7 +41,7 @@ class MostActiveMembersDashboardBox extends AbstractSidebarDashboardBox { $this->fetched(); } - + /** * @see \wcf\system\dashboard\box\AbstractContentDashboardBox::render() */ diff --git a/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php b/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php index 46d43b0ebf..0beb8c237b 100644 --- a/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php +++ b/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php @@ -40,7 +40,7 @@ class MySQLDatabase extends Database { throw new DatabaseException("Connecting to MySQL server '".$this->host."' failed:\n".$e->getMessage(), $this); } } - + /** * @see \wcf\system\database\Database::isSupported() */ diff --git a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php index 9948b59ea6..68d9f8d192 100644 --- a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php +++ b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php @@ -35,7 +35,7 @@ class PostgreSQLDatabase extends Database { // set connection character set $this->setCharset(); } - + /** * Sets the charset of the database connection. */ @@ -63,7 +63,7 @@ class PostgreSQLDatabase extends Database { $statement = self::fixQuery($statement); return parent::prepareStatement($statement, $limit, $offset); } - + /** * @see \wcf\system\database\Database::getInsertID() */ diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php index 35c6818d57..5c68de0e96 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php @@ -100,7 +100,7 @@ class ImagickImageAdapter implements IImageAdapter { public function clip($originX, $originY, $width, $height) { $this->imagick->cropImage($width, $height, $originX, $originY); } - + /** * @see \wcf\system\image\adapter\IImageAdapter::resize() */ 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 a2a651b97c..7cd593ec65 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php @@ -89,7 +89,7 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI if (empty($row)) { $this->presetEventIDs[] = $result->eventID; } - + return $result; } diff --git a/wcfsetup/install/files/lib/util/ArrayUtil.class.php b/wcfsetup/install/files/lib/util/ArrayUtil.class.php index a9154907d8..458f1abb42 100644 --- a/wcfsetup/install/files/lib/util/ArrayUtil.class.php +++ b/wcfsetup/install/files/lib/util/ArrayUtil.class.php @@ -157,7 +157,7 @@ final class ArrayUtil { return $array; } } - + /** * Returns true when array1 has the same values as array2. * @@ -169,7 +169,7 @@ final class ArrayUtil { public static function compare(array $array1, array $array2, Callback $callback = null) { return static::compareHelper('value', $array1, $array2, $callback); } - + /** * Returns true when array1 has the same keys as array2. * @@ -181,7 +181,7 @@ final class ArrayUtil { public static function compareKey(array $array1, array $array2, Callback $callback = null) { return static::compareHelper('key', $array1, $array2, $callback); } - + /** * Compares array1 with array2 and returns true when they are identical. * @@ -193,7 +193,7 @@ final class ArrayUtil { public static function compareAssoc(array $array1, array $array2, Callback $callback = null) { return static::compareHelper('assoc', $array1, $array2, $callback); } - + /** * Does the actual comparison of the above compare methods. * diff --git a/wcfsetup/install/files/style/colorPicker.less b/wcfsetup/install/files/style/colorPicker.less index d0df9523ab..3727d03b87 100644 --- a/wcfsetup/install/files/style/colorPicker.less +++ b/wcfsetup/install/files/style/colorPicker.less @@ -83,7 +83,7 @@ position: relative; text-align: center; width: 100px; - + > .colors { > .new, > .old { diff --git a/wcfsetup/install/files/style/datePicker.less b/wcfsetup/install/files/style/datePicker.less index ea7b957ee2..ad684ee0db 100644 --- a/wcfsetup/install/files/style/datePicker.less +++ b/wcfsetup/install/files/style/datePicker.less @@ -6,7 +6,7 @@ z-index: 450 !important; .boxShadow(2px, 2px, rgba(0, 0, 0, .2), 10px); - + &::after { border: 7px solid transparent; border-bottom-color: @wcfDropdownBorderColor; diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less index ef0fe07ab5..a7b377356d 100644 --- a/wcfsetup/install/files/style/dialog.less +++ b/wcfsetup/install/files/style/dialog.less @@ -161,10 +161,10 @@ text-align: center; top: 200px; z-index: 401; - + .boxShadow(0, 1px, rgba(0, 0, 0, .5), 7px); .linearGradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, 0), rgba(0, 0, 0, .7)); - + > .icon { color: #fff; } diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index cda9c70313..e2685330ce 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -58,7 +58,7 @@ top: 0; right: 0; z-index: 200; - + .icon { color: @wcfUserPanelColor; @@ -383,7 +383,7 @@ .mainMenu > ul > li { margin-top: -7px; vertical-align: bottom; - + > a { padding: 9px 21px; } @@ -517,7 +517,7 @@ background-color: @wcfNavigationHeaderBackgroundColor; border-bottom: 1px solid @wcfContainerBorderColor; border-top: 1px solid @wcfContainerBorderColor; - + > ul.navigationMenuItems { white-space: nowrap; } @@ -572,7 +572,7 @@ &.sidebarOrientationRight { background-color: @wcfSidebarBackgroundColor; } - + > div { display: table; table-layout: fixed; @@ -1449,7 +1449,7 @@ html[dir="rtl"] { @media all and (min-width: 801px) { .tabMenu > ul { padding: 0 5px 3px 5px; - + > li { > a { bottom: -3px; diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index 4d9684ab60..339d9d848b 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -725,7 +725,7 @@ li:nth-child(2n+1) .message { color: @wcfDimmedColor; opacity: .8; padding: @wcfGapMedium @wcfGapLarge; - + .transition(opacity, .1s); &:hover { diff --git a/wcfsetup/install/files/style/user.less b/wcfsetup/install/files/style/user.less index d2e8e64115..3365493334 100644 --- a/wcfsetup/install/files/style/user.less +++ b/wcfsetup/install/files/style/user.less @@ -69,7 +69,7 @@ .userProfilePreview { position: relative; - + > .userInformation { padding-bottom: 16px;// + @wcfGapTiny; -- 2.20.1