From e3369fd29f34e9c0b87f129383e0f04713237b96 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 13 Oct 2013 19:07:12 +0200 Subject: [PATCH] Fixes code formatting --- wcfsetup/install.php | 6 +++--- wcfsetup/install/files/acp/global.php | 2 +- .../acp/templates/packageInstallationSetup.tpl | 2 +- wcfsetup/install/files/js/WCF.Like.js | 2 +- wcfsetup/install/files/js/WCF.User.js | 4 ++-- wcfsetup/install/files/js/WCF.js | 18 +++++++++--------- .../action/UninstallPackageAction.class.php | 2 +- .../acp/form/AbstractCategoryAddForm.class.php | 2 +- .../form/AbstractCategoryEditForm.class.php | 2 +- .../lib/acp/form/LanguageEditForm.class.php | 2 +- .../lib/acp/form/TemplateAddForm.class.php | 6 +++--- .../lib/acp/form/TemplateEditForm.class.php | 6 +++--- .../acp/form/TemplateGroupAddForm.class.php | 2 +- .../acp/form/TemplateGroupEditForm.class.php | 4 ++-- .../files/lib/acp/form/UserAddForm.class.php | 2 +- .../files/lib/acp/form/UserEditForm.class.php | 6 +++--- .../lib/acp/form/UserOptionAddForm.class.php | 2 +- .../form/UserOptionCategoryAddForm.class.php | 4 ++-- .../form/UserOptionSetDefaultsForm.class.php | 2 +- .../lib/acp/form/UserSearchForm.class.php | 6 +++--- .../page/AbstractCategoryListPage.class.php | 2 +- .../acp/page/LanguageItemListPage.class.php | 8 ++++---- .../files/lib/acp/page/PHPInfoPage.class.php | 2 +- .../lib/acp/page/TemplateListPage.class.php | 4 ++-- .../lib/action/AJAXInvokeAction.class.php | 2 +- .../files/lib/action/AJAXProxyAction.class.php | 2 +- .../lib/action/AJAXUploadAction.class.php | 2 +- .../lib/action/AbstractAjaxAction.class.php | 2 +- .../lib/action/ClipboardProxyAction.class.php | 2 +- .../files/lib/data/DatabaseObject.class.php | 2 +- .../lib/data/DatabaseObjectList.class.php | 2 +- .../category/ACLOptionCategoryEditor.class.php | 2 +- .../lib/data/attachment/Attachment.class.php | 2 +- .../data/attachment/AttachmentAction.class.php | 2 +- .../lib/data/category/CategoryNode.class.php | 4 ++-- .../lib/data/language/LanguageEditor.class.php | 4 ++-- .../language/item/LanguageItemAction.class.php | 2 +- .../queue/ModerationQueueAction.class.php | 2 +- .../category/SmileyCategoryAction.class.php | 2 +- .../files/lib/data/template/Template.class.php | 2 +- .../lib/data/template/TemplateAction.class.php | 2 +- .../lib/data/template/TemplateEditor.class.php | 6 +++--- .../files/lib/data/user/TeamList.class.php | 2 +- .../files/lib/data/user/UserAction.class.php | 2 +- .../lib/data/user/avatar/Gravatar.class.php | 2 +- .../files/lib/data/user/group/Team.class.php | 2 +- .../ignore/ViewableUserIgnoreList.class.php | 2 +- .../install/files/lib/form/LoginForm.class.php | 2 +- .../files/lib/form/RegisterForm.class.php | 2 +- .../files/lib/form/UserSearchForm.class.php | 2 +- .../lib/page/DeletedContentListPage.class.php | 4 ++-- .../files/lib/page/TaggedPage.class.php | 2 +- .../install/files/lib/system/Regex.class.php | 2 +- .../system/bbcode/AttachmentBBCode.class.php | 4 ++-- .../highlighter/PhpHighlighter.class.php | 2 +- .../CategoryACLOptionCacheBuilder.class.php | 2 +- .../builder/LanguageCacheBuilder.class.php | 2 +- .../cache/builder/OptionCacheBuilder.class.php | 4 ++-- .../UserGroupPermissionCacheBuilder.class.php | 2 +- .../CategoryPermissionHandler.class.php | 2 +- .../system/category/ICategoryType.class.php | 2 +- .../MostActiveMembersDashboardBox.class.php | 2 +- .../box/MostLikedMembersDashboardBox.class.php | 2 +- .../box/NewestMembersDashboardBox.class.php | 2 +- .../box/StatsSidebarDashboardBox.class.php | 4 ++-- .../lib/system/database/Database.class.php | 2 +- .../database/DatabaseException.class.php | 2 +- .../database/PostgreSQLDatabase.class.php | 2 +- .../system/exporter/AbstractExporter.class.php | 2 +- .../lib/system/exporter/IExporter.class.php | 2 +- .../importer/AbstractACLImporter.class.php | 2 +- .../AbstractAttachmentImporter.class.php | 2 +- .../AbstractCategoryImporter.class.php | 2 +- .../importer/AbstractCommentImporter.class.php | 2 +- .../AbstractCommentResponseImporter.class.php | 2 +- .../system/importer/AbstractImporter.class.php | 2 +- .../importer/AbstractLikeImporter.class.php | 2 +- .../importer/AbstractPollImporter.class.php | 2 +- .../AbstractPollOptionImporter.class.php | 4 ++-- .../AbstractPollOptionVoteImporter.class.php | 4 ++-- .../AbstractWatchedObjectImporter.class.php | 2 +- .../lib/system/importer/IImporter.class.php | 2 +- .../system/importer/ImportHandler.class.php | 4 ++-- .../importer/LabelGroupImporter.class.php | 2 +- .../system/importer/LabelImporter.class.php | 2 +- .../system/importer/SmileyImporter.class.php | 2 +- .../importer/UserAvatarImporter.class.php | 2 +- .../importer/UserCommentImporter.class.php | 2 +- .../UserCommentResponseImporter.class.php | 2 +- .../importer/UserFollowerImporter.class.php | 2 +- .../importer/UserGroupImporter.class.php | 4 ++-- .../importer/UserOptionImporter.class.php | 2 +- .../system/importer/UserRankImporter.class.php | 2 +- .../files/lib/system/io/GZipFile.class.php | 4 ++-- .../language/LanguageServerProcessor.class.php | 2 +- .../lib/system/like/LikeHandler.class.php | 2 +- .../files/lib/system/mail/Mail.class.php | 2 +- .../lib/system/menu/page/PageMenu.class.php | 2 +- .../IDeletedContentProvider.class.php | 2 +- .../queue/ModerationQueueManager.class.php | 2 +- .../system/option/PasswordOptionType.class.php | 2 +- .../lib/system/option/URLOptionType.class.php | 2 +- .../system/package/PackageArchive.class.php | 2 +- ...ctOptionPackageInstallationPlugin.class.php | 4 ++-- ...tractXMLPackageInstallationPlugin.class.php | 2 +- .../system/session/SessionHandler.class.php | 2 +- .../template/SetupTemplateEngine.class.php | 2 +- .../plugin/IModifierTemplatePlugin.class.php | 4 ++-- .../plugin/IPrefilterTemplatePlugin.class.php | 2 +- .../LangPrefilterTemplatePlugin.class.php | 2 +- ...bstractUserNotificationObjectType.class.php | 2 +- .../worker/AbstractRebuildDataWorker.class.php | 4 ++-- .../lib/system/worker/ImportWorker.class.php | 2 +- .../install/files/lib/util/FileUtil.class.php | 4 ++-- .../install/files/lib/util/ImageUtil.class.php | 2 +- .../files/lib/util/MessageUtil.class.php | 2 +- .../files/lib/util/StringUtil.class.php | 6 +++--- wcfsetup/install/files/options.inc.php | 6 +++--- wcfsetup/install/files/style/global.less | 2 +- wcfsetup/install/files/style/layout.less | 2 +- wcfsetup/install/files/style/message.less | 2 +- wcfsetup/setup/template/stepSearchWcfDir.tpl | 16 ++++++++-------- 122 files changed, 175 insertions(+), 175 deletions(-) diff --git a/wcfsetup/install.php b/wcfsetup/install.php index 548e04ba18..623cad1de4 100644 --- a/wcfsetup/install.php +++ b/wcfsetup/install.php @@ -1,7 +1,7 @@ @@ -252,7 +252,7 @@ class BasicFileUtil { return $_SERVER['DOCUMENT_ROOT'].'/tmp/'; } } - + if (isset($_ENV['TMP']) && @is_writable($_ENV['TMP'])) { return $_ENV['TMP'] . '/'; } @@ -262,7 +262,7 @@ class BasicFileUtil { if (isset($_ENV['TMPDIR']) && @is_writable($_ENV['TMPDIR'])) { return $_ENV['TMPDIR'] . '/'; } - + if (($path = ini_get('upload_tmp_dir')) && @is_writable($path)) { return $path . '/'; } diff --git a/wcfsetup/install/files/acp/global.php b/wcfsetup/install/files/acp/global.php index a0efec2d40..2f4f8a7630 100644 --- a/wcfsetup/install/files/acp/global.php +++ b/wcfsetup/install/files/acp/global.php @@ -7,7 +7,7 @@ * @category Community Framework */ // Constant to get relative path to the wcf-root-dir. -// This constant is already set in each package which got an own config.inc.php +// This constant is already set in each package which got an own config.inc.php if (!defined('RELATIVE_WCF_DIR')) define('RELATIVE_WCF_DIR', '../'); // define the wcf-root-dir diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl index b1573eeef5..2810ecb285 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl @@ -4,7 +4,7 @@ // li:has(a[href])" ) .addClass( "ui-state-default ui-corner-top" ) .attr({ role: "tab", tabIndex: -1 }); - + this.anchors = this.tabs.map(function() { return $( "a", this )[ 0 ]; }) @@ -9196,15 +9196,15 @@ $.widget('ui.wcfTabs', $.ui.tabs, { role: "presentation", tabIndex: -1 }); - + this.panels = $(); - + this.anchors.each(function( i, anchor ) { var selector, panel, anchorId = $( anchor ).uniqueId().attr( "id" ), tab = $( anchor ).closest( "li" ), originalAriaControls = tab.attr( "aria-controls" ); - + // inline tab selector = anchor.hash; panel = that.element.find( that._sanitizeSelector( selector ) ); @@ -9221,7 +9221,7 @@ $.widget('ui.wcfTabs', $.ui.tabs, { }); panel.attr( "aria-labelledby", anchorId ); }); - + this.panels .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ) .attr( "role", "tabpanel" ); diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php index 9f340c8ef6..937c00723e 100644 --- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php @@ -188,7 +188,7 @@ class UninstallPackageAction extends InstallPackageAction { $installationType = $this->installation->nodeBuilder->getInstallationTypeByQueue($queueID); $currentAction = WCF::getLanguage()->getDynamicVariable('wcf.acp.package.uninstallation.step.'.$installationType, array('packageName' => $packageName)); } - + return $currentAction; } } diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php index 23adf41c04..e104260cb9 100644 --- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php @@ -17,7 +17,7 @@ use wcf\util\StringUtil; /** * Abstract implementation of a form to create categories. - * + * * @author Matthias Schmidt * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php index c7d0649ee6..86e8a5a8b9 100644 --- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php @@ -15,7 +15,7 @@ use wcf\system\WCF; /** * Abstract implementation of a form to edit a category. - * + * * @author Matthias Schmidt * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php index ee2f7f3420..b419d8617c 100644 --- a/wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LanguageEditForm.class.php @@ -76,7 +76,7 @@ class LanguageEditForm extends LanguageAddForm { */ public function readData() { parent::readData(); - + if (!count($_POST)) { $this->countryCode = $this->language->countryCode; $this->languageName = $this->language->languageName; diff --git a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php index 785b9105aa..21df6f4078 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php @@ -15,7 +15,7 @@ use wcf\util\StringUtil; /** * Shows the form for adding new templates. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -87,7 +87,7 @@ class TemplateAddForm extends AbstractForm { */ public function readParameters() { parent::readParameters(); - + if (!empty($_REQUEST['copy'])) { $this->copy = intval($_REQUEST['copy']); $this->copiedTemplate = new Template($this->copy); @@ -140,7 +140,7 @@ class TemplateAddForm extends AbstractForm { if (empty($this->tplName)) { throw new UserInputException('tplName'); } - + if (!preg_match('/^[a-z0-9_\-]+$/i', $this->tplName)) { throw new UserInputException('tplName', 'notValid'); } diff --git a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php index 299f11e119..24ab0e13fa 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php @@ -13,7 +13,7 @@ use wcf\util\StringUtil; /** * Shows the form for adding new templates. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -44,7 +44,7 @@ class TemplateEditForm extends TemplateAddForm { */ public function readParameters() { parent::readParameters(); - + if (isset($_REQUEST['id'])) $this->templateID = intval($_REQUEST['id']); $this->template = new Template($this->templateID); if (!$this->template->templateID || !$this->template->templateGroupID) { @@ -96,7 +96,7 @@ class TemplateEditForm extends TemplateAddForm { */ public function readData() { parent::readData(); - + if (!count($_POST)) { $this->tplName = $this->template->templateName; $this->templateSource = $this->template->getSource(); diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php index 9137628060..2e0386a2a5 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php @@ -10,7 +10,7 @@ use wcf\util\StringUtil; /** * Shows the form for adding new template groups. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php index ceecc01431..cbbb8d57c3 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php @@ -9,7 +9,7 @@ use wcf\system\WCF; /** * Shows the form for editing template groups. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -40,7 +40,7 @@ class TemplateGroupEditForm extends TemplateGroupAddForm { */ public function readParameters() { parent::readParameters(); - + if (isset($_REQUEST['id'])) $this->templateGroupID = intval($_REQUEST['id']); $this->templateGroup = new TemplateGroup($this->templateGroupID); if (!$this->templateGroup->templateGroupID) { diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index 66dd96ed1f..a2fbfee141 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -160,7 +160,7 @@ class UserAddForm extends UserOptionListForm { * @see wcf\form\IForm::validate() */ public function validate() { - // validate static user options + // validate static user options try { $this->validateUsername($this->username); } diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php index f1b4ce2834..5d3feeef0f 100755 --- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php @@ -337,7 +337,7 @@ class UserEditForm extends UserAddForm { */ protected function validateAvatar() { if ($this->avatarType != 'custom' && $this->avatarType != 'gravatar') $this->avatarType = 'none'; - + try { switch ($this->avatarType) { case 'custom': @@ -345,13 +345,13 @@ class UserEditForm extends UserAddForm { throw new UserInputException('customAvatar'); } break; - + case 'gravatar': if (!MODULE_GRAVATAR) { $this->avatarType = 'none'; break; } - + // test gravatar if (!Gravatar::test($this->user->email)) { throw new UserInputException('gravatar', 'notFound'); diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php index 40fd8b5988..eea2f8f314 100644 --- a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php @@ -79,7 +79,7 @@ class UserOptionAddForm extends AbstractForm { public $required = 0; /** - * shows this field in the registration process + * shows this field in the registration process * @var boolean */ public $askDuringRegistration = 0; diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php index f8ae8017d0..5354c3fec0 100644 --- a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php @@ -9,7 +9,7 @@ use wcf\system\WCF; /** * Shows the form for adding new user option categories. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -45,7 +45,7 @@ class UserOptionCategoryAddForm extends AbstractForm { */ public function readParameters() { parent::readParameters(); - + I18nHandler::getInstance()->register('categoryName'); } diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php index 75dc609383..f0bec55581 100644 --- a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php @@ -7,7 +7,7 @@ use wcf\system\WCF; /** * Provides functions to set the default values of user options. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php index c1dbefb36d..a5116f36b8 100755 --- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php @@ -34,7 +34,7 @@ class UserSearchForm extends UserOptionListForm { public $neededPermissions = array('admin.user.canSearchUser'); /** - * username + * username * @var string */ public $username = ''; @@ -71,7 +71,7 @@ class UserSearchForm extends UserOptionListForm { /** * registration start date - * @var string + * @var string */ public $registrationDateStart = ''; @@ -321,7 +321,7 @@ class UserSearchForm extends UserOptionListForm { $this->matches = array(); $sql = "SELECT user_table.userID FROM wcf".WCF_N."_user user_table - LEFT JOIN wcf".WCF_N."_user_option_value option_value + LEFT JOIN wcf".WCF_N."_user_option_value option_value ON (option_value.userID = user_table.userID)"; // build search condition diff --git a/wcfsetup/install/files/lib/acp/page/AbstractCategoryListPage.class.php b/wcfsetup/install/files/lib/acp/page/AbstractCategoryListPage.class.php index 39839fba95..b630e5fa57 100644 --- a/wcfsetup/install/files/lib/acp/page/AbstractCategoryListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/AbstractCategoryListPage.class.php @@ -12,7 +12,7 @@ use wcf\util\StringUtil; /** * Abstract implementation of a page with lists all categories of a certain object * type. - * + * * @author Matthias Schmidt * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/page/LanguageItemListPage.class.php b/wcfsetup/install/files/lib/acp/page/LanguageItemListPage.class.php index 790ab75e30..d94e704bbc 100644 --- a/wcfsetup/install/files/lib/acp/page/LanguageItemListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/LanguageItemListPage.class.php @@ -9,7 +9,7 @@ use wcf\util\StringUtil; /** * Shows a list of language items. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -81,7 +81,7 @@ class LanguageItemListPage extends AbstractPage { */ public function readParameters() { parent::readParameters(); - + if (isset($_REQUEST['id'])) $this->languageID = intval($_REQUEST['id']); if (isset($_REQUEST['languageCategoryID'])) $this->languageCategoryID = intval($_REQUEST['languageCategoryID']); if (isset($_REQUEST['languageItem'])) $this->languageItem = StringUtil::trim($_REQUEST['languageItem']); @@ -98,7 +98,7 @@ class LanguageItemListPage extends AbstractPage { // get languages $this->availableLanguages = LanguageFactory::getInstance()->getLanguages(); - // get categories + // get categories $languageCategoryList = new LanguageCategoryList(); $languageCategoryList->readObjects(); $this->availableLanguageCategories = $languageCategoryList->getObjects(); @@ -127,7 +127,7 @@ class LanguageItemListPage extends AbstractPage { */ public function assignVariables() { parent::assignVariables(); - + WCF::getTPL()->assign(array( 'objects' => $this->languageItemList, 'languageID' => $this->languageID, diff --git a/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php b/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php index 81ab1e37df..f7290b6c9a 100644 --- a/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Shows phpinfo() output. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php b/wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php index 74dfd741f8..91742a97d4 100644 --- a/wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php @@ -9,7 +9,7 @@ use wcf\util\StringUtil; /** * Shows a list of templates. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -136,7 +136,7 @@ class TemplateListPage extends SortablePage { */ public function assignVariables() { parent::assignVariables(); - + WCF::getTPL()->assign(array( 'templateGroupID' => $this->templateGroupID, 'searchTemplateName' => $this->searchTemplateName, diff --git a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php index cc8d364fb6..08c4f4b4bb 100644 --- a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php @@ -158,7 +158,7 @@ class AJAXInvokeAction extends AbstractSecureAction { if ($this->inDebugMode) { throw $e; } - + if ($e instanceof IllegalLinkException) { throw new AJAXException(WCF::getLanguage()->get('wcf.ajax.error.sessionExpired'), AJAXException::SESSION_EXPIRED, $e->getTraceAsString()); } diff --git a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php index de4c4f1f9f..4fd72f6dcd 100644 --- a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php @@ -8,7 +8,7 @@ use wcf\util\StringUtil; /** * Default implementation for object-actions using the AJAX-API. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php b/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php index 7b5b8e2dbf..ce9ef80312 100644 --- a/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php @@ -5,7 +5,7 @@ use wcf\util\JSON; /** * Default implementation for file uploads using the AJAX-API. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php b/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php index 44dc452896..a671e3c86d 100644 --- a/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php +++ b/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php @@ -4,7 +4,7 @@ use wcf\util\JSON; /** * Provides method to send JSON-encoded responses. - * + * * @author Alexander Ebert * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php b/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php index 9ed4db9a73..2e1c87955a 100644 --- a/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php +++ b/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php @@ -9,7 +9,7 @@ use wcf\util\StringUtil; /** * Clipboard proxy implementation. - * + * * @author Alexander Ebert * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/data/DatabaseObject.class.php b/wcfsetup/install/files/lib/data/DatabaseObject.class.php index 1058a33292..4954b1082b 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObject.class.php @@ -21,7 +21,7 @@ abstract class DatabaseObject implements IStorableObject { /** * indicates if database table index is an identity column - * @var boolean + * @var boolean */ protected static $databaseTableIndexIsIdentity = true; diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php index 8f031927c3..adc54e14d8 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php @@ -84,7 +84,7 @@ abstract class DatabaseObjectList implements \Countable, ITraversableObject { public $sqlJoins = ''; /** - * enables the automatic usage of the qualified shorthand + * enables the automatic usage of the qualified shorthand * @var boolean */ public $useQualifiedShorthand = true; diff --git a/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategoryEditor.class.php b/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategoryEditor.class.php index 78e81e842e..e4d3eda30a 100644 --- a/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategoryEditor.class.php @@ -4,7 +4,7 @@ use wcf\data\DatabaseObjectEditor; /** * Provides functions to edit acl option categories. - * + * * @author Alexander Ebert * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/data/attachment/Attachment.class.php b/wcfsetup/install/files/lib/data/attachment/Attachment.class.php index 00a35eb278..3124761c8f 100644 --- a/wcfsetup/install/files/lib/data/attachment/Attachment.class.php +++ b/wcfsetup/install/files/lib/data/attachment/Attachment.class.php @@ -33,7 +33,7 @@ class Attachment extends DatabaseObject implements IRouteController { protected $embedded = false; /** - * user permissions for attachment access + * user permissions for attachment access * @var array */ protected $permissions = array(); diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php index 681ecb1c63..0670deba8a 100644 --- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php +++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php @@ -140,7 +140,7 @@ class AttachmentAction extends AbstractDatabaseObjectAction { 'filesize' => $file->getFilesize(), 'fileType' => $file->getMimeType(), 'fileHash' => sha1_file($file->getLocation()), - 'uploadTime' => TIME_NOW + 'uploadTime' => TIME_NOW ); // get image data diff --git a/wcfsetup/install/files/lib/data/category/CategoryNode.class.php b/wcfsetup/install/files/lib/data/category/CategoryNode.class.php index 190e9cc2c3..385fc4e42d 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryNode.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryNode.class.php @@ -78,12 +78,12 @@ class CategoryNode extends DatabaseObjectDecorator implements \RecursiveIterator public function getOpenParentNodes() { $element = $this; $i = 0; - + while ($element->parentNode->parentNode != null && $element->isLastSibling()) { $i++; $element = $element->parentNode; } - + return $i; } diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php index 4ce2bd352a..6845bff42b 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php @@ -264,7 +264,7 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje public static function deleteLanguageFiles($languageID = '.*', $category = '.*') { if ($category != '.*') $category = preg_quote($category, '~'); if ($languageID != '.*') $languageID = intval($languageID); - + DirectoryUtil::getInstance(WCF_DIR.'language/')->removePattern(new Regex($languageID.'_'.$category.'\.php$')); } @@ -482,7 +482,7 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje * @param boolean $useRegex * @param boolean $caseSensitive * @param boolean $searchVariableName - * @return array results + * @return array */ public static function search($search, $replace = null, $languageID = null, $useRegex = 0, $searchVariableName = 0) { $results = array(); diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php index bc616dff8e..ffea21a398 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php @@ -64,7 +64,7 @@ class LanguageItemAction extends AbstractDatabaseObjectAction { WCF::getTPL()->assign(array( 'item' => $item )); - + return array( 'languageItem' => $item->languageItem, 'template' => WCF::getTPL()->fetch('languageItemEditDialog') diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php index 7b3b3e6f11..745256cc93 100644 --- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php +++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php @@ -29,7 +29,7 @@ class ModerationQueueAction extends AbstractDatabaseObjectAction { if (!isset($this->parameters['data']['lastChangeTime'])) { $this->parameters['data']['lastChangeTime'] = TIME_NOW; } - + return parent::create(); } diff --git a/wcfsetup/install/files/lib/data/smiley/category/SmileyCategoryAction.class.php b/wcfsetup/install/files/lib/data/smiley/category/SmileyCategoryAction.class.php index 7c58bb276b..e4c9ced4ac 100644 --- a/wcfsetup/install/files/lib/data/smiley/category/SmileyCategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/smiley/category/SmileyCategoryAction.class.php @@ -1,4 +1,4 @@ -objects as $template) { // rename file $templateName = (isset($this->parameters['data']['templateName']) ? $this->parameters['data']['templateName'] : $template->templateName); diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php index 81409fd5e5..1a686d5f81 100644 --- a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php +++ b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php @@ -37,7 +37,7 @@ class TemplateEditor extends DatabaseObjectEditor { /** * Saves the source of this template. * - * @param string $source + * @param string $source */ public function setSource($source) { $path = $this->getPath(); @@ -47,7 +47,7 @@ class TemplateEditor extends DatabaseObjectEditor { mkdir($folder, 0777); } - // set source + // set source $file = new File($path); $file->write($source); $file->close(); @@ -64,7 +64,7 @@ class TemplateEditor extends DatabaseObjectEditor { // get current path $currentPath = $this->getPath(); - // get new path + // get new path if ($templateGroupID != $this->templateGroupID) { // get folder name $sql = "SELECT templateGroupFolderName diff --git a/wcfsetup/install/files/lib/data/user/TeamList.class.php b/wcfsetup/install/files/lib/data/user/TeamList.class.php index 620664b026..9aa0b51253 100644 --- a/wcfsetup/install/files/lib/data/user/TeamList.class.php +++ b/wcfsetup/install/files/lib/data/user/TeamList.class.php @@ -1,4 +1,4 @@ -objectIDs; } - + if (!empty($userIDs)) { ClipboardHandler::getInstance()->unmark($userIDs, ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user')); } diff --git a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php index 6481baec8b..919865a4fc 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php @@ -79,7 +79,7 @@ class Gravatar extends DefaultAvatar { } else { $this->url[$size] = LinkHandler::getInstance()->getLink('GravatarDownload', array( - 'forceFrontend' => true + 'forceFrontend' => true ), 'userID='.$this->userID.'&size='.$size); } } diff --git a/wcfsetup/install/files/lib/data/user/group/Team.class.php b/wcfsetup/install/files/lib/data/user/group/Team.class.php index be9cb1d1de..e83392bad7 100644 --- a/wcfsetup/install/files/lib/data/user/group/Team.class.php +++ b/wcfsetup/install/files/lib/data/user/group/Team.class.php @@ -1,4 +1,4 @@ -username) || !empty($this->email)) { throw new PermissionDeniedException(); } diff --git a/wcfsetup/install/files/lib/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/form/UserSearchForm.class.php index 165de4ed41..13a2154558 100644 --- a/wcfsetup/install/files/lib/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/form/UserSearchForm.class.php @@ -1,4 +1,4 @@ - @@ -64,7 +64,7 @@ class DeletedContentListPage extends MultipleLinkPage { */ public function assignVariables() { parent::assignVariables(); - + WCF::getTPL()->assign(array( 'availableObjectTypes' => ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.deletedContent'), 'objectType' => $this->objectType->objectType, diff --git a/wcfsetup/install/files/lib/page/TaggedPage.class.php b/wcfsetup/install/files/lib/page/TaggedPage.class.php index c61326933c..963979690c 100644 --- a/wcfsetup/install/files/lib/page/TaggedPage.class.php +++ b/wcfsetup/install/files/lib/page/TaggedPage.class.php @@ -8,7 +8,7 @@ use wcf\system\WCF; /** * Shows the a list of tagged objects. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/Regex.class.php b/wcfsetup/install/files/lib/system/Regex.class.php index 61c397a03f..522611368a 100644 --- a/wcfsetup/install/files/lib/system/Regex.class.php +++ b/wcfsetup/install/files/lib/system/Regex.class.php @@ -211,7 +211,7 @@ final class Regex { /** * Replaces part of the string with the regex. * - * @param string $string + * @param string $string * @param mixed $replacement replacement-string or instance of wcf\system\Callback * @return string */ diff --git a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php index 6239ab81ac..2edee8f25b 100644 --- a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php @@ -52,10 +52,10 @@ class AttachmentBBCode extends AbstractBBCode { if ($attachment->showAsImage() && $parser->getOutputType() == 'text/html') { // image $linkParameters = array( - 'object' => $attachment + 'object' => $attachment ); if ($attachment->hasThumbnail()) { - $linkParameters['thumbnail'] = 1; + $linkParameters['thumbnail'] = 1; } // get alignment diff --git a/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php b/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php index 70274af54b..9c7cc5ee65 100644 --- a/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php @@ -62,7 +62,7 @@ class PhpHighlighter extends Highlighter { // convert colors to classes $highlightedCode = strtr($highlightedCode, self::$colorToClass); - // replace double quotes by entity + // replace double quotes by entity return Regex::compile('(?)')->replace($highlightedCode, '"'); } } diff --git a/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php index 30c5e04a44..788763534b 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CategoryACLOptionCacheBuilder.class.php @@ -5,7 +5,7 @@ use wcf\system\category\CategoryHandler; /** * Caches the acl options of categories. - * + * * @author Matthias Schmidt * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php index 52efc776b0..ce921ea25e 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php @@ -60,7 +60,7 @@ class LanguageCacheBuilder extends AbstractCacheBuilder { $data['categories'][$languageCategory->languageCategory] = $languageCategory; $data['categoryIDs'][$languageCategory->languageCategoryID] = $languageCategory->languageCategory; } - + return $data; } } diff --git a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php index 3b654d170d..3b73c424dc 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php @@ -40,7 +40,7 @@ class OptionCacheBuilder extends AbstractCacheBuilder { // option categories // get all option categories and sort categories by priority - $sql = "SELECT categoryName, categoryID + $sql = "SELECT categoryName, categoryID FROM wcf".WCF_N."_".$this->tableName."_category"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(); @@ -75,7 +75,7 @@ class OptionCacheBuilder extends AbstractCacheBuilder { // options // get all options and sort options by priority $optionIDs = array(); - $sql = "SELECT optionName, optionID + $sql = "SELECT optionName, optionID FROM wcf".WCF_N."_".$this->tableName; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php index d76f94217a..45295442e6 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php @@ -30,7 +30,7 @@ class UserGroupPermissionCacheBuilder extends AbstractCacheBuilder { $data = array(); // get all options - $sql = "SELECT optionName, optionID + $sql = "SELECT optionName, optionID FROM wcf".WCF_N."_user_group_option"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(); diff --git a/wcfsetup/install/files/lib/system/category/CategoryPermissionHandler.class.php b/wcfsetup/install/files/lib/system/category/CategoryPermissionHandler.class.php index 64995c1f9e..b10a56b974 100644 --- a/wcfsetup/install/files/lib/system/category/CategoryPermissionHandler.class.php +++ b/wcfsetup/install/files/lib/system/category/CategoryPermissionHandler.class.php @@ -8,7 +8,7 @@ use wcf\system\WCF; /** * Handles the category permissions. - * + * * @author Matthias Schmidt * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php index 964dfa88cd..5ec978daab 100644 --- a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php +++ b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php @@ -66,7 +66,7 @@ interface ICategoryType { public function getObjectTypeName($definitionName); /** - * Returns the language variable category for the description language + * Returns the language variable category for the description language * variables of categories of this type. * * @return string 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 d9c66991bd..b278ee39ee 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; class MostActiveMembersDashboardBox extends AbstractSidebarDashboardBox { /** * user profile list - * @var wcf\data\user\UserProfileList + * @var wcf\data\user\UserProfileList */ public $userProfileList = null; 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 02752a6e6a..8a30cd4cdb 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; class MostLikedMembersDashboardBox extends AbstractSidebarDashboardBox { /** * user profile list - * @var wcf\data\user\UserProfileList + * @var wcf\data\user\UserProfileList */ public $userProfileList = null; 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 02756c499b..94d35fed74 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; class NewestMembersDashboardBox extends AbstractSidebarDashboardBox { /** * user profile list - * @var wcf\data\user\UserProfileList + * @var wcf\data\user\UserProfileList */ public $userProfileList = null; 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 6bea7b7095..b44214d1c3 100644 --- a/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php +++ b/wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php @@ -17,8 +17,8 @@ use wcf\system\WCF; */ class StatsSidebarDashboardBox extends AbstractSidebarDashboardBox { /** - * the stats - * @var wcf\system\cache\builder\UserStatsCacheBuilder + * displayed stats + * @var wcf\system\cache\builder\UserStatsCacheBuilder */ public $stats = null; diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php index 508eb6ecf8..6b295da8f7 100644 --- a/wcfsetup/install/files/lib/system/database/Database.class.php +++ b/wcfsetup/install/files/lib/system/database/Database.class.php @@ -117,7 +117,7 @@ abstract class Database { * * @param string $table * @param string $field - * @return integer + * @return integer */ public function getInsertID($table, $field) { try { diff --git a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php index 98c9963521..43f6067991 100644 --- a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php +++ b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php @@ -115,7 +115,7 @@ class DatabaseException extends SystemException { /** * Returns the sql type of the active database. * - * @return string + * @return string */ public function getDBType() { return $this->DBType; diff --git a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php index bb7dad3c61..09589907c2 100644 --- a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php +++ b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php @@ -96,7 +96,7 @@ class PostgreSQLDatabase extends Database { // reinsert quotes $query = StringStack::reinsertStrings($query, 'postgresQuotes'); - + return $query; } diff --git a/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php b/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php index a4b1264376..ad1796ff9c 100644 --- a/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php +++ b/wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php @@ -7,7 +7,7 @@ use wcf\util\FileUtil; /** * Basic implementation of IExporter. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/exporter/IExporter.class.php b/wcfsetup/install/files/lib/system/exporter/IExporter.class.php index d45e01802c..9d6f623db6 100644 --- a/wcfsetup/install/files/lib/system/exporter/IExporter.class.php +++ b/wcfsetup/install/files/lib/system/exporter/IExporter.class.php @@ -3,7 +3,7 @@ namespace wcf\system\exporter; /** * Basic interface for all exporters. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php index 1fb763bde0..729b4df8f5 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Imports ACLs. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php index 233bc63960..ce42e4364e 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php @@ -7,7 +7,7 @@ use wcf\util\StringUtil; /** * Imports attachments. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCategoryImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCategoryImporter.class.php index 8dd2294d3f..609cb5c526 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractCategoryImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractCategoryImporter.class.php @@ -4,7 +4,7 @@ use wcf\data\category\CategoryEditor; /** * Imports categories. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCommentImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCommentImporter.class.php index 65e7abb328..8293c8a069 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractCommentImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractCommentImporter.class.php @@ -4,7 +4,7 @@ use wcf\data\comment\CommentEditor; /** * Imports comments. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php index 9096ecfbc0..4c3d86c867 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Imports comment responses. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractImporter.class.php index ffbc1d8dd7..f89352d7e2 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractImporter.class.php @@ -3,7 +3,7 @@ namespace wcf\system\importer; /** * Basic implementation of IImporter. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractLikeImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractLikeImporter.class.php index 9bad5c9a09..13332ad59d 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractLikeImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractLikeImporter.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Imports likes. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php index 63c813d920..c69da4099f 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php @@ -4,7 +4,7 @@ use wcf\data\poll\PollEditor; /** * Imports polls. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php index de63bd4a3b..1e02a6a2af 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php @@ -4,7 +4,7 @@ use wcf\data\poll\option\PollOptionEditor; /** * Imports poll votes. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -38,7 +38,7 @@ class AbstractPollOptionImporter extends AbstractImporter { if (!$data['pollID']) return 0; $option = PollOptionEditor::create($data); - + ImportHandler::getInstance()->saveNewID($this->objectTypeName, $oldID, $option->optionID); return $option->optionID; diff --git a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionVoteImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionVoteImporter.class.php index 7c303e24e3..f860cf40c4 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionVoteImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionVoteImporter.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Imports poll votes. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -21,7 +21,7 @@ class AbstractPollOptionVoteImporter extends AbstractImporter { /** * poll object type name - * @var string + * @var string */ protected $pollObjectTypeName = ''; diff --git a/wcfsetup/install/files/lib/system/importer/AbstractWatchedObjectImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractWatchedObjectImporter.class.php index 47ee5975b5..e2de76efc4 100644 --- a/wcfsetup/install/files/lib/system/importer/AbstractWatchedObjectImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/AbstractWatchedObjectImporter.class.php @@ -4,7 +4,7 @@ use wcf\data\user\object\watch\UserObjectWatchEditor; /** * Imports watched objects. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/IImporter.class.php b/wcfsetup/install/files/lib/system/importer/IImporter.class.php index a18e39c007..fa433e397f 100644 --- a/wcfsetup/install/files/lib/system/importer/IImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/IImporter.class.php @@ -3,7 +3,7 @@ namespace wcf\system\importer; /** * Basic interface for all importer. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php index b8c8e681ba..9cba3e7804 100644 --- a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php +++ b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php @@ -10,7 +10,7 @@ use wcf\system\WCF; /** * Handles data import. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -21,7 +21,7 @@ use wcf\system\WCF; class ImportHandler extends SingletonFactory implements IAJAXInvokeAction { /** * id map cache - * @var array + * @var array */ protected $idMappingCache = array(); diff --git a/wcfsetup/install/files/lib/system/importer/LabelGroupImporter.class.php b/wcfsetup/install/files/lib/system/importer/LabelGroupImporter.class.php index e8cc4b8c52..3dbb8663df 100644 --- a/wcfsetup/install/files/lib/system/importer/LabelGroupImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/LabelGroupImporter.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Imports label groups. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/LabelImporter.class.php b/wcfsetup/install/files/lib/system/importer/LabelImporter.class.php index a8151182e1..dc8f47f981 100644 --- a/wcfsetup/install/files/lib/system/importer/LabelImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/LabelImporter.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Imports labels. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/SmileyImporter.class.php b/wcfsetup/install/files/lib/system/importer/SmileyImporter.class.php index d6598d903f..359fe41cd0 100644 --- a/wcfsetup/install/files/lib/system/importer/SmileyImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/SmileyImporter.class.php @@ -6,7 +6,7 @@ use wcf\util\StringUtil; /** * Imports smilies. - * + * * @author Tim Duesterhus, Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php index bdf55410b3..db21a6a544 100644 --- a/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php @@ -8,7 +8,7 @@ use wcf\util\FileUtil; /** * Imports user avatars. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserCommentImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserCommentImporter.class.php index 56d9f4d76f..ead09ea3de 100644 --- a/wcfsetup/install/files/lib/system/importer/UserCommentImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserCommentImporter.class.php @@ -5,7 +5,7 @@ use wcf\data\object\type\ObjectTypeCache; /** * Imports user profile comments. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserCommentResponseImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserCommentResponseImporter.class.php index 823cc2a4e3..fc6b57905a 100644 --- a/wcfsetup/install/files/lib/system/importer/UserCommentResponseImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserCommentResponseImporter.class.php @@ -3,7 +3,7 @@ namespace wcf\system\importer; /** * Imports user profile comment response. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserFollowerImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserFollowerImporter.class.php index 968aafff54..f1ed9ac702 100644 --- a/wcfsetup/install/files/lib/system/importer/UserFollowerImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserFollowerImporter.class.php @@ -4,7 +4,7 @@ use wcf\system\WCF; /** * Imports followers. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserGroupImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserGroupImporter.class.php index 759324acdd..07e98342b6 100644 --- a/wcfsetup/install/files/lib/system/importer/UserGroupImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserGroupImporter.class.php @@ -5,7 +5,7 @@ use wcf\data\user\group\UserGroupAction; /** * Imports user groups. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License @@ -28,7 +28,7 @@ class UserGroupImporter extends AbstractImporter { } else { $action = new UserGroupAction(array(), 'create', array( - 'data' => $data + 'data' => $data )); $returnValues = $action->executeAction(); $newGroupID = $returnValues['returnValues']->groupID; diff --git a/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php index 98bf04931b..52badfbe73 100644 --- a/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php @@ -8,7 +8,7 @@ use wcf\util\StringUtil; /** * Imports user options. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/importer/UserRankImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserRankImporter.class.php index 3eca50d2b3..afce73c624 100644 --- a/wcfsetup/install/files/lib/system/importer/UserRankImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserRankImporter.class.php @@ -5,7 +5,7 @@ use wcf\data\user\rank\UserRankEditor; /** * Imports user ranks. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/io/GZipFile.class.php b/wcfsetup/install/files/lib/system/io/GZipFile.class.php index bf980f7ac7..e3d9d247e8 100644 --- a/wcfsetup/install/files/lib/system/io/GZipFile.class.php +++ b/wcfsetup/install/files/lib/system/io/GZipFile.class.php @@ -56,8 +56,8 @@ class GZipFile extends File { $byteBlock = 1<<14; $eof = $byteBlock; - // the correction is for zip files that are too small - // to get in the first while loop + // the correction is for zip files that are too small + // to get in the first while loop $correction = 1; while ($this->seek($eof) == 0) { $eof += $byteBlock; diff --git a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php index d025d42da9..082868a538 100644 --- a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php +++ b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php @@ -103,7 +103,7 @@ class LanguageServerProcessor extends SingletonFactory { // send content type and length $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; $request .= "Content-Length: ".strlen($postString)."\r\n"; - // if it is a POST request, there MUST be a blank line before the POST data, but there MUST NOT be + // if it is a POST request, there MUST be a blank line before the POST data, but there MUST NOT be // another blank line before, and of course there must be another blank line at the end of the request! $request .= "\r\n"; if (!empty($postString)) $request .= $postString."\r\n"; diff --git a/wcfsetup/install/files/lib/system/like/LikeHandler.class.php b/wcfsetup/install/files/lib/system/like/LikeHandler.class.php index d4edca16e9..be4a2565c1 100644 --- a/wcfsetup/install/files/lib/system/like/LikeHandler.class.php +++ b/wcfsetup/install/files/lib/system/like/LikeHandler.class.php @@ -28,7 +28,7 @@ use wcf\system\WCF; * LikeHandler::getInstance()->loadLikeObjects($objectType, $objectIDs); * // get like data * $likeObjects = LikeHandler::getInstance()->getLikeObjects($objectType); - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php index e629a94533..528d4f42e5 100644 --- a/wcfsetup/install/files/lib/system/mail/Mail.class.php +++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php @@ -144,7 +144,7 @@ class Mail { $this->header .= 'X-Priority: 3'.self::$lineEnding - .'X-Mailer: WoltLab Community Framework Mail Package'.self::$lineEnding + .'X-Mailer: WoltLab Community Framework Mail Package'.self::$lineEnding .'From: '.$this->getFrom().self::$lineEnding .($this->getCCString() != '' ? 'CC:'.$this->getCCString().self::$lineEnding : '') .($this->getBCCString() != '' ? 'BCC:'.$this->getBCCString().self::$lineEnding : ''); diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php index b98cbf7487..fd90868408 100644 --- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php @@ -98,7 +98,7 @@ class PageMenu extends TreeMenu { // ignore footer items return; } - + parent::setActiveMenuItem($menuItem); } } diff --git a/wcfsetup/install/files/lib/system/moderation/IDeletedContentProvider.class.php b/wcfsetup/install/files/lib/system/moderation/IDeletedContentProvider.class.php index 6578b8e56d..0fcba26992 100644 --- a/wcfsetup/install/files/lib/system/moderation/IDeletedContentProvider.class.php +++ b/wcfsetup/install/files/lib/system/moderation/IDeletedContentProvider.class.php @@ -3,7 +3,7 @@ namespace wcf\system\moderation; /** * Interface for deleted content provider. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php index 928b47750e..b7e4920c0e 100644 --- a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php +++ b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueManager.class.php @@ -371,7 +371,7 @@ class ModerationQueueManager extends SingletonFactory { $definitionNames[$objectTypeID] = $definitionName; } } - + return $definitionNames; } diff --git a/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php b/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php index 9ec6f67b6a..fc37e06f75 100644 --- a/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php @@ -5,7 +5,7 @@ use wcf\system\database\util\PreparedStatementConditionBuilder; /** * Option type implementation for password input fields. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/option/URLOptionType.class.php b/wcfsetup/install/files/lib/system/option/URLOptionType.class.php index cc0f200cf9..a9349c86aa 100644 --- a/wcfsetup/install/files/lib/system/option/URLOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/URLOptionType.class.php @@ -4,7 +4,7 @@ use wcf\data\option\Option; /** * Option type implementation for url input fields. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php index dbc3ae9155..300f22bde2 100644 --- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php @@ -677,7 +677,7 @@ class PackageArchive { if (isset($requirement['minversion'])) { if (Package::compareVersion($existingPackages[$requirement['name']]['packageVersion'], $requirement['minversion']) >= 0) { // package does already exist in needed version - // skip installation of requirement + // skip installation of requirement continue; } else { 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 7b977a0e15..1c7b6d54f3 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php @@ -94,7 +94,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag /** * Imports option categories. * - * @param \DOMXPath $xpath + * @param \DOMXPath $xpath */ protected function importCategories(\DOMXPath $xpath) { $elements = $xpath->query('/ns:data/ns:import/ns:categories/ns:category'); @@ -143,7 +143,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag /** * Imports options. * - * @param \DOMXPath $xpath + * @param \DOMXPath $xpath */ protected function importOptions(\DOMXPath $xpath) { $elements = $xpath->query('/ns:data/ns:import/ns:options/ns:option'); diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php index f26e9355f4..1e5411d95b 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php @@ -311,7 +311,7 @@ abstract class AbstractXMLPackageInstallationPlugin extends AbstractPackageInsta * @param string $parentName * @param string $columnName * @param string $tableNameExtension - * @return integer + * @return integer */ protected function getShowOrder($showOrder, $parentName = null, $columnName = null, $tableNameExtension = '') { if ($showOrder === null) { diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index 3ada788350..d04bb57335 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -390,7 +390,7 @@ class SessionHandler extends SingletonFactory { } /** - * Checks if the active user has the given permissions and throws a + * Checks if the active user has the given permissions and throws a * PermissionDeniedException if that isn't the case. */ public function checkPermissions(array $permissions) { diff --git a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php index e616e10bba..f6297a23e3 100644 --- a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php +++ b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php @@ -26,7 +26,7 @@ class SetupTemplateEngine extends TemplateEngine { if ($this->compilerObj === null) { $this->compilerObj = new SetupTemplateCompiler($this); } - + return $this->compilerObj; } diff --git a/wcfsetup/install/files/lib/system/template/plugin/IModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/IModifierTemplatePlugin.class.php index f11c93f043..e4702655b2 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/IModifierTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/IModifierTemplatePlugin.class.php @@ -3,8 +3,8 @@ namespace wcf\system\template\plugin; use wcf\system\template\TemplateEngine; /** - * Modifiers are functions that are applied to a variable in the template - * before it is displayed or used in some other context. + * Modifiers are functions that are applied to a variable in the template before + * it is displayed or used in some other context. * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH diff --git a/wcfsetup/install/files/lib/system/template/plugin/IPrefilterTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/IPrefilterTemplatePlugin.class.php index eb80feed1c..dd78a61a6d 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/IPrefilterTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/IPrefilterTemplatePlugin.class.php @@ -17,7 +17,7 @@ interface IPrefilterTemplatePlugin { * Executes this prefilter. * * @param string $templateName - * @param string $sourceContent + * @param string $sourceContent * @param wcf\system\template\TemplateScriptingCompiler $compiler * @return string */ diff --git a/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php index d092577697..985a77d1fb 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php @@ -30,7 +30,7 @@ class LangPrefilterTemplatePlugin implements IPrefilterTemplatePlugin { $sourceContent = preg_replace_callback("~{$ldq}lang{$rdq}([\w\.]+){$ldq}/lang{$rdq}~", function ($match) { return WCF::getLanguage()->get($match[1]); }, $sourceContent); - + return $sourceContent; } } diff --git a/wcfsetup/install/files/lib/system/user/notification/object/type/AbstractUserNotificationObjectType.class.php b/wcfsetup/install/files/lib/system/user/notification/object/type/AbstractUserNotificationObjectType.class.php index e22d9883a8..36cbe910e9 100644 --- a/wcfsetup/install/files/lib/system/user/notification/object/type/AbstractUserNotificationObjectType.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/object/type/AbstractUserNotificationObjectType.class.php @@ -50,7 +50,7 @@ class AbstractUserNotificationObjectType extends AbstractObjectTypeProcessor imp $objects[$objectID] = new static::$decoratorClassName(new static::$objectClassName(null, array($indexName => $objectID))); } } - + return $objects; } } diff --git a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php index 15f7fcf5db..46e1258299 100644 --- a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php +++ b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php @@ -88,11 +88,11 @@ abstract class AbstractRebuildDataWorker extends AbstractWorker implements IRebu if (empty($this->objectListClassName)) { throw new SystemException('DatabaseObjectList class name not specified.'); } - + if (!ClassUtil::isInstanceOf($this->objectListClassName, 'wcf\data\DatabaseObjectList')) { throw new SystemException("'".$this->objectListClassName."' does not extend 'wcf\data\DatabaseObjectList'"); } - + $this->objectList = new $this->objectListClassName(); $this->objectList->sqlLimit = $this->limit; $this->objectList->sqlOffset = $this->limit * $this->loopCount; diff --git a/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php b/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php index 98165bf15b..9e5f0b09ed 100644 --- a/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php +++ b/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php @@ -8,7 +8,7 @@ use wcf\util\StringUtil; /** * Worker implementation for data import. - * + * * @author Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/lib/util/FileUtil.class.php b/wcfsetup/install/files/lib/util/FileUtil.class.php index 529d9571c9..66ad302197 100644 --- a/wcfsetup/install/files/lib/util/FileUtil.class.php +++ b/wcfsetup/install/files/lib/util/FileUtil.class.php @@ -398,7 +398,7 @@ final class FileUtil { * @param array $postParameters * @param array $headers empty array or a not initialized variable * @return string - * @deprecated This method currently only is a wrapper around \wcf\util\HTTPRequest. Please use + * @deprecated This method currently only is a wrapper around \wcf\util\HTTPRequest. Please use * HTTPRequest from now on, as this method may be removed in the future. */ public static function downloadFileFromHttp($httpUrl, $prefix = 'package', array $options = array(), array $postParameters = array(), &$headers = array()) { @@ -445,7 +445,7 @@ final class FileUtil { * * @param string $gzipped * @param string $destination - * @return boolean + * @return boolean */ public static function uncompressFile($gzipped, $destination) { if (!@is_file($gzipped)) { diff --git a/wcfsetup/install/files/lib/util/ImageUtil.class.php b/wcfsetup/install/files/lib/util/ImageUtil.class.php index 56cb86d470..67033ac29c 100644 --- a/wcfsetup/install/files/lib/util/ImageUtil.class.php +++ b/wcfsetup/install/files/lib/util/ImageUtil.class.php @@ -36,7 +36,7 @@ final class ImageUtil { * Return the file extension for an image with the given mime type. * * @param string $mimeType - * @return string + * @return string * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php */ public static function getExtensionByMimeType($mimeType) { diff --git a/wcfsetup/install/files/lib/util/MessageUtil.class.php b/wcfsetup/install/files/lib/util/MessageUtil.class.php index 6c52f0eeb1..d9b5d5be1c 100644 --- a/wcfsetup/install/files/lib/util/MessageUtil.class.php +++ b/wcfsetup/install/files/lib/util/MessageUtil.class.php @@ -21,7 +21,7 @@ class MessageUtil { * @return string */ public static function stripCrap($text) { - // strip session links, security tokens and access tokens + // strip session links, security tokens and access tokens $text = Regex::compile('(?<=\?|&)([st]=[a-f0-9]{40}|at=\d+-[a-f0-9]{40})')->replace($text, ''); // convert html entities (utf-8) diff --git a/wcfsetup/install/files/lib/util/StringUtil.class.php b/wcfsetup/install/files/lib/util/StringUtil.class.php index 5c15871ed5..0d4871019c 100644 --- a/wcfsetup/install/files/lib/util/StringUtil.class.php +++ b/wcfsetup/install/files/lib/util/StringUtil.class.php @@ -6,7 +6,7 @@ use wcf\system\WCF; /** * Contains string-related functions. * - * @author Oliver Kliebisch, Marcel Werk + * @author Oliver Kliebisch, Marcel Werk * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf @@ -404,7 +404,7 @@ final class StringUtil { * Returns true if $haystack ends with $needle or if the length of $needle is 0. * * @param string $haystack - * @param string $needle + * @param string $needle * @param boolean $ci case insensitive * @return boolean */ @@ -745,7 +745,7 @@ final class StringUtil { // cut visible url if (empty($title)) { - // use URL and remove protocol and www subdomain + // use URL and remove protocol and www subdomain $title = preg_replace('~^(?:https?|ftps?)://(?:www\.)?~i', '', $url); if (mb_strlen($title) > 60) { diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php index 939b9aff39..5dd48a543f 100644 --- a/wcfsetup/install/files/options.inc.php +++ b/wcfsetup/install/files/options.inc.php @@ -1,8 +1,8 @@ */ diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less index da62d68b08..4045a8ab51 100644 --- a/wcfsetup/install/files/style/global.less +++ b/wcfsetup/install/files/style/global.less @@ -87,7 +87,7 @@ ol.nativeList { h2 { font-size: @wcfTitleFontSize; } - + h1, h2, h3, h4, h5, h6 { font-weight: bold; margin: 0.5em 0; diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 5b7912ef2c..0bf4d8c2c4 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -1926,7 +1926,7 @@ ul.inlineDataList { .contentNavigation .pageNavigation { float: left; margin: @wcfGapMedium + 5 0 3px; - + ul li { margin: 0 2px; } diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index d543dd605d..56a94d487b 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -754,7 +754,7 @@ li:nth-child(2n+1) .message { #messageQuoteList { max-width: 800px !important; - + li { &:not(:first-child) { margin-top: @wcfGapSmall; diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl index 1fe55c5b8b..266a44b704 100644 --- a/wcfsetup/setup/template/stepSearchWcfDir.tpl +++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl @@ -6,7 +6,7 @@ if (window.jQuery) { $(function() { $('#wcfUrlContainer').show(); - + // data var $domainName = '{@$domainName|encodeJS}'; var $installScriptDir = '{@$installScriptDir|encodeJS}'; @@ -14,7 +14,7 @@ var $invalidErrorMessage = '{lang}wcf.global.wcfDir.error.invalid{/lang}'; var $wcfDir = $('#wcfDir'); var $wcfUrl = $('#wcfUrl'); - + function updateWcfUrl() { // split paths and remove empty parts var $installScriptDirs = removeEmptyDirParts($installScriptDir.split('/')); @@ -41,7 +41,7 @@ $relativePathDirs.push($wcfDirs[$i]); } } - + // loop dirs for (var $i = 0; $i < $relativePathDirs.length; $i++) { if ($relativePathDirs[$i] == '..') { @@ -49,30 +49,30 @@ $wcfUrl.html($invalidErrorMessage); return; } - + $installScriptUrlDirs.pop(); } else { $installScriptUrlDirs.push($relativePathDirs[$i]); } } - + // implode and show result var $result = $domainName; for (var $i = 0; $i < $installScriptUrlDirs.length; $i++) $result += '/' + $installScriptUrlDirs[$i]; $wcfUrl.html($result); } - + function removeEmptyDirParts(dir) { for (var $i = dir.length; $i >= 0; $i--) { if (dir[$i] == '' || dir[$i] == '.') { dir.splice($i, 1); } } - + return dir; } - + $wcfDir.keyup(updateWcfUrl).blur(updateWcfUrl); updateWcfUrl(); }); -- 2.20.1