Fixes code formatting
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2013 14:35:44 +0000 (16:35 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2013 14:35:44 +0000 (16:35 +0200)
118 files changed:
wcfsetup/install/files/acp/js/WCF.ACP.js
wcfsetup/install/files/acp/post_install.php
wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
wcfsetup/install/files/js/WCF.ACL.js
wcfsetup/install/files/js/WCF.Like.js
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php
wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
wcfsetup/install/files/lib/acp/page/IndexPage.class.php
wcfsetup/install/files/lib/acp/page/LanguageItemListPage.class.php
wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php
wcfsetup/install/files/lib/acp/page/RebuildDataPage.class.php
wcfsetup/install/files/lib/acp/page/SmileyListPage.class.php
wcfsetup/install/files/lib/acp/page/TemplateGroupListPage.class.php
wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php
wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
wcfsetup/install/files/lib/acp/page/UserOptionListPage.class.php
wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php
wcfsetup/install/files/lib/data/attachment/AdministrativeAttachment.class.php
wcfsetup/install/files/lib/data/dashboard/box/DashboardBox.class.php
wcfsetup/install/files/lib/data/like/Like.class.php
wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
wcfsetup/install/files/lib/data/package/Package.class.php
wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemAction.class.php
wcfsetup/install/files/lib/data/template/TemplateAction.class.php
wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
wcfsetup/install/files/lib/data/user/group/Team.class.php
wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEventAction.class.php
wcfsetup/install/files/lib/data/user/online/UserOnline.class.php
wcfsetup/install/files/lib/data/user/option/UserOption.class.php
wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
wcfsetup/install/files/lib/form/RegisterForm.class.php
wcfsetup/install/files/lib/page/DashboardPage.class.php
wcfsetup/install/files/lib/page/DeletedContentListPage.class.php
wcfsetup/install/files/lib/page/SearchResultPage.class.php
wcfsetup/install/files/lib/page/TaggedPage.class.php
wcfsetup/install/files/lib/system/CLIWCF.class.php
wcfsetup/install/files/lib/system/Regex.class.php
wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
wcfsetup/install/files/lib/system/attachment/AttachmentHandler.class.php
wcfsetup/install/files/lib/system/cache/builder/TagCloudCacheBuilder.class.php
wcfsetup/install/files/lib/system/cache/source/MemcachedCacheSource.class.php
wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php
wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php
wcfsetup/install/files/lib/system/dashboard/box/MostActiveMembersDashboardBox.class.php
wcfsetup/install/files/lib/system/dashboard/box/MostLikedMembersDashboardBox.class.php
wcfsetup/install/files/lib/system/dashboard/box/NewestMembersDashboardBox.class.php
wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php
wcfsetup/install/files/lib/system/dashboard/box/StatsSidebarDashboardBox.class.php
wcfsetup/install/files/lib/system/database/Database.class.php
wcfsetup/install/files/lib/system/event/listener/PreParserAtUserListener.class.php
wcfsetup/install/files/lib/system/exporter/AbstractExporter.class.php
wcfsetup/install/files/lib/system/form/element/AbstractNamedFormElement.class.php
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractCategoryImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractCommentImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractLikeImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractPollOptionVoteImporter.class.php
wcfsetup/install/files/lib/system/importer/AbstractWatchedObjectImporter.class.php
wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
wcfsetup/install/files/lib/system/importer/LabelGroupImporter.class.php
wcfsetup/install/files/lib/system/importer/LabelImporter.class.php
wcfsetup/install/files/lib/system/importer/SmileyImporter.class.php
wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php
wcfsetup/install/files/lib/system/importer/UserCommentImporter.class.php
wcfsetup/install/files/lib/system/importer/UserCommentResponseImporter.class.php
wcfsetup/install/files/lib/system/importer/UserFollowerImporter.class.php
wcfsetup/install/files/lib/system/importer/UserGroupImporter.class.php
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
wcfsetup/install/files/lib/system/importer/UserOptionImporter.class.php
wcfsetup/install/files/lib/system/importer/UserRankImporter.class.php
wcfsetup/install/files/lib/system/mail/Mail.class.php
wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php
wcfsetup/install/files/lib/system/message/censorship/Censorship.class.php
wcfsetup/install/files/lib/system/option/AbstractCategoryMultiSelectOptionType.class.php
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/poll/PollManager.class.php
wcfsetup/install/files/lib/system/request/LinkHandler.class.php
wcfsetup/install/files/lib/system/search/SearchEngine.class.php
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
wcfsetup/install/files/lib/system/upload/DefaultUploadFileValidationStrategy.class.php
wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
wcfsetup/install/files/lib/system/user/notification/object/type/UserFollowUserNotificationObjectType.class.php
wcfsetup/install/files/lib/system/user/signature/SignatureCache.class.php
wcfsetup/install/files/lib/system/visitTracker/VisitTracker.class.php
wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
wcfsetup/install/files/lib/system/worker/IRebuildDataWorker.class.php
wcfsetup/install/files/lib/system/worker/ImportWorker.class.php
wcfsetup/install/files/lib/util/HTTPRequest.class.php
wcfsetup/install/files/lib/util/StringUtil.class.php

index 09e14ac28095a8986fb83604006f6a289e24e649..f4203db83154ded12f09e2a18b6a5ca6f924e643 100644 (file)
@@ -1674,7 +1674,7 @@ WCF.ACP.Worker = Class.extend({
                        this._dialog.wcfDialog({
                                closeConfirmMessage: WCF.Language.get('wcf.acp.worker.abort.confirmMessage'),
                                closeViaModal: false,
-                               onClose:  $.proxy(function() {
+                               onClose: $.proxy(function() {
                                        this._aborted = true;
                                        this._proxy.abortPrevious();
                                        
index 8dfbfb157263753292c987a3de64f7a38fec7623..4b30119c5334e897b646be6f24f640b16303ca9b 100644 (file)
@@ -26,14 +26,14 @@ $action = new UserProfileAction(array($editor), 'updateUserOnlineMarking');
 $action->executeAction();
 
 // set default mod permissions
-$sql = "INSERT IGNORE INTO     wcf".WCF_N."_user_group_option_value
+$sql = "INSERT IGNORE INTO     wcf".WCF_N."_user_group_option_value
                                (groupID, optionID, optionValue)
        SELECT                  5, optionID, 1
        FROM                    wcf".WCF_N."_user_group_option
        WHERE                   optionName LIKE 'mod.%'";
 $statement = WCF::getDB()->prepareStatement($sql);
 $statement->execute();
-$sql = "INSERT IGNORE INTO     wcf".WCF_N."_user_group_option_value
+$sql = "INSERT IGNORE INTO     wcf".WCF_N."_user_group_option_value
                                (groupID, optionID, optionValue)
        SELECT                  6, optionID, 1
        FROM                    wcf".WCF_N."_user_group_option
index 469f2720f6ee50fc3b0983317a6d35c39fdb0f62..c5b1f0470a4b69a73fb6c2ffad2482087cbd9a8f 100644 (file)
@@ -69,7 +69,7 @@
                                                                                                        <span class="statusDisplay sortableButtonContainer">
                                                                                                                <span class="icon icon16 icon-check{if $childMenuItem->isDisabled}-empty{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $childMenuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$childMenuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
                                                                                                                <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 icon-pencil"></span></a>
-                                                                                                               <span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer"  title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
+                                                                                                               <span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
                                                                                                                
                                                                                                                {event name='subHeaderItemButtons'}
                                                                                                        </span>
                                                                        <span class="statusDisplay sortableButtonContainer">
                                                                                <span class="icon icon16 icon-check{if $menuItem->isDisabled}-empty{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$menuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
                                                                                <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 icon-pencil"></span></a>
-                                                                               <span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer"  title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
+                                                                               <span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
                                                                                
                                                                                {event name='footerItemButtons'}
                                                                        </span>
index ece0440a7946a8a1b3be9d86fc3061b5f3a545d5..170ccc3266774b29d97c933bdfd8dfa02f641232 100644 (file)
@@ -155,7 +155,7 @@ WCF.ACL.List = Class.extend({
         * Loads current ACL configuration.
         */
        _loadACL: function() {
-               this._proxy.setOption('data',  {
+               this._proxy.setOption('data', {
                        actionName: 'loadAll',
                        className: 'wcf\\data\\acl\\option\\ACLOptionAction',
                        parameters: {
@@ -263,7 +263,7 @@ WCF.ACL.List = Class.extend({
                for (var $optionID in data.returnValues.options) {
                        var $option = data.returnValues.options[$optionID];
                        
-                       var $listItem = $('<li><span>' + $option.label +  '</span></li>').data('optionID', $optionID).data('optionName', $option.optionName);
+                       var $listItem = $('<li><span>' + $option.label + '</span></li>').data('optionID', $optionID).data('optionName', $option.optionName);
                        var $grantPermission = $('<input type="checkbox" id="grant' + $optionID + '" />').appendTo($listItem).wrap('<label for="grant' + $optionID + '" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.grant') + '" />');
                        var $denyPermission = $('<input type="checkbox" id="deny' + $optionID + '" />').appendTo($listItem).wrap('<label for="deny' + $optionID + '" class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.deny') + '" />');
                        
@@ -350,7 +350,7 @@ WCF.ACL.List = Class.extend({
         * @param       object          event
         */
        _click: function(event) {
-               var $listItem  = $(event.currentTarget);
+               var $listItem = $(event.currentTarget);
                if ($listItem.hasClass('active')) {
                        return;
                }
index 72e6bf3a542d5edb50d4cad281f9d50303176e0f..00daf46dfb28837e11c608f0ac166a2a1d43af05 100644 (file)
@@ -415,8 +415,8 @@ WCF.Like = Class.extend({
        /**
         * Sets button active state.
         * 
-        * @param       jquery          likeButton
-        * @param       jquery          dislikeButton
+        * @param       jquery          likeButton
+        * @param       jquery          dislikeButton
         * @param       integer         likeStatus
         */
        _setActiveState: function(likeButton, dislikeButton, likeStatus) {
index 5cb0255e8b72a6b63bbacf875c55b9f19ffce443..7b935dd47d4cbb7cf61c731e72547b37ac97cbbd 100644 (file)
@@ -1937,7 +1937,7 @@ WCF.User.Avatar.Crop = Class.extend({
                
                // check if object already had been initialized
                if (!this._proxy) {
-                       this._proxy  = new WCF.Action.Proxy({
+                       this._proxy = new WCF.Action.Proxy({
                                success: $.proxy(this._success, this)
                        });
                }
index ba4999f781edfffc46b01701aa77ee187a3d9a7b..1e647fa0dce379d822308e1ae8cbde807ffabd1b 100755 (executable)
@@ -346,7 +346,7 @@ $.fn.extend({
        /**
         * Disables a form element.
         * 
-        * @return jQuery
+        * @return      jQuery
         */
        disable: function() {
                return this.attr('disabled', 'disabled');
index 9053d45ca6dc8acf2dd29d9a0252ca3fa8b46ebb..c6ad844622fc93f8eb2b1c82d22b0a736a3456a1 100755 (executable)
@@ -17,7 +17,7 @@ use wcf\util\HeaderUtil;
  */
 class LogoutAction extends AbstractSecureAction {
        /**
-        * @see wcf\action\AbstractAction::$loginRequired
+        * @see wcf\action\AbstractAction::$loginRequired
         */
        public $loginRequired = true;
        
index 2db8cddb0533d514c934e956358760d464b69098..f47241c4738c15d2a91555eaae93d9d3a7933fe4 100644 (file)
@@ -19,7 +19,7 @@ use wcf\util\JSON;
  */
 class WorkerProxyAction extends AJAXInvokeAction {
        /**
-        * @see wcf\system\event\listener\SessionAccessLogListener::execute()
+        * @see wcf\system\event\listener\SessionAccessLogListener::execute()
         */
        const DO_NOT_LOG = true;
        
index abe5b06d78b1c51595ef3bb780fba42002f64e8a..cdcbd1ca00e0fa465d643fdb85828aac45f6a279 100644 (file)
@@ -45,7 +45,7 @@ class BBCodeEditForm extends BBCodeAddForm {
        
        /**
         * list of native bbcodes
-        * @var array<string>
+        * @var array<string>
         */
        public static $nativeBBCodes = array('b', 'i', 'u', 's', 'sub', 'sup', 'list', 'align', 'color', 'size', 'font', 'url', 'img', 'email', 'table');
        
index 4df0b915a99e7b225e8b6c85ba78fb9b899dc798..d8e5a9ee9357f4bb9cb237254cf717f25804efc6 100644 (file)
@@ -22,7 +22,7 @@ use wcf\util\StringUtil;
 class DataImportForm extends AbstractForm {
        /**
         * additional data
-        * @var array
+        * @var array
         */
        public $additionalData = array();
        
@@ -38,73 +38,73 @@ class DataImportForm extends AbstractForm {
        
        /**
         * list of available exporters
-        * @var array
+        * @var array
         */
        public $exporters = array();
        
        /**
         * exporter name
-        * @var string
+        * @var string
         */
        public $exporterName = '';
        
        /**
         * exporter object
-        * @var wcf\system\exporter\IExporter
+        * @var wcf\system\exporter\IExporter
         */
        public $exporter = null;
        
        /**
         * list of available importers
-        * @var array<string>
+        * @var array<string>
         */
        public $importers = array();
        
        /**
         * list of supported data types
-        * @var array
+        * @var array
         */
        public $supportedData = array();
        
        /**
         * selected data types
-        * @var array
+        * @var array
         */
        public $selectedData = array();
        
        /**
         * database host name
-        * @var string
+        * @var string
         */
        public $dbHost = '';
        
        /**
         * database user name
-        * @var string
+        * @var string
         */
        public $dbUser = '';
        
        /**
         * database password
-        * @var string
+        * @var string
         */
        public $dbPassword = '';
        
        /**
         * database name
-        * @var string
+        * @var string
         */
        public $dbName = '';
        
        /**
         * database table prefix
-        * @var string
+        * @var string
         */
        public $dbPrefix = '';
        
        /**
         * file system path
-        * @var string
+        * @var string
         */
        public $fileSystemPath = '';
        
@@ -122,12 +122,12 @@ class DataImportForm extends AbstractForm {
        
        /**
         * user merge mode
-        * @var integer
+        * @var integer
         */
        public $userMergeMode = 2;
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
@@ -167,7 +167,7 @@ class DataImportForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::readFormParameters()
+        * @see wcf\form\IForm::readFormParameters()
         */
        public function readFormParameters() {
                parent::readFormParameters();
@@ -185,7 +185,7 @@ class DataImportForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::validate()
+        * @see wcf\form\IForm::validate()
         */
        public function validate() {
                parent::validate();
@@ -218,7 +218,7 @@ class DataImportForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::save()
+        * @see wcf\form\IForm::save()
         */
        public function save() {
                parent::save();
@@ -243,7 +243,7 @@ class DataImportForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
@@ -274,7 +274,7 @@ class DataImportForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 84d8985b6dfeaade7fe736714bf9fb1bc4b4dfd4..785b9105aa13d6815994e39c66f5fb4e19e55460 100644 (file)
@@ -36,43 +36,43 @@ class TemplateAddForm extends AbstractForm {
        
        /**
         * template name
-        * @var string
+        * @var string
         */
        public $tplName = '';
        
        /**
         * template group id
-        * @var integer
+        * @var integer
         */
        public $templateGroupID = 0;
        
        /**
         * template source code
-        * @var string
+        * @var string
         */
        public $templateSource = '';
        
        /**
         * available template groups
-        * @var array
+        * @var array
         */
        public $availableTemplateGroups = array();
        
        /**
         * template's package id
-        * @var integer
+        * @var integer
         */
        public $packageID = 1;
        
        /**
         * id of copied template
-        * @var integer
+        * @var integer
         */
        public $copy = 0;
        
        /**
         * copied template object
-        * @var wcf\data\template\Template
+        * @var wcf\data\template\Template
         */
        public $copiedTemplate = null;
        
index b02af4270b1f778ba3469417b7e7116eaa0ad126..299f11e1196e76919b678c444297a082fd7b79c0 100644 (file)
@@ -29,13 +29,13 @@ class TemplateEditForm extends TemplateAddForm {
        
        /**
         * template id
-        * @var integer
+        * @var integer
         */
        public $templateID = 0;
        
        /**
         * template object
-        * @var wcf\data\template\Template
+        * @var wcf\data\template\Template
         */
        public $template = null;
        
@@ -54,7 +54,7 @@ class TemplateEditForm extends TemplateAddForm {
        }
        
        /**
-        * @see wcf\acp\form\TemplateAddForm::validateName()
+        * @see wcf\acp\form\TemplateAddForm::validateName()
         */
        protected function validateName() {
                if ($this->tplName != $this->template->templateName) {
@@ -63,7 +63,7 @@ class TemplateEditForm extends TemplateAddForm {
        }
        
        /**
-        * @see wcf\acp\form\TemplateAddForm::validateName()
+        * @see wcf\acp\form\TemplateAddForm::validateName()
         */
        protected function validateGroup() {
                if ($this->templateGroupID != $this->template->templateGroupID) {
index 5566a428a7163a69111c26bcc2291ad89b648909..91376280606316955e847a8559617c60558809fc 100644 (file)
@@ -31,25 +31,25 @@ class TemplateGroupAddForm extends AbstractForm {
        
        /**
         * template group name
-        * @var string
+        * @var string
         */
        public $templateGroupName = '';
        
        /**
         * template group folder
-        * @var integer
+        * @var integer
         */
        public $templateGroupFolderName = '';
        
        /**
         * parent template group id
-        * @var integer
+        * @var integer
         */
        public $parentTemplateGroupID = 0;
        
        /**
         * available template groups
-        * @var array
+        * @var array
         */
        public $availableTemplateGroups = array();
        
index 2f5d102a65b09c720257deb6fab734d9e52002ce..ceecc01431134a0da534718c4a46ecdb4ae8a64d 100644 (file)
@@ -25,13 +25,13 @@ class TemplateGroupEditForm extends TemplateGroupAddForm {
        
        /**
         * template group id
-        * @var integer
+        * @var integer
         */
        public $templateGroupID = 0;
        
        /**
         * template group object
-        * @var wcf\data\template\group\TemplateGroup
+        * @var wcf\data\template\group\TemplateGroup
         */
        public $templateGroup = null;
        
@@ -49,7 +49,7 @@ class TemplateGroupEditForm extends TemplateGroupAddForm {
        }
        
        /**
-        * @see wcf\acp\form\TemplateGroupAddForm::validateName()
+        * @see wcf\acp\form\TemplateGroupAddForm::validateName()
         */
        protected function validateName() {
                if ($this->templateGroupName != $this->templateGroup->templateGroupName) {
@@ -58,7 +58,7 @@ class TemplateGroupEditForm extends TemplateGroupAddForm {
        }
        
        /**
-        * @see wcf\acp\form\TemplateGroupAddForm::validateFolderName()
+        * @see wcf\acp\form\TemplateGroupAddForm::validateFolderName()
         */
        protected function validateFolderName() {
                if ($this->templateGroupFolderName != $this->templateGroup->templateGroupFolderName) {
index 250c9c7f63d6965f2e2790491d74a8c8bdf0e63f..0856845895479e8bbd3399fd859ccc12295df813 100644 (file)
@@ -98,37 +98,37 @@ class UserAddForm extends UserOptionListForm {
        
        /**
         * signature text
-        * @var string
+        * @var string
         */
        public $signature = '';
        
        /**
         * enables smilies
-        * @var boolean
+        * @var boolean
         */
        public $signatureEnableSmilies = 1;
        
        /**
         * enables bbcodes
-        * @var boolean
+        * @var boolean
         */
        public $signatureEnableBBCodes = 1;
        
        /**
         * enables html
-        * @var boolean
+        * @var boolean
         */
        public $signatureEnableHtml = 0;
        
        /**
         * true to disable this signature
-        * @var boolean
+        * @var boolean
         */
        public $disableSignature = 0;
        
        /**
         * reason
-        * @var string
+        * @var string
         */
        public $disableSignatureReason = '';
        
index 6095ffd295de990e5b4954496c99edf7f1a56e94..34636fea197da3cb03963b16ec25ee4f74e2fdd2 100644 (file)
@@ -67,49 +67,49 @@ class UserBulkProcessingForm extends UserOptionListForm {
        
        /**
         * registration start date
-        * @var string
+        * @var string
         */
        public $registrationDateStart = '';
        
        /**
         * registration start date
-        * @var string
+        * @var string
         */
        public $registrationDateEnd = '';
        
        /**
         * banned state
-        * @var boolean
+        * @var boolean
         */
        public $banned = 0;
        
        /**
         * not banned state
-        * @var boolean
+        * @var boolean
         */
        public $notBanned = 0;
        
        /**
         * last activity start time
-        * @var string
+        * @var string
         */
        public $lastActivityTimeStart = '';
        
        /**
         * last activity end time
-        * @var string
+        * @var string
         */
        public $lastActivityTimeEnd = '';
        
        /**
         * enabled state
-        * @var boolean
+        * @var boolean
         */
        public $enabled = 0;
        
        /**
         * disabled state
-        * @var boolean
+        * @var boolean
         */
        public $disabled = 0;
        
index 3e15815e66043fd894c0da83bee902a4d7a2106a..35c82333200057648a886e8c2514af97bfcbdac2 100755 (executable)
@@ -51,19 +51,19 @@ class UserEditForm extends UserAddForm {
        
        /**
         * ban status
-        * @var boolean
+        * @var boolean
         */
        public $banned = 0;
        
        /**
         * ban reason
-        * @var string
+        * @var string
         */
        public $banReason = '';
        
        /**
         * user avatar object
-        * @var wcf\data\user\avatar\UserAvatar
+        * @var wcf\data\user\avatar\UserAvatar
         */
        public $userAvatar = null;
        
@@ -75,13 +75,13 @@ class UserEditForm extends UserAddForm {
        
        /**
         * true to disable this avatar
-        * @var boolean
+        * @var boolean
         */
        public $disableAvatar = 0;
        
        /**
         * reason
-        * @var string
+        * @var string
         */
        public $disableAvatarReason = '';
        
index a7ea45d61197baee8455a332fa2741ddb6346665..40fd8b5988f25303c8dc8167cb900a7c48e690dc 100644 (file)
@@ -32,103 +32,103 @@ class UserOptionAddForm extends AbstractForm {
        
        /**
         * option name
-        * @var string
+        * @var string
         */
        public $optionName = '';
        
        /**
         * option description
-        * @var string
+        * @var string
         */
        public $optionDescription = '';
        
        /**
         * category name
-        * @var string
+        * @var string
         */
        public $categoryName = '';
        
        /**
         * option type
-        * @var string
+        * @var string
         */
        public $optionType = 'text';
        
        /**
         * option default value
-        * @var string
+        * @var string
         */
        public $defaultValue = '';
        
        /**
         * validation pattern
-        * @var string
+        * @var string
         */
        public $validationPattern = '';
        
        /**
         * select options
-        * @var string
+        * @var string
         */
        public $selectOptions = '';
        
        /**
         * field is required
-        * @var boolean
+        * @var boolean
         */
        public $required = 0;
        
        /**
         * shows this field in the registration process 
-        * @var boolean
+        * @var boolean
         */
        public $askDuringRegistration = 0;
        
        /**
         * edit permission bitmask
-        * @var integer
+        * @var integer
         */
        public $editable = 3;
        
        /**
         * view permission bitmask
-        * @var integer
+        * @var integer
         */
        public $visible = 15;
        
        /**
         * field is searchable
-        * @var boolean
+        * @var boolean
         */
        public $searchable = 0;
        
        /**
         * show order
-        * @var integer
+        * @var integer
         */
        public $showOrder = 0;
        
        /**
         * output class
-        * @var string
+        * @var string
         */
        public $outputClass = '';
        
        /**
         * available option categories
-        * @var array<wcf\data\user\option\UserOptionCategory>
+        * @var array<wcf\data\user\option\UserOptionCategory>
         */
        public $availableCategories = array();
        
        /**
         * available option types
-        * @var array<string>
+        * @var array<string>
         */
        public static $availableOptionTypes = array('birthday', 'boolean', 'date', 'integer', 'float', 'password', 'multiSelect', 'radioButton', 'select', 'text', 'textarea', 'message', 'URL');
        
        /**
         * list of option type that require select options
-        * @var array<string>
+        * @var array<string>
         */
        public static $optionTypesUsingSelectOptions = array('multiSelect', 'radioButton', 'select');
        
@@ -149,7 +149,7 @@ class UserOptionAddForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::readFormParameters()
+        * @see wcf\form\IForm::readFormParameters()
         */
        public function readFormParameters() {
                parent::readFormParameters();
@@ -180,7 +180,7 @@ class UserOptionAddForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::validate()
+        * @see wcf\form\IForm::validate()
         */
        public function validate() {
                parent::validate();
@@ -272,7 +272,7 @@ class UserOptionAddForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 67e81fbe157f13da6873f445cb1c7030833df717..f8ae8017d0b3a70f9a0069222bfaae3d492e1d0a 100644 (file)
@@ -30,13 +30,13 @@ class UserOptionCategoryAddForm extends AbstractForm {
        
        /**
         * category name
-        * @var string
+        * @var string
         */
        public $categoryName = '';
        
        /**
         * show order
-        * @var integer
+        * @var integer
         */
        public $showOrder = 0;
        
index 3817b70c8c86f04c405986c31847683b45332e7c..31bad0767d227e77cfd4e05addab194f892ef81a 100644 (file)
@@ -25,7 +25,7 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
        
        /**
         * category id
-        * @var integer
+        * @var integer
         */
        public $categoryID = 0;
        
@@ -36,7 +36,7 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
        public $category = null;
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
@@ -66,7 +66,7 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
        }
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
@@ -79,7 +79,7 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 91ebf25f4c836827db027792057d51d499d16ccb..ab87ad43d5414784b63c962d0a3de7fbe1c73383 100644 (file)
@@ -25,13 +25,13 @@ class UserOptionEditForm extends UserOptionAddForm {
        
        /**
         * user option id
-        * @var integer
+        * @var integer
         */
        public $optionID = 0;
        
        /**
         * user option object
-        * @var wcf\data\user\option\UserOption
+        * @var wcf\data\user\option\UserOption
         */
        public $userOption = null;
        
@@ -78,7 +78,7 @@ class UserOptionEditForm extends UserOptionAddForm {
        }
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
@@ -103,7 +103,7 @@ class UserOptionEditForm extends UserOptionAddForm {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index f672733e871d830b5f50d0ab68fdc55322e955af..75dc6093833685047346732435f81deee595476c 100644 (file)
@@ -34,7 +34,7 @@ class UserOptionSetDefaultsForm extends AbstractForm {
        
        /**
         * true to apply change to existing users
-        * @var boolean
+        * @var boolean
         */
        public $applyChangesToExistingUsers = 0;
        
@@ -49,7 +49,7 @@ class UserOptionSetDefaultsForm extends AbstractForm {
        }
        
        /**
-        * @see wcf\form\IForm::readFormParameters()
+        * @see wcf\form\IForm::readFormParameters()
         */
        public function readFormParameters() {
                parent::readFormParameters();
index 3fc754d255ef5c32b3ccfda1ad48582dc7c162d4..41c4e5efa7a189d541aaae1b3c5d09ebb8a5d6a1 100755 (executable)
@@ -79,43 +79,43 @@ class UserSearchForm extends UserOptionListForm {
        
        /**
         * registration start date
-        * @var string
+        * @var string
         */
        public $registrationDateEnd = '';
        
        /**
         * banned state
-        * @var boolean
+        * @var boolean
         */
        public $banned = 0;
        
        /**
         * not banned state
-        * @var boolean
+        * @var boolean
         */
        public $notBanned = 0;
        
        /**
         * last activity start time
-        * @var string
+        * @var string
         */
        public $lastActivityTimeStart = '';
        
        /**
         * last activity end time
-        * @var string
+        * @var string
         */
        public $lastActivityTimeEnd = '';
        
        /**
         * enabled state
-        * @var boolean
+        * @var boolean
         */
        public $enabled = 0;
        
        /**
         * disabled state
-        * @var boolean
+        * @var boolean
         */
        public $disabled = 0;
        
@@ -168,15 +168,15 @@ class UserSearchForm extends UserOptionListForm {
        public $maxResults = 0;
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
-       
+               
                // search user from passed groupID by group-view
                if (isset($_GET['groupID'])) {
                        $this->groupIDs[] = intval($_GET['groupID']);
-                               
+                       
                        // do search
                        try {
                                $this->validate();
index 8dfed1ae752ca54e846e227560c41f4c9117a63a..6cf23482c99dbe0e929725483c03ab209f1edc67 100755 (executable)
@@ -23,19 +23,19 @@ use wcf\system\WCF;
 class IndexPage extends AbstractPage {
        /**
         * server information
-        * @var array
+        * @var array
         */
        public $server = array();
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
-       
+               
                $this->server = array(
                        'os' => PHP_OS,
-                       'webserver' => (isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : ''),         
+                       'webserver' => (isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : ''),
                        'mySQLVersion' => WCF::getDB()->getVersion(),
                        'load' => ''
                );
@@ -50,7 +50,7 @@ class IndexPage extends AbstractPage {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index a16cab3868819a458bd37305c61d6789089b3791..790ab75e3090af9953c22732fc047fd2e4e42013 100644 (file)
@@ -30,49 +30,49 @@ class LanguageItemListPage extends AbstractPage {
        
        /**
         * language item list
-        * @var wcf\data\language\item\LanguageItemList
+        * @var wcf\data\language\item\LanguageItemList
         */
        public $languageItemList = null;
        
        /**
         * language id
-        * @var integer
+        * @var integer
         */
        public $languageID = 0;
        
        /**
         * language category id
-        * @var integer
+        * @var integer
         */
        public $languageCategoryID = 0;
        
        /**
         * language item name
-        * @var string
+        * @var string
         */
        public $languageItem = '';
        
        /**
         * language item value
-        * @var string
+        * @var string
         */
        public $languageItemValue = '';
        
        /**
         * search for custom values
-        * @var boolean
+        * @var boolean
         */
        public $hasCustomValue = 0;
        
        /**
         * available languages
-        * @var array
+        * @var array
         */
        public $availableLanguages = array();
        
        /**
         * available language categories
-        * @var array
+        * @var array
         */
        public $availableLanguageCategories = array();
        
index 128935f78f8e17e02c5774fe4991cebaa2ddc906..81ab1e37df1f361f123dc2c49fc2a3ecf655f805 100644 (file)
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class PHPInfoPage extends AbstractPage {
        /**
-        * @see wcf\page\AbstractPage::$templateName
+        * @see wcf\page\AbstractPage::$templateName
         */
        public $templateName = 'phpInfo';
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 10d2908557c2462fc8da3b1bc246c8ec5251449d..487a78d60985e5367b386355b6f512fbcc5c51e0 100644 (file)
@@ -27,7 +27,7 @@ class RebuildDataPage extends AbstractPage {
        
        /**
         * object types
-        * @var array
+        * @var array
         */
        public $objectTypes = array();
        
index 986a833543b5e56a8619979653c7aa17723cc379..2137ef82ac1da855ee1b3ed7822f67aa69b9a61a 100644 (file)
@@ -61,7 +61,7 @@ class SmileyListPage extends MultipleLinkPage {
        public $categories = array();
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
@@ -76,7 +76,7 @@ class SmileyListPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
@@ -89,7 +89,7 @@ class SmileyListPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\MultipleLinkPage::initObjectList()
+        * @see wcf\page\MultipleLinkPage::initObjectList()
         */
        protected function initObjectList() {
                parent::initObjectList();
@@ -103,7 +103,7 @@ class SmileyListPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
index ba1021b4a0fbae787595056c9bc81b7c79d7cfd1..bcf2df8aa8f80b253366c5e8f9f411f085703745 100644 (file)
@@ -24,22 +24,22 @@ class TemplateGroupListPage extends SortablePage {
        public $neededPermissions = array('admin.template.canManageTemplate');
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $defaultSortField = 'templateGroupName';
        
        /**
-        * @see wcf\page\MultipleLinkPage::$objectListClassName
+        * @see wcf\page\MultipleLinkPage::$objectListClassName
         */
        public $objectListClassName = 'wcf\data\template\group\TemplateGroupList';
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $validSortFields = array('templateGroupID', 'templateGroupName', 'templateGroupFolderName', 'templates');
        
        /**
-        * @see wcf\page\MultipleLinkPage::initObjectList
+        * @see wcf\page\MultipleLinkPage::initObjectList
         */
        protected function initObjectList() {
                parent::initObjectList();
index 2730ef87293be5588563f45eae3576adc1a094d4..74dfd741f8331a9b1bcbfdd9a28697d8a38e48ea 100644 (file)
@@ -50,31 +50,31 @@ class TemplateListPage extends SortablePage {
        
        /**
         * template group id
-        * @var integer
+        * @var integer
         */
        public $templateGroupID = 0;
        
        /**
         * template name
-        * @var string
+        * @var string
         */
        public $searchTemplateName = '';
        
        /**
         * application
-        * @var string
+        * @var string
         */
        public $application = '';
        
        /**
         * available template groups
-        * @var array
+        * @var array
         */
        public $availableTemplateGroups = array();
        
        /**
         * available applications
-        * @var array
+        * @var array
         */
        public $availableApplications = array();
        
@@ -83,7 +83,7 @@ class TemplateListPage extends SortablePage {
         */
        public function readParameters() {
                parent::readParameters();
-       
+               
                if (isset($_REQUEST['templateGroupID'])) $this->templateGroupID = intval($_REQUEST['templateGroupID']);
                if (isset($_REQUEST['searchTemplateName'])) $this->searchTemplateName = StringUtil::trim($_REQUEST['searchTemplateName']);
                if (isset($_REQUEST['application'])) $this->application = StringUtil::trim($_REQUEST['application']);
index c8ed7ef2919ed50b2510a761a38751be9942f9d5..1bf0e820b5597f077a8a8bf10a2cc3bd795176ca 100644 (file)
@@ -24,22 +24,22 @@ class UserOptionCategoryListPage extends SortablePage {
        public $neededPermissions = array('admin.user.canManageUserOption');
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $defaultSortField = 'showOrder';
        
        /**
-        * @see wcf\page\MultipleLinkPage::$objectListClassName
+        * @see wcf\page\MultipleLinkPage::$objectListClassName
         */
        public $objectListClassName = 'wcf\data\user\option\category\UserOptionCategoryList';
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $validSortFields = array('categoryID', 'categoryName', 'showOrder', 'userOptions');
        
        /**
-        * @see wcf\page\MultipleLinkPage::initObjectList
+        * @see wcf\page\MultipleLinkPage::initObjectList
         */
        protected function initObjectList() {
                parent::initObjectList();
index 6ace1c8095a8fb663f33989ca4532b1d165f1c0b..d57a26619ed3ebd288461b60894ff88a846d499b 100644 (file)
@@ -24,22 +24,22 @@ class UserOptionListPage extends SortablePage {
        public $neededPermissions = array('admin.user.canManageUserOption');
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $defaultSortField = 'showOrder';
        
        /**
-        * @see wcf\page\MultipleLinkPage::$objectListClassName
+        * @see wcf\page\MultipleLinkPage::$objectListClassName
         */
        public $objectListClassName = 'wcf\data\user\option\UserOptionList';
        
        /**
-        * @see wcf\page\SortablePage::$defaultSortField
+        * @see wcf\page\SortablePage::$defaultSortField
         */
        public $validSortFields = array('optionID', 'optionName', 'categoryName', 'optionType', 'showOrder');
        
        /**
-        * @see wcf\page\MultipleLinkPage::initObjectList
+        * @see wcf\page\MultipleLinkPage::initObjectList
         */
        protected function initObjectList() {
                parent::initObjectList();
index 0c1ab75df999dece6d05274d80c817e3b13a95db..b0d3c38e4d5a096f27821a28e8ee2c5593a18715 100644 (file)
@@ -21,19 +21,19 @@ use wcf\util\StringUtil;
 class GravatarDownloadAction extends AbstractAction {
        /**
         * user id
-        * @var integer
+        * @var integer
         */
        public $userID = 0;
        
        /**
         * user object
-        * @var wcf\data\user\User
+        * @var wcf\data\user\User
         */
        public $user = null;
        
        /**
         * avatar size
-        * @var integer
+        * @var integer
         */
        public $size = 150;
        
index 0c9ae71ca4054cbe93e7f81ddc3eb083acc1be10..21ed861fc889f1f74cfecf66ec8cd0417b26a611 100644 (file)
@@ -15,7 +15,7 @@ use wcf\data\DatabaseObjectDecorator;
  */
 class AdministrativeAttachment extends DatabaseObjectDecorator {
        /**
-        * @see wcf\data\DatabaseObjectDecorator::$baseClass
+        * @see wcf\data\DatabaseObjectDecorator::$baseClass
         */
        protected static $baseClass = 'wcf\data\attachment\Attachment';
        
@@ -34,7 +34,7 @@ class AdministrativeAttachment extends DatabaseObjectDecorator {
        /**
         * Gets the container object of this attachment.
         * 
-        * @return \wcf\data\IUserContent
+        * @return      wcf\data\IUserContent
         */
        public function getContainerObject() {
                if (!$this->containerObjectLoaded) {
index eed270302969a4beaf0dd8404bc746c81fba2f8e..683b3439c8340544b12e3d5d60edd7f2b4c6af2f 100644 (file)
@@ -27,7 +27,7 @@ class DashboardBox extends DatabaseObject {
        /**
         * Returns the owner of this dashboard box.
         * 
-        * @return wcf\data\package\Package
+        * @return      wcf\data\package\Package
         */
        public function getPackage() {
                return PackageCache::getInstance()->getPackage($this->packageID);
index 155f316664c8688ae7821ec107133ac0604d1cf3..68a8acea69cc31c5b62089c57bc14f64a75df9be 100644 (file)
@@ -26,13 +26,13 @@ class Like extends DatabaseObject {
        
        /**
         * like value
-        * @var integer
+        * @var integer
         */
        const LIKE = 1;
        
        /**
         * dislike value
-        * @var integer
+        * @var integer
         */
        const DISLIKE = -1;
        
index dead99ed5976a2a10d4b9f1c6dd6e8f0e6b5d1f6..60c04aa722ff0ed7dd7d8fe399d76bce6654f79e 100644 (file)
@@ -28,7 +28,7 @@ class LikeObject extends DatabaseObject {
        
        /**
         * liked object
-        * @var wcf\data\like\object\ILikeObject
+        * @var wcf\data\like\object\ILikeObject
         */
        protected $likedObject = null;
        
index 5d795a3199d989af8160aff509e7b313d99c9674..8356fc805d3b556ad0ad9b9cb296bea798fe4e46 100644 (file)
@@ -277,7 +277,7 @@ class Package extends DatabaseObject {
         * that the update covers the whole range of release numbers where the asterisk
         * wildcards digits from 0 to 9.
         * For example, if "fromversion" is "1.1.*" and this package updates to
-        * version 1.2.0, all releases from 1.1.0 to  1.1.9 may be updated using
+        * version 1.2.0, all releases from 1.1.0 to 1.1.9 may be updated using
         * this package.
         * 
         * @param       string          $currentVersion
index b7822b7312a7b81dc39d4c6159d5fc4059cdbcac..1a4becabd7678c0a0dfca1b79fbd168e125171b5 100644 (file)
@@ -51,7 +51,7 @@ class PageMenuItemAction extends AbstractDatabaseObjectAction implements ISortab
        protected $requireACP = array('delete', 'toggle', 'update', 'updatePosition');
        
        /**
-        * @see wcf\data\IDatabaseObjectAction::create()
+        * @see wcf\data\IDatabaseObjectAction::create()
         */
        public function create() {
                if (!isset($this->parameters['data']['packageID'])) {
index 273b7b8a12715a71d5af132f0b09313e8f7dd44d..03f3a71cf7d572e972acc8f33425625eb839dfc9 100644 (file)
@@ -39,7 +39,7 @@ class TemplateAction extends AbstractDatabaseObjectAction {
        protected $requireACP = array('create', 'delete', 'update');
        
        /**
-        * @see wcf\data\AbstractDatabaseObjectAction::create()
+        * @see wcf\data\AbstractDatabaseObjectAction::create()
         */
        public function create() {
                $template = parent::create();
index cebf41a9808e60701bdc38a3cd5e45a39e40792f..6481baec8bf7a57210ec598e4f4e2fd33c494892 100644 (file)
@@ -38,7 +38,7 @@ class Gravatar extends DefaultAvatar {
        
        /**
         * user id
-        * @var integer
+        * @var integer
         */
        public $userID = 0;
        
index 76a0d976e9a08c2e9c471e836199e49c86d85929..be9cb1d1dedcd3eef33ac6d5af01bce62dae890b 100644 (file)
@@ -15,13 +15,13 @@ use wcf\data\DatabaseObjectDecorator;
  */
 class Team extends DatabaseObjectDecorator {
        /**
-        * @see wcf\data\DatabaseObjectDecorator::$baseClass
+        * @see wcf\data\DatabaseObjectDecorator::$baseClass
         */
        protected static $baseClass = 'wcf\data\user\group\UserGroup';
        
        /**
         * list of user group members
-        * @var array<wcf\data\user\UserProfile>
+        * @var array<wcf\data\user\UserProfile>
         */
        protected $members = array();
        
index c41851591c380396b972e82ed4b4f2364439b914..7bd820080e53c6645dc7d2ab716f4c7e38135d46 100644 (file)
@@ -15,7 +15,7 @@ use wcf\system\WCF;
  */
 class UserNotificationEventAction extends AbstractDatabaseObjectAction {
        /**
-        * @see wcf\data\AbstractDatabaseObjectAction::create();
+        * @see wcf\data\AbstractDatabaseObjectAction::create();
         */
        public function create() {
                $event = parent::create();
index 7518fd1f2090eb325277227f4d9d5885b42d555f..cb560f417a3b6ff295842cca9a5dec545d088438 100644 (file)
@@ -25,7 +25,7 @@ class UserOnline extends UserProfile {
        
        /**
         * spider object
-        * @var wcf\data\spider\Spider
+        * @var wcf\data\spider\Spider
         */
        protected $spider = null;
        
index e1d9b875e103e8d8138f2dd2fc5f1c7971783151..8a349df4064937bccb801027b5abdeda4e31b4e4 100644 (file)
@@ -17,61 +17,61 @@ use wcf\system\WCF;
 class UserOption extends Option {
        /**
         * visible for no one (no valid bit)
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_NONE = 0;
        
        /**
         * visible for the owner
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_OWNER = 1;
        
        /**
         * visible for admins
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_ADMINISTRATOR = 2;
        
        /**
         * visible for users
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_REGISTERED = 4;
        
        /**
         * visible for guests
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_GUEST = 8;
        
        /**
         * visible for all (no valid bit)
-        * @var integer
+        * @var integer
         */
        const VISIBILITY_ALL = 15;
        
        /**
         * editable for no one (no valid bit)
-        * @var integer
+        * @var integer
         */
        const EDITABILITY_NONE = 0;
        
        /**
         * editable for the owner
-        * @var integer
+        * @var integer
         */
        const EDITABILITY_OWNER = 1;
        
        /**
         * editable for admins
-        * @var integer
+        * @var integer
         */
        const EDITABILITY_ADMINISTRATOR = 2;
        
        /**
         * editable for all (no valid bit)
-        * @var integer
+        * @var integer
         */
        const EDITABILITY_ALL = 3;
        
index 328f02b79d5fd34f253f2fe5d2c7d30255cd90e1..080ec22a7072982210be62b78c5d9a6ad83a867f 100644 (file)
@@ -31,7 +31,7 @@ class ViewableUserOption extends DatabaseObjectDecorator {
        
        /**
         * cached user options
-        * @var array<wcf\data\user\option\ViewableUserOption>
+        * @var array<wcf\data\user\option\ViewableUserOption>
         */
        public static $userOptions = array();
        
@@ -84,9 +84,9 @@ class ViewableUserOption extends DatabaseObjectDecorator {
        }
        
        /**
-        * Gets user option by name
+        * Returns the user option with the given name
         * 
-        * @param       string          $name
+        * @param       string          $name
         * @return      wcf\data\user\option\ViewableUserOption
         */
        public static function getUserOption($name) {
index 84e85ba9fb6ee88c5b6fba89a9c9ab2565e8eca5..cb8163c4fb3ec15ac83e7e32b18b17107d9c8bdd 100644 (file)
@@ -77,7 +77,7 @@ class RegisterForm extends UserAddForm {
        
        /**
         * field names
-        * @var array
+        * @var array
         */
        public $randomFieldNames = array();
        
index 4ed106d3ceeded3a42f7df56b45f20a2281b8485..4411453df725addd1bbaeeebed22f2d8a69937e9 100644 (file)
@@ -32,7 +32,7 @@ class DashboardPage extends AbstractPage {
        public $enableTracking = true;
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
index 8f17c6a4302842ff59e66bddd49a4f5f8c757e30..0644adbd9e8bad5fefcb77def61aa4e581ca1541 100644 (file)
@@ -32,7 +32,7 @@ class DeletedContentListPage extends MultipleLinkPage {
        public $objectType = null;
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
@@ -53,14 +53,14 @@ class DeletedContentListPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\MultipleLinkPage::readParameters()
+        * @see wcf\page\MultipleLinkPage::readParameters()
         */
        protected function initObjectList() {
                $this->objectList = $this->objectType->getProcessor()->getObjectList();
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 999e5bc7486e0bf0b1e5a92cdd41fb4a96f6107d..3d887bdb95e06545406ba08d0cb8fb903bcf44ef 100644 (file)
@@ -55,14 +55,14 @@ class SearchResultPage extends MultipleLinkPage {
        public $searchData = null;
        
        /**
-        *  result list template
-        * @var string
+        * result list template
+        * @var string
         */
        public $resultListTemplateName = 'searchResultList';
        
        /**
         * result list template's application
-        * @var string
+        * @var string
         */
        public $resultListApplication = 'wcf';
        
index f7b1e02d72fd5486027b9bbd346ad5747a330603..c61326933c3e464f3428e70b2eb0d091651f8a87 100644 (file)
@@ -42,7 +42,7 @@ class TaggedPage extends MultipleLinkPage {
        public $tagCloud = null;
        
        /**
-        * @see wcf\page\IPage::readParameters()
+        * @see wcf\page\IPage::readParameters()
         */
        public function readParameters() {
                parent::readParameters();
@@ -69,14 +69,14 @@ class TaggedPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\MultipleLinkPage::readParameters()
+        * @see wcf\page\MultipleLinkPage::readParameters()
         */
        protected function initObjectList() {
                $this->objectList = $this->objectType->getProcessor()->getObjectList($this->tag);
        }
        
        /**
-        * @see wcf\page\IPage::readData()
+        * @see wcf\page\IPage::readData()
         */
        public function readData() {
                parent::readData();
@@ -85,7 +85,7 @@ class TaggedPage extends MultipleLinkPage {
        }
        
        /**
-        * @see wcf\page\IPage::assignVariables()
+        * @see wcf\page\IPage::assignVariables()
         */
        public function assignVariables() {
                parent::assignVariables();
index 393b1a040d4d8b125bdcec252fef8c0a3419784c..7f34b634fa79d94f94031d63ad60f88d784d27c6 100644 (file)
@@ -78,7 +78,7 @@ class CLIWCF extends WCF {
        }
        
        /**
-        * @see wcf\system\WCF::destruct()
+        * @see wcf\system\WCF::destruct()
         */
        public static function destruct() {
                if (self::getReader() !== null && self::getReader()->getHistory() instanceof DatabaseCLICommandHistory) {
@@ -306,7 +306,7 @@ class CLIWCF extends WCF {
                if (WCF::getSession()->getPermission('admin.system.package.canUpdatePackage') && VERBOSITY >= -1 && !self::getArgvParser()->disableUpdateCheck) {
                        $updates = PackageUpdateDispatcher::getInstance()->getAvailableUpdates();
                        if (!empty($updates)) {
-                               $return = self::getReader()->println(count($updates) . ' update' . (count($updates) > 1 ? 's  are' : ' is') . ' available');
+                               $return = self::getReader()->println(count($updates) . ' update' . (count($updates) > 1 ? 's are' : ' is') . ' available');
                                
                                if (VERBOSITY >= 1) {
                                        $table = array(
index 5f209546c967bd8179476587716bd04f7be15510..61c397a03fd5011f98c84203ec8a4bc2774867ca 100644 (file)
@@ -70,7 +70,7 @@ final class Regex {
        
        /**
         * indicates that pattern string is treated as UTF-8.
-        * @var integer
+        * @var integer
         */
        const UTF_8 = 128;
        
index afde775aa03b95ba95fe92b5f87a33ab57e26b33..40143c4750bbdd3d7bd4814158e175739094f498 100644 (file)
@@ -124,7 +124,7 @@ class ACLHandler extends SingletonFactory {
        /**
         * Gets the object type id.
         * 
-        * @param       string          $objectType
+        * @param       string          $objectType
         * @return      integer
         */
        public function getObjectTypeID($objectType) {
index ec42fbf94f28a010787860987928d5842176386e..b617c98c0e30ad46984c5db3f918e619e0b4b682 100644 (file)
@@ -168,7 +168,7 @@ class AttachmentHandler implements \Countable {
        /**
         * Returns a formatted list of the allowed file extensions.
         * 
-        * @return array<string>
+        * @return      array<string>
         */
        public function getFormattedAllowedExtensions() {
                $extensions = $this->getAllowedExtensions();
@@ -210,7 +210,7 @@ class AttachmentHandler implements \Countable {
        /**
         * Returns the object type processor.
         * 
-        * @return wcf\system\attachment\IAttachmentObjectType
+        * @return      wcf\system\attachment\IAttachmentObjectType
         */
        public function getProcessor() {
                return $this->processor;
index efdabbea93ac2d209191dca600e59c4702d45ffe..57e8d6f8cdf565f4c5352a68b934b64582167419 100644 (file)
@@ -85,10 +85,10 @@ class TagCloudCacheBuilder extends AbstractCacheBuilder {
                        $conditionBuilder->add('object.objectTypeID IN (?)', array($this->objectTypeIDs));
                        $conditionBuilder->add('object.languageID IN (?)', array($this->languageIDs));
                        $sql = "SELECT          COUNT(*) AS counter, object.tagID
-                               FROM            wcf".WCF_N."_tag_to_object object
+                               FROM            wcf".WCF_N."_tag_to_object object
                                ".$conditionBuilder->__toString()."
-                               GROUP BY        object.tagID
-                               ORDER BY        counter DESC";
+                               GROUP BY        object.tagID
+                               ORDER BY        counter DESC";
                        $statement = WCF::getDB()->prepareStatement($sql, 500);
                        $statement->execute($conditionBuilder->getParameters());
                        while ($row = $statement->fetchArray()) {
index 3ae545ed6aa81a3a24b2314a7ed6f9a0a1e4d3e4..d6b84c87eb46a920927054dcba7316731336e809 100644 (file)
@@ -94,7 +94,7 @@ class MemcachedCacheSource implements ICacheSource {
        public function flush($cacheName, $useWildcard) {
                $cacheName = $this->prefix . $cacheName;
                
-               $resources = ($useWildcard) ? $this->getResources('~^' .  $cacheName. '(-[a-f0-9]+)?$~') : array($cacheName);
+               $resources = ($useWildcard) ? $this->getResources('~^' . $cacheName. '(-[a-f0-9]+)?$~') : array($cacheName);
                foreach ($resources as $resource) {
                        $this->memcached->delete($resource);
                        $this->updateMaster(null, $resource);
index f049b8fac7b1e6b1a28581d04eaf2cfcd779d9a5..d7bb2e1364f9ce5ac1faa459fde5b68198baa594 100644 (file)
@@ -56,7 +56,7 @@ class ImportCLICommand implements ICLICommand {
        
        /**
         * name of the selected
-        * @var string
+        * @var string
         */
        public $exporterName = '';
        
index fa64c005a22a4b02c4361739465d785b8068038e..89bb21c72103df91ce50c67304a709097ca5b621 100644 (file)
@@ -23,7 +23,7 @@ class DailyCleanUpCronjob extends AbstractCronjob {
                parent::execute($cronjob);
                
                // clean up search keywords
-               $sql = "SELECT  AVG(searches) AS searches
+               $sql = "SELECT  AVG(searches) AS searches
                        FROM    wcf".WCF_N."_search_keyword";
                $statement = WCF::getDB()->prepareStatement($sql);
                $statement->execute();
index c5b984526b576458761008e7b81c56796cbad0f2..fd6d25db72c67854417ec03a43d102867446e5df 100644 (file)
@@ -31,7 +31,7 @@ class DailyMailNotificationCronjob extends AbstractCronjob {
                
                // get user ids
                $userIDs = array();
-               $sql = "SELECT  DISTINCT notification_to_user.userID
+               $sql = "SELECT  DISTINCT notification_to_user.userID
                        FROM    wcf".WCF_N."_user_notification_to_user notification_to_user,
                                wcf".WCF_N."_user_notification notification
                        WHERE   notification.notificationID = notification_to_user.notificationID
index 039032e32e3b24fea2907bbc8aaab57072d37d79..d9c66991bd2ff767c5a06b078ea21dbce865518c 100644 (file)
@@ -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; 
        
index 97d13b799a1e253c1e56493c4de7d423415e1174..02752a6e6a36583274d430f19be81f108d879911 100644 (file)
@@ -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; 
        
index b604ae7acbbca0ed64d1ae6f1b11c88a22881ce3..02756c499b8c6479306f75755f64a64e57973752 100644 (file)
@@ -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; 
        
index 2360ad4eb49beaa22ad3c6a538896ac96d2e7945..fd243cb1e41deef5310e82bbf5160fa03107133a 100644 (file)
@@ -25,13 +25,13 @@ class RecentActivityDashboardBox extends AbstractContentDashboardBox {
        
        /**
         * true, if results were filtered by followed users
-        * @var boolean
+        * @var boolean
         */
        public $filteredByFollowedUsers = false;
        
        /**
         * latest event time
-        * @var integer
+        * @var integer
         */
        public $lastEventTime = 0;
        
index 84a635312d200edaee780965ab67460e8922f798..6bea7b7095bc81ec1fd5a8299f4e902db9679a5b 100644 (file)
@@ -18,7 +18,7 @@ use wcf\system\WCF;
 class StatsSidebarDashboardBox extends AbstractSidebarDashboardBox {
        /**
         * the stats 
-        * @var wcf\system\cache\builder\UserStatsCacheBuilder 
+        * @var wcf\system\cache\builder\UserStatsCacheBuilder 
         */
        public $stats = null; 
        
index 702160cee96c329fdf3c6d23a39d454362c4bd25..508eb6ecf8d7173f1a794d7333b759ce78c49529 100644 (file)
@@ -58,7 +58,7 @@ abstract class Database {
        
        /**
         * enables failsafe connection
-        * @var boolean
+        * @var boolean
         */
        protected $failsafeTest = false;
        
index 7a04847163cef04daa938e98da1d6e21c4bb9d4c..10555c44151b3d03380a303a2f93d787f24a4908 100644 (file)
@@ -21,7 +21,7 @@ use wcf\util\StringUtil;
  */
 class PreParserAtUserListener implements IEventListener {
        /**
-        * @see wcf\system\event\IEventListener::execute()
+        * @see wcf\system\event\IEventListener::execute()
         */
        public function execute($eventObj, $className, $eventName) {
                if (!$eventObj->text) return;
index 29acfa8260f162651746c638d1b981f052ef8d10..a4b12643762a67daec0cf609be1f86e864a67a9e 100644 (file)
@@ -18,78 +18,78 @@ use wcf\util\FileUtil;
 abstract class AbstractExporter implements IExporter {
        /**
         * additional data
-        * @var array
+        * @var array
         */
        public $additionalData = array();
-
+       
        /**
         * database host name
-        * @var string
+        * @var string
         */
        protected $databaseHost = '';
-
+       
        /**
         * database username
-        * @var string
+        * @var string
         */
        protected $databaseUser = '';
-
+       
        /**
         * database password
-        * @var string
+        * @var string
         */
        protected $databasePassword = '';
-
+       
        /**
         * database name
-        * @var string
+        * @var string
         */
        protected $databaseName = '';
-
+       
        /**
         * table prefix
-        * @var string
+        * @var string
         */
        protected $databasePrefix = '';
-
+       
        /**
         * file system path
-        * @var string
+        * @var string
         */
        protected $fileSystemPath = '';
-
+       
        /**
         * database connection
-        * @var wcf\system\database\Database
+        * @var wcf\system\database\Database
         */
        protected $database = null;
-
+       
        /**
         * object type => method names
-        * @var array
+        * @var array
         */
        protected $methods = array();
-
+       
        /**
         * limits for items per run
-        * @var array<integer>
+        * @var array<integer>
         */
        protected $limits = array();
-
+       
        /**
         * default limit for items per run
-        * @var integer
+        * @var integer
         */
        protected $defaultLimit = 1000;
-
+       
        /**
         * selected import data
-        * @var array
+        * @var array
         */
        protected $selectedData = array();
        
        /**
-        * @see wcf\system\exporter\IExporter::setData()
+        * @see wcf\system\exporter\IExporter::setData()
         */
        public function setData($databaseHost, $databaseUser, $databasePassword, $databaseName, $databasePrefix, $fileSystemPath, $additionalData) {
                $this->databaseHost = $databaseHost;
@@ -100,59 +100,59 @@ abstract class AbstractExporter implements IExporter {
                $this->fileSystemPath = ($fileSystemPath ? FileUtil::addTrailingSlash($fileSystemPath) : '');
                $this->additionalData = $additionalData;
        }
-
+       
        /**
-        * @see wcf\system\exporter\IExporter::init()
+        * @see wcf\system\exporter\IExporter::init()
         */
        public function init() {
                $this->database = new MySQLDatabase($this->databaseHost, $this->databaseUser, $this->databasePassword, $this->databaseName, 0);
        }
-
+       
        /**
-        * @see wcf\system\exporter\IExporter::validateDatabaseAccess()
+        * @see wcf\system\exporter\IExporter::validateDatabaseAccess()
         */
        public function validateDatabaseAccess() {
                $this->init();
        }
-
+       
        /**
-        * @see wcf\system\exporter\IExporter::getDefaultDatabasePrefix()
+        * @see wcf\system\exporter\IExporter::getDefaultDatabasePrefix()
         */
        public function getDefaultDatabasePrefix() {
                return '';
        }
-
+       
        /**
-        * @see wcf\system\exporter\IExporter::countLoops()
+        * @see wcf\system\exporter\IExporter::countLoops()
         */
        public function countLoops($objectType) {
                if (!isset($this->methods[$objectType]) || !method_exists($this, 'count'.$this->methods[$objectType])) {
                        throw new SystemException("unknown object type '".$objectType."' given");
                }
-
+               
                $count = call_user_func(array($this, 'count'.$this->methods[$objectType]));
                $limit = (isset($this->limits[$objectType]) ? $this->limits[$objectType] : $this->defaultLimit);
                return ceil($count / $limit);
        }
-
+       
        /**
-        * @see wcf\system\exporter\IExporter::exportData()
+        * @see wcf\system\exporter\IExporter::exportData()
         */
        public function exportData($objectType, $loopCount = 0) {
                if (!isset($this->methods[$objectType]) || !method_exists($this, 'export'.$this->methods[$objectType])) {
                        throw new SystemException("unknown object type '".$objectType."' given");
                }
-
+               
                $limit = (isset($this->limits[$objectType]) ? $this->limits[$objectType] : $this->defaultLimit);
                call_user_func(array($this, 'export'.$this->methods[$objectType]), $loopCount * $limit, $limit);
        }
        
        /**
-        * @see wcf\system\exporter\IExporter::validateSelectedData()
+        * @see wcf\system\exporter\IExporter::validateSelectedData()
         */
        public function validateSelectedData(array $selectedData) {
                $this->selectedData = $selectedData;
-       
+               
                if (!count($this->selectedData)) {
                        return false;
                }
@@ -174,5 +174,4 @@ abstract class AbstractExporter implements IExporter {
                
                return true;
        }
-       
 }
index af1e2a58c2e8a5f267790f5400a45690ffa33599..bd190d28239c96a86486b222ff33eb4982012437 100644 (file)
@@ -15,7 +15,7 @@ use wcf\util\StringUtil;
 abstract class AbstractNamedFormElement extends AbstractFormElement {
        /**
         * element description
-        * @var string
+        * @var string
         */
        protected $description = '';
        
index f696ae4456a6d4e68020f15bbe617ad3f3128cc5..368ac5be1c5ef7ea84daba4ba089b76646ac8b1d 100644 (file)
@@ -205,7 +205,7 @@ class GDImageAdapter implements IImageAdapter {
        }
        
        /**
-        * @see wcf\system\image\adapter\IImageAdapter::setTransparentColor()
+        * @see wcf\system\image\adapter\IImageAdapter::setTransparentColor()
         */
        public function setTransparentColor($red, $green, $blue) {
                if ($this->type == IMAGETYPE_PNG) {
index 3d962b628e30d9342c99e64590ab9595dd312004..cec91924d6f4de15d78b3eaabfc3bb74a7fff49c 100644 (file)
@@ -148,7 +148,7 @@ class ImagickImageAdapter implements IImageAdapter {
        }
        
        /**
-        * @see wcf\system\image\adapter\IImageAdapter::setTransparentColor()
+        * @see wcf\system\image\adapter\IImageAdapter::setTransparentColor()
         */
        public function setTransparentColor($red, $green, $blue) {
                $color = 'rgb(' . $red . ',' . $green . ',' . $blue . ')';
index 22984d0b405a4d0835cf6924612b4464e0d9851f..1fb763bde0c82d0a3a64c44220d51daa9b84f21b 100644 (file)
@@ -15,19 +15,19 @@ use wcf\system\WCF;
 class AbstractACLImporter extends AbstractImporter {
        /**
         * object type id for options
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
         * object type name
-        * @var integer
+        * @var integer
         */
        protected $objectTypeName = '';
        
        /**
         * available options
-        * @var array
+        * @var array
         */
        protected $options = array();
        
@@ -47,7 +47,7 @@ class AbstractACLImporter extends AbstractImporter {
        }
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                if (!isset($this->options[$additionalData['optionName']])) return 0;
index 68f003b69814b988b4fc507d6a951dc4bc3ec34c..eb7f53f5c8d763acf305dd83802f98489224d29e 100644 (file)
@@ -16,18 +16,18 @@ use wcf\util\StringUtil;
  */
 class AbstractAttachmentImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\attachment\Attachment';
        
        /**
         * object type id for attachments
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                // check file location
index b59f3f560e1eef9aa3ba808e856acbf5de0ce176..8dd2294d3ff1bde66d3d8bd7b8410bb2e69199cb 100644 (file)
@@ -14,24 +14,24 @@ use wcf\data\category\CategoryEditor;
  */
 class AbstractCategoryImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\category\Category';
        
        /**
         * object type id for categories
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
         * object type name
-        * @var integer
+        * @var integer
         */
        protected $objectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                if (!empty($data['parentCategoryID'])) $data['parentCategoryID'] = ImportHandler::getInstance()->getNewID($this->objectTypeName, $data['parentCategoryID']);
index 1333856377943a4abc3d9fb714d48d3753885f3b..65e7abb3285a8a0c5091e34adbf627eb71b54df9 100644 (file)
@@ -14,24 +14,24 @@ use wcf\data\comment\CommentEditor;
  */
 class AbstractCommentImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\comment\Comment';
        
        /**
         * object type id for comments
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
         * object type name
-        * @var integer
+        * @var integer
         */
        protected $objectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
index 81cc27ad28da032eeb5ff4806902e4b11665f480..9096ecfbc0073a17a63f5b1a104e95973f061574 100644 (file)
@@ -15,18 +15,18 @@ use wcf\system\WCF;
  */
 class AbstractCommentResponseImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\comment\response\CommentResponse';
        
        /**
         * object type name
-        * @var string
+        * @var string
         */
        protected $objectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
index a281ee75d08d9eec0e5fcde859e976201cccf586..ffbc1d8dd7d1a74b5e740ae82e58c846c65a7a69 100644 (file)
@@ -14,12 +14,12 @@ namespace wcf\system\importer;
 abstract class AbstractImporter implements IImporter {
        /**
         * database object class name
-        * @var string
+        * @var string
         */
        protected $className = '';
        
        /**
-        * @see wcf\system\importer\IImporter::getClassName()
+        * @see wcf\system\importer\IImporter::getClassName()
         */
        public function getClassName() {
                return $this->className;
index 75bd01dc39af729714ba1b3ac7851a0197ad36b5..9bad5c9a094ce36631d108a18677704d10391d09 100644 (file)
@@ -14,18 +14,18 @@ use wcf\system\WCF;
  */
 class AbstractLikeImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\like\Like';
        
        /**
         * object type id for likes
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                if ($data['objectUserID']) $data['objectUserID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['objectUserID']);
index 8e6e438d24c11a6f331409ec1d2ac3acb3d53fa7..63c813d920651752798cb2f1669c6dbba59d66f8 100644 (file)
@@ -14,24 +14,24 @@ use wcf\data\poll\PollEditor;
  */
 class AbstractPollImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\poll\Poll';
        
        /**
         * object type id for poll
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
         * object type name
-        * @var string
+        * @var string
         */
        protected $objectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $poll = PollEditor::create(array_merge($data, array('objectTypeID' => $this->objectTypeID)));
index db1c10d2fd6a7110332633541efe890a659fd88c..de63bd4a3b4d6ffbd750f0e873b8d91d222ba0b9 100644 (file)
@@ -14,24 +14,24 @@ use wcf\data\poll\option\PollOptionEditor;
  */
 class AbstractPollOptionImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\poll\option\PollOption';
        
        /**
         * option object type name
-        * @var string
+        * @var string
         */
        protected $objectTypeName = '';
        
        /**
         * poll object type name
-        * @var string
+        * @var string
         */
        protected $pollObjectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['pollID'] = ImportHandler::getInstance()->getNewID($this->pollObjectTypeName, $data['pollID']);
index 974c4ab23052469ee513e078ca143c2bf573c25d..7c303e24e3e191d107064835db8a2d4583c1be3b 100644 (file)
@@ -15,7 +15,7 @@ use wcf\system\WCF;
 class AbstractPollOptionVoteImporter extends AbstractImporter {
        /**
         * option object type name
-        * @var string
+        * @var string
         */
        protected $objectTypeName = '';
        
@@ -26,7 +26,7 @@ class AbstractPollOptionVoteImporter extends AbstractImporter {
        protected $pollObjectTypeName = '';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
index f6f498c5a6c3b5d04bb8aa97021371e9fc6bad8e..47ee5975b56ab4b6baa3c5c0f46cf09bcee2d6a5 100644 (file)
@@ -14,18 +14,18 @@ use wcf\data\user\object\watch\UserObjectWatchEditor;
  */
 class AbstractWatchedObjectImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\object\watch';
        
        /**
         * object type id for watched objects
-        * @var integer
+        * @var integer
         */
        protected $objectTypeID = 0;
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
index d089dbf9e17bb0f96adb9d17bf0b2725ad067729..b8c8e681ba8948803aa13158d5dc7c129d35b4c6 100644 (file)
@@ -27,25 +27,25 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction {
        
        /**
         * list of available importers
-        * @var array
+        * @var array
         */
        protected $objectTypes = array();
        
        /**
         * list of available importer processors
-        * @var array
+        * @var array
         */
        protected $importers = array();
        
        /**
         * user merge mode
-        * @var integer
+        * @var integer
         */
        protected $userMergeMode = 2;
        
        /**
         * import hash
-        * @var string
+        * @var string
         */
        protected $importHash = '';
        
@@ -56,7 +56,7 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction {
        public static $allowInvoke = array('resetMapping');
        
        /**
-        * @see wcf\system\SingletonFactory::init()
+        * @see wcf\system\SingletonFactory::init()
         */
        protected function init() {
                $this->objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.importer');
@@ -167,9 +167,9 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction {
        }
        
        /**
-        * Gets the user merge mode.
+        * Returns the user merge mode.
         * 
-        * @return integer
+        * @return      integer
         */
        public function getUserMergeMode() {
                return $this->userMergeMode;
@@ -177,7 +177,7 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction {
        
        /**
         * Sets the import hash.
-        *
+        * 
         * @param       string          $hash
         */
        public function setImportHash($hash) {
index 771003f5ee63d1b91e182390e1f98e26910cddb5..e8cc4b8c520d46c14711c2662d8baf7813f0b66c 100644 (file)
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class LabelGroupImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\label\group\LabelGroup';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                // save label group
index 9d8a0754d84b1142cae253d27c9f7ca1675b6bc8..a8151182e1d3c6361b67432569102933c034a7b5 100644 (file)
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class LabelImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\label\Label';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['groupID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.label.group', $data['groupID']);
index 73da7ada203d4b552307f8e9caa1100df5d71a82..d6598d903fe1af3df689ed80fb5a605251bc3e7e 100644 (file)
@@ -16,14 +16,14 @@ use wcf\util\StringUtil;
  */
 class SmileyImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\smiley\Smiley';
        
        /**
         * known smiley codes
         * 
-        * @var array<string>
+        * @var array<string>
         */
        public $knownCodes = array();
        
@@ -50,7 +50,7 @@ class SmileyImporter extends AbstractImporter {
        }
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                // copy smiley
index 2e345745d2e706b1a22e673d90768e020129c772..bdf55410b34224b1ff3b3d58baae342870edc098 100644 (file)
@@ -18,12 +18,12 @@ use wcf\util\FileUtil;
  */
 class UserAvatarImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\avatar\UserAvatar';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                // check file location
index 5b9448950d4ece6e22211a9ed445d6cc9a4b57d1..56d9f4d76fc290646240929b4d5fb6e3e8ce2edb 100644 (file)
@@ -15,7 +15,7 @@ use wcf\data\object\type\ObjectTypeCache;
  */
 class UserCommentImporter extends AbstractCommentImporter {
        /**
-        * @see wcf\system\importer\AbstractCommentImporter::$objectTypeName
+        * @see wcf\system\importer\AbstractCommentImporter::$objectTypeName
         */
        protected $objectTypeName = 'com.woltlab.wcf.user.comment';
        
@@ -28,7 +28,7 @@ class UserCommentImporter extends AbstractCommentImporter {
        }
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['objectID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['objectID']);
index 1e734e2b5c579ecaf0c781d01eee73f8474e7b34..823cc2a4e3c00e215dd8e7ed0c0a118ee0f065f0 100644 (file)
@@ -13,7 +13,7 @@ namespace wcf\system\importer;
  */
 class UserCommentResponseImporter extends AbstractCommentResponseImporter {
        /**
-        * @see wcf\system\importer\AbstractCommentResponseImporter::$objectTypeName
+        * @see wcf\system\importer\AbstractCommentResponseImporter::$objectTypeName
         */
        protected $objectTypeName = 'com.woltlab.wcf.user.comment';
 }
index f9162705c7a2d89d577e32f0af649c383f40074a..968aafff54f04000050a44d6d5399f2dbdf8dc1a 100644 (file)
@@ -14,12 +14,12 @@ use wcf\system\WCF;
  */
 class UserFollowerImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\follow\UserFollow';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['userID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['userID']);
index e39883ad2a27ade9144b3c5bd7f62b2d97938ca3..759324acdd69e1b2b85fafae56db321b35feaf44 100644 (file)
@@ -15,12 +15,12 @@ use wcf\data\user\group\UserGroupAction;
  */
 class UserGroupImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\group\UserGroup';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                if ($data['groupType'] < 4) {
index 75da10caf15226a0014987d4f4e600551b11a9b6..dfeefde6f6d381589e16efc3e46269cfd71306be 100644 (file)
@@ -21,7 +21,7 @@ use wcf\util\StringUtil;
  */
 class UserImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\User';
        
@@ -33,7 +33,7 @@ class UserImporter extends AbstractImporter {
        
        /**
         * list of user options
-        * @var array<wcf\data\user\option\UserOption>
+        * @var array<wcf\data\user\option\UserOption>
         */
        protected $userOptions = array();
        
@@ -57,7 +57,7 @@ class UserImporter extends AbstractImporter {
        }
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                // resolve duplicates
@@ -194,10 +194,10 @@ class UserImporter extends AbstractImporter {
        }
        
        /**
-        * Revolves duplicate user names.
+        * Revolves duplicate user names and returns the new user name.
         * 
         * @param       string          $username
-        * @return      string          new username
+        * @return      string
         */
        private static function resolveDuplicate($username) {
                $i = 0;
index 5b792d5e687666d36384fdc4c0104e55cc3cce79..98bf04931b9856f917e859b949ee39729930ef72 100644 (file)
@@ -18,13 +18,13 @@ use wcf\util\StringUtil;
  */
 class UserOptionImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\option\UserOption';
        
        /**
         * language category id
-        * @var integer
+        * @var integer
         */
        protected $languageCategoryID = null;
        
@@ -43,7 +43,7 @@ class UserOptionImporter extends AbstractImporter {
        }
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['packageID'] = 1;
index 53a4d2128bb30f2a36ac812a843041cab2da64a1..3eca50d2b327f1dd5de7da9dcd20d8dc8d66bec4 100644 (file)
@@ -15,12 +15,12 @@ use wcf\data\user\rank\UserRankEditor;
  */
 class UserRankImporter extends AbstractImporter {
        /**
-        * @see wcf\system\importer\AbstractImporter::$className
+        * @see wcf\system\importer\AbstractImporter::$className
         */
        protected $className = 'wcf\data\user\rank\UserRank';
        
        /**
-        * @see wcf\system\importer\IImporter::import()
+        * @see wcf\system\importer\IImporter::import()
         */
        public function import($oldID, array $data, array $additionalData = array()) {
                $data['groupID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user.group', $data['groupID']);
index a48268b2ff239d8a491e706a7d3c5577cede2b6a..e629a945338120c9bf0bc308149b7b02886cea23 100644 (file)
@@ -18,67 +18,67 @@ use wcf\util\StringUtil;
 class Mail {
        /**
         * line ending string
-        * @var string
+        * @var string
         */
        public static $lineEnding = "\n";
        
        /**
         * mail header
-        * @var string
+        * @var string
         */
        protected $header = '';
        
        /**
         * boundary for multipart/mixed mail
-        * @var string
+        * @var string
         */
        protected $boundary = '';
        
        /**
         * mail content mime type
-        * @var string
+        * @var string
         */
        protected $contentType = "text/plain";
        
        /**
         * mail recipients
-        * @var array<string>
+        * @var array<string>
         */
        protected $to = array();
        
        /**
         * mail subject
-        * @var string
+        * @var string
         */
        protected $subject = '';
        
        /**
         * mail message
-        * @var string
+        * @var string
         */
        protected $message = '';
        
        /**
         * mail sender
-        * @var array<string>
+        * @var array<string>
         */
        protected $from = array();
        
        /**
         * mail carbon copy
-        * @var array<string>
+        * @var array<string>
         */
        protected $cc = array();
        
        /**
         * mail blind carbon copy
-        * @var array<string>
+        * @var array<string>
         */
        protected $bcc = array();
        
        /**
         * mail attachments
-        * @var array
+        * @var array
         */
        protected $attachments = array();
        
@@ -96,7 +96,7 @@ class Mail {
        
        /**
         * mail language
-        * @var wcf\data\language\Language
+        * @var wcf\data\language\Language
         */
        protected $language = null;
        
index da90e4273529070cd7b1aa670926a70da64f0a98..22fa006b63b7c2e2d47a5b7f1f59a3d8bdc798ac 100644 (file)
@@ -16,25 +16,25 @@ use wcf\system\io\RemoteFile;
 class SMTPMailSender extends MailSender {
        /**
         * smtp connection
-        * @var wcf\system\io\RemoteFile
+        * @var wcf\system\io\RemoteFile
         */
        protected $connection = null;
        
        /**
         * last received status code
-        * @var string
+        * @var string
         */
        protected $statusCode = '';
        
        /**
         * last received status message
-        * @var string
+        * @var string
         */
        protected $statusMsg = '';
        
        /**
         * mail recipients
-        * @var array
+        * @var array
         */
        protected $recipients = array();
        
index 3c6e2a6885b7042818c847c294dd7380501ede92..2e73664581bb4bfe65157a92887aeed6ba41d4a9 100644 (file)
@@ -17,7 +17,7 @@ use wcf\util\StringUtil;
 class Censorship extends SingletonFactory {
        /**
         * censored words
-        * @var array<string>
+        * @var array<string>
         */
        protected $censoredWords = array();
        
@@ -40,7 +40,7 @@ class Censorship extends SingletonFactory {
        protected $matches = array();
        
        /**
-        * @see wcf\system\SingletonFactory::init()
+        * @see wcf\system\SingletonFactory::init()
         */
        protected function init() {
                // get words which should be censored
index b76b62c22d9c445aec23b1190858fd7bfe856e71..f44a3de28f8fc48a713e4f78298b4d3a63654945 100644 (file)
@@ -20,13 +20,13 @@ use wcf\util\ArrayUtil;
 class AbstractCategoryMultiSelectOptionType extends AbstractOptionType {
        /**
         * object type name
-        * @var string
+        * @var string
         */
        public $objectType = '';
        
        /**
         * node tree class
-        * @var string
+        * @var string
         */
        public $nodeTreeClassname = 'wcf\data\category\CategoryNodeTree';
        
index e6f0998990ff4ee52d03e2b3bcaaac598f92afe0..3d8761031db469e049a0f62f59210646a0d7d046 100644 (file)
@@ -31,13 +31,13 @@ class UserOptionHandler extends OptionHandler {
        
        /**
         * true, if within edit mode
-        * @var boolean
+        * @var boolean
         */
        public $editMode = true;
        
        /**
         * true, if within search mode
-        * @var boolean
+        * @var boolean
         */
        public $searchMode = false;
        
index ad743dc29587916818e8d2d70d4abbc07603fd9c..0a592d07497821d384992469f3de9f8a748664a6 100644 (file)
@@ -87,7 +87,7 @@ class PackageInstallationDispatcher {
        
        /**
         * holds state of structuring version tables
-        * @var boolean
+        * @var boolean
         */
        protected $requireRestructureVersionTables = false;
        
index ecfd6c0007a22e1b14a86ba50e9dd10a8c835c38..752049d43c2789e8babe9190de9c41990a3b15db 100644 (file)
@@ -479,7 +479,7 @@ class PackageInstallationScheduler {
                        WHERE           puf.packageUpdateVersionID IN (
                                                SELECT  packageUpdateVersionID
                                                FROM    wcf".WCF_N."_package_update_version
-                                               WHERE   packageUpdateID IN (
+                                               WHERE   packageUpdateID IN (
                                                        SELECT  packageUpdateID
                                                        FROM    wcf".WCF_N."_package_update
                                                        WHERE   package = ?
index 185de7a2a6ec7e4db5a965820fd37f48d1fa467d..d142c8327d180be6aa6e8b1c0cc90c1fd0572aaa 100644 (file)
@@ -150,7 +150,7 @@ class BBCodePackageInstallationPlugin extends AbstractXMLPackageInstallationPlug
                // clear attributes
                $sql = "DELETE FROM     wcf".WCF_N."_bbcode_attribute
                        WHERE           bbcodeID IN (
-                                               SELECT  bbcodeID
+                                               SELECT  bbcodeID
                                                FROM    wcf".WCF_N."_bbcode
                                                WHERE   packageID = ?
                                        )";
index 840bf3f458489b4394ecbb051bdd1a50b6574a2b..52ecdc2d04d41f0b0d1540d7965a864de9c7a279 100644 (file)
@@ -183,7 +183,7 @@ class PollManager extends SingletonFactory {
                        $this->pollData['isPublic'] = $this->poll->isPublic;
                }
                
-               //  poll options
+               // poll options
                if (isset($_POST['pollOptions']) && is_array($_POST['pollOptions'])) {
                        foreach ($_POST['pollOptions'] as $showOrder => $value) {
                                list($optionID, $optionValue) = explode('_', $value, 2);
index fa83af3aad8fb13c5959412028ee07be4807bc5a..44d0abc4d2f66efa04a911d257eb4bec9bf1d147 100644 (file)
@@ -27,13 +27,13 @@ class LinkHandler extends SingletonFactory {
        
        /**
         * title search strings
-        * @var array<string>
+        * @var array<string>
         */
        protected $titleSearch = array();
        
        /**
         * title replacement strings
-        * @var array<string>
+        * @var array<string>
         */
        protected $titleReplace = array();
        
index 4d54683397e46507a181df7b8e5267602b30ff57..aa5cbd7d7caf140b251e1a4ee1018678b1221e6d 100644 (file)
@@ -166,7 +166,7 @@ class SearchEngine extends SingletonFactory {
                                                        '".$objectTypeName."' AS objectType
                                                        ".($relevanceCalc ? ',search_index.relevance' : '')."
                                        FROM            ".$objectType->getTableName()."
-                                       INNER JOIN      (
+                                       INNER JOIN      (
                                                                SELECT          objectID
                                                                                ".($relevanceCalc ? ','.$relevanceCalc : '')."
                                                                FROM            wcf".WCF_N."_search_index
@@ -176,7 +176,7 @@ class SearchEngine extends SingletonFactory {
                                                                ".(!empty($orderBy) && $fulltextCondition === null ? 'ORDER BY '.$orderBy : '')."
                                                                LIMIT           1000
                                                        ) search_index
-                                       ON              (".$objectType->getIDFieldName()." = search_index.objectID)
+                                       ON              (".$objectType->getIDFieldName()." = search_index.objectID)
                                        ".$objectType->getJoins()."
                                        ".(isset($additionalConditions[$objectTypeName]) ? $additionalConditions[$objectTypeName] : '')."
                                )";
index 0b0a897d49da147d4d8d5f4a8aa3371f2b69faf5..3ada788350ac03c09b423fc9d6fc006fb083a4cc 100644 (file)
@@ -632,7 +632,7 @@ class SessionHandler extends SingletonFactory {
        /**
         * Returns the spider id for given user agent.
         *
-        * @param       string          $userAgent
+        * @param       string          $userAgent
         * @return      mixed
         */
        protected function getSpiderID($userAgent) {
@@ -651,13 +651,13 @@ class SessionHandler extends SingletonFactory {
        /**
         * Searches for existing session of a search spider.
         *
-        * @param       integer         $spiderID
+        * @param       integer         $spiderID
         * @return      wcf\data\session\Session
         */
        protected function getExistingSpiderSession($spiderID) {
-               $sql = "SELECT  *
-                       FROM    wcf".WCF_N."_session
-                       WHERE   spiderID = ?
+               $sql = "SELECT  *
+                       FROM    wcf".WCF_N."_session
+                       WHERE   spiderID = ?
                                AND userID IS NULL";
                $statement = WCF::getDB()->prepareStatement($sql);
                $statement->execute(array($spiderID));
@@ -666,7 +666,7 @@ class SessionHandler extends SingletonFactory {
                        // fix session validation
                        $row['ipAddress'] = UserUtil::getIpAddress();
                        $row['userAgent'] = UserUtil::getUserAgent();
-                               
+                       
                        // return session object
                        return new $this->sessionClassName(null, $row);
                }
index 793fb7f769ba2c943982669577d6c6860c5e274c..30bcff019eceeff5ddec1cc42979e95ff5cd7e48 100644 (file)
@@ -78,7 +78,7 @@ class TagEngine extends SingletonFactory {
                // save tags
                $sql = "INSERT INTO     wcf".WCF_N."_tag_to_object
                                        (objectID, tagID, objectTypeID, languageID)
-                       VALUES          (?, ?, ?, ?)";
+                       VALUES          (?, ?, ?, ?)";
                WCF::getDB()->beginTransaction();
                $statement = WCF::getDB()->prepareStatement($sql);
                foreach ($tagIDs as $tagID) {
index 037e92d7f4379789c21a17b8da5a4c6ea1a41b3c..9a25c9c7b59fdda627bb0aae7d987cde4512d9a8 100644 (file)
@@ -26,7 +26,7 @@ class DefaultUploadFileValidationStrategy implements IUploadFileValidationStrate
        
        /**
         * regex for validation of allowed file extension
-        * @var string
+        * @var string
         */
        protected $fileExtensionRegex = '';
        
index 39e1ce5191439e4f8f702da4c280dd8e266884dd..f79769dc3bd0a0a0b7f1cc37ea8bbfcd39b23d61 100644 (file)
@@ -50,7 +50,7 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp
        
        /**
         * language object
-        * @var wcf\data\language\Language
+        * @var wcf\data\language\Language
         */
        protected $language = null;
        
index 51e5d87a1171510a744a48b77dda82523b426bff..cf6b49d693776737b657b27214dcad5fdab399e9 100644 (file)
@@ -13,17 +13,17 @@ namespace wcf\system\user\notification\object\type;
  */
 class UserFollowUserNotificationObjectType extends AbstractUserNotificationObjectType {
        /**
-        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$decoratorClassName
+        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$decoratorClassName
         */
        protected static $decoratorClassName = 'wcf\system\user\notification\object\UserFollowUserNotificationObject';
        
        /**
-        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$objectClassName
+        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$objectClassName
         */
        protected static $objectClassName = 'wcf\data\user\follow\UserFollow';
        
        /**
-        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$objectListClassName
+        * @see wcf\system\user\notification\object\type\AbstractUserNotificationObjectType::$objectListClassName
         */
        protected static $objectListClassName = 'wcf\data\user\follow\UserFollowList';
 }
index 2d60c75833e1ad9b57404b2f49c563ac90ce7b4f..3e5b747706277ff25c3e9a8d8ee2da217f7d57fb 100644 (file)
@@ -6,7 +6,7 @@ use wcf\system\SingletonFactory;
 
 /**
  * Caches parsed user signatures.
- *
+ * 
  * @author     Marcel Werk
  * @copyright  2001-2013 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
@@ -17,7 +17,7 @@ use wcf\system\SingletonFactory;
 class SignatureCache extends SingletonFactory {
        /**
         * cached signatures
-        * @var string
+        * @var string
         */
        protected $signatures = array();
        
@@ -25,7 +25,7 @@ class SignatureCache extends SingletonFactory {
         * Returns a parsed user signature.
         * 
         * @param       wcf\data\user\User      $user
-        * @return      string
+        * @return      string
         */
        public function getSignature(User $user) {
                if (!isset($this->signatures[$user->userID])) {
index 39eff69e768b9fe2a2f50c384ea42925642222f3..044734d8c20a3df45e497e99029a9e29436983c7 100644 (file)
@@ -44,9 +44,9 @@ class VisitTracker extends SingletonFactory {
        }
        
        /**
-        * Gets the object type id.
+        * Returns the object type id of the given visit tracker object type.
         * 
-        * @param       string          $objectType
+        * @param       string          $objectType
         * @return      integer
         */
        public function getObjectTypeID($objectType) {
@@ -70,15 +70,15 @@ class VisitTracker extends SingletonFactory {
                        if (WCF::getUser()->userID) {
                                // get data from storage
                                UserStorageHandler::getInstance()->loadStorage(array(WCF::getUser()->userID));
-                                               
+                               
                                // get ids
                                $data = UserStorageHandler::getInstance()->getStorage(array(WCF::getUser()->userID), 'trackedUserVisits');
-                                       
+                               
                                // cache does not exist or is outdated
                                if ($data[WCF::getUser()->userID] === null) {
                                        $this->userVisits = array();
-                                       $sql = "SELECT  objectTypeID, visitTime
-                                               FROM    wcf".WCF_N."_tracked_visit_type
+                                       $sql = "SELECT  objectTypeID, visitTime
+                                               FROM    wcf".WCF_N."_tracked_visit_type
                                                WHERE   userID = ?";
                                        $statement = WCF::getDB()->prepareStatement($sql);
                                        $statement->execute(array(WCF::getUser()->userID));
index a5895f2d4b35ba7f5921b4a22d6f0e4ffde53a44..15f7fcf5dbe748fb5a52667780b743b0852b77bd 100644 (file)
@@ -25,7 +25,7 @@ abstract class AbstractRebuildDataWorker extends AbstractWorker implements IRebu
        
        /**
         * database object list
-        * @var wcf\data\DatabaseObjectList
+        * @var wcf\data\DatabaseObjectList
         */
        protected $objectList = null;
        
index de0142dc043bc2106089c2a6487413dd4484a906..13d971399ceb43ffa67f09028c7fd442545e7a17 100644 (file)
@@ -3,7 +3,7 @@ namespace wcf\system\worker;
 
 /**
  * Every rebuild data worker has to implement this interface.
- *
+ * 
  * @author     Marcel Werk
  * @copyright  2001-2013 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
@@ -14,8 +14,8 @@ namespace wcf\system\worker;
 interface IRebuildDataWorker extends IWorker {
        /**
         * Returns the list of objects.
-        *
-        * @return wcf\data\DatabaseObjectList
+        * 
+        * @return      wcf\data\DatabaseObjectList
         */
        public function getObjectList();
 }
index aa1b799a2e83e4eb177b903568866cc77016607d..1dbaf0fe8211e11ec63d795d902cbe54ff98803c 100644 (file)
@@ -22,65 +22,65 @@ class ImportWorker extends AbstractWorker {
         * @var array
         */
        protected $importData = null;
-
+       
        /**
         * exporter object
-        * @var wcf\system\exporter\IExporter
+        * @var wcf\system\exporter\IExporter
         */
        protected $exporter = null;
-
+       
        /**
         * @see wcf\system\worker\IWorker::validate()
         */
        public function validate() {
                WCF::getSession()->checkPermissions(array('admin.system.canImportData'));
-
+               
                if (!isset($this->parameters['objectType'])) {
                        throw new SystemException("parameter 'objectType' missing");
                }
-
+               
                // get import data
                $this->importData = WCF::getSession()->getVar('importData');
                if ($this->importData === null) {
                        throw new SystemException("import data missing");
                }
-
+               
                // get exporter
                $this->exporter = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.exporter', $this->importData['exporterName'])->getProcessor();
-
+               
                // set data
                $this->exporter->setData($this->importData['dbHost'], $this->importData['dbUser'], $this->importData['dbPassword'], $this->importData['dbName'], $this->importData['dbPrefix'], $this->importData['fileSystemPath'], $this->importData['additionalData']);
                $this->exporter->init();
-
+               
                // set user merge mode
                ImportHandler::getInstance()->setUserMergeMode($this->importData['userMergeMode']);
                
                // set import hash
                ImportHandler::getInstance()->setImportHash(substr(StringUtil::getHash($this->importData['dbHost'] . $this->importData['dbName'] . $this->importData['dbPrefix']), 0, 8));
        }
-
+       
        /**
         * @see wcf\system\worker\AbstractWorker::countObjects()
         */
        protected function countObjects() {
                $this->count = $this->exporter->countLoops($this->parameters['objectType']);
        }
-
+       
        /**
         * @see wcf\system\worker\IWorker::getProgress()
         */
        public function getProgress() {
                $this->countObjects();
-
+               
                if (!$this->count) {
                        return 100;
                }
-
+               
                $progress = (($this->loopCount + 1) / $this->count) * 100;
                if ($progress > 100) $progress = 100;
                return floor($progress);
        }
-
+       
        /**
         * @see wcf\system\worker\IWorker::execute()
         */
@@ -88,10 +88,10 @@ class ImportWorker extends AbstractWorker {
                if (!$this->count) {
                        return;
                }
-
+               
                $this->exporter->exportData($this->parameters['objectType'], $this->loopCount);
        }
-
+       
        /**
         * @see wcf\system\worker\IWorker::getProceedURL()
         */
index 1277f7251e5ec0db1087afe24de074ce508c2777..6da9d293f96013908073ce90ac693a1f937536f9 100644 (file)
@@ -34,7 +34,7 @@ final class HTTPRequest {
        
        /**
         * given files
-        * @var array
+        * @var array
         */
        private $files = array();
        
index 22ecfd217316a657a11c56678ad6783d38f8b13a..5c15871ed58227bbe1395774977dfa0f4b14ea81 100644 (file)
@@ -731,7 +731,7 @@ final class StringUtil {
        
        /**
         * Generates an anchor tag from given URL.
-        *  
+        * 
         * @param       string          $url
         * @param       string          $title
         * @param       boolean         $encodeTitle
@@ -773,7 +773,7 @@ final class StringUtil {
        /**
         * Simple multi-byte safe wordwrap() function.
         * 
-        * @param       string          $string
+        * @param       string          $string
         * @param       integer         $width
         * @param       string          $break
         * @return      string