From 92fd47d9d80519a2e08b05529e63eb181ca1c53d Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 29 Nov 2012 23:25:24 +0100 Subject: [PATCH] Removes trailing whitespaces --- XSD/types.xsd | 2 +- wcfsetup/install/files/lib/acp/form/UserAddForm.class.php | 6 +++--- .../files/lib/acp/form/UserEmailAddressExportForm.class.php | 2 +- .../install/files/lib/acp/form/UserSearchForm.class.php | 2 +- .../files/lib/acp/form/UsersMassProcessingForm.class.php | 2 +- .../install/files/lib/data/DatabaseObjectList.class.php | 2 +- .../install/files/lib/data/option/OptionAction.class.php | 4 ++-- .../lib/system/cache/builder/ACPMenuCacheBuilder.class.php | 2 +- .../cache/builder/EventListenerCacheBuilder.class.php | 2 +- .../lib/system/cache/builder/IconCacheBuilder.class.php | 2 +- .../lib/system/cache/builder/PageMenuCacheBuilder.class.php | 2 +- .../cache/builder/TemplateListenerCacheBuilder.class.php | 2 +- .../builder/TemplateListenerCodeCacheBuilder.class.php | 2 +- wcfsetup/install/files/lib/system/mail/MailSender.class.php | 2 +- .../install/files/lib/system/mail/SMTPMailSender.class.php | 2 +- wcfsetup/install/files/lib/system/menu/TreeMenu.class.php | 2 +- .../AbstractOptionPackageInstallationPlugin.class.php | 2 +- wcfsetup/install/files/lib/system/request/Request.class.php | 2 +- .../template/plugin/PagesFunctionTemplatePlugin.class.php | 4 ++-- wcfsetup/install/files/lib/util/UserUtil.class.php | 2 +- wcfsetup/install/files/style/datePicker.less | 4 ++-- wcfsetup/install/files/style/dialog.less | 2 +- wcfsetup/install/files/style/global.less | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/XSD/types.xsd b/XSD/types.xsd index 60c7ef224e..f16242a12e 100644 --- a/XSD/types.xsd +++ b/XSD/types.xsd @@ -22,5 +22,5 @@ - + \ No newline at end of file diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index 493ee71cea..94dd9058fa 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -103,7 +103,7 @@ class UserAddForm extends UserOptionListForm { public function readFormParameters() { parent::readFormParameters(); - if (isset($_POST['username'])) $this->username = StringUtil::trim($_POST['username']); + if (isset($_POST['username'])) $this->username = StringUtil::trim($_POST['username']); if (isset($_POST['email'])) $this->email = StringUtil::trim($_POST['email']); if (isset($_POST['confirmEmail'])) $this->confirmEmail = StringUtil::trim($_POST['confirmEmail']); if (isset($_POST['password'])) $this->password = $_POST['password']; @@ -119,14 +119,14 @@ class UserAddForm extends UserOptionListForm { public function validate() { // validate static user options try { - $this->validateUsername($this->username); + $this->validateUsername($this->username); } catch (UserInputException $e) { $this->errorType[$e->getField()] = $e->getType(); } try { - $this->validateEmail($this->email, $this->confirmEmail); + $this->validateEmail($this->email, $this->confirmEmail); } catch (UserInputException $e) { $this->errorType[$e->getField()] = $e->getType(); diff --git a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php index 4a4f95116a..5cdcf590fc 100755 --- a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php @@ -50,7 +50,7 @@ class UserEmailAddressExportForm extends ACPForm { * string used to wrap email adresses * @var string */ - public $textSeparator = '"'; + public $textSeparator = '"'; /** * users whose email addresses are exported diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php index bb33de2010..cb64f5ecc7 100755 --- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php @@ -251,7 +251,7 @@ class UserSearchForm extends UserOptionListForm { ON (option_value.userID = user_table.userID)"; // build search condition - $this->conditions = new PreparedStatementConditionBuilder(); + $this->conditions = new PreparedStatementConditionBuilder(); // static fields $this->buildStaticConditions(); diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php index 04873a9ac1..68caed9d4c 100644 --- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php @@ -70,7 +70,7 @@ class UsersMassProcessingForm extends UserOptionListForm { // export mail address public $fileType = 'csv'; public $separator = ','; - public $textSeparator = '"'; + public $textSeparator = '"'; // send mail public $subject = ''; diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php index 9d8b8e102b..71e760cf06 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php @@ -38,7 +38,7 @@ abstract class DatabaseObjectList implements \Countable, ITraversableObject { * ids of result objects * @var array */ - public $objectIDs = null; + public $objectIDs = null; /** * sql offset diff --git a/wcfsetup/install/files/lib/data/option/OptionAction.class.php b/wcfsetup/install/files/lib/data/option/OptionAction.class.php index 832026bd24..82dc19e090 100644 --- a/wcfsetup/install/files/lib/data/option/OptionAction.class.php +++ b/wcfsetup/install/files/lib/data/option/OptionAction.class.php @@ -37,14 +37,14 @@ class OptionAction extends AbstractDatabaseObjectAction { * Validates permissions and parameters. */ public function validateImport() { - parent::validateCreate(); + parent::validateCreate(); } /** * Validates permissions and parameters. */ public function validateUpdateAll() { - parent::validateCreate(); + parent::validateCreate(); } /** 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 56fbb7b1d7..71ec8b0983 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php @@ -21,7 +21,7 @@ class ACPMenuCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($cache, $packageID) = explode('-', $cacheResource['cache']); + list($cache, $packageID) = explode('-', $cacheResource['cache']); $data = array(); // get all menu items and filter menu items with low priority diff --git a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php index e4452353d2..ac39258077 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php @@ -18,7 +18,7 @@ class EventListenerCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($cache, $packageID) = explode('-', $cacheResource['cache']); + list($cache, $packageID) = explode('-', $cacheResource['cache']); $data = array( 'actions' => array('user' => array(), 'admin' => array()), 'inheritedActions' => array('user' => array(), 'admin' => array()) diff --git a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php index 9882b85302..0af419c5d3 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php @@ -21,7 +21,7 @@ class IconCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($cache, $packageID, $styleID) = explode('-', $cacheResource['cache']); + list($cache, $packageID, $styleID) = explode('-', $cacheResource['cache']); $data = array(); // get active package 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 cdbe5f9b31..6b8b2e8c90 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php @@ -19,7 +19,7 @@ class PageMenuCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($cache, $packageID) = explode('-', $cacheResource['cache']); + list($cache, $packageID) = explode('-', $cacheResource['cache']); $data = array(); // get all menu items and filter menu items with low priority diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php index c4502a35e8..b8979d7698 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php @@ -18,7 +18,7 @@ class TemplateListenerCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($cache, $packageID, $environment) = explode('-', $cacheResource['cache']); + list($cache, $packageID, $environment) = explode('-', $cacheResource['cache']); // get templates for current package id $templateListenerList = new TemplateListenerList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php index 773bc0009f..0b1e09bb90 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php @@ -18,7 +18,7 @@ class TemplateListenerCodeCacheBuilder implements ICacheBuilder { * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - list($packageID, $environment, $templateName) = explode('-', $cacheResource['cache']); + list($packageID, $environment, $templateName) = explode('-', $cacheResource['cache']); // get template codes for specified template $templateListenerList = new TemplateListenerList(); diff --git a/wcfsetup/install/files/lib/system/mail/MailSender.class.php b/wcfsetup/install/files/lib/system/mail/MailSender.class.php index 96c3f2f6ab..7b1fb38818 100644 --- a/wcfsetup/install/files/lib/system/mail/MailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/MailSender.class.php @@ -48,5 +48,5 @@ abstract class MailSender { * * @param wcf\system\mail\Mail $mail */ - abstract public function sendMail(Mail $mail); + abstract public function sendMail(Mail $mail); } diff --git a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php index bfda668895..f0387b5d25 100644 --- a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php @@ -189,7 +189,7 @@ class SMTPMailSender extends MailSender { $result .= $read; if (substr($read, 3, 1) == " ") break; } - return $result; + return $result; } /** diff --git a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php index 582f8aa47d..3961dc5716 100644 --- a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php @@ -161,7 +161,7 @@ abstract class TreeMenu extends SingletonFactory { * @param string $menuItem name of the active menu item */ public function setActiveMenuItem($menuItem) { - $this->activeMenuItems = array(); + $this->activeMenuItems = array(); // build active menu list while (isset($this->menuItemList[$menuItem])) { diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php index b88cb4ca06..11dcd2ceab 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php @@ -161,7 +161,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag if (!preg_match("/^[\w-\.]+$/", $data['name'])) { $matches = array(); preg_match_all("/(\W)/", $data['name'], $matches); - throw new SystemException("The user option '".$data['name']."' has at least one non-alphanumeric character (underscore is permitted): (".implode("), ( ", $matches[1]).")."); + throw new SystemException("The user option '".$data['name']."' has at least one non-alphanumeric character (underscore is permitted): (".implode("), ( ", $matches[1]).")."); } $this->saveOption($data, $data['categoryname']); diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php index 0455a4260b..420a48e918 100644 --- a/wcfsetup/install/files/lib/system/request/Request.class.php +++ b/wcfsetup/install/files/lib/system/request/Request.class.php @@ -74,7 +74,7 @@ class Request { * @return string */ public function getClassName() { - return $this->className; + return $this->className; } /** diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php index 4282ec9152..77c6bb89f3 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php @@ -136,9 +136,9 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { // calculate page links $maxLinks = static::SHOW_LINKS - 4; $linksBeforePage = $tagArgs['page'] - 2; - if ($linksBeforePage < 0) $linksBeforePage = 0; + if ($linksBeforePage < 0) $linksBeforePage = 0; $linksAfterPage = $tagArgs['pages'] - ($tagArgs['page'] + 1); - if ($linksAfterPage < 0) $linksAfterPage = 0; + if ($linksAfterPage < 0) $linksAfterPage = 0; if ($tagArgs['page'] > 1 && $tagArgs['page'] < $tagArgs['pages']) { $maxLinks--; } diff --git a/wcfsetup/install/files/lib/util/UserUtil.class.php b/wcfsetup/install/files/lib/util/UserUtil.class.php index 76755b110d..3c3936703f 100644 --- a/wcfsetup/install/files/lib/util/UserUtil.class.php +++ b/wcfsetup/install/files/lib/util/UserUtil.class.php @@ -110,7 +110,7 @@ final class UserUtil { // darwin fix if ($REMOTE_ADDR == '::1' || $REMOTE_ADDR == 'fe80::1') { - $REMOTE_ADDR = '127.0.0.1'; + $REMOTE_ADDR = '127.0.0.1'; } $REMOTE_ADDR = self::convertIPv4To6($REMOTE_ADDR); diff --git a/wcfsetup/install/files/style/datePicker.less b/wcfsetup/install/files/style/datePicker.less index 7f9e0b9e6a..27168934c4 100644 --- a/wcfsetup/install/files/style/datePicker.less +++ b/wcfsetup/install/files/style/datePicker.less @@ -98,11 +98,11 @@ > a { display: inline-block; color: @wcfColor; - font-weight: bold; + font-weight: bold; height: 30px; line-height: 30px; text-align: center; - width: 30px; + width: 30px; .textShadow(@wcfContainerBackgroundColor); } diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less index e6185a7c6e..df19117258 100644 --- a/wcfsetup/install/files/style/dialog.less +++ b/wcfsetup/install/files/style/dialog.less @@ -13,7 +13,7 @@ .dialogTitlebar { background-color: @wcfTabularBoxBackgroundColor; - border-bottom: 1px solid rgba(0, 0, 0, .1); + border-bottom: 1px solid rgba(0, 0, 0, .1); display: block; padding: 10px 20px; min-height: 27px; diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less index fb1c25321a..f56204d988 100644 --- a/wcfsetup/install/files/style/global.less +++ b/wcfsetup/install/files/style/global.less @@ -110,7 +110,7 @@ a { z-index: 800; .borderRadius(6px); - .boxShadow(0, 3px, rgba(0, 0, 0, .3), 7px); + .boxShadow(0, 3px, rgba(0, 0, 0, .3), 7px); .pointer { border-color: @wcfTooltipBackgroundColor transparent; -- 2.20.1