From d726f13d950d0d417192d9983e00ae1a7b008914 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 9 Dec 2012 15:05:45 +0100 Subject: [PATCH] Removes trailing tabs and whitespaces --- .../lib/acp/form/MasterPasswordForm.class.php | 2 +- .../acp/form/MasterPasswordInitForm.class.php | 2 +- .../lib/acp/page/ACPSessionLogPage.class.php | 2 +- .../files/lib/acp/page/CronjobListPage.class.php | 2 +- .../lib/acp/page/CronjobLogListPage.class.php | 2 +- .../lib/acp/page/UpdateServerListPage.class.php | 4 ++-- .../lib/acp/page/UserGroupListPage.class.php | 4 ++-- .../files/lib/acp/page/UserListPage.class.php | 4 ++-- .../files/lib/data/DatabaseObject.class.php | 2 +- .../lib/data/language/LanguageEditor.class.php | 4 ++-- .../page/menu/item/PageMenuItemEditor.class.php | 16 ++++++++-------- .../files/lib/page/MultipleLinkPage.class.php | 8 ++++---- .../files/lib/system/SingletonFactory.class.php | 2 +- .../application/ApplicationHandler.class.php | 2 +- .../cache/builder/ACPMenuCacheBuilder.class.php | 2 +- .../image/adapter/GDImageAdapter.class.php | 6 +++--- .../image/adapter/ImagickImageAdapter.class.php | 4 ++-- .../system/language/LanguageFactory.class.php | 2 +- .../lib/system/package/PackageArchive.class.php | 2 +- .../lib/system/request/RouteHandler.class.php | 2 +- .../lib/system/session/SessionFactory.class.php | 6 +++--- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php index 3df4d283fd..246c988dd7 100755 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php @@ -31,7 +31,7 @@ class MasterPasswordForm extends ACPForm { /** * @see wcf\page\IPage::readParameters() - */ + */ public function readParameters() { parent::readParameters(); diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php index 4beeaa2ced..833ec1b896 100755 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php @@ -26,7 +26,7 @@ class MasterPasswordInitForm extends MasterPasswordForm { /** * @see wcf\page\IPage::readParameters() - */ + */ public function readParameters() { parent::readParameters(); diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php index 9703949f47..84657047f2 100755 --- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php @@ -79,7 +79,7 @@ class ACPSessionLogPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::readObjects() - */ + */ protected function readObjects() { $this->sqlOrderBy = 'acp_session_access_log.'.$this->sortField." ".$this->sortOrder; diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php index 5e3ddaa0cc..2174125007 100755 --- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php @@ -36,7 +36,7 @@ class CronjobListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::initObjectList() - */ + */ public function initObjectList() { parent::initObjectList(); diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php index fab57cc15c..a62d96d420 100755 --- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php @@ -41,7 +41,7 @@ class CronjobLogListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\cronjob\log\CronjobLogList'; /** diff --git a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php index c225e1d561..94e4391817 100755 --- a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php @@ -32,7 +32,7 @@ class UpdateServerListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\package\update\server\PackageUpdateServerList'; /** @@ -52,7 +52,7 @@ class UpdateServerListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::readObjects() - */ + */ public function readObjects() { $this->sqlOrderBy = ($this->sortField != 'packages' ? 'package_update_server.' : '') . $this->sortField.' '.$this->sortOrder; diff --git a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php index 68cd37c123..5a7ae22239 100755 --- a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php @@ -32,7 +32,7 @@ class UserGroupListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\user\group\UserGroupList'; /** @@ -55,7 +55,7 @@ class UserGroupListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::initObjectList() - */ + */ protected function initObjectList() { parent::initObjectList(); diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index 99ecbbdae1..a16d12bb7c 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -343,11 +343,11 @@ class UserListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::initObjectList() - */ + */ protected function initObjectList() { } /** * @see wcf\page\MultipleLinkPage::readObjects() - */ + */ protected function readObjects() { } } diff --git a/wcfsetup/install/files/lib/data/DatabaseObject.class.php b/wcfsetup/install/files/lib/data/DatabaseObject.class.php index c1c2342a50..c294d19244 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObject.class.php @@ -22,7 +22,7 @@ abstract class DatabaseObject implements IStorableObject { /** * indicates if database table index is an identity column * @var boolean - */ + */ protected static $databaseTableIndexIsIdentity = true; /** diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php index c8624da09d..adec04b551 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php @@ -54,7 +54,7 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje /** * Write the languages files. * - * @param array $languageCategoryIDs + * @param array $languageCategoryIDs */ protected function writeLanguageFiles(array $languageCategoryIDs) { $conditions = new PreparedStatementConditionBuilder(); @@ -62,7 +62,7 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje $conditions->add("languageCategoryID IN (?)", array($languageCategoryIDs)); // get language items - $sql = "SELECT languageItem, languageItemValue, languageCustomItemValue, + $sql = "SELECT languageItem, languageItemValue, languageCustomItemValue, languageUseCustomValue, languageCategoryID FROM wcf".WCF_N."_language_item ".$conditions; diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php index dd76b18a49..39c1938e42 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php @@ -88,7 +88,7 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached $sql = "UPDATE wcf".WCF_N."_page_menu_item SET showOrder = ?, menuPosition = ? - WHERE menuItemID = ?"; + WHERE menuItemID = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( $showOrder, @@ -136,8 +136,8 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached } else { $sql = "UPDATE wcf".WCF_N."_page_menu_item - SET showOrder = showOrder - 1 - WHERE showOrder >= ? + SET showOrder = showOrder - 1 + WHERE showOrder >= ? AND menuPosition = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( @@ -145,9 +145,9 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached $this->menuPosition )); - $sql = "UPDATE wcf".WCF_N."_page_menu_item - SET showOrder = showOrder + 1 - WHERE showOrder >= ? + $sql = "UPDATE wcf".WCF_N."_page_menu_item + SET showOrder = showOrder + 1 + WHERE showOrder >= ? AND menuPosition = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( @@ -178,8 +178,8 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached } else { $sql = "UPDATE wcf".WCF_N."_page_menu_item - SET showOrder = showOrder + 1 - WHERE showOrder >= ? + SET showOrder = showOrder + 1 + WHERE showOrder >= ? AND menuPosition = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php index a827223dc8..d109e41184 100644 --- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php +++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php @@ -56,13 +56,13 @@ abstract class MultipleLinkPage extends AbstractPage { /** * DatabaseObjectList object * @var wcf\data\DatabaseObjectList - */ + */ public $objectList = null; /** * class name for DatabaseObjectList * @var string - */ + */ public $objectListClassName = ''; /** @@ -79,7 +79,7 @@ abstract class MultipleLinkPage extends AbstractPage { /** * @see wcf\data\DatabaseObjectList::$sqlLimit - */ + */ public $sqlLimit = 0; /** @@ -89,7 +89,7 @@ abstract class MultipleLinkPage extends AbstractPage { /** * @see wcf\data\DatabaseObjectList::$sqlOrderBy - */ + */ public $sqlOrderBy = ''; /** diff --git a/wcfsetup/install/files/lib/system/SingletonFactory.class.php b/wcfsetup/install/files/lib/system/SingletonFactory.class.php index 2badbbdf72..7621eb7e63 100644 --- a/wcfsetup/install/files/lib/system/SingletonFactory.class.php +++ b/wcfsetup/install/files/lib/system/SingletonFactory.class.php @@ -29,7 +29,7 @@ abstract class SingletonFactory { /** * Called within __construct(), override if neccessary. - */ + */ protected function init() { } /** diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php index fc3c2755f7..3a6f94471a 100644 --- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php +++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php @@ -19,7 +19,7 @@ class ApplicationHandler extends SingletonFactory { /** * application cache * @var array - */ + */ protected $cache = null; /** 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 70e88e281c..740433f4f6 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php @@ -105,7 +105,7 @@ class ACPMenuCacheBuilder implements ICacheBuilder { $conditions = new PreparedStatementConditionBuilder(); $conditions->add("categoryID IN (?)", array($optionCategories)); - $sql = "SELECT categoryID, parentCategoryName, categoryName, + $sql = "SELECT categoryID, parentCategoryName, categoryName, ( SELECT COUNT(*) FROM wcf".WCF_N."_option WHERE categoryName = category.categoryName ) AS count diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php index b566157c22..ce5b08bb50 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php @@ -190,7 +190,7 @@ class GDImageAdapter implements IImageAdapter { /** * @see wcf\system\image\adapter\IImageAdapter::setColor() - */ + */ public function setColor($red, $green, $blue) { $this->color = imageColorAllocate($this->image, $red, $green, $blue); } @@ -230,7 +230,7 @@ class GDImageAdapter implements IImageAdapter { /** * @see wcf\system\image\adapter\IImageAdapter::getWidth() - */ + */ public function getWidth() { return $this->width; } @@ -251,7 +251,7 @@ class GDImageAdapter implements IImageAdapter { /** * @see wcf\system\image\adapter\IImageAdapter::isSupported() - */ + */ public static function isSupported() { return true; } 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 6fe2bdcd39..4a9734da9b 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php @@ -28,13 +28,13 @@ class ImagickImageAdapter implements IImageAdapter { /** * image height * @var integer - */ + */ protected $height = 0; /** * image width * @var integer - */ + */ protected $width = 0; /** diff --git a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php index de50b103f5..f25adb7000 100644 --- a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php +++ b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php @@ -144,7 +144,7 @@ class LanguageFactory extends SingletonFactory { * Returns a list of available language categories. * * @return array - */ + */ public function getCategories() { return $this->cache['categories']; } diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php index ffc83bad40..e8dce442b3 100644 --- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php @@ -71,7 +71,7 @@ class PackageArchive { /** * list of instructions * @var array - */ + */ protected $instructions = array( 'install' => array(), 'update' => array() diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php index 7f24d2b95c..8eed3bc8b9 100644 --- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php @@ -136,7 +136,7 @@ class RouteHandler extends SingletonFactory { /** * Registers route data within $_GET and $_REQUEST. - */ + */ protected function registerRouteData() { foreach ($this->routeData as $key => $value) { $_GET[$key] = $value; diff --git a/wcfsetup/install/files/lib/system/session/SessionFactory.class.php b/wcfsetup/install/files/lib/system/session/SessionFactory.class.php index c9c2c4c9cc..de22e34e5f 100644 --- a/wcfsetup/install/files/lib/system/session/SessionFactory.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionFactory.class.php @@ -15,12 +15,12 @@ use wcf\util\HeaderUtil; class SessionFactory extends ACPSessionFactory { /** * @see wcf\system\session\ACPSessionFactory::$sessionEditor - */ + */ protected $sessionEditor = 'wcf\data\session\SessionEditor'; /** * @see wcf\system\session\ACPSessionFactory::readSessionID() - */ + */ protected function readSessionID() { $sessionID = parent::readSessionID(); @@ -34,7 +34,7 @@ class SessionFactory extends ACPSessionFactory { /** * @see wcf\system\session\ACPSessionFactory::init() - */ + */ protected function init() { $usesCookies = true; -- 2.20.1