From: Matthias Schmidt Date: Sun, 16 Sep 2012 16:06:48 +0000 (+0200) Subject: Cleans up package X-Git-Tag: 2.0.0_Beta_1~870^2^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f959ced2aaace391dba57ad0cf059afca8fb2dd;p=GitHub%2FWoltLab%2FWCF.git Cleans up package Fixes whitespaces and indentation, also updates and adds comments and adds to missing `var`s in JavaScript code. --- diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index be267ab325..39c7933254 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -13,14 +13,14 @@ WCF.ACP = {}; /** * Handles ACPMenu. - * + * * @param array activeMenuItems */ WCF.ACP.Menu = function(activeMenuItems) { this.init(activeMenuItems); }; WCF.ACP.Menu.prototype = { /** * Initializes ACPMenu. - * + * * @param array activeMenuItems */ init: function(activeMenuItems) { @@ -66,7 +66,7 @@ WCF.ACP.Menu.prototype = { /** * Handles clicks on main menu. - * + * * @param object event */ _toggleSidebar: function(event) { @@ -84,7 +84,7 @@ WCF.ACP.Menu.prototype = { /** * Renders sidebar including highlighting of currently active menu items. - * + * * @param string menuItem * @param array activeMenuItems */ @@ -140,19 +140,19 @@ WCF.ACP.Package.List.prototype = { * @var object */ _pages: {}, - + /** * plugin list references * @var object */ _pluginLists: [], - + /** * action proxy * @var WCF.Action.Proxy */ _proxy: null, - + /** * target container * @var jQuery @@ -249,20 +249,18 @@ WCF.ACP.Package.Installation = function(actionName, queueID, initialize) { this. WCF.ACP.Package.Installation.prototype = { /** * package installation type - * * @var string */ _actionName: '', - + /** * dialog api * @var $.ui.wcfDialog */ _api: null, - + /** * package installation dialog - * * @var object */ _dialog: null, @@ -272,13 +270,13 @@ WCF.ACP.Package.Installation.prototype = { * @var WCF.Action.Proxy */ _proxy: null, - + /** * queue id * @var integer */ _queueID: 0, - + /** * render dialog * @var boolean @@ -300,7 +298,7 @@ WCF.ACP.Package.Installation.prototype = { success: $.proxy(this._handleResponse, this), url: 'index.php/' + this._actionName + '/?t=' + SECURITY_TOKEN + SID_ARG_2ND }); - + if (initialize) { $('#submitButton').click($.proxy(function(event) { this.prepareInstallation(); @@ -348,7 +346,7 @@ WCF.ACP.Package.Installation.prototype = { $('#packageInstallationProgress').attr('value', data.progress).text(data.progress + '%'); $('#packageInstallationProgressLabel').text(data.progress + '%'); } - + // update action if (data.currentAction) { $('#packageInstallationAction').html(data.currentAction); @@ -459,7 +457,7 @@ WCF.ACP.Package.Installation.prototype = { queueID: this._queueID, step: step }, additionalData); - + this._proxy.setOption('data', $data); this._proxy.sendRequest(); } @@ -474,7 +472,6 @@ WCF.ACP.Package.Uninstallation = function(elements) { this.init(elements); }; WCF.ACP.Package.Uninstallation.prototype = { /** * WCF.ACP.Package.Installation object - * * @var WCF.ACP.Package.Installation */ _installation: null, @@ -878,7 +875,7 @@ WCF.ACP.Category.Collapsible = WCF.Collapsible.SimpleRemote.extend({ this._super(className); }, - + /** * @see WCF.Collapsible.Remote._getAdditionalParameters() */ @@ -892,14 +889,14 @@ WCF.ACP.Category.Collapsible = WCF.Collapsible.SimpleRemote.extend({ _getButtonContainer: function(containerID) { return $('#' + containerID + ' > .buttons'); }, - + /** * @see WCF.Collapsible.Remote._getContainers() */ _getContainers: function() { return $('.jsCategory').has('ol').has('li'); }, - + /** * @see WCF.Collapsible.Remote._getTarget() */ diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index f901a8d62f..f4ef8f0b2c 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -49,9 +49,8 @@ {/content} - - +
{@$pagesLinks}
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index d5af8a112b..1473a484b6 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -42,14 +42,13 @@

{@$sessionLog->time|time}

{@$sessionLog->lastActivityTime|time}

{#$sessionLog->accesses}

- + {event name='columns'} {/foreach} {/content} -
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 3bab602c51..f9e0a7b952 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -44,7 +44,7 @@ {event name='dataFields'}
- +
{/if} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index b49600807d..33d3e6517f 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -136,7 +136,7 @@
- {if $cronjobID|isset}{/if} + {if $cronjobID|isset}{/if}
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index d38b26d713..03c48c8c9b 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -19,7 +19,7 @@ }, { success: function(data, statusText, jqXHR) { $('.jsCronjobRow').each(function(index, row) { - $button = $(row).find('.jsExecuteButton'); + var $button = $(row).find('.jsExecuteButton'); if (WCF.inArray($($button).data('objectID'), data.objectIDs)) { // insert feedback here @@ -83,7 +83,7 @@ {else} {/if} - + {if $cronjob->canBeDisabled()} {else} @@ -93,7 +93,7 @@ {/if} {/if} - + {if $cronjob->isEditable()} {else} @@ -125,7 +125,7 @@

{@$cronjob->nextExec|plainTime}

{/if} - + {event name='columns'} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index 50665d267a..6720d9d59d 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -53,7 +53,6 @@ {/content} -
diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index ba7568d181..f29c23ee2f 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -1,4 +1,5 @@ {include file='header'} + + -{if $didYouKnow !== ''}

{lang}wcf.acp.index.didYouKnow{/lang}: {@$didYouKnow|language}

{/if} + +{if $didYouKnow !== ''} +

{lang}wcf.acp.index.didYouKnow{/lang}: {@$didYouKnow|language}

+{/if} +

{lang}wcf.acp.index.health.summary.{@$health}{/lang}

+ {event name='boxes'}
@@ -25,26 +32,31 @@ {event name='tabs'} + {if $health !== 'success'} {/if} + +
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 4246ccb599..9ff78fbc83 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -117,7 +117,7 @@
-
+
{/if} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index ddfeef1d79..d8f377463a 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -6,15 +6,15 @@ -
+
{pages print=true assign=pagesLinks controller="PackageUpdateSearchResult" id=$searchID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{foreach from=$packages item=package} -
+
-
+

{if $package[isApplication] == 1} @@ -26,8 +26,8 @@ {$package[packageName]}

- -
+ +
@@ -74,7 +74,7 @@
{lang}wcf.acp.packageUpdate.options{/lang} - +
{* new installation *} {if $package[isUnique] && !$package[updatableInstances]|count} @@ -93,11 +93,10 @@ {/foreach}
-
-
+
{/foreach}
@@ -106,7 +105,7 @@
-
+
{@$pagesLinks}
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 78c4883569..437c1c4b27 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -26,11 +26,11 @@ {/if} - + - + {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
- + {hascontent} {/hascontent} - + {hascontent}
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 8f827e9ab6..1715a6398d 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -6,7 +6,7 @@ var actionObjects = { }; actionObjects['com.woltlab.wcf.user'] = { }; actionObjects['com.woltlab.wcf.user']['delete'] = new WCF.Action.Delete('wcf\\data\\user\\UserAction', $('.jsUserRow'), $('#userTableContainer .wcf-menu li:first-child .wcf-badge')); - + WCF.Clipboard.init('wcf\\acp\\page\\UserListPage', {@$hasMarkedItems}, actionObjects); var options = { }; @@ -83,23 +83,22 @@ {else} {/if} - + {event name='buttons'}

{@$user->userID}

{if $user->editable}{$user->username}{else}{$user->username}{/if}

- + {foreach from=$columnHeads key=column item=columnLanguageVariable}

{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}

{/foreach} - + {event name='columns'} {/foreach} {/content} -
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl index 333e8f6f78..af195d1f50 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -50,7 +50,7 @@
{implode from=$userList item=$user}{$user}{/implode}
- + {/if} {if $action == 'group'} diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index cf05441bab..d24a6b0fec 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -52,7 +52,7 @@
-
+
@@ -118,13 +118,13 @@ {/foreach}
{/if} - + {event name='tabMenuContent'} - +
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 3d1c6ba312..313f2ee2e5 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -117,7 +117,7 @@ {/if} - + {event name='fieldsets'} {hascontent} @@ -128,7 +128,7 @@ {if $options|count}
  • {lang}wcf.acp.user.search.conditions.profile{/lang}
    • {/if} - + {event name='tabMenuTabs'} {/content} @@ -235,7 +235,7 @@ - +
    diff --git a/wcfsetup/install/files/js/WCF.ImageViewer.js b/wcfsetup/install/files/js/WCF.ImageViewer.js index c1bc3833ba..bc8471d86c 100644 --- a/wcfsetup/install/files/js/WCF.ImageViewer.js +++ b/wcfsetup/install/files/js/WCF.ImageViewer.js @@ -2,7 +2,6 @@ * ImageViewer for WCF. * Based upon "Slimbox 2" by Christophe Beyls 2007-20120, http://www.digitalia.be/software/slimbox2, MIT-style license. * - * * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 7c204d4510..c30f0be994 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -9,7 +9,7 @@ (function() { // store original implementation var $jQueryData = jQuery.fn.data; - + /** * Override jQuery.fn.data() to support custom 'ID' suffix which will * be translated to '-id' at runtime. @@ -20,7 +20,7 @@ if (key && key.match(/ID$/)) { arguments[0] = key.replace(/ID$/, '-id'); } - + // call jQuery's own data method var $data = $jQueryData.apply(this, arguments); @@ -38,7 +38,8 @@ }; })(); - /* Simple JavaScript Inheritance +/** + * Simple JavaScript Inheritance * By John Resig http://ejohn.org/ * MIT Licensed. */ @@ -107,7 +108,7 @@ $.extend(true, { wcfIsset: function(id) { return !!$('#' + $.wcfEscapeID(id)).length; }, - + /** * Returns the length of an object. * @@ -116,7 +117,7 @@ $.extend(true, { */ getLength: function(targetObject) { var $length = 0; - + for (var $key in targetObject) { if (targetObject.hasOwnProperty($key)) { $length++; @@ -288,7 +289,7 @@ $.fn.extend({ enable: function() { return this.removeAttr('disabled'); }, - + /** * Returns the element's id. If none is set, a random unique * ID will be assigned. @@ -299,7 +300,7 @@ $.fn.extend({ if (!this.attr('id')) { this.attr('id', WCF.getRandomID()); } - + return this.attr('id'); }, @@ -407,7 +408,7 @@ $.fn.extend({ wcfHighlight: function(options, callback) { return this.effect('highlight', options, 600, callback); }, - + /** * Shows an element by fading it in. * @@ -420,7 +421,7 @@ $.fn.extend({ return this.show(WCF.getEffect(this.getTagName(), 'fade'), { }, duration, callback); }, - + /** * Hides an element by fading it out. * @@ -451,7 +452,7 @@ $.extend(WCF, { * @var integer */ _idCounter: 0, - + /** * Shows a modal dialog with a built-in AJAX-loader. * @@ -491,7 +492,7 @@ $.extend(WCF, { // we cannot work with a non-existant dialog, if you wish to // load content via AJAX, see showAJAXDialog() instead if (!$.wcfIsset(dialogID)) return; - + var $dialog = $('#' + $.wcfEscapeID(dialogID)); var dialogOptions = arguments[1] || {}; @@ -1086,12 +1087,12 @@ WCF.Clipboard = { // bind event $listItem.click($.proxy(this._executeAction, this)); } - + // block click event $container.click(function(event) { event.stopPropagation(); }); - + // register event handler var $containerID = $container.wcfIdentify(); WCF.CloseOverlayHandler.addCallback($containerID, $.proxy(this._closeLists, this)); @@ -1224,7 +1225,7 @@ WCF.PeriodicalExecuter.prototype = { /** * interval id - * @var integer + * @var integer */ _intervalID: null, @@ -1296,19 +1297,19 @@ WCF.Action.Proxy.prototype = { * @var integer */ _activeRequests: 0, - + /** * loading overlay * @var jQuery */ _loadingOverlay: null, - + /** * loading overlay state * @var boolean */ _loadingOverlayVisible: false, - + /** * timer for overlay activity * @var integer @@ -1320,7 +1321,7 @@ WCF.Action.Proxy.prototype = { * @var boolean */ _suppressErrors: false, - + /** * Initializes AJAXProxy. * @@ -1383,7 +1384,7 @@ WCF.Action.Proxy.prototype = { this._showLoadingOverlay(); } }, - + /** * Displays the loading overlay if not already visible due to an active request. */ @@ -1392,7 +1393,7 @@ WCF.Action.Proxy.prototype = { if (this._loadingOverlay === null) { this._loadingOverlay = $('').hide().appendTo($('body')); } - + // fade in overlay if (!this._loadingOverlayVisible) { this._loadingOverlayVisible = true; @@ -1401,7 +1402,7 @@ WCF.Action.Proxy.prototype = { }, this)); } }, - + /** * Hides loading overlay if no requests are active and the timer reached at least 1 second. * @@ -1414,7 +1415,7 @@ WCF.Action.Proxy.prototype = { this._loadingOverlayVisible = false; this._loadingOverlayVisibleTimer = 0; pe.stop(); - + this._loadingOverlay.fadeOut(100); } }, @@ -1499,7 +1500,7 @@ WCF.Action.Proxy.prototype = { setOption: function(optionName, optionData) { this.options[optionName] = optionData; }, - + /** * Displays a spinner image for given element. * @@ -1507,16 +1508,16 @@ WCF.Action.Proxy.prototype = { */ showSpinner: function(element) { element = $(element); - + if (element.getTagName() !== 'img') { console.debug('The given element is not an image, aborting.'); return; } - + // force element dimensions element.attr('width', element.attr('width')); element.attr('height', element.attr('height')); - + // replace image element.attr('src', WCF.Icon.get('wcf.global.loading')); } @@ -1959,11 +1960,11 @@ WCF.Date.Time.prototype = { // re-calculate relative datetime every minute new WCF.PeriodicalExecuter($.proxy(this._refresh, this), 60000); - + // bind dom node inserted listener WCF.DOMNodeInsertedHandler.addCallback('WCF.Date.Time', $.proxy(this._domNodeInserted, this)); }, - + /** * Updates element collection once a DOM node was inserted. */ @@ -2014,7 +2015,7 @@ WCF.Date.Time.prototype = { else if (this.timestamp < ($timestamp + 604800)) { var $days = Math.round((this.timestamp - $timestamp) / 86400); var $string = eval(WCF.Language.get('wcf.date.relative.pastDays')); - + // get day of week var $dateObj = WCF.Date.Util.getTimezoneDate(($timestamp * 1000), $offset); var $dow = $dateObj.getDay(); @@ -2228,13 +2229,13 @@ WCF.MultipleLanguageInput.prototype = { * @var object */ _availableLanguages: {}, - + /** * initialization state * @var boolean */ _didInit: false, - + /** * target input element * @var jQuery @@ -2246,37 +2247,37 @@ WCF.MultipleLanguageInput.prototype = { * @var boolean */ _insertedDataAfterInit: false, - + /** * enables multiple language ability * @var boolean */ _isEnabled: false, - + /** * enforce multiple language ability * @var boolean */ _forceSelection: false, - + /** * currently active language id * @var integer */ _languageID: 0, - + /** * language selection list * @var jQuery */ _list: null, - + /** * list of language values on init * @var object */ _values: null, - + /** * Initializes multiple language ability for given element id. * @@ -2306,10 +2307,10 @@ WCF.MultipleLanguageInput.prototype = { // listen for submit event this._element.parents('form').submit($.proxy(this._submit, this)); - + this._didInit = true; }, - + /** * Builds language handler. * @@ -2348,7 +2349,7 @@ WCF.MultipleLanguageInput.prototype = { for (var $languageID in this._availableLanguages) { $('
  • ' + this._availableLanguages[$languageID] + '
    • ').data('languageID', $languageID).click($.proxy(this._changeLanguage, this)).appendTo(this._list); } - + // disable language input if (!this._forceSelection) { $('
  • ').appendTo(this._list); @@ -2357,7 +2358,7 @@ WCF.MultipleLanguageInput.prototype = { if (enableOnInit || this._forceSelection) { $button.trigger('click'); - + // pre-select current language this._list.children('li').each($.proxy(function(index, listItem) { var $listItem = $(listItem); @@ -2384,7 +2385,7 @@ WCF.MultipleLanguageInput.prototype = { this._closeSelection(); } }, - + /** * Enables the language selection or shows the selection if already enabled. * @@ -2410,11 +2411,11 @@ WCF.MultipleLanguageInput.prototype = { else { this._showSelection(); } - + // discard event event.stopPropagation(); }, - + /** * Shows the language selection. */ @@ -2424,7 +2425,7 @@ WCF.MultipleLanguageInput.prototype = { this._list.children('li').each($.proxy(function(index, listItem) { var $listItem = $(listItem); var $languageID = $listItem.data('languageID'); - + if ($languageID) { if (this._values[$languageID] && this._values[$languageID] != '') { $listItem.removeClass('missingValue'); @@ -2436,7 +2437,7 @@ WCF.MultipleLanguageInput.prototype = { }, this)); } }, - + /** * Closes the language selection. */ @@ -2448,7 +2449,7 @@ WCF.MultipleLanguageInput.prototype = { this._disable(); } }, - + /** * Changes the currently active language. * @@ -2483,7 +2484,7 @@ WCF.MultipleLanguageInput.prototype = { this._closeSelection(); this._element.blur().focus(); }, - + /** * Disables language selection for current element. */ @@ -2495,7 +2496,7 @@ WCF.MultipleLanguageInput.prototype = { // remove active marking this._list.prev('.dropdownToggle').children('span').removeClass('active').text(WCF.Language.get('wcf.global.button.disabledI18n')); this._closeSelection(); - + // update element value if (this._values[LANGUAGE_ID]) { this._element.val(this._values[LANGUAGE_ID]); @@ -2508,7 +2509,7 @@ WCF.MultipleLanguageInput.prototype = { this._element.blur(); this._isEnabled = false; }, - + /** * Prepares language variables on before submit. */ @@ -2517,19 +2518,19 @@ WCF.MultipleLanguageInput.prototype = { if (!this._isEnabled) { return 0xDEADBEAF; } - + // fetch active value if (this._languageID) { this._values[this._languageID] = this._element.val(); } - + var $form = $(this._element.parents('form')[0]); var $elementID = this._element.wcfIdentify(); - + for (var $languageID in this._values) { $('').appendTo($form); } - + // remove name attribute to prevent conflict with i18n values this._element.removeAttr('name'); } @@ -2546,21 +2547,21 @@ WCF.Icon = { * @var WCF.Dictionary */ _icons: new WCF.Dictionary(), - + /** * @see WCF.Dictionary.add() */ add: function(name, path) { this._icons.add(name, path); }, - + /** * @see WCF.Dictionary.addObject() */ addObject: function(object) { this._icons.addObject(object); }, - + /** * @see WCF.Dictionary.get() */ @@ -2600,7 +2601,7 @@ WCF.String = { addThousandsSeparator: function(number) { var $numberString = String(number); var parts = $numberString.split(/[^0-9]+/); - + var $decimalPoint = $numberString.match(/[^0-9]+/); $numberString = parts[0]; @@ -2802,7 +2803,8 @@ WCF.TabMenu = { }; /** - * Templates that may be fetched more than once with different variables. Based upon ideas from Prototype's template + * Templates that may be fetched more than once with different variables. + * Based upon ideas from Prototype's template. * * Usage: * var myTemplate = new WCF.Template('{$hello} World'); @@ -2811,26 +2813,23 @@ WCF.TabMenu = { * * my2ndTemplate = new WCF.Template('{@$html}{$html}'); * my2ndTemplate.fetch({ html: 'Test' }); // Test<b>Test</b> - * + * * var my3rdTemplate = new WCF.Template('You can use {literal}{$variable}{/literal}-Tags here'); * my3rdTemplate.fetch({ variable: 'Not shown' }); // You can use {$variable}-Tags here * - * * @param template template-content * @see https://github.com/sstephenson/prototype/blob/master/src/prototype/lang/template.js */ WCF.Template = function(template) { this.init(template); }; WCF.Template.prototype = { /** - * Template-content - * + * template content * @var string */ _template: '', /** - * Saved literal-tags - * + * saved literal tags * @var WCF.Dictionary */ _literals: new WCF.Dictionary(), @@ -3118,7 +3117,7 @@ WCF.Collapsible.Simple = { /** * Basic implementation for collapsible containers with AJAX support. Results for open * and closed state will be cached. - * + * * @param string className */ WCF.Collapsible.Remote = Class.extend({ @@ -3127,25 +3126,25 @@ WCF.Collapsible.Remote = Class.extend({ * @var string */ _className: '', - + /** * list of active containers * @var object */ _containers: {}, - + /** * container meta data * @var object */ _containerData: {}, - + /** * action proxy * @var WCF.Action.Proxy */ _proxy: null, - + /** * Initializes the controller for collapsible containers with AJAX support. * @@ -3226,7 +3225,7 @@ WCF.Collapsible.Remote = Class.extend({ var $isOpen = this._containers[containerID].data('isOpen'); var $button = $('').prependTo(buttonContainer); $button.data('containerID', containerID).click($.proxy(this._toggleContainer, this)); - + return $button; }, @@ -3254,7 +3253,7 @@ WCF.Collapsible.Remote = Class.extend({ }, this._getAdditionalParameters($containerID)) }); this._proxy.sendRequest(); - + // set spinner for current button this._exchangeIcon($button); }, @@ -3406,15 +3405,13 @@ WCF.Collapsible.SimpleRemote = WCF.Collapsible.Remote.extend({ */ WCF.User = { /** - * UserID of the user - * + * id of the actuve user * @var integer */ userID: 0, /** - * Username of the user - * + * name of the active user * @var string */ username: '', @@ -3504,19 +3501,19 @@ WCF.Effect.BalloonTooltip.prototype = { * @var boolean */ _didInit: false, - + /** * tooltip element * @var jQuery */ _tooltip: null, - + /** * cache viewport dimensions * @var object */ _viewportDimensions: { }, - + /** * Initializes tooltips. */ @@ -3524,23 +3521,23 @@ WCF.Effect.BalloonTooltip.prototype = { if (!this._didInit) { // create empty div this._tooltip = $('
    ').appendTo($('body')).hide(); - + // get viewport dimensions this._updateViewportDimensions(); - + // update viewport dimensions on resize $(window).resize($.proxy(this._updateViewportDimensions, this)); - + // observe DOM changes WCF.DOMNodeInsertedHandler.addCallback('WCF.Effect.BalloonTooltip', $.proxy(this.init, this)); - + this._didInit = true; } // init elements $('.jsTooltip').each($.proxy(this._initTooltip, this)); }, - + /** * Updates cached viewport dimensions. */ @@ -3560,12 +3557,12 @@ WCF.Effect.BalloonTooltip.prototype = { if ($element.hasClass('jsTooltip')) { $element.removeClass('jsTooltip'); var $title = $element.attr('title'); - + // ignore empty elements if ($title !== '') { $element.data('tooltip', $title); $element.removeAttr('title'); - + $element.hover( $.proxy(this._mouseEnterHandler, this), $.proxy(this._mouseLeaveHandler, this) @@ -3603,10 +3600,10 @@ WCF.Effect.BalloonTooltip.prototype = { // update text this._tooltip.children('span:eq(0)').text($element.data('tooltip')); - + // get arrow var $arrow = this._tooltip.find('.pointer'); - + // get arrow width this._tooltip.show(); var $arrowWidth = $arrow.outerWidth(); @@ -3617,49 +3614,49 @@ WCF.Effect.BalloonTooltip.prototype = { var $elementDimensions = $element.getDimensions('outer'); var $tooltipDimensions = this._tooltip.getDimensions('outer'); var $tooltipDimensionsInner = this._tooltip.getDimensions('inner'); - + var $elementCenter = $elementOffsets.left + Math.ceil($elementDimensions.width / 2); var $tooltipHalfWidth = Math.ceil($tooltipDimensions.width / 2); // determine alignment - $alignment = 'center'; + var $alignment = 'center'; if (($elementCenter - $tooltipHalfWidth) < 5) { $alignment = 'left'; } else if ((this._viewportDimensions.width - 5) < ($elementCenter + $tooltipHalfWidth)) { $alignment = 'right'; } - + // calculate top offset var $top = $elementOffsets.top + $elementDimensions.height + 7; - + // calculate left offset switch ($alignment) { case 'center': var $left = Math.round($elementOffsets.left - $tooltipHalfWidth + ($elementDimensions.width / 2)); - + $arrow.css({ left: ($tooltipDimensionsInner.width / 2 - $arrowWidth / 2) + "px" }); break; - + case 'left': var $left = $elementOffsets.left; - + $arrow.css({ left: "5px" }); break; - + case 'right': var $left = $elementOffsets.left + $elementDimensions.width - $tooltipDimensions.width; - + $arrow.css({ left: ($tooltipDimensionsInner.width - $arrowWidth - 5) + "px" }); break; } - + // move tooltip this._tooltip.css({ top: $top + "px", @@ -3696,13 +3693,13 @@ WCF.CloseOverlayHandler = { * @var WCF.Dictionary */ _callbacks: new WCF.Dictionary(), - + /** * indicates that overlay handler is listening to click events on body-tag * @var boolean */ _isListening: false, - + /** * Adds a new callback. * @@ -3716,10 +3713,10 @@ WCF.CloseOverlayHandler = { console.debug("[WCF.CloseOverlayHandler] identifier '" + identifier + "' is already bound to a callback"); return false; } - + this._callbacks.add(identifier, callback); }, - + /** * Removes a callback from list. * @@ -3730,18 +3727,18 @@ WCF.CloseOverlayHandler = { this._callbacks.remove(identifier); } }, - + /** * Binds click event handler. */ _bindListener: function() { if (this._isListening) return; - + $('body').click($.proxy(this._executeCallbacks, this)); - + this._isListening = true; }, - + /** * Executes callbacks on click. */ @@ -3864,19 +3861,19 @@ WCF.DOMNodeRemovedHandler = { * @var WCF.Dictionary */ _callbacks: new WCF.Dictionary(), - + /** * prevent infinite loop if a callback manipulates DOM * @var boolean */ _isExecuting: false, - + /** * indicates that overlay handler is listening to DOMNodeRemoved events on body-tag * @var boolean */ _isListening: false, - + /** * Adds a new callback. * @@ -3885,15 +3882,15 @@ WCF.DOMNodeRemovedHandler = { */ addCallback: function(identifier, callback) { this._bindListener(); - + if (this._callbacks.isset(identifier)) { console.debug("[WCF.DOMNodeRemovedHandler] identifier '" + identifier + "' is already bound to a callback"); return false; } - + this._callbacks.add(identifier, callback); }, - + /** * Removes a callback from list. * @@ -3904,24 +3901,24 @@ WCF.DOMNodeRemovedHandler = { this._callbacks.remove(identifier); } }, - + /** * Binds click event handler. */ _bindListener: function() { if (this._isListening) return; - + $(document).bind('DOMNodeRemoved', $.proxy(this._executeCallbacks, this)); - + this._isListening = true; }, - + /** * Executes callbacks if a DOM node is removed. */ _executeCallbacks: function(event) { if (this._isExecuting) return; - + // do not track events while executing callbacks this._isExecuting = true; @@ -4207,7 +4204,7 @@ WCF.Search.Base = Class.extend({ _getParameters: function(parameters) { return parameters; }, - + /** * Evalutes search results. * @@ -4225,7 +4222,7 @@ WCF.Search.Base = Class.extend({ for (var $i in data.returnValues) { var $item = data.returnValues[$i]; - + this._createListItem($item); } @@ -4247,7 +4244,7 @@ WCF.Search.Base = Class.extend({ return $listItem; }, - + /** * Executes callback upon result click. * @@ -4284,11 +4281,11 @@ WCF.Search.Base = Class.extend({ $clearSearchInput = (this._callback($listItem.data()) === true) ? true : false; } } - + // close list and revert input this._clearList($clearSearchInput); }, - + /** * Closes the suggestion list and clears search input on demand. * @@ -4298,7 +4295,7 @@ WCF.Search.Base = Class.extend({ if (clearSearchInput && !this._commaSeperated) { this._searchInput.val(''); } - + this._list.parent().removeClass('dropdownOpen').end().empty(); WCF.CloseOverlayHandler.removeCallback('WCF.Search.Base'); @@ -4879,55 +4876,55 @@ WCF.InlineEditor = Class.extend({ WCF.Upload = Class.extend({ /** * name of the upload field - * @var string + * @var string */ _name: '__files[]', /** * button selector - * @var jquery + * @var jQuery */ _buttonSelector: null, /** * file list selector - * @var jquery + * @var jQuery */ _fileListSelector: null, /** * upload file - * @var jquery + * @var jQuery */ _fileUpload: null, /** * class name - * @var string + * @var string */ _className: '', /** * additional options - * @var jquery + * @var jQuery */ _options: {}, /** * upload matrix - * @var array + * @var array */ _uploadMatrix: [], /** - * True, if your browser supports ajax file uploads. False, if your browser sucks. - * @var boolean + * true, if the active user's browser supports ajax file uploads + * @var boolean */ _supportsAJAXUpload: true, /** * fallback overlay for stupid browsers - * @var jquery + * @var jquery */ _overlay: null, @@ -6038,29 +6035,33 @@ $.widget('ui.wcfSidebar', { * @var jQuery */ _button: null, - + + /** + * sidebar containder + * @var jQuery + */ _container: null, - + /** * sidebar visibility * @var boolean */ _visible: true, - + /** * Creates a new toggleable sidebar. */ _create: function() { - this.element.wrap('
    '); + this.element.wrap('
    '); this._container = this.element.parents('aside:eq(0)'); // create toggle button - this._button = $('').appendTo(this._container); - + this._button = $('').appendTo(this._container); + // bind event this._button.click($.proxy(this._toggle, this)); }, - + /** * Toggles visibility on button click. */ @@ -6072,7 +6073,7 @@ $.widget('ui.wcfSidebar', { this.show(); } }, - + /** * Shows sidebar content. */ @@ -6080,11 +6081,11 @@ $.widget('ui.wcfSidebar', { if (this._visible) { return; } - + this._visible = true; this._container.removeClass('collapsed'); }, - + /** * Hides the sidebar content. */ @@ -6104,6 +6105,7 @@ $.widget('ui.wcfSidebar', { WCF.Sitemap = Class.extend({ /** * sitemap name cache + * @var array */ _cache: [ ], @@ -6331,13 +6333,13 @@ $.widget('ui.wcfPersistentSidebar', $.ui.wcfSidebar, { collapsed: false, objectTypeID: 0 }, - + /** * action proxy * @var WCF.Action.Proxy */ _proxy: null, - + /** * Creates a new toggleable sidebar. */ @@ -6348,17 +6350,17 @@ $.widget('ui.wcfPersistentSidebar', $.ui.wcfSidebar, { } $.ui.wcfSidebar.prototype._init.apply(this, arguments); - + // collapse on init if (this.options.collapsed) { this.element.hide(); this._visible = false; } - + // init proxy this._proxy = new WCF.Action.Proxy(); }, - + /** * Shows sidebar content. */ @@ -6366,13 +6368,13 @@ $.widget('ui.wcfPersistentSidebar', $.ui.wcfSidebar, { if (this._visible) { return; } - + $.ui.wcfSidebar.prototype._init.apply(this, arguments); - + // save state this._save(); }, - + /** * Hides the sidebar content. */ @@ -6380,13 +6382,13 @@ $.widget('ui.wcfPersistentSidebar', $.ui.wcfSidebar, { if (!this._visible) { return; } - + $.ui.wcfSidebar.prototype._init.apply(this, arguments); - + // save state this._save(); }, - + /** * Save collapsible state */ @@ -6427,55 +6429,55 @@ $.widget('ui.wcfDialog', { * @var jQuery */ _closeButton: null, - + /** * dialog container * @var jQuery */ _container: null, - + /** * dialog content * @var jQuery */ _content: null, - + /** * dialog content dimensions * @var object */ _contentDimensions: null, - + /** * rendering state * @var boolean */ _isRendering: false, - + /** * modal overlay * @var jQuery */ _overlay: null, - + /** * plain html for title * @var string */ _title: null, - + /** * title bar * @var jQuery */ _titlebar: null, - + /** * dialog visibility state * @var boolean */ _isOpen: false, - + /** * option list * @var object @@ -6489,7 +6491,7 @@ $.widget('ui.wcfDialog', { modal: true, title: '', zIndex: 400, - + // AJAX support ajax: false, data: { }, @@ -6502,7 +6504,7 @@ $.widget('ui.wcfDialog', { onClose: null, onShow: null }, - + /** * Initializes a new dialog. */ @@ -6520,22 +6522,22 @@ $.widget('ui.wcfDialog', { type: this.options.type, url: this.options.url }); - + // force open if using AJAX this.options.autoOpen = true; - + // apply loading overlay this._content.addClass('overlayLoading'); } - + if (this.options.autoOpen) { this.open(); } - + // act on resize $(window).resize($.proxy(this._resize, this)); }, - + /** * Creates a new dialog instance. */ @@ -6548,11 +6550,11 @@ $.widget('ui.wcfDialog', { this._titlebar = $('
    ').appendTo(this._container); this._title = $('
    • ').html(this.options.title).appendTo(this._titlebar); } - + // create close button if (this.options.closable) { this._closeButton = $('' + this.options.closeButtonLabel + '').click($.proxy(this.close, this)); - + if (!this.options.hideTitle && this.options.title != '') { this._closeButton.appendTo(this._titlebar); } @@ -6563,11 +6565,11 @@ $.widget('ui.wcfDialog', { // create content container this._content = $('
    ').appendTo(this._container); - + // move target element into content var $content = this.element.detach(); this._content.html($content); - + // create modal view if (this.options.modal) { this._overlay = $('#jsWcfDialogOverlay'); @@ -6598,7 +6600,7 @@ $.widget('ui.wcfDialog', { _success: function(data, textStatus, jqXHR) { // initialize dialog content this._initDialog(data); - + // remove loading overlay this._content.removeClass('overlayLoading'); @@ -6621,7 +6623,7 @@ $.widget('ui.wcfDialog', { this.render(); } }, - + /** * Returns a response value, taking care of different object * structure returned by AJAXProxy. @@ -6636,10 +6638,10 @@ $.widget('ui.wcfDialog', { else if (data[key]) { return data[key]; } - + return null; }, - + /** * Opens this dialog. */ @@ -6647,7 +6649,7 @@ $.widget('ui.wcfDialog', { if (this.isOpen()) { return; } - + if (this._overlay !== null) { WCF.activeDialogs++; @@ -6655,11 +6657,11 @@ $.widget('ui.wcfDialog', { this._overlay.show(); } } - + this.render(); this._isOpen = true; }, - + /** * Returns true, if dialog is visible. * @@ -6676,10 +6678,10 @@ $.widget('ui.wcfDialog', { if (!this.isOpen()) { return; } - + this._isOpen = false; this._container.wcfFadeOut(); - + if (this._overlay !== null) { WCF.activeDialogs--; @@ -6717,12 +6719,12 @@ $.widget('ui.wcfDialog', { width: 'auto' }); } - + // force content to be visible this._content.children().each(function() { $(this).show(); }); - + // handle multiple rendering requests if (this._isRendering) { // stop current process @@ -6732,12 +6734,12 @@ $.widget('ui.wcfDialog', { // set dialog to be fully opaque, should prevent weird bugs in WebKit this._container.show().css('opacity', 1.0); } - + // calculate dimensions var $windowDimensions = $(window).getDimensions(); var $containerDimensions = this._container.getDimensions('outer'); var $contentDimensions = this._content.getDimensions(); - + // calculate maximum content height var $heightDifference = $containerDimensions.height - $contentDimensions.height; var $maximumHeight = $windowDimensions.height - $heightDifference; @@ -6747,45 +6749,45 @@ $.widget('ui.wcfDialog', { if ($maximumHeight < $contentDimensions.height) { $containerDimensions = this._container.getDimensions('outer'); } - + // handle multiple rendering requests if (this._isRendering) { // use current dimensions as previous ones this._contentDimensions = this._getContentDimensions($maximumHeight); } - + // calculate new dimensions $contentDimensions = this._getContentDimensions($maximumHeight); - + // move container var $leftOffset = Math.round(($windowDimensions.width - $containerDimensions.width) / 2); var $topOffset = Math.round(($windowDimensions.height - $containerDimensions.height) / 2); - + // place container at 20% height if possible var $desiredTopOffset = Math.round(($windowDimensions.height / 100) * 20); if ($desiredTopOffset < $topOffset) { $topOffset = $desiredTopOffset; } - + if (!this.isOpen()) { // hide container again this._container.hide(); - + // apply offset this._container.css({ left: $leftOffset + 'px', top: $topOffset + 'px' }); - + // save current dimensions this._contentDimensions = $contentDimensions; - + // force dimensions this._content.css({ height: this._contentDimensions.height + 'px', width: this._contentDimensions.width + 'px' }); - + // fade in container this._container.wcfFadeIn($.proxy(function() { this._isRendering = false; @@ -6800,7 +6802,7 @@ $.widget('ui.wcfDialog', { height: this._contentDimensions.height + 'px', width: this._contentDimensions.width + 'px' }); - + // apply new dimensions $content.animate({ height: ($contentDimensions.height) + 'px', @@ -6815,7 +6817,7 @@ $.widget('ui.wcfDialog', { // store new dimensions this._contentDimensions = $contentDimensions; - + // move container this._container.animate({ left: $leftOffset + 'px', @@ -6828,10 +6830,10 @@ $.widget('ui.wcfDialog', { if (this.options.onShow !== null) { this.options.onShow(); } - + this._isRendering = true; }, - + /** * Returns calculated content dimensions. * @@ -6840,12 +6842,12 @@ $.widget('ui.wcfDialog', { */ _getContentDimensions: function(maximumHeight) { var $contentDimensions = this._content.getDimensions(); - + // set height to maximum height if exceeded if ($contentDimensions.height > maximumHeight) { $contentDimensions.height = maximumHeight; } - + return $contentDimensions; } }); @@ -6888,7 +6890,7 @@ $.widget('ui.wcfTabs', $.ui.tabs, { $.ui.tabs.prototype.select.apply(this, arguments); }, - + /** * Returns the currently selected tab index. * @@ -7173,11 +7175,10 @@ $.widget('ui.wcfPages', { }, /** - * Renders a page link + * Renders a page link. * * @parameter integer page - * - * @return $(element) + * @return jQuery */ _renderLink: function(page, lineBreak) { var $pageElement = $('
  • '); diff --git a/wcfsetup/install/files/lib/acp/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/AJAXProxyAction.class.php index 6cf562206c..fbfd6ae5fe 100755 --- a/wcfsetup/install/files/lib/acp/action/AJAXProxyAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/AJAXProxyAction.class.php @@ -5,10 +5,10 @@ namespace wcf\acp\action; * Copy of the default implementation for object-actions using the AJAX-API. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class AJAXProxyAction extends \wcf\action\AJAXProxyAction { } diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php index 50b5a9c7a2..59a251dbf0 100644 --- a/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php @@ -5,10 +5,10 @@ namespace wcf\acp\action; * Copy of the default implementation for the clipboard-API. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class ClipboardAction extends \wcf\action\ClipboardAction { } diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php index 6392bb45be..eb70dc5c60 100644 --- a/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php @@ -5,10 +5,10 @@ namespace wcf\acp\action; * Copy of the default implementation for loading marked items from clipboard API. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class ClipboardLoadMarkedItemsAction extends \wcf\action\ClipboardLoadMarkedItemsAction { } diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php index 9041d12a5b..4b23184af5 100644 --- a/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php @@ -5,10 +5,10 @@ namespace wcf\acp\action; * Copy of the default implementation for the clipboard proxy API. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class ClipboardProxyAction extends \wcf\action\ClipboardProxyAction { } diff --git a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php index f7dc1b9892..efd00b7ad2 100755 --- a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php @@ -11,13 +11,13 @@ use wcf\util\StringUtil; /** * Handles an AJAX-based package installation. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class InstallPackageAction extends AbstractDialogAction { /** diff --git a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php index 2f18ed59ba..ea6813e007 100755 --- a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php @@ -7,13 +7,13 @@ use wcf\util\HeaderUtil; /** * Does the user logout in the admin control panel. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class LogoutAction extends AbstractSecureAction { /** diff --git a/wcfsetup/install/files/lib/acp/action/OptionExportAction.class.php b/wcfsetup/install/files/lib/acp/action/OptionExportAction.class.php index fce9c7bd6d..9ada5482df 100644 --- a/wcfsetup/install/files/lib/acp/action/OptionExportAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/OptionExportAction.class.php @@ -8,11 +8,11 @@ use wcf\util\StringUtil; * Exports the options to an XML. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class OptionExportAction extends AbstractAction { /** diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php index ef60241064..bf96e4b380 100644 --- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php @@ -13,11 +13,11 @@ use wcf\util\StringUtil; * Handles an AJAX-based package uninstallation. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class UninstallPackageAction extends InstallPackageAction { /** diff --git a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php index 9ad0bb378f..bebafaecf1 100644 --- a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php @@ -11,11 +11,11 @@ use wcf\util\JSON; * Handles worker actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.action - * @category Community Framework + * @category Community Framework */ class WorkerProxyAction extends AbstractSecureAction { /** diff --git a/wcfsetup/install/files/lib/acp/form/ACPForm.class.php b/wcfsetup/install/files/lib/acp/form/ACPForm.class.php index 2ea0610bdf..1bda404911 100755 --- a/wcfsetup/install/files/lib/acp/form/ACPForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/ACPForm.class.php @@ -7,21 +7,21 @@ use wcf\system\menu\acp\ACPMenu; * Provides a default implementation for the show method in acp forms. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class ACPForm extends AbstractForm { /** * active acp menu item - * @var string + * @var string */ public $activeMenuItem = ''; /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // set active acp menu item diff --git a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php index 80afcb4cc4..ebbe6c9810 100755 --- a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php @@ -5,13 +5,13 @@ use wcf\system\exception\UserInputException; /** * This class provides default implementations for a list of options. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ abstract class AbstractOptionListForm extends AbstractForm { /** @@ -32,7 +32,7 @@ abstract class AbstractOptionListForm extends AbstractForm { /** * cache class name - * @var string + * @var string */ public $cacheClass = 'wcf\system\cache\builder\OptionCacheBuilder'; diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php index 7038ebae32..86565d9b75 100755 --- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php @@ -9,75 +9,75 @@ use wcf\util\StringUtil; /** * Shows the cronjob add form. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class CronjobAddForm extends ACPForm { /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.cronjob.add'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.cronjob.canAddCronjob'); /** * cronjob class name - * @var string + * @var string */ public $className = ''; /** * cronjob package id - * @var integer + * @var integer */ public $packageID = PACKAGE_ID; /** * cronjob description - * @var string + * @var string */ public $description = ''; /** * execution time (min) - * @var string + * @var string */ public $startMinute = '*'; /** * execution time (hour) - * @var string + * @var string */ public $startHour = '*'; /** * execution time (day of month) - * @var string + * @var string */ public $startDom = '*'; /** * execution time (month) - * @var string + * @var string */ public $startMonth = '*'; /** * execution time (day of week) - * @var string + * @var string */ public $startDow = '*'; /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -92,7 +92,7 @@ class CronjobAddForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -121,7 +121,7 @@ class CronjobAddForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -153,7 +153,7 @@ class CronjobAddForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php index 357d5a31fc..dc11acedb2 100755 --- a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php @@ -9,20 +9,20 @@ use wcf\system\WCF; * Shows the cronjob edit form. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class CronjobEditForm extends CronjobAddForm { /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.cronjob'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.cronjob.canEditCronjob'); @@ -34,12 +34,12 @@ class CronjobEditForm extends CronjobAddForm { /** * cronjob object - * @var wcf\data\cronjob\Cronjob + * @var wcf\data\cronjob\Cronjob */ public $cronjob = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -54,7 +54,7 @@ class CronjobEditForm extends CronjobAddForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { ACPForm::save(); @@ -82,7 +82,7 @@ class CronjobEditForm extends CronjobAddForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -99,7 +99,7 @@ class CronjobEditForm extends CronjobAddForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php index 0b3263cc45..c7f0d9a090 100755 --- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php @@ -14,34 +14,34 @@ use wcf\util\StringUtil; * Shows the acp login form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class LoginForm extends AbstractForm { /** * given login username - * @var string + * @var string */ public $username = ''; /** * given login password - * @var string + * @var string */ public $password = ''; /** * user object - * @var wcf\data\user\User + * @var wcf\data\user\User */ public $user; /** * given forward url - * @var string + * @var string */ public $url = null; @@ -57,7 +57,7 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -66,7 +66,7 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -105,7 +105,7 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -123,7 +123,7 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -145,11 +145,11 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); - + // get preferred username if (!count($_POST)) { if (isset($_COOKIE[COOKIE_PREFIX.'userID'])) { @@ -160,7 +160,7 @@ class LoginForm extends AbstractForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php index 875294a201..066f0649af 100755 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php @@ -8,24 +8,24 @@ use wcf\util\StringUtil; /** * Shows the master password form. - * + * * @author Marcel Werk * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class MasterPasswordForm extends ACPForm { /** * master password - * @var string + * @var string */ public $masterPassword = ''; /** * forward url - * @var string + * @var string */ public $url = ''; @@ -39,9 +39,9 @@ class MasterPasswordForm extends ACPForm { require_once(WCF_DIR.'acp/masterPassword.inc.php'); } } - + /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -51,7 +51,7 @@ class MasterPasswordForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -67,7 +67,7 @@ class MasterPasswordForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -86,7 +86,7 @@ class MasterPasswordForm extends ACPForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -97,7 +97,7 @@ class MasterPasswordForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php index 9599072c83..934983ee51 100755 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordInitForm.class.php @@ -11,11 +11,11 @@ use wcf\util\StringUtil; * Shows the master password init form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class MasterPasswordInitForm extends MasterPasswordForm { /** @@ -25,7 +25,7 @@ class MasterPasswordInitForm extends MasterPasswordForm { public $confirmMasterPassword = ''; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -36,7 +36,7 @@ class MasterPasswordInitForm extends MasterPasswordForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -45,7 +45,7 @@ class MasterPasswordInitForm extends MasterPasswordForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { ACPForm::validate(); @@ -107,12 +107,12 @@ class MasterPasswordInitForm extends MasterPasswordForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { // generate salt $salt = StringUtil::getRandomID(); - + // write master password file $file = new File(WCF_DIR.'acp/masterPassword.inc.php'); $file->write(" * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class OptionForm extends AbstractOptionListForm { /** * category option - * @var OptionCategory + * @var wcf\data\option\category\OptionCategory */ public $category = null; /** * category id - * @var integer + * @var integer */ public $categoryID = 0; /** * active tab menu item name - * @var string + * @var string */ public $activeTabMenuItem = ''; @@ -45,7 +45,7 @@ class OptionForm extends AbstractOptionListForm { /** * the option tree - * @var array + * @var array */ public $optionTree = array(); @@ -55,7 +55,7 @@ class OptionForm extends AbstractOptionListForm { protected $languageItemPattern = 'wcf.acp.option.option\d+'; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { if (isset($_REQUEST['id'])) $this->categoryID = intval($_REQUEST['id']); @@ -71,7 +71,7 @@ class OptionForm extends AbstractOptionListForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -80,7 +80,7 @@ class OptionForm extends AbstractOptionListForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -96,7 +96,7 @@ class OptionForm extends AbstractOptionListForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -115,7 +115,7 @@ class OptionForm extends AbstractOptionListForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -129,7 +129,7 @@ class OptionForm extends AbstractOptionListForm { } /** - * @see wcf\form\IForm::show() + * @see wcf\form\IForm::show() */ public function show() { // set active menu item @@ -137,7 +137,7 @@ class OptionForm extends AbstractOptionListForm { // check permission WCF::getSession()->checkPermissions(array('admin.system.canEditOption')); - + if ($this->category->categoryName == 'module') { // check master password WCFACP::checkMasterPassword(); diff --git a/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php index 8197b1cc50..3ca400a669 100755 --- a/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php @@ -9,34 +9,34 @@ use wcf\util\XML; /** * Shows the option import form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class OptionImportForm extends ACPForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.canEditOption'); /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.option.importAndExport'; /** * upload file data - * @var array + * @var array */ public $optionImport = null; /** * list of options - * @var array + * @var array */ public $options = array(); @@ -50,7 +50,7 @@ class OptionImportForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -92,7 +92,7 @@ class OptionImportForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -107,7 +107,7 @@ class OptionImportForm extends ACPForm { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // check master password diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php index a4b80834a3..4878e8dd23 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php @@ -19,15 +19,15 @@ use wcf\util\StringUtil; * Shows the package install and update form. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class PackageStartInstallForm extends ACPForm { /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package.install'; @@ -68,7 +68,7 @@ class PackageStartInstallForm extends ACPForm { public $queue = null; /** - * @see wcf\form\IForm::readParameters() + * @see wcf\form\IForm::readParameters() */ public function readParameters() { parent::readParameters(); @@ -87,7 +87,7 @@ class PackageStartInstallForm extends ACPForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -97,7 +97,7 @@ class PackageStartInstallForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -200,7 +200,7 @@ class PackageStartInstallForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -233,7 +233,7 @@ class PackageStartInstallForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -245,7 +245,7 @@ class PackageStartInstallForm extends ACPForm { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { if ($this->action == 'install') WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage')); diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php index f1563b9b94..f003be2b94 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php @@ -13,20 +13,20 @@ use wcf\util\StringUtil; * Shows the package update authentification form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class PackageUpdateAuthForm extends ACPForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canInstallPackage'); /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package'; @@ -107,7 +107,7 @@ class PackageUpdateAuthForm extends ACPForm { /** * Creates a new PackageUpdateAuthForm object. * - * @param PackageUpdateAuthorizationRequiredException $exception + * @param wcf\system\package\PackageUpdateAuthorizationRequiredException $exception */ public function __construct(PackageUpdateAuthorizationRequiredException $exception = null) { $this->exception = $exception; @@ -134,7 +134,7 @@ class PackageUpdateAuthForm extends ACPForm { /** * @todo This whole page is carzy, it's manipulating the requested page, but RequestHandler does not work this way - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -203,7 +203,7 @@ class PackageUpdateAuthForm extends ACPForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -232,7 +232,7 @@ class PackageUpdateAuthForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php index 173f6925dc..78472cec62 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php @@ -10,22 +10,22 @@ use wcf\util\HeaderUtil; /** * Shows the package update confirmation form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class PackageUpdateForm extends ACPForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canInstallPackage'); /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package'; @@ -54,7 +54,7 @@ class PackageUpdateForm extends ACPForm { public $packageUpdate = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -63,7 +63,7 @@ class PackageUpdateForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -88,7 +88,7 @@ class PackageUpdateForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { if (isset($_POST['send'])) { @@ -106,7 +106,7 @@ class PackageUpdateForm extends ACPForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -118,7 +118,7 @@ class PackageUpdateForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -131,7 +131,7 @@ class PackageUpdateForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function show() { // check master password diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php index 3b1fd7b264..705cca8425 100644 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php @@ -14,22 +14,22 @@ use wcf\util\StringUtil; /** * Shows the package update search form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class PackageUpdateSearchForm extends ACPForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canInstallPackage'); /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package.database'; @@ -94,7 +94,7 @@ class PackageUpdateSearchForm extends ACPForm { public $packageUpdateIDs = ''; /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -111,7 +111,7 @@ class PackageUpdateSearchForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -135,10 +135,13 @@ class PackageUpdateSearchForm extends ACPForm { $conditions->add('('.$condition.')', $parameters); } + // author if (!empty($this->author)) $conditions->add("author LIKE ?", array($this->author)); + // ignore already installed uniques if ($this->ignoreUniques == 1) $conditions->add("package NOT IN (SELECT package FROM wcf".WCF_N."_package WHERE isUnique = 1)"); + // package type if (($this->plugin == 0 || $this->isApplication == 0 || $this->other == 0) && ($this->plugin == 1 || $this->isApplication == 1 || $this->other == 1)) { if ($this->isApplication == 1) { @@ -221,7 +224,7 @@ class PackageUpdateSearchForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -243,7 +246,7 @@ class PackageUpdateSearchForm extends ACPForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -252,7 +255,7 @@ class PackageUpdateSearchForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -271,7 +274,7 @@ class PackageUpdateSearchForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function show() { // check master password diff --git a/wcfsetup/install/files/lib/acp/form/UpdateServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UpdateServerAddForm.class.php index 596cb576a1..94fb78fdac 100755 --- a/wcfsetup/install/files/lib/acp/form/UpdateServerAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UpdateServerAddForm.class.php @@ -11,43 +11,43 @@ use wcf\util\StringUtil; * Shows the server add form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UpdateServerAddForm extends ACPForm { /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package.server.add'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canEditServer'); /** * server url - * @var string + * @var string */ public $serverURL = ''; /** * server login username - * @var string + * @var string */ public $loginUsername = ''; /** * server login password - * @var string + * @var string */ public $loginPassword = ''; /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -58,7 +58,7 @@ class UpdateServerAddForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -73,7 +73,7 @@ class UpdateServerAddForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -95,7 +95,7 @@ class UpdateServerAddForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -109,7 +109,7 @@ class UpdateServerAddForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function show() { // check master password diff --git a/wcfsetup/install/files/lib/acp/form/UpdateServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UpdateServerEditForm.class.php index b223047931..4619916d3b 100755 --- a/wcfsetup/install/files/lib/acp/form/UpdateServerEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UpdateServerEditForm.class.php @@ -8,34 +8,34 @@ use wcf\system\WCF; /** * Shows the server edit form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UpdateServerEditForm extends UpdateServerAddForm { /** - * @see wcf\acp\form\ACPForm::$activeMenuItem + * @see wcf\acp\form\ACPForm::$activeMenuItem */ public $activeMenuItem = 'wcf.acp.menu.link.package.server'; /** * update server id - * @var integer + * @var integer */ public $packageUpdateServerID = 0; /** * active package update server - * @var PackageUpdateServer + * @var wcf\data\package\update\server\PackageUpdateServer */ public $updateServer = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -48,7 +48,7 @@ class UpdateServerEditForm extends UpdateServerAddForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { AbstractForm::save(); @@ -67,7 +67,7 @@ class UpdateServerEditForm extends UpdateServerAddForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -80,7 +80,7 @@ class UpdateServerEditForm extends UpdateServerAddForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index ddcfe3db98..6eed598a2f 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -16,15 +16,15 @@ use wcf\util\UserUtil; * Shows the user add form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserAddForm extends UserOptionListForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canAddUser'); @@ -36,55 +36,55 @@ class UserAddForm extends UserOptionListForm { /** * username - * @var string + * @var string */ public $username = ''; /** * email address - * @var string + * @var string */ public $email = ''; /** * confirmed email address - * @var string + * @var string */ public $confirmEmail = ''; /** * user password - * @var string + * @var string */ public $password = ''; /** * confirmed user password - * @var string + * @var string */ public $confirmPassword = ''; /** * user group ids - * @var array + * @var array */ public $groupIDs = array(); /** * language id - * @var integer + * @var integer */ public $languageID = 0; /** * visible languages - * @var array + * @var array */ public $visibleLanguages = array(); /** * additional fields - * @var array + * @var array */ public $additionalFields = array(); @@ -98,7 +98,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -114,7 +114,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { // validate static user options @@ -181,7 +181,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { AbstractForm::save(); @@ -281,7 +281,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -297,7 +297,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -320,7 +320,7 @@ class UserAddForm extends UserOptionListForm { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // set active menu item diff --git a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php index 62d3bf25cb..0060d0b102 100755 --- a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php @@ -16,11 +16,11 @@ use wcf\util\ArrayUtil; * Shows the assign user to group form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserAssignToGroupForm extends ACPForm { /** @@ -33,9 +33,28 @@ class UserAssignToGroupForm extends ACPForm { */ public $activeMenuItem = 'wcf.acp.menu.link.user.management'; + /** + * ids of the relevant users + * @var array + */ public $userIDs = array(); + + /** + * ids of the assigned user groups + * @var array + */ public $groupIDs = array(); + + /** + * relevant users + * @var array + */ public $users = array(); + + /** + * assigned user groups + * @var array + */ public $groups = array(); /** @@ -66,7 +85,7 @@ class UserAssignToGroupForm extends ACPForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -75,7 +94,7 @@ class UserAssignToGroupForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -93,7 +112,7 @@ class UserAssignToGroupForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -135,7 +154,7 @@ class UserAssignToGroupForm extends ACPForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -144,7 +163,7 @@ class UserAssignToGroupForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php index 50311f40cf..336ac3c23c 100755 --- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php @@ -14,32 +14,32 @@ use wcf\util\StringUtil; * Shows the user edit form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserEditForm extends UserAddForm { /** - * @see wcf\acp\form\UserAddForm::$menuItemName + * @see wcf\acp\form\UserAddForm::$menuItemName */ public $menuItemName = 'wcf.acp.menu.link.user.management'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canEditUser'); /** * user id - * @var integer + * @var integer */ public $userID = 0; /** * user editor object - * @var UserEditor + * @var wcf\data\user\UserEditor */ public $user = null; @@ -49,7 +49,7 @@ class UserEditForm extends UserAddForm { public $loadActiveOptions = false; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -71,7 +71,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\page\IPage::readFormParameters() + * @see wcf\page\IPage::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -81,7 +81,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { if (!count($_POST)) { @@ -124,7 +124,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -139,7 +139,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { AbstractForm::save(); @@ -174,13 +174,13 @@ class UserEditForm extends UserAddForm { // reset password $this->password = $this->confirmPassword = ''; - + // show success message WCF::getTPL()->assign('success', true); } /** - * @see wcf\acp\form\UserAddForm::validateUsername() + * @see wcf\acp\form\UserAddForm::validateUsername() */ protected function validateUsername($username) { if (StringUtil::toLowerCase($this->user->username) != StringUtil::toLowerCase($username)) { @@ -189,7 +189,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\acp\form\UserAddForm::validateEmail() + * @see wcf\acp\form\UserAddForm::validateEmail() */ protected function validateEmail($email, $confirmEmail) { if (StringUtil::toLowerCase($this->user->email) != StringUtil::toLowerCase($email)) { @@ -198,7 +198,7 @@ class UserEditForm extends UserAddForm { } /** - * @see wcf\acp\form\UserAddForm::validatePassword() + * @see wcf\acp\form\UserAddForm::validatePassword() */ protected function validatePassword($password, $confirmPassword) { if (!empty($password) || !empty($confirmPassword)) { diff --git a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php index e3d2992c0b..4a4f95116a 100755 --- a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php @@ -9,22 +9,53 @@ use wcf\util\StringUtil; /** * Shows the export user mail addresses form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserEmailAddressExportForm extends ACPForm { + /** + * @see wcf\page\AbstractPage::$activeMenuItem + */ public $activeMenuItem = 'wcf.acp.menu.link.user.management'; + + /** + * @see wcf\page\AbstractPage::$neededPermissions + */ public $neededPermissions = array('admin.user.canMailUser'); + /** + * type of the file containg the exported email addresses + * @var string + */ public $fileType = 'csv'; + + /** + * ids of the users whose email addresses are exported + * @var array + */ public $userIDs = array(); + + /** + * string used to separate email adresses + * @var string + */ public $separator = ','; + + /** + * string used to wrap email adresses + * @var string + */ public $textSeparator = '"'; + + /** + * users whose email addresses are exported + * @var array + */ public $users = array(); /** @@ -55,7 +86,7 @@ class UserEmailAddressExportForm extends ACPForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -66,7 +97,7 @@ class UserEmailAddressExportForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -100,8 +131,12 @@ class UserEmailAddressExportForm extends ACPForm { $i = 0; while ($row = $statement->fetchArray()) { - if ($this->fileType == 'xml') echo "
    \n"; - else echo $this->textSeparator . $row['email'] . $this->textSeparator . ($i < $count['count'] ? $this->separator : ''); + if ($this->fileType == 'xml') { + echo "
    \n"; + } + else { + echo $this->textSeparator . $row['email'] . $this->textSeparator . ($i < $count['count'] ? $this->separator : ''); + } $i++; } @@ -118,7 +153,7 @@ class UserEmailAddressExportForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php index 324bd04502..c6f48bc4a5 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php @@ -13,44 +13,44 @@ use wcf\system\WCFACP; * Shows the group add form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserGroupAddForm extends AbstractOptionListForm { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canAddGroup'); /** * name of the active acp menu item - * @var string + * @var string */ public $menuItemName = 'wcf.acp.menu.link.group.add'; /** - * @see wcf\acp\form\AbstractOptionListForm::$cacheName + * @see wcf\acp\form\AbstractOptionListForm::$cacheName */ public $cacheName = 'userGroup-option'; /** * active tab menu item name - * @var string + * @var string */ public $activeTabMenuItem = ''; /** * active sub tab menu item name - * @var string + * @var string */ public $activeMenuItem = ''; /** - * the option tree - * @var array + * option tree + * @var array */ public $optionTree = array(); @@ -66,13 +66,13 @@ class UserGroupAddForm extends AbstractOptionListForm { /** * group name - * @var string + * @var string */ public $groupName = ''; /** * additional fields - * @var array + * @var array */ public $additionalFields = array(); @@ -92,7 +92,7 @@ class UserGroupAddForm extends AbstractOptionListForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -105,7 +105,7 @@ class UserGroupAddForm extends AbstractOptionListForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { // validate dynamic options @@ -120,14 +120,14 @@ class UserGroupAddForm extends AbstractOptionListForm { catch (UserInputException $e) { $this->errorType[$e->getField()] = $e->getType(); } - + if (count($this->errorType) > 0) { throw new UserInputException('groupName', $this->errorType); } } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -179,7 +179,7 @@ class UserGroupAddForm extends AbstractOptionListForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -206,7 +206,7 @@ class UserGroupAddForm extends AbstractOptionListForm { 'activeMenuItem' => $this->activeMenuItem )); } - + /** * @see wcf\form\IForm::show() */ diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php index e8756b8054..b19ca92caa 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php @@ -13,37 +13,37 @@ use wcf\system\WCF; * Shows the group edit form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserGroupEditForm extends UserGroupAddForm { /** - * @see wcf\acp\form\UserGroupAddForm::$menuItemName + * @see wcf\acp\form\UserGroupAddForm::$menuItemName */ public $menuItemName = 'wcf.acp.menu.link.group'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canEditGroup'); /** - * group id - * @var integer + * id of the edited user group + * @var integer */ public $groupID = 0; /** - * group editor object - * @var GroupEditor + * user group editor object + * @var wcf\data\user\group\UserGroupEditor */ public $group = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -63,7 +63,7 @@ class UserGroupEditForm extends UserGroupAddForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { if (!count($_POST)) { @@ -94,7 +94,7 @@ class UserGroupEditForm extends UserGroupAddForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -114,7 +114,7 @@ class UserGroupEditForm extends UserGroupAddForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { AbstractForm::save(); diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php index 890cd96d65..02aab11858 100644 --- a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php @@ -22,7 +22,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserGroupOptionForm extends ACPForm { /** @@ -332,7 +332,7 @@ class UserGroupOptionForm extends ACPForm { } } if (!$hasEnabledOption) return false; - + // check the permission of this item for the active user $hasPermission = true; if ($object->permissions) { @@ -346,7 +346,7 @@ class UserGroupOptionForm extends ACPForm { } } if (!$hasPermission) return false; - + return true; } } diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php index c534e5f9a7..1cf2abcea7 100755 --- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php @@ -18,7 +18,7 @@ use wcf\util\StringUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserMailForm extends ACPForm { /** @@ -75,7 +75,7 @@ class UserMailForm extends ACPForm { public $userList = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -84,7 +84,7 @@ class UserMailForm extends ACPForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -98,7 +98,7 @@ class UserMailForm extends ACPForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { parent::validate(); @@ -124,7 +124,7 @@ class UserMailForm extends ACPForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -149,7 +149,7 @@ class UserMailForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function readData() { parent::readData(); @@ -186,7 +186,7 @@ class UserMailForm extends ACPForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionListForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionListForm.class.php index fff5286904..79d80580dc 100644 --- a/wcfsetup/install/files/lib/acp/form/UserOptionListForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserOptionListForm.class.php @@ -7,11 +7,11 @@ use wcf\system\language\LanguageFactory; * This class provides default implementations for a list of dynamic user options. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ abstract class UserOptionListForm extends AbstractOptionListForm { /** diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php index 1caff90f34..01ea4ea3f2 100755 --- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php @@ -15,107 +15,107 @@ use wcf\util\StringUtil; /** * Shows the user search form. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UserSearchForm extends UserOptionListForm { /** * active menu item name - * @var string + * @var string */ public $menuItemName = 'wcf.acp.menu.link.user.search'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canSearchUser'); /** * username - * @var string + * @var string */ public $username = ''; /** * email address - * @var string + * @var string */ public $email = ''; /** * user id - * @var integer + * @var integer */ public $userID = 0; - + /** * group ids - * @var array + * @var array */ public $groupIDs = array(); /** * true to invert the given group ids - * @var boolean + * @var boolean */ public $invertGroupIDs = 0; /** * language ids - * @var array + * @var array */ public $languageIDs = array(); /** * matches - * @var array + * @var array */ public $matches = array(); /** * condtion builder object - * @var wcf\system\database\condition\PreparedStatementConditionBuilder + * @var wcf\system\database\condition\PreparedStatementConditionBuilder */ public $conditions = null; /** * search id - * @var integer + * @var integer */ public $searchID = 0; /** * sort field - * @var string + * @var string */ public $sortField = 'username'; /** * sort order - * @var string + * @var string */ public $sortOrder = 'ASC'; /** * results per page - * @var integer + * @var integer */ public $itemsPerPage = 50; /** * shown columns - * @var array + * @var array */ public $columns = array('email', 'registrationDate'); /** * number of results - * @var integer + * @var integer */ public $maxResults = 0; @@ -126,7 +126,7 @@ class UserSearchForm extends UserOptionListForm { public $values = array(); /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -147,11 +147,11 @@ class UserSearchForm extends UserOptionListForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { $this->readOptionTree(); - + parent::readData(); } @@ -163,7 +163,7 @@ class UserSearchForm extends UserOptionListForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -186,7 +186,7 @@ class UserSearchForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::show() + * @see wcf\form\IForm::show() */ public function show() { // set active menu item @@ -197,8 +197,8 @@ class UserSearchForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::save() - */ + * @see wcf\form\IForm::save() + */ public function save() { parent::save(); @@ -261,7 +261,7 @@ class UserSearchForm extends UserOptionListForm { // call buildConditions event EventHandler::getInstance()->fireAction($this, 'buildConditions'); - + // do search $statement = WCF::getDB()->prepareStatement($sql.$this->conditions, $this->maxResults); $statement->execute($this->conditions->getParameters()); diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php index 65dc48d5cc..ef8332aa72 100644 --- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php @@ -16,26 +16,52 @@ use wcf\system\WCF; use wcf\system\WCFACP; use wcf\util\ArrayUtil; use wcf\util\StringUtil; - + /** * Shows the users mass processing form. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form - * @category Community Framework + * @category Community Framework */ class UsersMassProcessingForm extends UserOptionListForm { - // system + /** + * @see wcf\page\AbstractPage::$neededPermissions + */ public $neededPermissions = array('admin.user.canEditUser', 'admin.user.canDeleteUser', 'admin.user.canMailUser'); - // parameters + /** + * searched username + * @var string + */ public $username = ''; + + /** + * searched email adress + * @var string + */ public $email = ''; + + /** + * ids of the searched user group ids + * @var array + */ public $groupIDArray = array(); + + /** + * ids of the users' languages + * @var array + */ public $languageIDArray = array(); + + /** + * indicates if the user may not be in the user groups with the selected + * ids + * @var integer + */ public $invertGroupIDs = 0; // assign to group @@ -59,21 +85,19 @@ class UsersMassProcessingForm extends UserOptionListForm { public $affectedUsers = 0; /** - * conditions builder object. - * + * conditions builder object * @var wcf\system\database\condition\PreparedStatementConditionBuilder */ public $conditions = null; /** - * Options of the active category. - * + * options of the active category * @var array */ public $activeOptions = array(); /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); @@ -97,11 +121,11 @@ class UsersMassProcessingForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { AbstractForm::validate(); - + // action if (!in_array($this->action, $this->availableActions)) { throw new UserInputException('action'); @@ -131,7 +155,7 @@ class UsersMassProcessingForm extends UserOptionListForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { parent::save(); @@ -157,7 +181,7 @@ class UsersMassProcessingForm extends UserOptionListForm { $value = isset($this->values[$option['optionName']]) ? $this->values[$option['optionName']] : null; $this->getTypeObject($option['optionType'])->getCondition($this->conditions, $option, $value); } - + // call buildConditions event EventHandler::getInstance()->fireAction($this, 'buildConditions'); @@ -178,7 +202,7 @@ class UsersMassProcessingForm extends UserOptionListForm { $userIDArray[] = $row['userID']; $this->affectedUsers++; } - + // save config in session $userMailData = WCF::getSession()->getVar('userMailData'); if ($userMailData === null) $userMailData = array(); @@ -204,8 +228,8 @@ class UsersMassProcessingForm extends UserOptionListForm { )); WCF::getTPL()->display('worker'); exit; - break; - + break; + case 'exportMailAddress': WCF::getSession()->checkPermissions(array('admin.user.canMailUser')); // send content type @@ -249,8 +273,8 @@ class UsersMassProcessingForm extends UserOptionListForm { } $this->saved(); exit; - break; - + break; + case 'assignToGroup': WCF::getSession()->checkPermissions(array('admin.user.canEditUser')); @@ -260,15 +284,15 @@ class UsersMassProcessingForm extends UserOptionListForm { }); UserStorageHandler::getInstance()->reset($userIDArray, 'groupIDs', 1); - break; - + break; + case 'delete': WCF::getSession()->checkPermissions(array('admin.user.canDeleteUser')); $userIDArray = $this->fetchUsers(); UserEditor::deleteUsers($userIDArray); - break; + break; } $this->saved(); @@ -277,8 +301,8 @@ class UsersMassProcessingForm extends UserOptionListForm { protected function fetchUsers($loopFunction = null) { // select users - $sql = "SELECT user.* - FROM wcf".WCF_N."_user user + $sql = "SELECT user.* + FROM wcf".WCF_N."_user user LEFT JOIN wcf".WCF_N."_user_option_value option_value ON (option_value.userID = user.userID) ".$this->conditions; diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php index eb540f3793..883a5bf1fb 100755 --- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php @@ -7,35 +7,35 @@ use wcf\system\menu\acp\ACPMenu; * Shows a list of log sessions. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class ACPSessionLogListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$templateName + * @see wcf\page\AbstractPage::$templateName */ public $templateName = 'acpSessionLogList'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.canViewLog'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'lastActivityTime'; /** - * @see wcf\page\SortablePage::$defaultSortOrder + * @see wcf\page\SortablePage::$defaultSortOrder */ public $defaultSortOrder = 'DESC'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('sessionLogID', 'username', 'ipAddress', 'userAgent', 'time', 'lastActivityTime', 'accesses'); @@ -54,7 +54,7 @@ class ACPSessionLogListPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php index 4e92ed3cfe..f7e6db32dd 100755 --- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php @@ -10,25 +10,25 @@ use wcf\system\WCF; * Shows the details of a logged sessions. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class ACPSessionLogPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$templateName + * @see wcf\page\AbstractPage::$templateName */ public $templateName = 'acpSessionLog'; /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.canViewLog'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'time'; @@ -39,13 +39,13 @@ class ACPSessionLogPage extends SortablePage { /** * session log id - * @var integer + * @var integer */ public $sessionLogID = 0; /** * session log object - * @var wcf\data\acp\session\log\ACPSessionLog + * @var wcf\data\acp\session\log\ACPSessionLog */ public $sessionLog = null; @@ -87,7 +87,7 @@ class ACPSessionLogPage extends SortablePage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -99,7 +99,7 @@ class ACPSessionLogPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php index 8d61897411..7dc4888150 100755 --- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php @@ -16,15 +16,15 @@ use wcf\util\DirectoryUtil; * Shows a list of all cache resources. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class CacheListPage extends AbstractPage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.canViewLog'); @@ -42,12 +42,12 @@ class CacheListPage extends AbstractPage { /** * contains general cache information - * @var array + * @var array */ public $cacheData = array(); /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -56,7 +56,7 @@ class CacheListPage extends AbstractPage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -144,7 +144,7 @@ class CacheListPage extends AbstractPage { ".$conditions; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute($conditions->getParameters()); - + $packageNames = array(); while ($row = $statement->fetchArray()) { $packagePath = FileUtil::getRealPath(WCF_DIR.$row['packageDir']).'cache/'; @@ -185,7 +185,7 @@ class CacheListPage extends AbstractPage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -198,7 +198,7 @@ class CacheListPage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php index 2a2a49d054..2db0776c93 100755 --- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php @@ -8,25 +8,25 @@ use wcf\system\package\PackageDependencyHandler; * Shows information about configured cron jobs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class CronjobListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.cronjob.canEditCronjob', 'admin.system.cronjob.canDeleteCronjob', 'admin.system.cronjob.canEnableDisableCronjob'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'description'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('description', 'cronjobID', 'nextExec', 'startMinute', 'startHour', 'startDom', 'startMonth', 'startDow'); @@ -46,7 +46,7 @@ class CronjobListPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // set active menu item. diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php index f47458be5d..330c5873ec 100755 --- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php @@ -8,35 +8,35 @@ use wcf\system\package\PackageDependencyHandler; * Shows cronjob log information. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class CronjobLogListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.cronjob.canEditCronjob'); /** - * @see wcf\page\MultipleLinkPage::$itemsPerPage + * @see wcf\page\MultipleLinkPage::$itemsPerPage */ public $itemsPerPage = 100; /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'execTime'; /** - * @see wcf\page\SortablePage::$defaultSortOrder + * @see wcf\page\SortablePage::$defaultSortOrder */ public $defaultSortOrder = 'DESC'; - + /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('cronjobID', 'className', 'description', 'execTime', 'success'); diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php index 0f47d7ea64..029d4f39a3 100755 --- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php @@ -12,31 +12,29 @@ use wcf\system\WCFACP; /** * Shows the welcome page in admin control panel. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class IndexPage extends AbstractPage { /** - * Did you know language item. - * - * @var string + * did you know language item + * @var string */ public $didYouKnow = ''; /** - * Detailed Health-Status - * + * health status data * @var array */ public $healthDetails = array('error' => array(), 'warning' => array(), 'info' => array()); /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -113,7 +111,7 @@ class IndexPage extends AbstractPage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -131,7 +129,7 @@ class IndexPage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { $wcfPackageID = WCFACP::getWcfPackageID(); diff --git a/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php index 4bdb190ea5..6bb5323449 100755 --- a/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php @@ -10,15 +10,15 @@ use wcf\system\WCFACP; * Shows the list of available updates for installed packages. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackageAutoUpdateListPage extends AbstractPage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage'); @@ -29,7 +29,7 @@ class PackageAutoUpdateListPage extends AbstractPage { public $availableUpdates = array(); /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function readParameters() { parent::readParameters(); @@ -44,7 +44,7 @@ class PackageAutoUpdateListPage extends AbstractPage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -55,7 +55,7 @@ class PackageAutoUpdateListPage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // set active menu item diff --git a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php index e51b852356..7d18c213c0 100644 --- a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php @@ -7,46 +7,46 @@ use wcf\system\menu\acp\ACPMenu; * Shows a list of all installed packages. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackageListDetailedPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage'); /** - * @see wcf\page\MultipleLinkPage::$itemsPerPage + * @see wcf\page\MultipleLinkPage::$itemsPerPage */ public $itemsPerPage = 50; /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'packageType'; /** - * @see wcf\page\SortablePage::$defaultSortOrder + * @see wcf\page\SortablePage::$defaultSortOrder */ public $defaultSortOrder = 'DESC'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('packageID', 'package', 'packageDir', 'packageName', 'instanceNo', 'packageDescription', 'packageDate', 'packageURL', 'parentPackageID', 'isUnique', 'isApplication', 'author', 'authorURL', 'installDate', 'updateDate'); /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\package\PackageList'; /** * @see wcf\page\MultipleLinkPage::readObjects() - */ + */ protected function readObjects() { $this->sqlOrderBy = 'package.'.($this->sortField == 'packageType' ? 'isApplication '.$this->sortOrder.', package.parentPackageID '.$this->sortOrder : $this->sortField.' '.$this->sortOrder).($this->sortField != 'packageName' ? ', package.packageName ASC' : ''); @@ -54,7 +54,7 @@ class PackageListDetailedPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php index 932a26a33a..936c13dba4 100755 --- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php @@ -12,11 +12,11 @@ use wcf\util\HeaderUtil; * Shows a list of installed packages and plugins. * * @author Alexander Ebert - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackageListPage extends AbstractPage { /** @@ -75,7 +75,7 @@ class PackageListPage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // use detailed view if accessing WCF ACP directly diff --git a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php index 1d0c1a9123..978bceabec 100755 --- a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php @@ -18,7 +18,7 @@ use wcf\system\WCFACP; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackagePage extends AbstractPage { /** @@ -32,7 +32,7 @@ class PackagePage extends AbstractPage { public $queueID = 0; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -43,11 +43,11 @@ class PackagePage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { parent::show(); - + // check master password WCFACP::checkMasterPassword(); diff --git a/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php index 7c52d0a03a..9f4de1b4da 100755 --- a/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php @@ -12,25 +12,25 @@ use wcf\system\WCF; * Shows the list of package update search results. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackageUpdateSearchResultPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canInstallPackage'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'packageName'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('package', 'packageName', 'author'); @@ -45,7 +45,7 @@ class PackageUpdateSearchResultPage extends SortablePage { * @var wcf\data\search\Search */ public $search = null; - + /** * list with data of package updates * @var array @@ -53,7 +53,7 @@ class PackageUpdateSearchResultPage extends SortablePage { public $packages = array(); /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -79,7 +79,7 @@ class PackageUpdateSearchResultPage extends SortablePage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -89,7 +89,7 @@ class PackageUpdateSearchResultPage extends SortablePage { } /** - * @see wcf\page\MultipleLinkPage::countItems() + * @see wcf\page\MultipleLinkPage::countItems() */ public function countItems() { $conditions = new PreparedStatementConditionBuilder(); diff --git a/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php index b701d14ab7..5eb57c8f8e 100755 --- a/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php @@ -10,15 +10,15 @@ use wcf\system\WCF; * Shows all information about an installed package. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class PackageViewPage extends AbstractPage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage'); @@ -30,12 +30,12 @@ class PackageViewPage extends AbstractPage { /** * package object - * @var Package + * @var wcf\data\package\Package */ public $package = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -48,7 +48,7 @@ class PackageViewPage extends AbstractPage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -57,7 +57,7 @@ class PackageViewPage extends AbstractPage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php index 03362c8f31..c225e1d561 100755 --- a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php @@ -8,25 +8,25 @@ use wcf\system\WCF; * Shows information about available update package servers. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class UpdateServerListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.system.package.canEditServer'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'serverURL'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('packageUpdateServerID', 'serverURL', 'status', 'errorMessage', 'lastUpdateTime', 'packages'); @@ -42,7 +42,7 @@ class UpdateServerListPage extends SortablePage { public $deletedPackageUpdateServerID = 0; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -60,7 +60,7 @@ class UpdateServerListPage extends SortablePage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -71,7 +71,7 @@ class UpdateServerListPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php index 39390bc77c..68cd37c123 100755 --- a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php @@ -8,25 +8,25 @@ use wcf\system\WCF; * Shows a list of all user groups. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class UserGroupListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canEditGroup', 'admin.user.canDeleteGroup'); /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'groupName'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('groupID', 'groupName', 'groupType', 'members'); @@ -42,7 +42,7 @@ class UserGroupListPage extends SortablePage { public $deletedGroups = 0; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -72,7 +72,7 @@ class UserGroupListPage extends SortablePage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -83,7 +83,7 @@ class UserGroupListPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // enable menu item diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index dfa1b8dabb..85e777cca7 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -19,30 +19,30 @@ use wcf\util\StringUtil; * Shows the result of a user search. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page - * @category Community Framework + * @category Community Framework */ class UserListPage extends SortablePage { /** - * @see wcf\page\AbstractPage::$neededPermissions + * @see wcf\page\AbstractPage::$neededPermissions */ public $neededPermissions = array('admin.user.canSearchUser'); /** - * @see wcf\page\MultipleLinkPage::$itemsPerPage + * @see wcf\page\MultipleLinkPage::$itemsPerPage */ public $itemsPerPage = 50; /** - * @see wcf\page\SortablePage::$defaultSortField + * @see wcf\page\SortablePage::$defaultSortField */ public $defaultSortField = 'username'; /** - * @see wcf\page\SortablePage::$validSortFields + * @see wcf\page\SortablePage::$validSortFields */ public $validSortFields = array('email', 'userID', 'registrationDate', 'username'); @@ -53,6 +53,7 @@ class UserListPage extends SortablePage { public $searchID = 0; // data + // @todo: comment properties public $userIDs = array(); public $markedUsers = array(); public $users = array(); @@ -66,7 +67,7 @@ class UserListPage extends SortablePage { protected $optionHandler = null; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -87,7 +88,7 @@ class UserListPage extends SortablePage { } /** - * @see wcf\page\SortablePage::validateSortField() + * @see wcf\page\SortablePage::validateSortField() */ public function validateSortField() { // add options to valid sort fields @@ -97,7 +98,7 @@ class UserListPage extends SortablePage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -117,7 +118,7 @@ class UserListPage extends SortablePage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); @@ -133,7 +134,7 @@ class UserListPage extends SortablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // set active menu item @@ -143,12 +144,12 @@ class UserListPage extends SortablePage { } /** - * @see wcf\page\MultipleLinkPage::countItems() + * @see wcf\page\MultipleLinkPage::countItems() */ public function countItems() { // call countItems event EventHandler::getInstance()->fireAction($this, 'countItems'); - + $sql = "SELECT COUNT(*) AS count FROM wcf".WCF_N."_user user_table ".$this->conditions; diff --git a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php index d66425163e..07739bdc8b 100644 --- a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php @@ -16,11 +16,11 @@ use wcf\util\StringUtil; * Default implementation for object-actions using the AJAX-API. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class AJAXProxyAction extends AbstractSecureAction { /** diff --git a/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php b/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php index 0d4582aea3..a80e0ce288 100644 --- a/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXUploadAction.class.php @@ -10,7 +10,7 @@ use wcf\system\upload\UploadHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class AJAXUploadAction extends AJAXProxyAction { /** diff --git a/wcfsetup/install/files/lib/action/AbstractAction.class.php b/wcfsetup/install/files/lib/action/AbstractAction.class.php index 3ae7b46bb6..16b6c495c4 100644 --- a/wcfsetup/install/files/lib/action/AbstractAction.class.php +++ b/wcfsetup/install/files/lib/action/AbstractAction.class.php @@ -10,11 +10,11 @@ use wcf\system\WCF; * This includes the call of the default event listeners for an action: readParameters and execute. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ abstract class AbstractAction implements IAction { /** @@ -50,7 +50,7 @@ abstract class AbstractAction implements IAction { } /** - * @see wcf\action\IAction::readParameters() + * @see wcf\action\IAction::readParameters() */ public function readParameters() { // call readParameters event @@ -58,7 +58,7 @@ abstract class AbstractAction implements IAction { } /** - * @see wcf\action\IAction::execute() + * @see wcf\action\IAction::execute() */ public function execute() { // check if active user is logged in diff --git a/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php b/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php index e4a77b8721..da49e3289d 100644 --- a/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php +++ b/wcfsetup/install/files/lib/action/AbstractAjaxAction.class.php @@ -6,11 +6,11 @@ use wcf\util\JSON; * Provides method to send JSON-encoded responses. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class AbstractAjaxAction extends AbstractAction { /** diff --git a/wcfsetup/install/files/lib/action/AbstractDialogAction.class.php b/wcfsetup/install/files/lib/action/AbstractDialogAction.class.php index 4ade89a5aa..99b002c916 100644 --- a/wcfsetup/install/files/lib/action/AbstractDialogAction.class.php +++ b/wcfsetup/install/files/lib/action/AbstractDialogAction.class.php @@ -9,12 +9,14 @@ use wcf\util\StringUtil; * Abstract implementation of an action that displays a dialog and that is executed * in multiple steps. * + * @todo add class author + * * @author - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ abstract class AbstractDialogAction extends AbstractSecureAction { /** @@ -80,5 +82,5 @@ abstract class AbstractDialogAction extends AbstractSecureAction { /** * Validates current dialog step. */ - protected abstract function validateStep(); + abstract protected function validateStep(); } diff --git a/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php b/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php index c47bed4efd..97648f2778 100644 --- a/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php +++ b/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * A missing or invalid token will be result in a throw of a IllegalLinkException. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ abstract class AbstractSecureAction extends AbstractAction { /** - * @see wcf\action\IAction::readParameters() + * @see wcf\action\IAction::readParameters() */ public function readParameters() { parent::readParameters(); diff --git a/wcfsetup/install/files/lib/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/action/ClipboardAction.class.php index 4e27af8cb1..cf09c24e38 100644 --- a/wcfsetup/install/files/lib/action/ClipboardAction.class.php +++ b/wcfsetup/install/files/lib/action/ClipboardAction.class.php @@ -11,11 +11,11 @@ use wcf\util\StringUtil; * Handles clipboard items. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class ClipboardAction extends AbstractSecureAction { /** diff --git a/wcfsetup/install/files/lib/action/ClipboardLoadMarkedItemsAction.class.php b/wcfsetup/install/files/lib/action/ClipboardLoadMarkedItemsAction.class.php index e157d39e7c..ce2b75348f 100644 --- a/wcfsetup/install/files/lib/action/ClipboardLoadMarkedItemsAction.class.php +++ b/wcfsetup/install/files/lib/action/ClipboardLoadMarkedItemsAction.class.php @@ -6,11 +6,11 @@ use wcf\system\clipboard\ClipboardHandler; * Handles marked clipboard items once DOM is loaded. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class ClipboardLoadMarkedItemsAction extends ClipboardAction { /** diff --git a/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php b/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php index 9227d32208..189aa71452 100644 --- a/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php +++ b/wcfsetup/install/files/lib/action/ClipboardProxyAction.class.php @@ -11,11 +11,11 @@ use wcf\util\StringUtil; * Clipboard proxy implementation. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ class ClipboardProxyAction extends AbstractSecureAction { /** diff --git a/wcfsetup/install/files/lib/action/IAction.class.php b/wcfsetup/install/files/lib/action/IAction.class.php index 751067f787..b3b2b57c02 100644 --- a/wcfsetup/install/files/lib/action/IAction.class.php +++ b/wcfsetup/install/files/lib/action/IAction.class.php @@ -6,11 +6,11 @@ namespace wcf\action; * An action executes a user input without showing a result page or a form. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage action - * @category Community Framework + * @category Community Framework */ interface IAction { /** diff --git a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php index f810bc0939..c7dd115948 100644 --- a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php +++ b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php @@ -10,13 +10,13 @@ use wcf\util\StringUtil; /** * Default implementation for DatabaseObject-related actions. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction { /** @@ -74,15 +74,15 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction { protected $returnValues = null; /** - * allows guest access for all specified methods, by default - * guest access is completely disabled + * allows guest access for all specified methods, by default guest access + * is completely disabled * @var array */ protected $allowGuestAccess = array(); /** * Initialize a new DatabaseObject-related action. - * + * * @param array $objects * @param string $action * @param array $parameters diff --git a/wcfsetup/install/files/lib/data/DatabaseObject.class.php b/wcfsetup/install/files/lib/data/DatabaseObject.class.php index 1adc322b26..31c122784e 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObject.class.php @@ -6,11 +6,11 @@ use wcf\system\WCF; * Abstract class for all data holder classes. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ abstract class DatabaseObject implements IStorableObject { /** @@ -51,7 +51,7 @@ abstract class DatabaseObject implements IStorableObject { /** * Creates a new instance of the DatabaseObject class. - * + * * @param mixed $id * @param array $row * @param wcf\data\DatabaseObject $object @@ -142,7 +142,7 @@ abstract class DatabaseObject implements IStorableObject { if (!empty(static::$databaseTableName)) { static::$databaseTableName .= '_'; } - + static::$databaseTableName .= strtolower($part); } } @@ -152,7 +152,7 @@ abstract class DatabaseObject implements IStorableObject { /** * @see wcf\data\IStorableObject::getDatabaseTableIndexIsIdentity() - */ + */ public static function getDatabaseTableIndexIsIdentity() { return static::$databaseTableIndexIsIdentity; } @@ -163,10 +163,10 @@ abstract class DatabaseObject implements IStorableObject { public static function getDatabaseTableIndexName() { return static::$databaseTableIndexName; } - + /** * Sorts a list of database objects. - * + * * @param array $objects * @param mixed $sortBy * @param string $sortOrder @@ -182,16 +182,17 @@ abstract class DatabaseObject implements IStorableObject { $objects2[$idx.'x'] = $obj; } } - + if ($maintainIndexAssociation) { $objects = array(); array_multisort($sortArray, $sortOrder == 'ASC' ? SORT_ASC : SORT_DESC, $objects2); - + $objects = array(); foreach ($objects2 as $idx => $obj) { $objects[substr($idx, 0, -1)] = $obj; } - } else { + } + else { array_multisort($sortArray, $sortOrder == 'ASC' ? SORT_ASC : SORT_DESC, $objects); } } diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php index c767eae1ae..08ab47a278 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php @@ -6,11 +6,11 @@ use wcf\system\exception\SystemException; * Basic implementation for object decorators. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ abstract class DatabaseObjectDecorator extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php index 3bf23ac2f9..51c8cbcbd9 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php @@ -4,17 +4,17 @@ use wcf\system\WCF; /** * Basic implementation for object editors following the decorator pattern. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ abstract class DatabaseObjectEditor extends DatabaseObjectDecorator implements IEditableObject { /** - * @see wcf\data\IEditableObject::create() + * @see wcf\data\IEditableObject::create() */ public static function create(array $parameters = array()) { $keys = $values = ''; @@ -48,7 +48,7 @@ abstract class DatabaseObjectEditor extends DatabaseObjectDecorator implements I } /** - * @see wcf\data\IEditableObject::update() + * @see wcf\data\IEditableObject::update() */ public function update(array $parameters = array()) { if (!count($parameters)) return; @@ -82,7 +82,7 @@ abstract class DatabaseObjectEditor extends DatabaseObjectDecorator implements I } /** - * @see wcf\data\IEditableObject::updateCounters() + * @see wcf\data\IEditableObject::updateCounters() */ public function updateCounters(array $counters = array()) { if (!count($counters)) return; @@ -104,14 +104,14 @@ abstract class DatabaseObjectEditor extends DatabaseObjectDecorator implements I } /** - * @see wcf\data\IEditableObject::delete() + * @see wcf\data\IEditableObject::delete() */ public function delete() { static::deleteAll(array($this->__get(static::getDatabaseTableIndexName()))); } /** - * @see wcf\data\IEditableObject::deleteAll() + * @see wcf\data\IEditableObject::deleteAll() */ public static function deleteAll(array $objectIDs = array()) { $sql = "DELETE FROM ".static::getDatabaseTableName()." diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php index ea22f1a863..cc2e1f4a16 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php @@ -7,13 +7,13 @@ use wcf\util\StringUtil; /** * Abstract class for a list of database objects. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ abstract class DatabaseObjectList implements \Countable, ITraversableObject { /** @@ -78,7 +78,7 @@ abstract class DatabaseObjectList implements \Countable, ITraversableObject { /** * enables the automatic usage of the qualified shorthand - * @var boolean + * @var boolean */ public $useQualifiedShorthand = true; @@ -168,7 +168,6 @@ abstract class DatabaseObjectList implements \Countable, ITraversableObject { $this->objects = $statement->fetchObjects(($this->objectClassName ?: $this->className)); } else { - //if (!empty($this->sqlSelects)) die("x".$this->sqlSelects); $sql = "SELECT ".(!empty($this->sqlSelects) ? $this->sqlSelects.($this->useQualifiedShorthand ? ',' : '') : '')." ".($this->useQualifiedShorthand ? $this->getDatabaseTableAlias().'.*' : '')." FROM ".$this->getDatabaseTableName()." ".$this->getDatabaseTableAlias()." diff --git a/wcfsetup/install/files/lib/data/ICategorizedObject.class.php b/wcfsetup/install/files/lib/data/ICategorizedObject.class.php index 225b972a88..ce7f3af21f 100644 --- a/wcfsetup/install/files/lib/data/ICategorizedObject.class.php +++ b/wcfsetup/install/files/lib/data/ICategorizedObject.class.php @@ -9,7 +9,7 @@ namespace wcf\data; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface ICategorizedObject { /** diff --git a/wcfsetup/install/files/lib/data/IDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/IDatabaseObjectAction.class.php index 22f31cf0b4..160e9a93da 100644 --- a/wcfsetup/install/files/lib/data/IDatabaseObjectAction.class.php +++ b/wcfsetup/install/files/lib/data/IDatabaseObjectAction.class.php @@ -5,11 +5,11 @@ namespace wcf\data; * Default interface for DatabaseObject-related actions. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface IDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/IDatabaseObjectProcessor.class.php b/wcfsetup/install/files/lib/data/IDatabaseObjectProcessor.class.php index aa636d9182..57866bedd2 100644 --- a/wcfsetup/install/files/lib/data/IDatabaseObjectProcessor.class.php +++ b/wcfsetup/install/files/lib/data/IDatabaseObjectProcessor.class.php @@ -3,13 +3,13 @@ namespace wcf\data; /** * Default interface for DatabaseObject processors. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface IDatabaseObjectProcessor { /** diff --git a/wcfsetup/install/files/lib/data/IEditableCachedObject.class.php b/wcfsetup/install/files/lib/data/IEditableCachedObject.class.php index 5e782722ed..af8d69bea1 100644 --- a/wcfsetup/install/files/lib/data/IEditableCachedObject.class.php +++ b/wcfsetup/install/files/lib/data/IEditableCachedObject.class.php @@ -3,13 +3,13 @@ namespace wcf\data; /** * Abstract class for all cached data holder objects. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface IEditableCachedObject extends IEditableObject { /** diff --git a/wcfsetup/install/files/lib/data/IEditableObject.class.php b/wcfsetup/install/files/lib/data/IEditableObject.class.php index 47c13c7d07..5656331818 100644 --- a/wcfsetup/install/files/lib/data/IEditableObject.class.php +++ b/wcfsetup/install/files/lib/data/IEditableObject.class.php @@ -3,13 +3,13 @@ namespace wcf\data; /** * Abstract class for all data holder classes. - * + * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface IEditableObject extends IStorableObject { /** diff --git a/wcfsetup/install/files/lib/data/ILinkableDatabaseObject.class.php b/wcfsetup/install/files/lib/data/ILinkableDatabaseObject.class.php index e641fe4c75..99eaea07d9 100644 --- a/wcfsetup/install/files/lib/data/ILinkableDatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/ILinkableDatabaseObject.class.php @@ -9,7 +9,7 @@ namespace wcf\data; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface ILinkableDatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/IStorableObject.class.php b/wcfsetup/install/files/lib/data/IStorableObject.class.php index 5137e63b7c..eb6b9462d2 100644 --- a/wcfsetup/install/files/lib/data/IStorableObject.class.php +++ b/wcfsetup/install/files/lib/data/IStorableObject.class.php @@ -3,13 +3,13 @@ namespace wcf\data; /** * Abstract class for all data holder classes. - * + * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface IStorableObject { /** diff --git a/wcfsetup/install/files/lib/data/ITitledDatabaseObject.class.php b/wcfsetup/install/files/lib/data/ITitledDatabaseObject.class.php index f005653019..18cea0f32c 100644 --- a/wcfsetup/install/files/lib/data/ITitledDatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/ITitledDatabaseObject.class.php @@ -9,7 +9,7 @@ namespace wcf\data; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface ITitledDatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/ITraversableObject.class.php b/wcfsetup/install/files/lib/data/ITraversableObject.class.php index 2c905ac5c2..00ebb3df92 100644 --- a/wcfsetup/install/files/lib/data/ITraversableObject.class.php +++ b/wcfsetup/install/files/lib/data/ITraversableObject.class.php @@ -3,13 +3,13 @@ namespace wcf\data; /** * Interface for enhanced iteration support. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ interface ITraversableObject extends \SeekableIterator { /** diff --git a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php index ad9660a82b..af60731ae3 100644 --- a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php @@ -5,13 +5,13 @@ use wcf\util\ClassUtil; /** * Abstract class for all processible data holder classes. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data - * @category Community Framework + * @category Community Framework */ class ProcessibleDatabaseObject extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php index 128965570a..0df9ac5cad 100644 --- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php +++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php @@ -8,11 +8,11 @@ use wcf\system\request\LinkHandler; * Represents an ACP menu item. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class ACPMenuItem extends DatabaseObject implements ITreeMenuItem { /** @@ -26,7 +26,7 @@ class ACPMenuItem extends DatabaseObject implements ITreeMenuItem { protected static $databaseTableIndexName = 'menuItemID'; /** - * @see wcf\system\menu\ITreeMenuItem::getLink() + * @see wcf\system\menu\ITreeMenuItem::getLink() */ public function getLink() { return LinkHandler::getInstance()->getLink(null, array(), $this->menuItemLink); diff --git a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemAction.class.php b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemAction.class.php index 4b7880a1b2..1e1ae1cf30 100644 --- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes ACP menu item-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class ACPMenuItemAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\acp\menu\item\ACPMenuItemEditor'; } diff --git a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php index e8fe501f5e..e8805bf944 100644 --- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit ACP menu items. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class ACPMenuItemEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemList.class.php b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemList.class.php index 9ce39369f4..2507d61996 100644 --- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemList.class.php +++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of ACP menu items. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class ACPMenuItemList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php index 86354db2c6..b1ed236dd2 100644 --- a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php +++ b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php @@ -10,7 +10,7 @@ use wcf\data\DatabaseObject; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.search.provider - * @category Community Framework + * @category Community Framework */ class ACPSearchProvider extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderAction.class.php b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderAction.class.php index acae83a44c..37a3faf2a4 100644 --- a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderAction.class.php @@ -13,9 +13,12 @@ use wcf\util\StringUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.search.provider - * @category Community Framework + * @category Community Framework */ class ACPSearchProviderAction extends AbstractDatabaseObjectAction { + /** + * Validates the 'getList' action. + */ public function validateGetList() { $this->parameters['data']['searchString'] = (isset($this->parameters['data']['searchString'])) ? StringUtil::trim($this->parameters['data']['searchString']) : ''; if (empty($this->parameters['data']['searchString'])) { @@ -23,6 +26,11 @@ class ACPSearchProviderAction extends AbstractDatabaseObjectAction { } } + /** + * Returns the data of the searched acp elements. + * + * @return array + */ public function getList() { $data = array(); $results = ACPSearchHandler::getInstance()->search($this->parameters['data']['searchString']); diff --git a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderEditor.class.php b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderEditor.class.php index 0c2381154b..12f4bf1c37 100644 --- a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderEditor.class.php @@ -10,7 +10,7 @@ use wcf\data\DatabaseObjectEditor; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.search.provider - * @category Community Framework + * @category Community Framework */ class ACPSearchProviderEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderList.class.php b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderList.class.php index bb9fdaed7c..d5afd83d0b 100644 --- a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderList.class.php +++ b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProviderList.class.php @@ -5,11 +5,11 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of ACP search providers. * - * @author Alexander Ebert + * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.search.provider - * @category Community Framework + * @category Community Framework */ class ACPSearchProviderList extends DatabaseObjectList { } diff --git a/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php b/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php index ba27a8d637..c100d0c5b7 100644 --- a/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an ACP session. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session - * @category Community Framework + * @category Community Framework */ class ACPSession extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/ACPSessionAction.class.php b/wcfsetup/install/files/lib/data/acp/session/ACPSessionAction.class.php index 8cafecce43..af20196c93 100644 --- a/wcfsetup/install/files/lib/data/acp/session/ACPSessionAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/ACPSessionAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes ACP session-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session - * @category Community Framework + * @category Community Framework */ class ACPSessionAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\acp\session\ACPSessionEditor'; } diff --git a/wcfsetup/install/files/lib/data/acp/session/ACPSessionEditor.class.php b/wcfsetup/install/files/lib/data/acp/session/ACPSessionEditor.class.php index 87a305d37e..d42b0450ec 100644 --- a/wcfsetup/install/files/lib/data/acp/session/ACPSessionEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/ACPSessionEditor.class.php @@ -8,11 +8,11 @@ use wcf\system\WCF; * Provides functions to edit ACP sessions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session - * @category Community Framework + * @category Community Framework */ class ACPSessionEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/ACPSessionList.class.php b/wcfsetup/install/files/lib/data/acp/session/ACPSessionList.class.php index ba8e24ba7f..1d58d46887 100644 --- a/wcfsetup/install/files/lib/data/acp/session/ACPSessionList.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/ACPSessionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of ACP sessions. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session - * @category Community Framework + * @category Community Framework */ class ACPSessionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php index f1aaa25782..0f2481cbc5 100644 --- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a session access log entry. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.access.log - * @category Community Framework + * @category Community Framework */ class ACPSessionAccessLog extends DatabaseObject { /** @@ -26,7 +26,7 @@ class ACPSessionAccessLog extends DatabaseObject { /** * Returns true, if the URI of this log entry is protected. * - * @return boolean + * @return boolean */ public function hasProtectedURI() { if ($this->requestMethod != 'GET' || !preg_match('/(\?|&)(page|form)=/', $this->requestURI)) { diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogAction.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogAction.class.php index ae0c48f69f..9a9b1d51ab 100644 --- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes ACP session access log-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.access.log - * @category Community Framework + * @category Community Framework */ class ACPSessionAccessLogAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\acp\session\access\log\ACPSessionAccessLogEditor'; } diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogEditor.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogEditor.class.php index 198115a5d5..2ae275e157 100644 --- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit ACP session access logs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.access.log - * @category Community Framework + * @category Community Framework */ class ACPSessionAccessLogEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogList.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogList.class.php index faf43a6eef..968a717f20 100644 --- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogList.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLogList.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectList; * Represents a list of access logs. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.access.log - * @category Community Framework + * @category Community Framework */ class ACPSessionAccessLogList extends DatabaseObjectList { /** @@ -19,7 +19,7 @@ class ACPSessionAccessLogList extends DatabaseObjectList { public $className = 'wcf\data\acp\session\access\log\ACPSessionAccessLog'; /** - * @see wcf\data\DatabaseObjectList::readObjects() + * @see wcf\data\DatabaseObjectList::readObjects() */ public function readObjects() { if (!empty($this->sqlSelects)) $this->sqlSelects .= ','; diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php index ae64dc6117..d1bf325587 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Represents a session log entry. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.log - * @category Community Framework + * @category Community Framework */ class ACPSessionLog extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogAction.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogAction.class.php index 83978cef55..c4a1183e85 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes ACP session log-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.log - * @category Community Framework + * @category Community Framework */ class ACPSessionLogAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\acp\session\log\ACPSessionLogEditor'; } diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogEditor.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogEditor.class.php index b377a23f8d..a61ef65118 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit ACP session logs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.log - * @category Community Framework + * @category Community Framework */ class ACPSessionLogEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php index a95b49b959..cee4942834 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectList; * Represents a list of session log entries. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.session.log - * @category Community Framework + * @category Community Framework */ class ACPSessionLogList extends DatabaseObjectList { /** @@ -19,7 +19,7 @@ class ACPSessionLogList extends DatabaseObjectList { public $className = 'wcf\data\acp\session\log\ACPSessionLog'; /** - * @see wcf\data\DatabaseObjectList::readObjects() + * @see wcf\data\DatabaseObjectList::readObjects() */ public function readObjects() { if (!empty($this->sqlSelects)) $this->sqlSelects .= ','; diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php index b3805f91a7..ba7a9b2726 100644 --- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php +++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an ACP template. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.template - * @category Community Framework + * @category Community Framework */ class ACPTemplate extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php index 57a4bbe295..bbbf14bc3e 100644 --- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php +++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes ACP templates-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.template - * @category Community Framework + * @category Community Framework */ class ACPTemplateAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\acp\template\ACPTemplateEditor'; diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateEditor.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateEditor.class.php index 3372059b28..8fe461ec93 100644 --- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateEditor.class.php +++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit ACP templates. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.template - * @category Community Framework + * @category Community Framework */ class ACPTemplateEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateList.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateList.class.php index 0905e8994e..a7b09359ec 100644 --- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateList.class.php +++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of ACP templates. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.template - * @category Community Framework + * @category Community Framework */ class ACPTemplateList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php index bba367733b..f31e465e93 100644 --- a/wcfsetup/install/files/lib/data/application/Application.class.php +++ b/wcfsetup/install/files/lib/data/application/Application.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an application. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application - * @category Community Framework + * @category Community Framework */ class Application extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php index 921d926f30..e90f546312 100644 --- a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php +++ b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes application-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application - * @category Community Framework + * @category Community Framework */ class ApplicationAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/application/ApplicationEditor.class.php b/wcfsetup/install/files/lib/data/application/ApplicationEditor.class.php index 3ebe233fce..f7825e5741 100644 --- a/wcfsetup/install/files/lib/data/application/ApplicationEditor.class.php +++ b/wcfsetup/install/files/lib/data/application/ApplicationEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit applications. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application - * @category Community Framework + * @category Community Framework */ class ApplicationEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/application/ApplicationList.class.php b/wcfsetup/install/files/lib/data/application/ApplicationList.class.php index 57c2f99f7a..64bdc1191f 100644 --- a/wcfsetup/install/files/lib/data/application/ApplicationList.class.php +++ b/wcfsetup/install/files/lib/data/application/ApplicationList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of applications. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application - * @category Community Framework + * @category Community Framework */ class ApplicationList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/application/group/ApplicationGroup.class.php b/wcfsetup/install/files/lib/data/application/group/ApplicationGroup.class.php index 33b97e4ac4..8631c87569 100644 --- a/wcfsetup/install/files/lib/data/application/group/ApplicationGroup.class.php +++ b/wcfsetup/install/files/lib/data/application/group/ApplicationGroup.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an application group. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application.group - * @category Community Framework + * @category Community Framework */ class ApplicationGroup extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupAction.class.php b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupAction.class.php index 4f8a38eacf..2451e3c23c 100644 --- a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupAction.class.php +++ b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes application group-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application.group - * @category Community Framework + * @category Community Framework */ class ApplicationGroupAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\application\group\ApplicationGroupEditor'; } diff --git a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupEditor.class.php b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupEditor.class.php index f76fa1e5ae..3991026c6a 100644 --- a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupEditor.class.php +++ b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit application groups. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application.group - * @category Community Framework + * @category Community Framework */ class ApplicationGroupEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupList.class.php b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupList.class.php index c548b9c8ec..d730161183 100644 --- a/wcfsetup/install/files/lib/data/application/group/ApplicationGroupList.class.php +++ b/wcfsetup/install/files/lib/data/application/group/ApplicationGroupList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of application groups. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.application.group - * @category Community Framework + * @category Community Framework */ class ApplicationGroupList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/category/Category.class.php b/wcfsetup/install/files/lib/data/category/Category.class.php index 25f1435843..7d569470fe 100644 --- a/wcfsetup/install/files/lib/data/category/Category.class.php +++ b/wcfsetup/install/files/lib/data/category/Category.class.php @@ -13,7 +13,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class Category extends DatabaseObject implements IRouteController { /** @@ -105,7 +105,7 @@ class Category extends DatabaseObject implements IRouteController { while ($parentCaregory = $parentCaregory->getParentCategory()) { $this->parentCategories[] = $parentCaregory; } - + $this->parentCategories = array_reverse($this->parentCategories); } diff --git a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php index d20bab41a7..94d326ee63 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php @@ -15,7 +15,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class CategoryAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/category/CategoryEditor.class.php b/wcfsetup/install/files/lib/data/category/CategoryEditor.class.php index 44f7245ef2..43c205365d 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryEditor.class.php @@ -14,7 +14,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class CategoryEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -23,7 +23,7 @@ class CategoryEditor extends DatabaseObjectEditor implements IEditableCachedObje protected static $baseClass = 'wcf\data\category\Category'; /** - * @see wcf\data\IEditableObject::update() + * @see wcf\data\IEditableObject::update() */ public function update(array $parameters = array()) { // update show order @@ -104,7 +104,7 @@ class CategoryEditor extends DatabaseObjectEditor implements IEditableCachedObje if ($showOrder > $maxShowOrder) { $showOrder = $maxShowOrder; } - + $sql = "UPDATE ".static::getDatabaseTableName()." SET showOrder = showOrder - 1 WHERE showOrder <= ? @@ -123,7 +123,7 @@ class CategoryEditor extends DatabaseObjectEditor implements IEditableCachedObje } /** - * @see wcf\data\IEditableObject::create() + * @see wcf\data\IEditableObject::create() */ public static function create(array $parameters = array()) { // handle time @@ -143,7 +143,7 @@ class CategoryEditor extends DatabaseObjectEditor implements IEditableCachedObje } /** - * @see wcf\data\IEditableObject::deleteAll() + * @see wcf\data\IEditableObject::deleteAll() */ public static function deleteAll(array $objectIDs = array()) { // update positions diff --git a/wcfsetup/install/files/lib/data/category/CategoryList.class.php b/wcfsetup/install/files/lib/data/category/CategoryList.class.php index 81191e8a32..3cc7081ca8 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryList.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryList.class.php @@ -10,6 +10,6 @@ use wcf\data\DatabaseObjectList; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class CategoryList extends DatabaseObjectList { } diff --git a/wcfsetup/install/files/lib/data/category/CategoryNode.class.php b/wcfsetup/install/files/lib/data/category/CategoryNode.class.php index 2a74de5519..46c8ad1a01 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryNode.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryNode.class.php @@ -12,7 +12,7 @@ use wcf\system\category\CategoryHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class CategoryNode extends DatabaseObjectDecorator implements \RecursiveIterator, \Countable { /** diff --git a/wcfsetup/install/files/lib/data/category/CategoryNodeList.class.php b/wcfsetup/install/files/lib/data/category/CategoryNodeList.class.php index 1bbef6f191..b5b4366e54 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryNodeList.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryNodeList.class.php @@ -5,13 +5,13 @@ use wcf\system\category\CategoryHandler; /** * Represents a category node list. - * + * * @author Matthias Schmidt * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.category - * @category Community Framework + * @category Community Framework */ class CategoryNodeList extends \RecursiveIteratorIterator implements \Countable { /** diff --git a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListener.class.php b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListener.class.php index a410ac6822..b5cb6db9f8 100644 --- a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListener.class.php +++ b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListener.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a cleanup listener. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cleanup.listener - * @category Community Framework + * @category Community Framework */ class CleanupListener extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerAction.class.php b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerAction.class.php index fa58b3b884..adb9be5977 100644 --- a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerAction.class.php +++ b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes cleanup listener-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cleanup.listener - * @category Community Framework + * @category Community Framework */ class CleanupListenerAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerEditor.class.php b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerEditor.class.php index ecda2cf76a..ccd9669a93 100644 --- a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerEditor.class.php +++ b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit cleanup listeners. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cleanup.listener - * @category Community Framework + * @category Community Framework */ class CleanupListenerEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerList.class.php b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerList.class.php index dba254f152..fddd31f10a 100644 --- a/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerList.class.php +++ b/wcfsetup/install/files/lib/data/cleanup/listener/CleanupListenerList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of cleanup listener. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cleanup.listener - * @category Community Framework + * @category Community Framework */ class CleanupListenerList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php index 9df83387d8..8decdd93fe 100644 --- a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php +++ b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a clipboard action. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.clipboard.action - * @category Community Framework + * @category Community Framework */ class ClipboardAction extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionAction.class.php b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionAction.class.php index 917a1a0212..f1c0da1f0a 100644 --- a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionAction.class.php +++ b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes clipboard action-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.clipboard.action - * @category Community Framework + * @category Community Framework */ class ClipboardActionAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionEditor.class.php b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionEditor.class.php index fbdced40d1..7dc65dfdb1 100644 --- a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionEditor.class.php +++ b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit clipboard actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.clipboard.action - * @category Community Framework + * @category Community Framework */ class ClipboardActionEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionList.class.php b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionList.class.php index a499a68902..ccc4d010ac 100644 --- a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionList.class.php +++ b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardActionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of clipboard actions. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.clipboard.action - * @category Community Framework + * @category Community Framework */ class ClipboardActionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php b/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php index 76886706ee..ad5696ac09 100644 --- a/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php +++ b/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a core object. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.core.object - * @category Community Framework + * @category Community Framework */ class CoreObject extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/core/object/CoreObjectAction.class.php b/wcfsetup/install/files/lib/data/core/object/CoreObjectAction.class.php index d46f0e098d..f2bc776aa8 100644 --- a/wcfsetup/install/files/lib/data/core/object/CoreObjectAction.class.php +++ b/wcfsetup/install/files/lib/data/core/object/CoreObjectAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes core object-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.core.object - * @category Community Framework + * @category Community Framework */ class CoreObjectAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/core/object/CoreObjectEditor.class.php b/wcfsetup/install/files/lib/data/core/object/CoreObjectEditor.class.php index 8cadb4d909..282daf3319 100644 --- a/wcfsetup/install/files/lib/data/core/object/CoreObjectEditor.class.php +++ b/wcfsetup/install/files/lib/data/core/object/CoreObjectEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit core objects. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.core.object - * @category Community Framework + * @category Community Framework */ class CoreObjectEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/core/object/CoreObjectList.class.php b/wcfsetup/install/files/lib/data/core/object/CoreObjectList.class.php index 7ba9413508..80a00fe0e5 100644 --- a/wcfsetup/install/files/lib/data/core/object/CoreObjectList.class.php +++ b/wcfsetup/install/files/lib/data/core/object/CoreObjectList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of core objects. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.event - * @category Community Framework + * @category Community Framework */ class CoreObjectList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php index 4a61b5f5e3..9e78e20f32 100644 --- a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php @@ -12,7 +12,7 @@ use wcf\util\CronjobUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cronjob - * @category Community Framework + * @category Community Framework */ class Cronjob extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php index e01e957715..c12aafff48 100644 --- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php @@ -11,15 +11,15 @@ use wcf\util\DateUtil; * Executes cronjob-related actions. * * @author Tim Düsterhus, Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cronjob - * @category Community Framework + * @category Community Framework */ class CronjobAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\cronjob\CronjobEditor'; diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php index 50ebe45f8d..3e8de06bf4 100644 --- a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php @@ -8,11 +8,11 @@ use wcf\system\cache\CacheHandler; * Provides functions to edit cronjobs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cronjob - * @category Community Framework + * @category Community Framework */ class CronjobEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -21,7 +21,7 @@ class CronjobEditor extends DatabaseObjectEditor implements IEditableCachedObjec protected static $baseClass = 'wcf\data\cronjob\Cronjob'; /** - * @see wcf\data\IEditableCachedObject::resetCache() + * @see wcf\data\IEditableCachedObject::resetCache() */ public static function resetCache() { CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.cronjobs-*'); diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobList.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobList.class.php index 2921a69e4c..0711a04f21 100644 --- a/wcfsetup/install/files/lib/data/cronjob/CronjobList.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/CronjobList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of cronjobs. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cronjob - * @category Community Framework + * @category Community Framework */ class CronjobList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php index 1236697aef..e3c381548f 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a croniob log. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.cronjob.log - * @category Community Framework + * @category Community Framework */ class CronjobLog extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php index 76b19c73c0..e6cea493f0 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes cronjob log-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class CronjobLogAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\cronjob\log\CronjobLogEditor'; } diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php index eaa30a8add..410e2269c9 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Provides functions to edit cronjob logs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.item - * @category Community Framework + * @category Community Framework */ class CronjobLogEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogList.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogList.class.php index 6cc6e90244..c0192f5991 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogList.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of cronjob log entries. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.acp.menu.item - * @category Community Framework + * @category Community Framework */ class CronjobLogList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php b/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php index 3e0ce86e51..91d6b70c9a 100644 --- a/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php +++ b/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an event listener. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.event.listener - * @category Community Framework + * @category Community Framework */ class EventListener extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/event/listener/EventListenerAction.class.php b/wcfsetup/install/files/lib/data/event/listener/EventListenerAction.class.php index f87309f349..87f462a5b4 100644 --- a/wcfsetup/install/files/lib/data/event/listener/EventListenerAction.class.php +++ b/wcfsetup/install/files/lib/data/event/listener/EventListenerAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes event listener-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.event.listener - * @category Community Framework + * @category Community Framework */ class EventListenerAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\event\listener\EventListenerEditor'; } diff --git a/wcfsetup/install/files/lib/data/event/listener/EventListenerList.class.php b/wcfsetup/install/files/lib/data/event/listener/EventListenerList.class.php index 8b92bf95f6..4371b49b9e 100644 --- a/wcfsetup/install/files/lib/data/event/listener/EventListenerList.class.php +++ b/wcfsetup/install/files/lib/data/event/listener/EventListenerList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of event listener. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.event.listener - * @category Community Framework + * @category Community Framework */ class EventListenerList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/language/Language.class.php b/wcfsetup/install/files/lib/data/language/Language.class.php index 2d5c2e9cad..b1811afadc 100644 --- a/wcfsetup/install/files/lib/data/language/Language.class.php +++ b/wcfsetup/install/files/lib/data/language/Language.class.php @@ -12,7 +12,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language - * @category Community Framework + * @category Community Framework */ class Language extends DatabaseObject { /** @@ -111,10 +111,10 @@ class Language extends DatabaseObject { /** * Executes template scripting in a language variable. * - * @param string $item - * @param array $variables + * @param string $item + * @param array $variables * @param boolean $optional - * @return string result + * @return string result */ public function getDynamicVariable($item, array $variables = array(), $optional = false) { $staticItem = $this->get($item, $optional); @@ -129,7 +129,7 @@ class Language extends DatabaseObject { /** * Loads category files. - * + * * @param string $category * @return boolean */ @@ -172,7 +172,7 @@ class Language extends DatabaseObject { /** * Sets the local language. * Recall this function after language changed. - * + * * @param integer $languageID */ public function setLocale() { @@ -199,6 +199,9 @@ class Language extends DatabaseObject { return LanguageFactory::getInstance()->getLanguages(); } + /** + * Sets the package id when a language object is unserialized. + */ public function __wakeup() { $this->packageID = PACKAGE_ID; } diff --git a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php index d533bdb8af..f5bea5a2f4 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php @@ -9,15 +9,15 @@ use wcf\system\WCF; * Executes language-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language - * @category Community Framework + * @category Community Framework */ class LanguageAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\language\LanguageEditor'; diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php index f109015773..5d482e66aa 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php @@ -25,7 +25,7 @@ use wcf\util\XML; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language - * @category Community Framework + * @category Community Framework */ class LanguageEditor extends DatabaseObjectEditor { /** @@ -46,7 +46,7 @@ class LanguageEditor extends DatabaseObjectEditor { * Updates the language files for the given category. * * @param array $categoryIDs - * @param array $packageIDs + * @param array $packageIDs */ public function updateCategory(array $categoryIDs = array(), array $packageIDs = array()) { if (!count($categoryIDs)) { diff --git a/wcfsetup/install/files/lib/data/language/LanguageList.class.php b/wcfsetup/install/files/lib/data/language/LanguageList.class.php index 769cc3ad70..491b139676 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageList.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of languages. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language - * @category Community Framework + * @category Community Framework */ class LanguageList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php b/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php index 4b39989e37..6b02192d9a 100644 --- a/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php +++ b/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php @@ -9,11 +9,11 @@ use wcf\util\XML; * SetupLanguage is a modification of Language only for the setup process. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language - * @category Community Framework + * @category Community Framework */ class SetupLanguage extends Language { /** @@ -68,12 +68,12 @@ class SetupLanguage extends Language { $file->write("\$this->dynamicItems['".$name['name']."'] = '".str_replace("'", "\'", $compiledString['template'])."';\n"); } } - + $file->write("?>"); $file->close(); } } - + include_once($filename); $this->setLocale(); } diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php index e80871cb37..d4b6779fc4 100644 --- a/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php +++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a language category. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.category - * @category Community Framework + * @category Community Framework */ class LanguageCategory extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php index 9cdb2dd9ef..639acbbd14 100644 --- a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes language category-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.category - * @category Community Framework + * @category Community Framework */ class LanguageCategoryAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\language\category\LanguageCategoryEditor'; diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryEditor.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryEditor.class.php index 223fe69722..68cf375efe 100644 --- a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit language categories. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.category - * @category Community Framework + * @category Community Framework */ class LanguageCategoryEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryList.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryList.class.php index 91181557cb..e1a89a7f87 100644 --- a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryList.class.php +++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of language categories. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.category - * @category Community Framework + * @category Community Framework */ class LanguageCategoryList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php index 54a6bb5ea2..1832e933c6 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a language item. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.item - * @category Community Framework + * @category Community Framework */ class LanguageItem extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php index 575e63effe..14ee39627d 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes language item-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.item - * @category Community Framework + * @category Community Framework */ class LanguageItemAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\language\item\LanguageItemEditor'; diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemEditor.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemEditor.class.php index 676083c53b..a74cc2a06f 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItemEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit language items. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.item - * @category Community Framework + * @category Community Framework */ class LanguageItemEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemList.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemList.class.php index 8f79075c8c..83985f0ce7 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItemList.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of language items. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.item - * @category Community Framework + * @category Community Framework */ class LanguageItemList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServer.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServer.class.php index 84fa6d29dc..fd737da8c8 100644 --- a/wcfsetup/install/files/lib/data/language/server/LanguageServer.class.php +++ b/wcfsetup/install/files/lib/data/language/server/LanguageServer.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a language server. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.server - * @category Community Framework + * @category Community Framework */ class LanguageServer extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php index 21089d3ffc..13b8461a91 100644 --- a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php +++ b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes language server-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.server - * @category Community Framework + * @category Community Framework */ class LanguageServerAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\language\server\LanguageServerEditor'; diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServerEditor.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServerEditor.class.php index 88075cc49e..0fed145a01 100644 --- a/wcfsetup/install/files/lib/data/language/server/LanguageServerEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/server/LanguageServerEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit language servers. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.server - * @category Community Framework + * @category Community Framework */ class LanguageServerEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServerList.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServerList.class.php index 6c58dc987b..158b81706e 100644 --- a/wcfsetup/install/files/lib/data/language/server/LanguageServerList.class.php +++ b/wcfsetup/install/files/lib/data/language/server/LanguageServerList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of language servers. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.language.server - * @category Community Framework + * @category Community Framework */ class LanguageServerList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php b/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php index e96396717e..ed7764d3b4 100644 --- a/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php +++ b/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php @@ -10,7 +10,7 @@ use wcf\data\DatabaseObject; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.modification.log - * @category Community Framework + * @category Community Framework */ class ModificationLog extends DatabaseObject { /** @@ -28,14 +28,14 @@ class ModificationLog extends DatabaseObject { */ public function __get($name) { $value = parent::__get($name); - + // treat additional data as data variables if it is an array if ($value === null) { if (is_array($this->data['additionalData']) && isset($this->data['additionalData'][$name])) { $value = $this->data['additionalData'][$name]; } } - + return $value; } @@ -44,7 +44,7 @@ class ModificationLog extends DatabaseObject { */ protected function handleData($data) { parent::handleData($data); - + $this->data['additionalData'] = @unserialize($this->data['additionalData']); if (!is_array($this->data['additionalData'])) { $this->data['additionalData'] = array(); diff --git a/wcfsetup/install/files/lib/data/modification/log/ModificationLogAction.class.php b/wcfsetup/install/files/lib/data/modification/log/ModificationLogAction.class.php index b14c4bc53a..911f5da81b 100644 --- a/wcfsetup/install/files/lib/data/modification/log/ModificationLogAction.class.php +++ b/wcfsetup/install/files/lib/data/modification/log/ModificationLogAction.class.php @@ -10,6 +10,6 @@ use wcf\data\AbstractDatabaseObjectAction; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.modification.log - * @category Community Framework + * @category Community Framework */ class ModificationLogAction extends AbstractDatabaseObjectAction { } diff --git a/wcfsetup/install/files/lib/data/modification/log/ModificationLogEditor.class.php b/wcfsetup/install/files/lib/data/modification/log/ModificationLogEditor.class.php index 6e4cac379d..0d74c343ff 100644 --- a/wcfsetup/install/files/lib/data/modification/log/ModificationLogEditor.class.php +++ b/wcfsetup/install/files/lib/data/modification/log/ModificationLogEditor.class.php @@ -10,7 +10,7 @@ use wcf\data\DatabaseObjectEditor; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.modification.log - * @category Community Framework + * @category Community Framework */ class ModificationLogEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/modification/log/ModificationLogList.class.php b/wcfsetup/install/files/lib/data/modification/log/ModificationLogList.class.php index 4b9b508ef5..47d4388b61 100644 --- a/wcfsetup/install/files/lib/data/modification/log/ModificationLogList.class.php +++ b/wcfsetup/install/files/lib/data/modification/log/ModificationLogList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of modification logs. * - * @author Alexander Ebert + * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.modification.log - * @category Community Framework + * @category Community Framework */ class ModificationLogList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProcessor.class.php b/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProcessor.class.php index 49b736577e..c714527d01 100644 --- a/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProcessor.class.php +++ b/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProcessor.class.php @@ -7,15 +7,15 @@ use wcf\data\IDatabaseObjectProcessor; * Provides default a implementation for object type processors. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ abstract class AbstractObjectTypeProcessor extends DatabaseObjectDecorator implements IDatabaseObjectProcessor { /** - * @see wcf\data\DatabaseObjectDecorator::$baseClass + * @see wcf\data\DatabaseObjectDecorator::$baseClass */ protected static $baseClass = 'wcf\data\object\type\ObjectType'; } diff --git a/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProvider.class.php b/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProvider.class.php index 34d7126b41..a566e2ab73 100644 --- a/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProvider.class.php +++ b/wcfsetup/install/files/lib/data/object/type/AbstractObjectTypeProvider.class.php @@ -5,11 +5,11 @@ namespace wcf\data\object\type; * Basic implementation for object type providers. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ abstract class AbstractObjectTypeProvider implements IObjectTypeProvider { /** diff --git a/wcfsetup/install/files/lib/data/object/type/IObjectTypeProvider.class.php b/wcfsetup/install/files/lib/data/object/type/IObjectTypeProvider.class.php index 3162de9c43..41ab22d5bf 100644 --- a/wcfsetup/install/files/lib/data/object/type/IObjectTypeProvider.class.php +++ b/wcfsetup/install/files/lib/data/object/type/IObjectTypeProvider.class.php @@ -3,18 +3,18 @@ namespace wcf\data\object\type; /** * Any object type provider should implement this interface. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ interface IObjectTypeProvider { /** * Gets an object by its ID. - * + * * @param integer $objectID * @return wcf\data\DatabaseObject */ @@ -22,7 +22,7 @@ interface IObjectTypeProvider { /** * Gets like objects by their IDs. - * + * * @param array $objectIDs * @return array */ diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php index 0c2bd3ea58..dc2383a744 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php @@ -8,11 +8,11 @@ use wcf\util\ClassUtil; * Represents an object type. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ class ObjectType extends ProcessibleDatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeAction.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeAction.class.php index a47219f987..22b6e2480a 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeAction.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes object type-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ class ObjectTypeAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\object\type\ObjectTypeEditor'; } diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php index f591c414f6..81cb75e5ac 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php @@ -7,16 +7,16 @@ use wcf\system\SingletonFactory; * Manages the object type cache. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ class ObjectTypeCache extends SingletonFactory { /** * object type definitions - * @var array + * @var array */ protected $definitions = array(); @@ -28,24 +28,24 @@ class ObjectTypeCache extends SingletonFactory { /** * object type definitions sorted by name - * @var array + * @var array */ protected $definitionsByName = array(); /** * object types - * @var array + * @var array */ protected $objectTypes = array(); /** * object types grouped by definition - * @var array + * @var array */ protected $groupedObjectTypes = array(); /** - * @see wcf\system\SingletonFactory::init() + * @see wcf\system\SingletonFactory::init() */ protected function init() { // get definition cache diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php index 1693817a51..7af9b07c3b 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php @@ -1,6 +1,5 @@ * @package com.woltlab.wcf * @subpackage data.object.type - * @category Community Framework + * @category Community Framework */ class ObjectTypeEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -21,7 +20,7 @@ class ObjectTypeEditor extends DatabaseObjectEditor implements IEditableCachedOb protected static $baseClass = 'wcf\data\object\type\ObjectType'; /** - * @see wcf\data\IEditableCachedObject::resetCache() + * @see wcf\data\IEditableCachedObject::resetCache() */ public static function resetCache() { ObjectTypeCache::getInstance()->resetCache(); diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeList.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeList.class.php index f78fbbed13..34b47a1a11 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeList.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of object types. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type.definition - * @category Community Framework + * @category Community Framework */ class ObjectTypeList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php index c5feb33553..d6efa308be 100644 --- a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php +++ b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an object type definition. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type.definition - * @category Community Framework + * @category Community Framework */ class ObjectTypeDefinition extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionAction.class.php b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionAction.class.php index ee31b94925..a504acc2d0 100644 --- a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionAction.class.php +++ b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes object type definition-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type.definition - * @category Community Framework + * @category Community Framework */ class ObjectTypeDefinitionAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\object\type\definition\ObjectTypeDefinitionEditor'; } diff --git a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionEditor.class.php b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionEditor.class.php index 2b52c8dab5..a9b0d46af7 100644 --- a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionEditor.class.php +++ b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionEditor.class.php @@ -4,13 +4,13 @@ use wcf\data\DatabaseObjectEditor; /** * Provides functions to edit object type definitions. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type.definition - * @category Community Framework + * @category Community Framework */ class ObjectTypeDefinitionEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionList.class.php b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionList.class.php index 449f0300f3..6aba557961 100644 --- a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionList.class.php +++ b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinitionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of object type definitions. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.object.type.definition - * @category Community Framework + * @category Community Framework */ class ObjectTypeDefinitionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/option/Option.class.php b/wcfsetup/install/files/lib/data/option/Option.class.php index f31a2b2ae4..94c594e0b2 100644 --- a/wcfsetup/install/files/lib/data/option/Option.class.php +++ b/wcfsetup/install/files/lib/data/option/Option.class.php @@ -9,11 +9,11 @@ use wcf\util\StringUtil; * Represents an option. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option - * @category Community Framework + * @category Community Framework */ class Option extends DatabaseObject { /** @@ -38,7 +38,7 @@ class Option extends DatabaseObject { const VISIBILITY_ALL = 15; /** - * @see wcf\data\DatabaseObject::handleData() + * @see wcf\data\DatabaseObject::handleData() */ protected function handleData($data) { parent::handleData($data); @@ -49,7 +49,7 @@ class Option extends DatabaseObject { /** * Returns a list of options. - * + * * @param integer $packageID * @return array */ @@ -90,7 +90,7 @@ class Option extends DatabaseObject { /** * Parses enableOptions. - * + * * @param string $optionData * @return array */ @@ -120,7 +120,7 @@ class Option extends DatabaseObject { /** * Returns a list of the available options. - * + * * @return array */ public function parseSelectOptions() { @@ -142,7 +142,7 @@ class Option extends DatabaseObject { /** * Returns a list of the enable options. - * + * * @return array */ public function parseMultipleEnableOptions() { diff --git a/wcfsetup/install/files/lib/data/option/OptionAction.class.php b/wcfsetup/install/files/lib/data/option/OptionAction.class.php index f0a3eb67bd..832026bd24 100644 --- a/wcfsetup/install/files/lib/data/option/OptionAction.class.php +++ b/wcfsetup/install/files/lib/data/option/OptionAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes option-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data. - * @category Community Framework + * @category Community Framework */ class OptionAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\option\OptionEditor'; diff --git a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php index 2f094f025f..b70ad346b7 100644 --- a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php +++ b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php @@ -11,16 +11,16 @@ use wcf\util\FileUtil; * Provides functions to edit options. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option - * @category Community Framework + * @category Community Framework */ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * options cache file name - * @var string + * @var string */ const FILENAME = 'options.inc.php'; @@ -32,7 +32,7 @@ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject /** * Imports the given options. * - * @param array $options name to value + * @param array $options name to value */ public static function import(array $options) { // get option ids @@ -79,7 +79,7 @@ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject } /** - * @see wcf\data\IEditableCachedObject::resetCache() + * @see wcf\data\IEditableCachedObject::resetCache() */ public static function resetCache() { // reset cache @@ -108,7 +108,7 @@ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject /** * Rebuilds cached options * - * @param string filename + * @param string $filename * @param integer $packageID */ public static function rebuildFile($filename, $packageID = PACKAGE_ID) { diff --git a/wcfsetup/install/files/lib/data/option/OptionList.class.php b/wcfsetup/install/files/lib/data/option/OptionList.class.php index 43357a9480..6edf7856ad 100644 --- a/wcfsetup/install/files/lib/data/option/OptionList.class.php +++ b/wcfsetup/install/files/lib/data/option/OptionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of options. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option - * @category Community Framework + * @category Community Framework */ class OptionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php index 340eb375b8..bfd33896d8 100644 --- a/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents an option category. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option.category - * @category Community Framework + * @category Community Framework */ class OptionCategory extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php index 82445d1eaf..52254ffa82 100644 --- a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes option categories-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option.category - * @category Community Framework + * @category Community Framework */ class OptionCategoryAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\option\category\OptionCategoryEditor'; diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategoryEditor.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategoryEditor.class.php index acb80edbd1..b7b0757f35 100644 --- a/wcfsetup/install/files/lib/data/option/category/OptionCategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/option/category/OptionCategoryEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit option categories. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option.category - * @category Community Framework + * @category Community Framework */ class OptionCategoryEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategoryList.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategoryList.class.php index 9247dc5d17..2963481e3a 100644 --- a/wcfsetup/install/files/lib/data/option/category/OptionCategoryList.class.php +++ b/wcfsetup/install/files/lib/data/option/category/OptionCategoryList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of option categories. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.option.category - * @category Community Framework + * @category Community Framework */ class OptionCategoryList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 6c9933128f..9f67235745 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -13,11 +13,11 @@ use wcf\util\StringUtil; * Represents a package. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package - * @category Community Framework + * @category Community Framework */ class Package extends DatabaseObject { /** @@ -56,7 +56,7 @@ class Package extends DatabaseObject { /** * Returns true, if this package is required by other packages. - * + * * @return boolean */ public function isRequired() { @@ -72,7 +72,7 @@ class Package extends DatabaseObject { /** * Returns true if package is a plugin. - * + * * @return boolean */ public function isPlugin() { @@ -83,7 +83,7 @@ class Package extends DatabaseObject { /** * Returns the name of this package. - * + * * @return string */ public function getName() { @@ -92,7 +92,7 @@ class Package extends DatabaseObject { /** * Returns the abbreviation of the package name. - * + * * @param string $package * @return string */ @@ -105,7 +105,7 @@ class Package extends DatabaseObject { * Returns package object for parent package. * * @return Package - */ + */ public function getParentPackage() { if (!$this->parentPackageID) { throw new SystemException("Package ".$this->package." does not have a parent package."); @@ -117,7 +117,7 @@ class Package extends DatabaseObject { /** * Returns a list of all by this package required packages. * Contains required packages and the requirements of the required packages. - * + * * @return array */ public function getDependencies() { @@ -142,7 +142,7 @@ class Package extends DatabaseObject { /** * Returns a list of all packages that require this package. * Returns packages that require this package and packages that require these packages. - * + * * @return array */ public function getDependentPackages() { @@ -167,7 +167,7 @@ class Package extends DatabaseObject { /** * Returns a list of the requirements of this package. * Contains the content of the tag in the package.xml of this package. - * + * * @return array */ public function getRequiredPackages() { @@ -197,7 +197,7 @@ class Package extends DatabaseObject { * official WCF packet naming scheme in the future). * Reminder: The '$packageName' variable being examined here contains the 'name' attribute * of the 'package' tag noted in the 'packages.xml' file delivered inside the respective package. - * + * * @param string $packageName * @return boolean isValid */ @@ -236,7 +236,7 @@ class Package extends DatabaseObject { /** * Compares two version number strings. - * + * * @param string $version1 * @param string $version2 * @param string $operator @@ -252,7 +252,7 @@ class Package extends DatabaseObject { /** * Formats a package version string for comparing. - * + * * @param string $version * @return string formatted version * @see http://www.php.net/manual/en/function.version-compare.php @@ -273,7 +273,7 @@ class Package extends DatabaseObject { /** * Rebuilds the requirement map for the given package id. - * + * * @param integer $packageID */ public static function rebuildPackageRequirementMap($packageID) { @@ -346,7 +346,7 @@ class Package extends DatabaseObject { /** * Rebuilds the dependencies list for the given package id. - * + * * @param integer $packageID */ public static function rebuildPackageDependencies($packageID) { @@ -494,7 +494,7 @@ class Package extends DatabaseObject { /** * Writes the config.inc.php for an application. - * + * * @param integer $packageID */ public static function writeConfigFile($packageID) { @@ -548,7 +548,7 @@ class Package extends DatabaseObject { /** * Searches all dependent packages for the given package id * and rebuild their package dependencies list. - * + * * @param integer $packageID */ public static function rebuildParentPackageDependencies($packageID) { diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php index a8510c442d..cf8aa691c3 100644 --- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * Executes package-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package - * @category Community Framework + * @category Community Framework */ class PackageAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\package\PackageEditor'; diff --git a/wcfsetup/install/files/lib/data/package/PackageCache.class.php b/wcfsetup/install/files/lib/data/package/PackageCache.class.php index 7ef0a8cd19..bd39a50bf9 100644 --- a/wcfsetup/install/files/lib/data/package/PackageCache.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageCache.class.php @@ -11,17 +11,17 @@ use wcf\system\SingletonFactory; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package - * @category Community Framework + * @category Community Framework */ class PackageCache extends SingletonFactory { /** * list of cached packages - * @var array + * @var array */ protected $packages = array(); /** - * @see wcf\system\SingletonFactory::init() + * @see wcf\system\SingletonFactory::init() */ protected function init() { CacheHandler::getInstance()->addResource( diff --git a/wcfsetup/install/files/lib/data/package/PackageEditor.class.php b/wcfsetup/install/files/lib/data/package/PackageEditor.class.php index 28299b7452..78dc03e1e8 100644 --- a/wcfsetup/install/files/lib/data/package/PackageEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit packages. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package - * @category Community Framework + * @category Community Framework */ class PackageEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/PackageList.class.php b/wcfsetup/install/files/lib/data/package/PackageList.class.php index c9c01602fe..6ea1ba1d77 100644 --- a/wcfsetup/install/files/lib/data/package/PackageList.class.php +++ b/wcfsetup/install/files/lib/data/package/PackageList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of packages. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package - * @category Community Framework + * @category Community Framework */ class PackageList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php index a8d06f5745..2bfe908e9d 100644 --- a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a package installation plugin. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.plugin - * @category Community Framework + * @category Community Framework */ class PackageInstallationPlugin extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginAction.class.php b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginAction.class.php index ec3d69159d..1a3cbc5e6f 100644 --- a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginAction.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes package installation plugin-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.plugin - * @category Community Framework + * @category Community Framework */ class PackageInstallationPluginAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\package\installation\plugin\PackageInstallationPluginEditor'; } diff --git a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginEditor.class.php b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginEditor.class.php index 32fff58edc..6f72e53c14 100644 --- a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit package installation plugins. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.plugin - * @category Community Framework + * @category Community Framework */ class PackageInstallationPluginEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginList.class.php b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginList.class.php index d30968c4c6..5bd1b4dedc 100644 --- a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginList.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPluginList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of package installation plugins. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.plugin - * @category Community Framework + * @category Community Framework */ class PackageInstallationPluginList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php index 972f141f93..245955ca71 100644 --- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Represents a package installation queue. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.queue - * @category Community Framework + * @category Community Framework */ class PackageInstallationQueue extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php index 841326eb80..2930a93209 100644 --- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php @@ -7,16 +7,25 @@ use wcf\system\WCF; /** * Executes package installation queue-related actions. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.queue - * @category Community Framework + * @category Community Framework */ class PackageInstallationQueueAction extends AbstractDatabaseObjectAction { + /** + * package the prepared queue belongs to + * @var wcf\data\package\Package + */ protected $package = null; + + /** + * id of the package the prepared queue belongs to + * @var integer + */ protected $packageID = 0; /** @@ -24,6 +33,9 @@ class PackageInstallationQueueAction extends AbstractDatabaseObjectAction { */ protected $className = 'wcf\data\package\installation\queue\PackageInstallationQueueEditor'; + /** + * Validates the 'prepareQueue' action: + */ public function validatePrepareQueue() { if (isset($this->parameters['packageID'])) $this->packageID = intval($this->parameters['packageID']); @@ -37,6 +49,11 @@ class PackageInstallationQueueAction extends AbstractDatabaseObjectAction { } } + /** + * Prepares a new package installation queue. + * + * @return array + */ public function prepareQueue() { $processNo = PackageInstallationQueue::getNewProcessNo(); diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueEditor.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueEditor.class.php index 06ed6d5016..4b03dfca99 100644 --- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit package installation queues. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.queue - * @category Community Framework + * @category Community Framework */ class PackageInstallationQueueEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueList.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueList.class.php index ccf76feeb0..8ebe1398ec 100644 --- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueList.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of package installation queues. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.installation.queue - * @category Community Framework + * @category Community Framework */ class PackageInstallationQueueList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php index 458ceb668e..2df9f16420 100644 --- a/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php +++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a package update. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update - * @category Community Framework + * @category Community Framework */ class PackageUpdate extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php index cff6a8cf91..b500f9f838 100644 --- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php +++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes package update-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update - * @category Community Framework + * @category Community Framework */ class PackageUpdateAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateEditor.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateEditor.class.php index 5486a23040..b1d44e269a 100644 --- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit package updates. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update - * @category Community Framework + * @category Community Framework */ class PackageUpdateEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateList.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateList.class.php index 3bb2417632..a59cdd5362 100644 --- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateList.class.php +++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of package updates. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update - * @category Community Framework + * @category Community Framework */ class PackageUpdateList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php index 50bddfa5b3..5c02492c65 100644 --- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php +++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Contains business logic related to handling of package update servers. * * @author Siegfried Schweizer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.server - * @category Community Framework + * @category Community Framework */ class PackageUpdateServer extends DatabaseObject { /** @@ -44,7 +44,7 @@ class PackageUpdateServer extends DatabaseObject { /** * Validates a server url. - * + * * @param string $serverURL * @return boolean validates */ @@ -65,7 +65,7 @@ class PackageUpdateServer extends DatabaseObject { /** * Gets stored auth data of this update server. - * + * * @return array $authData */ public function getAuthData() { diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php index b45b82a689..3a924e5ac6 100644 --- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php +++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes package update server-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.server - * @category Community Framework + * @category Community Framework */ class PackageUpdateServerAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\package\update\server\PackageUpdateServerEditor'; diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerEditor.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerEditor.class.php index a796d5b90b..1386ba4462 100644 --- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Contains business logic related to handling of package update servers. * * @author Siegfried Schweizer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.server - * @category Community Framework + * @category Community Framework */ class PackageUpdateServerEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerList.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerList.class.php index 92ff179779..701e0cf216 100644 --- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerList.class.php +++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of package update servers. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.server - * @category Community Framework + * @category Community Framework */ class PackageUpdateServerList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php index 669da23e8e..4d1de7ed01 100644 --- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php +++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a package update version. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.version - * @category Community Framework + * @category Community Framework */ class PackageUpdateVersion extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionAction.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionAction.class.php index 82608abfdd..7b29d16643 100644 --- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionAction.class.php +++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes package update version-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.version - * @category Community Framework + * @category Community Framework */ class PackageUpdateVersionAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\package\update\version\PackageUpdateVersionEditor'; } diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionEditor.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionEditor.class.php index 21cbf512d7..26f30e684b 100644 --- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionEditor.class.php +++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit package update versions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.version - * @category Community Framework + * @categor Community Framework */ class PackageUpdateVersionEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionList.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionList.class.php index cfc9ad9eb9..fd5936c748 100644 --- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionList.class.php +++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of package update versions. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.package.update.version - * @category Community Framework + * @category Community Framework */ class PackageUpdateVersionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php index da0cfff9bc..3ade88de0a 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php @@ -10,11 +10,11 @@ use wcf\system\request\LinkHandler; * Represents an page menu item. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.page.menu.item - * @category Community Framework + * @category Community Framework */ class PageMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem { /** @@ -33,7 +33,7 @@ class PageMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem { protected static $processorInterface = 'wcf\system\menu\page\IPageMenuItemProvider'; /** - * @see wcf\data\ProcessibleDatabaseObject::getProcessor() + * @see wcf\data\ProcessibleDatabaseObject::getProcessor() */ public function getProcessor() { if (parent::getProcessor() === null) { @@ -44,7 +44,7 @@ class PageMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem { } /** - * @see wcf\system\menu\ITreeMenuItem::getLink() + * @see wcf\system\menu\ITreeMenuItem::getLink() */ public function getLink() { $abbreviation = ApplicationHandler::getInstance()->getAbbreviation($this->packageID); diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemAction.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemAction.class.php index 6cdf31d201..e8481ec82d 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemAction.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes page menu item-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.page.menu.item - * @category Community Framework + * @category Community Framework */ class PageMenuItemAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\page\menu\item\PageMenuItemEditor'; } diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php index 298bdb7cf0..be525aa98b 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php @@ -9,11 +9,11 @@ use wcf\system\WCF; * Provides functions to edit page menu items. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.page.menu.item - * @category Community Framework + * @category Community Framework */ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -66,7 +66,7 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached /** * Updates the positions of a page menu item directly. - * + * * @param integer $menuItemID * @param string $menuPosition * @param integer $showOrder diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemList.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemList.class.php index b4c11f73ec..00dbb74b1c 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemList.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of page menu items. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.page.menu.item - * @category Community Framework + * @category Community Framework */ class PageMenuItemList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/search/Search.class.php b/wcfsetup/install/files/lib/data/search/Search.class.php index 7f5e78ef87..4b1fa3e6c8 100644 --- a/wcfsetup/install/files/lib/data/search/Search.class.php +++ b/wcfsetup/install/files/lib/data/search/Search.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a search. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.search - * @category Community Framework + * @category Community Framework */ class Search extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/search/SearchAction.class.php b/wcfsetup/install/files/lib/data/search/SearchAction.class.php index e812695138..6a4d2a54fa 100644 --- a/wcfsetup/install/files/lib/data/search/SearchAction.class.php +++ b/wcfsetup/install/files/lib/data/search/SearchAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes search-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.search - * @category Community Framework + * @category Community Framework */ class SearchAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/search/SearchEditor.class.php b/wcfsetup/install/files/lib/data/search/SearchEditor.class.php index dfeec6a6e9..33bd471e76 100644 --- a/wcfsetup/install/files/lib/data/search/SearchEditor.class.php +++ b/wcfsetup/install/files/lib/data/search/SearchEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit searches. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.search - * @category Community Framework + * @category Community Framework */ class SearchEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/search/SearchList.class.php b/wcfsetup/install/files/lib/data/search/SearchList.class.php index 99acaf659f..cd1e0e5442 100644 --- a/wcfsetup/install/files/lib/data/search/SearchList.class.php +++ b/wcfsetup/install/files/lib/data/search/SearchList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of searches. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.search - * @category Community Framework + * @category Community Framework */ class SearchList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/session/Session.class.php b/wcfsetup/install/files/lib/data/session/Session.class.php index 566c1afb2f..47838ec9ea 100644 --- a/wcfsetup/install/files/lib/data/session/Session.class.php +++ b/wcfsetup/install/files/lib/data/session/Session.class.php @@ -6,11 +6,11 @@ use wcf\data\acp\session\ACPSession; * Represents a session. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.session - * @category Community Framework + * @category Community Framework */ class Session extends ACPSession { /** @@ -24,7 +24,7 @@ class Session extends ACPSession { protected static $databaseTableIndexName = 'sessionID'; /** - * @see wcf\data\acp\session\ACPSession::supportsPersistentLogins() + * @see wcf\data\acp\session\ACPSession::supportsPersistentLogins() */ public static function supportsPersistentLogins() { return true; diff --git a/wcfsetup/install/files/lib/data/session/SessionAction.class.php b/wcfsetup/install/files/lib/data/session/SessionAction.class.php index cb3b71c14d..e150bf5cb7 100644 --- a/wcfsetup/install/files/lib/data/session/SessionAction.class.php +++ b/wcfsetup/install/files/lib/data/session/SessionAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes session-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.session - * @category Community Framework + * @category Community Framework */ class SessionAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/session/SessionEditor.class.php b/wcfsetup/install/files/lib/data/session/SessionEditor.class.php index c7347195e5..e135f5d1df 100644 --- a/wcfsetup/install/files/lib/data/session/SessionEditor.class.php +++ b/wcfsetup/install/files/lib/data/session/SessionEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\acp\session\ACPSessionEditor; * Provides functions to edit sessions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.session - * @category Community Framework + * @category Community Framework */ class SessionEditor extends ACPSessionEditor { /** diff --git a/wcfsetup/install/files/lib/data/session/SessionList.class.php b/wcfsetup/install/files/lib/data/session/SessionList.class.php index 991fb7f141..d8037d5513 100644 --- a/wcfsetup/install/files/lib/data/session/SessionList.class.php +++ b/wcfsetup/install/files/lib/data/session/SessionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of sessions. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.session - * @category Community Framework + * @category Community Framework */ class SessionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php index 4c7363685e..958d542ffd 100644 --- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php +++ b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php @@ -12,7 +12,7 @@ use wcf\util\ClassUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.sitemap - * @category Community Framework + * @category Community Framework */ class Sitemap extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php index 4fc9c67dc9..fdd7babe3c 100644 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php +++ b/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php @@ -12,7 +12,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.sitemap - * @category Community Framework + * @category Community Framework */ class SitemapAction extends AbstractDatabaseObjectAction { /** @@ -21,7 +21,7 @@ class SitemapAction extends AbstractDatabaseObjectAction { protected $allowGuestAccess = array('getSitemap'); /** - * Does nothing. + * Validates the 'getSitemap' action. */ public function validateGetSitemap() { if (isset($this->parameters['sitemapName'])) { diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php index 2e0f18598a..c7b283b8b8 100644 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php +++ b/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php @@ -10,7 +10,7 @@ use wcf\data\DatabaseObjectEditor; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.sitemap - * @category Community Framework + * @category Community Framework */ class SitemapEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php index 4a80631d97..d2d41fe518 100644 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php +++ b/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php @@ -5,11 +5,11 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of sitemap entries. * - * @author Alexander Ebert + * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.sitemap - * @category Community Framework + * @category Community Framework */ class SitemapList extends DatabaseObjectList { } diff --git a/wcfsetup/install/files/lib/data/spider/Spider.class.php b/wcfsetup/install/files/lib/data/spider/Spider.class.php index 9b542e5ced..ef0292752f 100644 --- a/wcfsetup/install/files/lib/data/spider/Spider.class.php +++ b/wcfsetup/install/files/lib/data/spider/Spider.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a spider. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.spider - * @category Community Framework + * @category Community Framework */ class Spider extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/spider/SpiderAction.class.php b/wcfsetup/install/files/lib/data/spider/SpiderAction.class.php index b84635d6ce..444f76fe51 100644 --- a/wcfsetup/install/files/lib/data/spider/SpiderAction.class.php +++ b/wcfsetup/install/files/lib/data/spider/SpiderAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes spider-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.spider - * @category Community Framework + * @category Community Framework */ class SpiderAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\spider\SpiderEditor'; } diff --git a/wcfsetup/install/files/lib/data/spider/SpiderEditor.class.php b/wcfsetup/install/files/lib/data/spider/SpiderEditor.class.php index 3edb031a7f..f0b8d7a929 100644 --- a/wcfsetup/install/files/lib/data/spider/SpiderEditor.class.php +++ b/wcfsetup/install/files/lib/data/spider/SpiderEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit spiders. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.spider - * @category Community Framework + * @category Community Framework */ class SpiderEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/spider/SpiderList.class.php b/wcfsetup/install/files/lib/data/spider/SpiderList.class.php index 9cb201a230..669d2dd72c 100644 --- a/wcfsetup/install/files/lib/data/spider/SpiderList.class.php +++ b/wcfsetup/install/files/lib/data/spider/SpiderList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of spiders. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.spider - * @category Community Framework + * @category Community Framework */ class SpiderList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php index fd2fd6956b..6d2f0f0acc 100644 --- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php +++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php @@ -9,15 +9,15 @@ use wcf\util\StringUtil; * Represents the active user style. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.style - * @category Community Framework + * @category Community Framework */ class ActiveStyle extends DatabaseObjectDecorator { /** - * @see wcf\data\DatabaseObjectDecorator::$baseClass + * @see wcf\data\DatabaseObjectDecorator::$baseClass */ protected static $baseClass = 'wcf\data\style\Style'; @@ -30,7 +30,7 @@ class ActiveStyle extends DatabaseObjectDecorator { /** * Creates a new ActiveStyle object. * - * @param Style $object + * @param wcf\data\style\Style $object */ public function __construct(Style $object) { parent::__construct($object); diff --git a/wcfsetup/install/files/lib/data/style/Style.class.php b/wcfsetup/install/files/lib/data/style/Style.class.php index c7da1bb1f1..ac3554da22 100644 --- a/wcfsetup/install/files/lib/data/style/Style.class.php +++ b/wcfsetup/install/files/lib/data/style/Style.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Represents a style. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.style - * @category Community Framework + * @category Community Framework */ class Style extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php index 99baa14eb6..a86f7aac61 100644 --- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes style-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.style - * @category Community Framework + * @category Community Framework */ class StyleAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\style\StyleEditor'; } diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php index a464594be3..d44fe6fdfc 100644 --- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php @@ -24,11 +24,11 @@ use wcf\util\XML; * @todo Thumbnail class has been removed * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.style - * @category Community Framework + * @category Community Framework */ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject { const INFO_FILE = 'style.xml'; @@ -41,7 +41,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject protected static $baseClass = 'wcf\data\style\Style'; /** - * @see wcf\data\IEditableObject::update() + * @see wcf\data\IEditableObject::update() */ public function update(array $parameters = array()) { $variables = null; @@ -49,7 +49,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject $variables = $parameters['variables']; unset($parameters['variables']); } - + // update style data parent::update($parameters); @@ -65,7 +65,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject } /** - * @see wcf\data\IEditableObject::delete() + * @see wcf\data\IEditableObject::delete() */ public function delete() { parent::delete(); @@ -143,7 +143,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject case 'image': case 'copyright': case 'license': $data[$general['name']] = $general['cdata']; break; } } - break; + break; case 'author': foreach ($child['children'] as $author) { @@ -152,7 +152,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject case 'authorurl': $data['authorURL'] = $author['cdata']; break; } } - break; + break; case 'files': foreach ($child['children'] as $files) { @@ -160,7 +160,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject case 'templates': case 'images': case 'variables': case 'icons': $data[$files['name']] = $files['cdata']; break; } } - break; + break; } } @@ -483,7 +483,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject @unlink($destination); } } - + $tar->close(); return $style; @@ -593,7 +593,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject $styleTar->add($templatesTarName, 'templates.tar', $templatesTarName); @unlink($templatesTarName); } - + if ($images) { // create images tar $imagesTarName = FileUtil::getTemporaryFilename('images_', '.tar'); @@ -772,7 +772,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject // write attribute if (!empty($attributeName)) $file->write($attributeName .":"); - + // write value $file->write($variables[$variableName]); @@ -786,7 +786,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject // write attribute if (!empty($attributeName)) $file->write($attributeName .":"); - + // write value $file->write($variables[$variableName]); @@ -819,7 +819,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject } /** - * @see wcf\data\IEditableObject::create() + * @see wcf\data\IEditableObject::create() */ public static function create(array $parameters = array()) { $variables = null; @@ -833,7 +833,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject if (!isset($parameters['styleDate'])) $parameters['styleDate'] = gmdate('Y-m-d', TIME_NOW); // save style - $style = parent::create($parameters); + $style = parent::create($parameters); $styleEditor = new StyleEditor($style); // save variables @@ -850,7 +850,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject } /** - * @see wcf\data\IEditableCachedObject::resetCache() + * @see wcf\data\IEditableCachedObject::resetCache() */ public static function resetCache() { CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.icon-*-*.php'); diff --git a/wcfsetup/install/files/lib/data/style/StyleList.class.php b/wcfsetup/install/files/lib/data/style/StyleList.class.php index a637e8ae5f..5356cfe082 100644 --- a/wcfsetup/install/files/lib/data/style/StyleList.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of styles. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.style - * @category Community Framework + * @category Community Framework */ class StyleList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/template/Template.class.php b/wcfsetup/install/files/lib/data/template/Template.class.php index 8f7cdc91bc..0a2aec35d0 100644 --- a/wcfsetup/install/files/lib/data/template/Template.class.php +++ b/wcfsetup/install/files/lib/data/template/Template.class.php @@ -10,11 +10,11 @@ use wcf\util\StringUtil; * Represents a template. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template - * @category Community Framework + * @category Community Framework */ class Template extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/template/TemplateAction.class.php b/wcfsetup/install/files/lib/data/template/TemplateAction.class.php index ebf056c1af..afbf1166df 100644 --- a/wcfsetup/install/files/lib/data/template/TemplateAction.class.php +++ b/wcfsetup/install/files/lib/data/template/TemplateAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes template-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template - * @category Community Framework + * @category Community Framework */ class TemplateAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\template\TemplateEditor'; diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php index c9f6efd7e3..1cdae2a1d0 100644 --- a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php +++ b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php @@ -10,7 +10,7 @@ use wcf\util\DirectoryUtil; * TemplateEditor provides functions to create, edit or delete templates. * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template diff --git a/wcfsetup/install/files/lib/data/template/TemplateList.class.php b/wcfsetup/install/files/lib/data/template/TemplateList.class.php index bae32343a9..96b553bf0f 100644 --- a/wcfsetup/install/files/lib/data/template/TemplateList.class.php +++ b/wcfsetup/install/files/lib/data/template/TemplateList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of templates. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template - * @category Community Framework + * @category Community Framework */ class TemplateList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php index 1277549e65..dfbbe94481 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php @@ -5,14 +5,14 @@ use wcf\system\WCF; use wcf\util\StringUtil; /** - * TemplateGroup represents a template group. + * Represents a template group. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.group - * @category Community Framework + * @category Community Framework */ class TemplateGroup extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php index 33137f3353..d3cb6a85ab 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes template group-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.group - * @category Community Framework + * @category Community Framework */ class TemplateGroupAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\template\group\TemplateGroupEditor'; diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php index bbd19786b4..7c9c98cd49 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php @@ -9,7 +9,7 @@ use wcf\util\FileUtil; * TemplateGroupEditor provides functions to create, edit or delete template group. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.group @@ -61,7 +61,7 @@ class TemplateGroupEditor extends DatabaseObjectEditor { } /** - * Deletes this template group. + * @see wcf\data\IEditableObject::delete() */ public function delete() { // update children diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupList.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupList.class.php index 68c4cd8556..40a6d2b3be 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupList.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of template groups. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.group - * @category Community Framework + * @category Community Framework */ class TemplateGroupList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php b/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php index 8f2712d086..33a4c80e24 100644 --- a/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php +++ b/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObject; * Represents a template listener. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.listener - * @category Community Framework + * @category Community Framework */ class TemplateListener extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerAction.class.php b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerAction.class.php index 0de5a8b48b..b1944adf33 100644 --- a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerAction.class.php +++ b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerAction.class.php @@ -6,15 +6,15 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes template listener-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.listener - * @category Community Framework + * @category Community Framework */ class TemplateListenerAction extends AbstractDatabaseObjectAction { /** - * @see wcf\data\AbstractDatabaseObjectAction::$className + * @see wcf\data\AbstractDatabaseObjectAction::$className */ protected $className = 'wcf\data\template\listener\TemplateListenerEditor'; } diff --git a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerEditor.class.php b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerEditor.class.php index 084f4eeb5c..7b93e20b94 100644 --- a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerEditor.class.php +++ b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit template listener. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.listener - * @category Community Framework + * @category Community Framework */ class TemplateListenerEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerList.class.php b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerList.class.php index 2ad4bed78a..ed21ab6473 100644 --- a/wcfsetup/install/files/lib/data/template/listener/TemplateListenerList.class.php +++ b/wcfsetup/install/files/lib/data/template/listener/TemplateListenerList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of template listener. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.template.listener - * @category Community Framework + * @category Community Framework */ class TemplateListenerList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php index b46ea2aa5b..45f0d59cf9 100644 --- a/wcfsetup/install/files/lib/data/user/User.class.php +++ b/wcfsetup/install/files/lib/data/user/User.class.php @@ -11,13 +11,13 @@ use wcf\util\StringUtil; /** * Represents a user. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user - * @category Community Framework + * @category Community Framework */ final class User extends DatabaseObject implements IRouteController { /** @@ -32,14 +32,12 @@ final class User extends DatabaseObject implements IRouteController { /** * list of group ids - * * @var array */ protected $groupIDs = null; /** * list of language ids - * * @var array */ protected $languageIDs = null; @@ -51,8 +49,7 @@ final class User extends DatabaseObject implements IRouteController { protected $timezoneObj = null; /** - * list of user options. - * + * list of user options * @var array */ protected static $userOptions = null; @@ -83,7 +80,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns true, if the given password is the correct password for this user. - * + * * @param string $password * @return boolean password correct */ @@ -93,7 +90,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns true, if the given password hash from a cookie is the correct password for this user. - * + * * @param string $passwordHash * @return boolean password correct */ @@ -187,7 +184,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns the value of the user option with the given name. - * + * * @param string $name user option name * @return mixed user option value */ @@ -216,7 +213,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns the id of a user option. - * + * * @param string $name * @return integer id */ @@ -234,7 +231,7 @@ final class User extends DatabaseObject implements IRouteController { } /** - * @see wcf\data\DatabaseObject::__get() + * @see wcf\data\DatabaseObject::__get() */ public function __get($name) { $value = parent::__get($name); @@ -243,10 +240,10 @@ final class User extends DatabaseObject implements IRouteController { } /** - * Returns User-object by username. - * + * Returns the user with the given username. + * * @param string $username - * @return User + * @return wcf\data\user\User */ public static function getUserByUsername($username) { $sql = "SELECT * @@ -261,10 +258,10 @@ final class User extends DatabaseObject implements IRouteController { } /** - * Returns User-object by email. - * + * Returns the user with the given email. + * * @param string $email - * @return User + * @return wcf\data\user\User */ public static function getUserByEmail($email) { $sql = "SELECT * @@ -280,7 +277,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns true, if this user is marked. - * + * * @return boolean */ public function isMarked() { @@ -294,7 +291,7 @@ final class User extends DatabaseObject implements IRouteController { /** * Returns the time zone of this user. - * + * * @return DateTimeZone */ public function getTimeZone() { @@ -314,7 +311,7 @@ final class User extends DatabaseObject implements IRouteController { * Returns a list of users. * * @param array $userIDs - * @return array + * @return array */ public static function getUsers(array $userIDs) { $userList = new UserList(); diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index 58b532e2fa..6089679dc2 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -16,7 +16,7 @@ use wcf\util\StringUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user - * @category Community Framework + * @category Community Framework */ class UserAction extends AbstractDatabaseObjectAction { /** @@ -223,7 +223,7 @@ class UserAction extends AbstractDatabaseObjectAction { $excludedSearchValues = $this->parameters['data']['excludedSearchValues']; } $list = array(); - + if ($this->parameters['data']['includeUserGroups']) { $accessibleGroups = UserGroup::getAccessibleGroups(); foreach ($accessibleGroups as $group) { @@ -246,7 +246,7 @@ class UserAction extends AbstractDatabaseObjectAction { if (count($excludedSearchValues)) { $conditionBuilder->add("username NOT IN (?)", array($excludedSearchValues)); } - + // find users $sql = "SELECT userID, username FROM wcf".WCF_N."_user @@ -260,7 +260,7 @@ class UserAction extends AbstractDatabaseObjectAction { 'type' => 'user' ); } - + return $list; } } diff --git a/wcfsetup/install/files/lib/data/user/UserEditor.class.php b/wcfsetup/install/files/lib/data/user/UserEditor.class.php index dde1e8e857..05e391c9a4 100644 --- a/wcfsetup/install/files/lib/data/user/UserEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/UserEditor.class.php @@ -12,11 +12,11 @@ use wcf\util\StringUtil; * Provides functions to edit users. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user - * @category Community Framework + * @category Community Framework */ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -77,7 +77,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Inserts default options. - * + * * @param integer $userID */ protected static function createUserOptions($userID) { @@ -112,7 +112,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Updates user options. - * + * * @param array $userOptions */ public function updateUserOptions(array $userOptions = array()) { @@ -137,7 +137,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Adds a user to the groups he should be in. - * + * * @param array $groups * @param boolean $deleteOldGroups * @param boolean $addDefaultGroups @@ -171,7 +171,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Adds a user to a user group. - * + * * @param integer $groupID */ public function addToGroup($groupID) { @@ -197,7 +197,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Removes a user from a user group. - * + * * @param integer $groupID */ public function removeFromGroup($groupID) { @@ -228,7 +228,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** * Saves the visible languages of a user. - * + * * @param array $languageIDs */ public function addToLanguages(array $languageIDs) { diff --git a/wcfsetup/install/files/lib/data/user/UserList.class.php b/wcfsetup/install/files/lib/data/user/UserList.class.php index db8720204e..4a7f11fc54 100644 --- a/wcfsetup/install/files/lib/data/user/UserList.class.php +++ b/wcfsetup/install/files/lib/data/user/UserList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of users. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user - * @category Community Framework + * @category Community Framework */ class UserList extends DatabaseObjectList { /** @@ -19,7 +19,7 @@ class UserList extends DatabaseObjectList { public $className = 'wcf\data\user\User'; /** - * Creates a new UserList object. + * @see wcf\data\DatabaseObjectList::__construct() */ public function __construct() { parent::__construct(); diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php index 95a72a7231..0882b97e07 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php @@ -11,34 +11,34 @@ use wcf\system\WCF; * Represents a user group. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group - * @category Community Framework + * @category Community Framework */ class UserGroup extends DatabaseObject { /** * group type everyone user group - * @var integer + * @var integer */ const EVERYONE = 1; /** * group type guests user group - * @var integer + * @var integer */ const GUESTS = 2; /** * group type registered users user group - * @var integer + * @var integer */ const USERS = 3; /** * group type of other user groups - * @var integer + * @var integer */ const OTHER = 4; @@ -53,22 +53,19 @@ class UserGroup extends DatabaseObject { protected static $databaseTableIndexName = 'groupID'; /** - * Caches groups. - * - * @var array + * group cache + * @var array */ protected static $cache = null; /** - * list of accessible groups for active user. - * - * @param array + * list of accessible groups for active user + * @var array */ protected static $accessibleGroups = null; /** - * Cached group options of this group. - * + * group options of this group * @var array */ protected $groupOptions = null; @@ -101,6 +98,7 @@ class UserGroup extends DatabaseObject { */ public static function getGroupsByType(array $types = array()) { self::getCache(); + // get all groups if (!count($types)) return self::$cache['groups']; @@ -131,9 +129,10 @@ class UserGroup extends DatabaseObject { } /** - * Returns true, if the given user is member of the group. + * Returns true, if the given user is member of the group. If no user is + * given, the active user is used. * - * @param wcf\data\user\User $user WCF::getUser() is omitted + * @param wcf\data\user\User $user * @return boolean */ public function isMember(User $user = null) { diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupAction.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupAction.class.php index c1e5fdd04e..482913cc53 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroupAction.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroupAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes user group-related actions. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group - * @category Community Framework + * @category Community Framework */ class UserGroupAction extends AbstractDatabaseObjectAction { /** @@ -34,9 +34,7 @@ class UserGroupAction extends AbstractDatabaseObjectAction { protected $permissionsUpdate = array('admin.user.canEditGroup'); /** - * Creates a new group. - * - * @return UserGroup + * @see wcf\data\AbstractDatabaseObjectAction::create() */ public function create() { $group = parent::create(); @@ -48,7 +46,7 @@ class UserGroupAction extends AbstractDatabaseObjectAction { } /** - * Updates groups. + * @see wcf\data\AbstractDatabaseObjectAction::update() */ public function update() { if (!count($this->objects)) { diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php index 1bb59c455a..45ccb8b784 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php @@ -11,11 +11,11 @@ use wcf\system\WCF; * Provides functions to edit user groups. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group - * @category Community Framework + * @category Community Framework */ class UserGroupEditor extends DatabaseObjectEditor implements IEditableCachedObject { /** @@ -196,7 +196,7 @@ class UserGroupEditor extends DatabaseObjectEditor implements IEditableCachedObj } /** - * @see wcf\data\IEditableCachedObject::resetCache() + * @see wcf\data\IEditableCachedObject::resetCache() */ public static function resetCache() { // clear cache diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupList.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupList.class.php index adce57c46b..47551b2f85 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroupList.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroupList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of user groups. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group - * @category Community Framework + * @category Community Framework */ class UserGroupList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php index afb5c01d6f..5257eb0993 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php @@ -6,11 +6,11 @@ use wcf\data\option\Option; * Represents a usergroup option. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option - * @category Community Framework + * @category Community Framework */ class UserGroupOption extends Option { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php index 2a91145d72..f6b2150d79 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php @@ -8,11 +8,11 @@ use wcf\system\WCF; * Executes user group option-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option - * @category Community Framework + * @category Community Framework */ class UserGroupOptionAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionEditor.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionEditor.class.php index 34359232ee..bb72e865a0 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit usergroup options. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option - * @category Community Framework + * @category Community Framework */ class UserGroupOptionEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionList.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionList.class.php index 25e65b7d43..ad8ab4ff0c 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionList.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of user group options. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option - * @category Community Framework + * @category Community Framework */ class UserGroupOptionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php index 90834fc228..70df88968c 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php @@ -3,14 +3,14 @@ namespace wcf\data\user\group\option\category; use wcf\data\DatabaseObject; /** - * Represents a usergroup options category. + * Represents a user group options category. * * @author Alexander Ebert - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option.category - * @category Community Framework + * @category Community Framework */ class UserGroupOptionCategory extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryAction.class.php index b0aa7568bb..e7a8d769e7 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes user group option category-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option.category - * @category Community Framework + * @category Community Framework */ class UserGroupOptionCategoryAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryEditor.class.php b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryEditor.class.php index de8a84c9b9..2c2bfa30c3 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to edit usergroup option categories. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option.category - * @category Community Framework + * @category Community Framework */ class UserGroupOptionCategoryEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryList.class.php b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryList.class.php index eef35494af..d838e3aede 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryList.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategoryList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of user group option categories. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.group.option.category - * @category Community Framework + * @category Community Framework */ class UserGroupOptionCategoryList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php index d64431001d..2d24dd2591 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php @@ -2,18 +2,17 @@ namespace wcf\data\user\option; use wcf\data\option\Option; use wcf\data\user\User; -use wcf\system\option\user\IUserOptionOutput; use wcf\system\WCF; /** * Represents a user option. * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option - * @category Community Framework + * @category Community Framework */ class UserOption extends Option { /** diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php index bebdeed01c..6707906288 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes user option-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option - * @category Community Framework + * @category Community Framework */ class UserOptionAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php index ab880f6a1f..7403e29535 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Provides functions to edit user options. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option - * @category Community Framework + * @category Community Framework */ class UserOptionEditor extends DatabaseObjectEditor { /** @@ -28,7 +28,7 @@ class UserOptionEditor extends DatabaseObjectEditor { // alter the table "wcf".WCF_N."_user_option_value" with this new option WCF::getDB()->getEditor()->addColumn('wcf'.WCF_N.'_user_option_value', 'userOption'.$userOption->optionID, self::getColumnDefinition($parameters['optionType'])); - // add the default value to this column + // add the default value to this column if (isset($parameters['defaultValue'])) { $sql = "UPDATE wcf".WCF_N."_user_option_value SET userOption".$userOption->optionID." = ?"; diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionList.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionList.class.php index 51667473f9..77a090e5c4 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOptionList.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOptionList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** * Represents a list of user options. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option - * @category Community Framework + * @category Community Framework */ class UserOptionList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php index e1c1765f14..7165eee3fa 100644 --- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php @@ -7,6 +7,16 @@ use wcf\system\option\user\IUserOptionOutputContactInformation; use wcf\util\ClassUtil; use wcf\util\StringUtil; +/** + * Represents a viewable user option. + * + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH + * @license GNU Lesser General Public License + * @package com.woltlab.wcf + * @subpackage data.user.option + * @category Community Framework + */ class ViewableUserOption extends DatabaseObjectDecorator { /** * @see wcf\data\DatabaseObjectDecorator::$baseClass diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php index d461bdd1da..c11e8ac3eb 100644 --- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php @@ -7,11 +7,11 @@ use wcf\system\WCF; * Represents a user option category. * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option.category - * @category Community Framework + * @category Community Framework */ class UserOptionCategory extends DatabaseObject { /** diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php index 9426acd75c..80733cb51e 100644 --- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php @@ -6,11 +6,11 @@ use wcf\data\AbstractDatabaseObjectAction; * Executes user option category-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option.category - * @category Community Framework + * @category Community Framework */ class UserOptionCategoryAction extends AbstractDatabaseObjectAction { /** diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryEditor.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryEditor.class.php index 9717583a25..c39dcc39ba 100644 --- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryEditor.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectEditor; * Provides functions to add, edit and delete user option categories. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user.option.category - * @category Community Framework + * @category Community Framework */ class UserOptionCategoryEditor extends DatabaseObjectEditor { /** diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php index 9cde6ca480..65ca593fb9 100644 --- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php +++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php @@ -1,18 +1,16 @@ * @package com.woltlab.wcf * @subpackage data.user.option.category - * @category Community Framework + * @category Community Framework */ class UserOptionCategoryList extends DatabaseObjectList { /** diff --git a/wcfsetup/install/files/lib/form/AbstractForm.class.php b/wcfsetup/install/files/lib/form/AbstractForm.class.php index 092c12ba28..42f01a3455 100644 --- a/wcfsetup/install/files/lib/form/AbstractForm.class.php +++ b/wcfsetup/install/files/lib/form/AbstractForm.class.php @@ -19,13 +19,13 @@ use wcf\system\WCF; abstract class AbstractForm extends AbstractPage implements IForm { /** * name of error field - * @var string + * @var string */ public $errorField = ''; /** * error type - * @var string + * @var string */ public $errorType = ''; @@ -36,7 +36,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { public $objectAction = null; /** - * @see wcf\form\IForm::submit() + * @see wcf\form\IForm::submit() */ public function submit() { // call submit event @@ -56,7 +56,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { } /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { // call readFormParameters event @@ -64,7 +64,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { } /** - * @see wcf\form\IForm::validate() + * @see wcf\form\IForm::validate() */ public function validate() { // call validate event @@ -72,7 +72,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { } /** - * @see wcf\form\IForm::save() + * @see wcf\form\IForm::save() */ public function save() { // call save event @@ -88,7 +88,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { if (count($_POST) || count($_FILES)) { @@ -99,7 +99,7 @@ abstract class AbstractForm extends AbstractPage implements IForm { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { parent::assignVariables(); diff --git a/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php b/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php index d1260645d7..681a595504 100644 --- a/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php +++ b/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * A missing or invalid token will be result in a throw of a IllegalLinkException. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage form - * @category Community Framework + * @category Community Framework */ abstract class AbstractSecureForm extends AbstractForm { /** - * @see wcf\form\IForm::readFormParameters() + * @see wcf\form\IForm::readFormParameters() */ public function readFormParameters() { parent::readFormParameters(); diff --git a/wcfsetup/install/files/lib/form/IForm.class.php b/wcfsetup/install/files/lib/form/IForm.class.php index 444303fae4..49134a62d0 100644 --- a/wcfsetup/install/files/lib/form/IForm.class.php +++ b/wcfsetup/install/files/lib/form/IForm.class.php @@ -6,11 +6,11 @@ use wcf\page\IPage; * All form classes should implement this interface. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage form - * @category Community Framework + * @category Community Framework */ interface IForm extends IPage { /** diff --git a/wcfsetup/install/files/lib/page/AbstractAuthedPage.class.php b/wcfsetup/install/files/lib/page/AbstractAuthedPage.class.php index 223edde95d..ff38e352f2 100644 --- a/wcfsetup/install/files/lib/page/AbstractAuthedPage.class.php +++ b/wcfsetup/install/files/lib/page/AbstractAuthedPage.class.php @@ -15,11 +15,11 @@ use wcf\util\StringUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ abstract class AbstractAuthedPage extends AbstractPage { /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); diff --git a/wcfsetup/install/files/lib/page/AbstractPage.class.php b/wcfsetup/install/files/lib/page/AbstractPage.class.php index 4b46048f29..8c5b4145e6 100644 --- a/wcfsetup/install/files/lib/page/AbstractPage.class.php +++ b/wcfsetup/install/files/lib/page/AbstractPage.class.php @@ -19,7 +19,7 @@ use wcf\system\WCF; abstract class AbstractPage implements IPage, ITrackablePage { /** * name of the template for the called page - * @var string + * @var string */ public $templateName = ''; @@ -31,7 +31,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { /** * value of the given action parameter - * @var string + * @var string */ public $action = ''; @@ -49,13 +49,13 @@ abstract class AbstractPage implements IPage, ITrackablePage { /** * needed permissions to view this page - * @var array + * @var array */ public $neededPermissions = array(); /** * enables the tracking of this page - * @var boolean + * @var boolean */ public $enableTracking = false; @@ -74,7 +74,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { // call readParameters event @@ -85,7 +85,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { // call readData event @@ -93,7 +93,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::assignVariables() + * @see wcf\page\IPage::assignVariables() */ public function assignVariables() { // call assignVariables event @@ -107,7 +107,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::checkModules() + * @see wcf\page\IPage::checkModules() */ public function checkModules() { // call checkModules event @@ -124,7 +124,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::checkPermissions() + * @see wcf\page\IPage::checkPermissions() */ public function checkPermissions() { // call checkPermissions event @@ -147,7 +147,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\IPage::show() + * @see wcf\page\IPage::show() */ public function show() { // check if active user is logged in @@ -163,7 +163,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { // read data $this->readData(); - + // try to guess template name if (empty($this->templateName)) { $classParts = explode('\\', get_class($this)); @@ -178,7 +178,7 @@ abstract class AbstractPage implements IPage, ITrackablePage { } // assign variables - $this->assignVariables(); + $this->assignVariables(); // call show event EventHandler::getInstance()->fireAction($this, 'show'); @@ -190,42 +190,42 @@ abstract class AbstractPage implements IPage, ITrackablePage { } /** - * @see wcf\page\ITrackablePage::isTracked() + * @see wcf\page\ITrackablePage::isTracked() */ public function isTracked() { return $this->enableTracking; } /** - * @see wcf\page\ITrackablePage::getController() + * @see wcf\page\ITrackablePage::getController() */ public function getController() { return get_class($this); } /** - * @see wcf\page\ITrackablePage::getParentObjectType() + * @see wcf\page\ITrackablePage::getParentObjectType() */ public function getParentObjectType() { return ''; } /** - * @see wcf\page\ITrackablePage::getParentObjectID() + * @see wcf\page\ITrackablePage::getParentObjectID() */ public function getParentObjectID() { return 0; } /** - * @see wcf\page\ITrackablePage::getObjectType() + * @see wcf\page\ITrackablePage::getObjectType() */ public function getObjectType() { return ''; } /** - * @see wcf\page\ITrackablePage::getObjectID() + * @see wcf\page\ITrackablePage::getObjectID() */ public function getObjectID() { return 0; diff --git a/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php b/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php index ae3fd7658b..ec8920bf19 100644 --- a/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php +++ b/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * A missing or invalid token will be result in a throw of a IllegalLinkException. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ abstract class AbstractSecurePage extends AbstractPage { /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); diff --git a/wcfsetup/install/files/lib/page/IPage.class.php b/wcfsetup/install/files/lib/page/IPage.class.php index 8870223e37..8d1de4e595 100644 --- a/wcfsetup/install/files/lib/page/IPage.class.php +++ b/wcfsetup/install/files/lib/page/IPage.class.php @@ -5,11 +5,11 @@ namespace wcf\page; * All page classes should implement this interface. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ interface IPage { /** diff --git a/wcfsetup/install/files/lib/page/ITrackablePage.class.php b/wcfsetup/install/files/lib/page/ITrackablePage.class.php index 417d23fd82..e63f280ff5 100644 --- a/wcfsetup/install/files/lib/page/ITrackablePage.class.php +++ b/wcfsetup/install/files/lib/page/ITrackablePage.class.php @@ -9,48 +9,48 @@ namespace wcf\page; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ interface ITrackablePage { /** * Returns true if this page should be tracked. * - * @return boolean + * @return boolean */ public function isTracked(); /** * Returns the controller name. * - * @return string + * @return string */ public function getController(); /** * Returns the parent object type. * - * @return string + * @return string */ public function getParentObjectType(); /** * Returns the parent object id. * - * @return integer + * @return integer */ public function getParentObjectID(); /** * Returns the object type. * - * @return string + * @return string */ public function getObjectType(); /** * Returns the object id. * - * @return integer + * @return integer */ public function getObjectID(); } diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php index c1d9a545b9..7a4d7d102b 100644 --- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php +++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php @@ -10,46 +10,46 @@ use wcf\util\ClassUtil; * Handles the page number parameter automatically. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ abstract class MultipleLinkPage extends AbstractPage { /** * current page number - * @var integer + * @var integer */ public $pageNo = 0; /** * number of all pages - * @var integer + * @var integer */ public $pages = 0; /** * number of items shown per page - * @var integer + * @var integer */ public $itemsPerPage = 20; /** * number of all items - * @var integer + * @var integer */ public $items = 0; /** * indicates the range of the listed items - * @var integer + * @var integer */ public $startIndex = 0; /** * indicates the range of the listed items. - * @var integer + * @var integer */ public $endIndex = 0; @@ -67,13 +67,13 @@ abstract class MultipleLinkPage extends AbstractPage { /** * selected sort field - * @var string + * @var string */ public $sortField = ''; /** * selected sort order - * @var string + * @var string */ public $sortOrder = ''; @@ -93,7 +93,7 @@ abstract class MultipleLinkPage extends AbstractPage { public $sqlOrderBy = ''; /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -103,7 +103,7 @@ abstract class MultipleLinkPage extends AbstractPage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { parent::readData(); @@ -125,7 +125,7 @@ abstract class MultipleLinkPage extends AbstractPage { /** * Initializes DatabaseObjectList instance. - */ + */ protected function initObjectList() { if (empty($this->objectListClassName)) { throw new SystemException('DatabaseObjectList class name not specified.'); @@ -140,7 +140,7 @@ abstract class MultipleLinkPage extends AbstractPage { /** * Reads object list. - */ + */ protected function readObjects() { $this->objectList->sqlLimit = $this->sqlLimit; $this->objectList->sqlOffset = $this->sqlOffset; diff --git a/wcfsetup/install/files/lib/page/SortablePage.class.php b/wcfsetup/install/files/lib/page/SortablePage.class.php index 729278c816..407c450f48 100644 --- a/wcfsetup/install/files/lib/page/SortablePage.class.php +++ b/wcfsetup/install/files/lib/page/SortablePage.class.php @@ -8,22 +8,22 @@ use wcf\system\WCF; * Handles the sorting parameters automatically. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page - * @category Community Framework + * @category Community Framework */ abstract class SortablePage extends MultipleLinkPage { /** * default sort field - * @var string + * @var string */ public $defaultSortField = ''; /** * default sort order - * @var string + * @var string */ public $defaultSortOrder = 'ASC'; @@ -34,7 +34,7 @@ abstract class SortablePage extends MultipleLinkPage { public $validSortFields = array(); /** - * @see wcf\page\IPage::readParameters() + * @see wcf\page\IPage::readParameters() */ public function readParameters() { parent::readParameters(); @@ -45,7 +45,7 @@ abstract class SortablePage extends MultipleLinkPage { } /** - * @see wcf\page\IPage::readData() + * @see wcf\page\IPage::readData() */ public function readData() { $this->validateSortOrder(); @@ -75,8 +75,11 @@ abstract class SortablePage extends MultipleLinkPage { switch ($this->sortOrder) { case 'ASC': - case 'DESC': break; - default: $this->sortOrder = $this->defaultSortOrder; + case 'DESC': + break; + + default: + $this->sortOrder = $this->defaultSortOrder; } } diff --git a/wcfsetup/install/files/lib/page/util/InlineCalendar.class.php b/wcfsetup/install/files/lib/page/util/InlineCalendar.class.php index 77960f3952..f99c9c9883 100644 --- a/wcfsetup/install/files/lib/page/util/InlineCalendar.class.php +++ b/wcfsetup/install/files/lib/page/util/InlineCalendar.class.php @@ -7,12 +7,14 @@ use wcf\util\DateUtil; /** * Assigns default variables for the usage of the inline (javascript) calendar. * + * @todo uses non-existing methods and properties + * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage page.util - * @category Community Framework + * @category Community Framework */ class InlineCalendar { /** diff --git a/wcfsetup/install/files/lib/system/Regex.class.php b/wcfsetup/install/files/lib/system/Regex.class.php index 753d25b519..2090d15edd 100644 --- a/wcfsetup/install/files/lib/system/Regex.class.php +++ b/wcfsetup/install/files/lib/system/Regex.class.php @@ -6,7 +6,7 @@ use \wcf\system\exception\SystemException; * Represents a regex. * * @author Tim Düsterhus - * @copyright 2011 - 2012 Tim Düsterhus + * @copyright 2011-2012 Tim Düsterhus * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system @@ -14,80 +14,70 @@ use \wcf\system\exception\SystemException; */ final class Regex { /** - * The delimiter that is used internally. - * + * delimiter used internally * @var string */ const REGEX_DELIMITER = '/'; /** - * Do not apply any modifiers. - * + * inidicates that no modifier is applied * @var integer */ const MODIFIER_NONE = 0; /** - * Case insensitive matching. - * + * indicates case insensitive matching * @var integer */ const CASE_INSENSITIVE = 1; /** - * Ungreedy matching. - * + * indicates ungreedy matching * @var integer */ const UNGREEDY = 2; /** - * eval() replacement of Regex::replace() - * + * indicates eval() replacement of Regex::replace() * @var integer */ const EVAL_REPLACEMENT = 4; /** - * Do not spend extra time on analysing. - * + * indicates that no extra time is spent on analysing * @var integer */ const NO_ANALYSE = 8; /** - * Ignore whitepsace in regex. - * + * indicates that whitespaces are igored in regex * @var integer */ const IGNORE_WHITESPACE = 16; /** - * A dot matches every char. - * + * indicates that a dot matches every char * @var integer */ const DOT_ALL = 32; /** - * The compiled regex (:D) - * + * compiled regex * @var string */ private $regex = ''; /** - * The last matches - * + * last matches * @var array */ private $matches = array(); /** * Creates a regex. - * - * @param string $regex - * @param integer $modifier + * + * @param string $regex + * @param integer $modifier */ public function __construct($regex, $modifier = self::MODIFIER_NONE) { // escape delimiter @@ -121,7 +111,7 @@ final class Regex { /** * Checks whether the regex is syntactically correct. - * + * * @return boolean */ public function isValid() { @@ -138,9 +128,9 @@ final class Regex { /** * Checks whether the regex matches the given string. * - * @param string $string String to match. - * @param boolean $all Find all matches. - * @return integer Return value of preg_match(_all) + * @param string $string string to match + * @param boolean $all indicates if all matches are collected + * @return integer return value of preg_match(_all) */ public function match($string, $all = false) { if ($all) { @@ -152,9 +142,9 @@ final class Regex { /** * Replaces part of the string with the regex. - * - * @param string $string String to work on. - * @param mixed $replacement Either replacement-string or instance of \wcf\system\Callback + * + * @param string $string + * @param mixed $replacement replacement-string or instance of wcf\system\Callback * @return string */ public function replace($string, $replacement) { @@ -167,8 +157,8 @@ final class Regex { /** * Splits the string with the regex. - * - * @param string $string String to split. + * + * @param string $string * @return array */ public function split($string) { @@ -177,8 +167,9 @@ final class Regex { /** * Checks whether there was success. - * - * @param mixed $result + * + * @param mixed $result + * @param string $method */ private function checkResult($result, $method = '') { if ($result === false || $result === null) { @@ -210,7 +201,7 @@ final class Regex { /** * Returns the matches of the last string. - * + * * @return array */ public function getMatches() { @@ -219,7 +210,7 @@ final class Regex { /** * Returns the compiled regex. - * + * * @return string */ public function getRegex() { diff --git a/wcfsetup/install/files/lib/system/SingletonFactory.class.php b/wcfsetup/install/files/lib/system/SingletonFactory.class.php index 337fd44884..cb592a7e80 100644 --- a/wcfsetup/install/files/lib/system/SingletonFactory.class.php +++ b/wcfsetup/install/files/lib/system/SingletonFactory.class.php @@ -6,11 +6,11 @@ use wcf\system\exception\SystemException; * Basis class for singleton classes. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system - * @category Community Framework + * @category Community Framework */ abstract class SingletonFactory { /** diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 26ee5ee92f..93c8039f76 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -31,13 +31,13 @@ if (!defined('NO_IMPORTS')) { /** * WCF is the central class for the community framework. * It holds the database connection, access to template and language engine. - * - * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * + * @author Marcel Werk + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system - * @category Community Framework + * @category Community Framework */ class WCF { /** @@ -48,7 +48,7 @@ class WCF { /** * list of autoload directories - * @var array + * @var array */ protected static $autoloadDirectories = array(); @@ -72,25 +72,25 @@ class WCF { /** * database object - * @var wcf\system\database\Database + * @var wcf\system\database\Database */ protected static $dbObj = null; /** * language object - * @var wcf\system\language\Language + * @var wcf\system\language\Language */ protected static $languageObj = null; /** * session object - * @var wcf\system\session\SessionHandler + * @var wcf\system\session\SessionHandler */ protected static $sessionObj = null; /** * template object - * @var wcf\system\template\TemplateEngine + * @var wcf\system\template\TemplateEngine */ protected static $tplObj = null; @@ -176,7 +176,7 @@ class WCF { } } } - + if (function_exists('set_magic_quotes_runtime')) { @set_magic_quotes_runtime(0); } @@ -184,7 +184,7 @@ class WCF { /** * Returns the database object. - * + * * @return wcf\system\database\Database */ public static final function getDB() { @@ -193,7 +193,7 @@ class WCF { /** * Returns the session object. - * + * * @return wcf\system\session\SessionHandler */ public static final function getSession() { @@ -202,7 +202,7 @@ class WCF { /** * Returns the user object. - * + * * @return wcf\data\user\User */ public static final function getUser() { @@ -211,8 +211,8 @@ class WCF { /** * Returns the language object. - * - * @return wcf\data\language\Language + * + * @return wcf\data\language\Language */ public static final function getLanguage() { return self::$languageObj; @@ -220,7 +220,7 @@ class WCF { /** * Returns the template object. - * + * * @return wcf\system\template\TemplateEngine */ public static final function getTPL() { @@ -229,7 +229,7 @@ class WCF { /** * Calls the show method on the given exception. - * + * * @param \Exception $e */ public static final function handleException(\Exception $e) { @@ -244,7 +244,7 @@ class WCF { /** * Catches php errors and throws instead a system exception. - * + * * @param integer $errorNo * @param string $message * @param string $filename @@ -410,10 +410,10 @@ class WCF { /** * Loads an application. - * + * * @param wcf\data\application\Application $application * @param boolean $isDependentApplication - */ + */ protected function loadApplication(Application $application, $isDependentApplication = false) { $package = PackageCache::getInstance()->getPackage($application->packageID); @@ -481,7 +481,7 @@ class WCF { /** * Wrapper for the getter methods of this class. - * + * * @param string $name * @return mixed value */ @@ -496,7 +496,7 @@ class WCF { /** * Changes the active language. - * + * * @param integer $languageID */ public static final function setLanguage($languageID) { @@ -537,7 +537,7 @@ class WCF { /** * Returns dynamically loaded core objects. - * + * * @param string $name * @param array $arguments */ @@ -565,7 +565,7 @@ class WCF { /** * Searches for cached core object definition. - * + * * @param string $className * @return string */ @@ -582,7 +582,7 @@ class WCF { /** * Returns true if the debug mode is enabled, otherwise false. * - * @return boolean + * @return boolean */ public static function debugModeIsEnabled() { if (defined('ENABLE_DEBUG_MODE') && ENABLE_DEBUG_MODE) return true; @@ -592,7 +592,7 @@ class WCF { /** * Returns true if benchmarking is enabled, otherwise false. * - * @return boolean + * @return boolean */ public static function benchmarkIsEnabled() { // benchmarking is enabled by default diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php index 780dea2b83..0d863a31df 100644 --- a/wcfsetup/install/files/lib/system/WCFACP.class.php +++ b/wcfsetup/install/files/lib/system/WCFACP.class.php @@ -11,12 +11,12 @@ use wcf\util; /** * Extends WCF class with functions for the admin control panel. * - * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @author Marcel Werk + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system - * @category Community Framework + * @category Community Framework */ class WCFACP extends WCF { /** @@ -92,7 +92,7 @@ class WCFACP extends WCF { } /** - * @see wcf\system\WCF::assignDefaultTemplateVariables() + * @see wcf\system\WCF::assignDefaultTemplateVariables() */ protected function assignDefaultTemplateVariables() { parent::assignDefaultTemplateVariables(); @@ -104,12 +104,12 @@ class WCFACP extends WCF { self::getTPL()->assign(array( 'baseHref' => $host . $path, 'quickAccessPackages' => $this->getQuickAccessPackages(), - //'timezone' => util\DateUtil::getTimezone() + // todo: 'timezone' => util\DateUtil::getTimezone() )); } /** - * @see WCF::loadDefaultCacheResources() + * @see WCF::loadDefaultCacheResources() */ protected function loadDefaultCacheResources() { parent::loadDefaultCacheResources(); @@ -131,7 +131,7 @@ class WCFACP extends WCF { define('PACKAGE_ID', $packageID); } - /* + /* todo $packageID = 0; $packages = CacheHandler::getInstance()->get('packages'); if (isset($_REQUEST['packageID'])) $packageID = intval($_REQUEST['packageID']); diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 3c8dacf166..e027ba09e0 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -38,23 +38,62 @@ define('ENABLE_BENCHMARK', 1); /** * WCFSetup executes the installation of the basic wcf systems. * - * @author Marcel Werk + * @author Marcel Werk * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system - * @category Community Framework + * @category Community Framework */ class WCFSetup extends WCF { + /** + * list of available languages + * @var array + */ protected static $availableLanguages = array(); + + /** + * language code of selected installation language + * @var string + */ protected static $selectedLanguageCode = 'en'; + + /** + * selected languages to be installed + * @var array + */ protected static $selectedLanguages = array(); + + /** + * directory of the framework + * @var string + */ protected static $wcfDir = ''; + + /** + * list of installed files + * @var array + */ protected static $installedFiles = array(); + + /** + * name of installed primary application + * @var string + */ protected static $setupPackageName = 'WoltLab Community Framework'; + + /** + * indicates if developer mode is used to install + * @var boolean + */ protected static $developerMode = 0; + + /** + * supported databases + * @var array + */ protected static $dbClasses = array( - 'MySQLDatabase' => array('class' => 'wcf\system\database\MySQLDatabase', 'minversion' => '5.1.17'), // MySQL 5.0.0+ + 'MySQLDatabase' => array('class' => 'wcf\system\database\MySQLDatabase', 'minversion' => '5.1.17'), // MySQL 5.1.17+ 'PostgreSQLDatabase' => array('class' => 'wcf\system\database\PostgreSQLDatabase', 'minversion' => '8.2.0') // PostgreSQL 8.2.0+ ); @@ -104,7 +143,7 @@ class WCFSetup extends WCF { /** * Gets the available database classes. - * + * * @return array */ protected static function getAvailableDBClasses() { @@ -117,7 +156,7 @@ class WCFSetup extends WCF { return $availableDBClasses; } - + /** * Gets the selected wcf dir from request. */ @@ -131,7 +170,7 @@ class WCFSetup extends WCF { define('WCF_DIR', self::$wcfDir); } - + /** * Initialises the language engine. */ @@ -168,7 +207,7 @@ class WCFSetup extends WCF { /** * Returns all languages from WCFSetup.tar.gz. - * + * * @return array */ protected static function getAvailableLanguages() { @@ -185,16 +224,16 @@ class WCFSetup extends WCF { } } $tar->close(); - + // sort languages by language name asort($languages); - + return $languages; } /** * Calculates the current state of the progress bar. - * + * * @param integer $currentStep */ protected function calcProgress($currentStep) { @@ -210,7 +249,7 @@ class WCFSetup extends WCF { // get current step if (isset($_REQUEST['step'])) $step = $_REQUEST['step']; else $step = 'selectSetupLanguage'; - + // execute current step switch ($step) { case 'selectSetupLanguage': @@ -219,65 +258,65 @@ class WCFSetup extends WCF { $this->selectSetupLanguage(); break; } - + case 'showLicense': if (!self::$developerMode) { $this->calcProgress(1); $this->showLicense(); break; } - + case 'showSystemRequirements': if (!self::$developerMode) { $this->calcProgress(2); $this->showSystemRequirements(); break; } - + case 'searchWcfDir': $this->calcProgress(3); $this->searchWcfDir(); - break; - + break; + case 'unzipFiles': $this->calcProgress(4); $this->unzipFiles(); - break; - + break; + case 'selectLanguages': $this->calcProgress(5); $this->selectLanguages(); - break; - + break; + case 'configureDB': $this->calcProgress(6); $this->configureDB(); - break; - + break; + case 'createDB': $this->calcProgress(7); $this->createDB(); - break; - + break; + case 'logFiles': $this->calcProgress(8); $this->logFiles(); - break; - + break; + case 'installLanguage': $this->calcProgress(9); $this->installLanguage(); - break; - + break; + case 'createUser': $this->calcProgress(10); $this->createUser(); - break; - + break; + case 'installPackages': $this->calcProgress(11); $this->installPackages(); - break; + break; } } @@ -609,9 +648,9 @@ class WCFSetup extends WCF { /** * Checks if in the chosen database are tables in conflict with the wcf tables * which will be created in the next step. - * - * @param Database $db - * @param integer $dbNumber + * + * @param wcf\system\database\Database $db + * @param integer $dbNumber */ protected function getConflictedTables($db, $dbNumber) { // get content of the sql structure file @@ -737,8 +776,8 @@ class WCFSetup extends WCF { /** * Scans the given dir for installed files. - * - * @param string $dir + * + * @param string $dir */ protected function getInstalledFiles($dir) { if ($files = glob($dir.'*')) { @@ -1082,7 +1121,7 @@ class WCFSetup extends WCF { /** * Goes to the next step. - * + * * @param string $nextStep */ protected function gotoNextStep($nextStep) { diff --git a/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php b/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php index dcb0e45ef5..645d5c35ff 100644 --- a/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php +++ b/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php @@ -5,12 +5,12 @@ use wcf\system\SingletonFactory; /** * Default implementation for all applications for community framework. * - * @author Alexander Ebert + * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.application - * @category Community Framework + * @category Community Framework */ abstract class AbstractApplication extends SingletonFactory implements IApplication { /** diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php index 0a9b32ed96..467464219d 100644 --- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php +++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php @@ -7,11 +7,11 @@ use wcf\system\SingletonFactory; * Handles multi-application environments. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-20121 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.application - * @category Community Framework + * @category Community Framework */ class ApplicationHandler extends SingletonFactory { /** diff --git a/wcfsetup/install/files/lib/system/application/IApplication.class.php b/wcfsetup/install/files/lib/system/application/IApplication.class.php index 74f4d3537c..bdb45c2e32 100644 --- a/wcfsetup/install/files/lib/system/application/IApplication.class.php +++ b/wcfsetup/install/files/lib/system/application/IApplication.class.php @@ -4,12 +4,12 @@ namespace wcf\system\application; /** * Default interface for all applications for the community framework. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.application - * @category Community Framework + * @category Community Framework */ interface IApplication { /** diff --git a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php index 4a1a05615d..76b2349a56 100644 --- a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php +++ b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php @@ -7,11 +7,11 @@ use wcf\util\FileUtil; * Provides functions to do a benchmark. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.benchmark - * @category Community Framework + * @category Community Framework */ class Benchmark extends SingletonFactory { const TYPE_SQL_QUERY = 1; @@ -19,35 +19,35 @@ class Benchmark extends SingletonFactory { /** * general benchmark start time - * @var float + * @var float */ protected $startTime = 0; /** * benchmark items - * @var array + * @var array */ protected $items = array(); /** * number of executed sql queries - * @var integer + * @var integer */ protected $queryCount = 0; /** * total sql query execution time - * @var float + * @var float */ protected $queryTime = 0; - + /** * Creates a new Benchmark object. */ protected function init() { $this->startTime = self::getMicrotime(); } - + /** * Starts a benchmark. * @@ -63,7 +63,7 @@ class Benchmark extends SingletonFactory { $this->items[$newIndex]['start'] = self::compareMicrotimes($this->startTime, $this->items[$newIndex]['before']); return $newIndex; } - + /** * Stops an active benchmark. * @@ -73,7 +73,7 @@ class Benchmark extends SingletonFactory { if ($index === null) { $index = count($this->items) - 1; } - + $this->items[$index]['after'] = self::getMicrotime(); $this->items[$index]['use'] = self::compareMicrotimes($this->items[$index]['before'], $this->items[$index]['after']); $this->items[$index]['end'] = self::compareMicrotimes($this->startTime, $this->items[$index]['after']); @@ -81,14 +81,12 @@ class Benchmark extends SingletonFactory { $this->queryCount++; $this->queryTime += $this->items[$index]['use']; } - - } - + /** * Returns the execution time. * - * @return float + * @return float */ public function getExecutionTime() { return $this->compareMicrotimes($this->startTime, self::getMicrotime()); @@ -97,7 +95,7 @@ class Benchmark extends SingletonFactory { /** * Returns the sql query execution time * - * @return float + * @return float */ public function getQueryExecutionTime() { return $this->queryTime; @@ -106,7 +104,7 @@ class Benchmark extends SingletonFactory { /** * Returns the number of executed sql queries. * - * @return integer + * @return integer */ public function getQueryCount() { return $this->queryCount; @@ -115,7 +113,7 @@ class Benchmark extends SingletonFactory { /** * Returns the logged items. * - * @return array + * @return array */ public function getItems() { return $this->items; @@ -129,7 +127,7 @@ class Benchmark extends SingletonFactory { protected static function getMicrotime() { return microtime(true); } - + /** * Calculates the difference of two unix timestamps. * diff --git a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php index a4148d6c5d..4a1571a31b 100644 --- a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php +++ b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php @@ -6,11 +6,11 @@ use wcf\util\StringUtil; * Represents a breadcrumb. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.breadcrumb - * @category Community Framework + * @category Community Framework */ class Breadcrumb { /** @@ -40,7 +40,7 @@ class Breadcrumb { * Sets the displayed label. * * @param string $label - */ + */ public function setLabel($label) { $this->label = $label; } @@ -51,7 +51,7 @@ class Breadcrumb { * * @param string $url * @param boolean $appendSession - */ + */ public function setURL($url, $appendSession = false) { // append session id if ($appendSession) { diff --git a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php index 35a93eeb27..a341765ce7 100644 --- a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php +++ b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php @@ -6,17 +6,17 @@ use wcf\system\SingletonFactory; * Manages breadcrumbs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.breadcrumb - * @category Community Framework + * @category Community Framework */ class Breadcrumbs extends SingletonFactory implements \Countable, \Iterator { /** * list of breadcrumbs * @var array - */ + */ protected $items = array(); /** @@ -28,7 +28,7 @@ class Breadcrumbs extends SingletonFactory implements \Countable, \Iterator { * Adds a breadcrumb (insertion order is crucial!). * * @param wcf\system\breadcrumb\Breadcrumb $item - */ + */ public function add(Breadcrumb $item) { $this->items[] = $item; } @@ -37,7 +37,7 @@ class Breadcrumbs extends SingletonFactory implements \Countable, \Iterator { * Returns the list of breadcrumbs. * * @return array - */ + */ public function get() { return $this->items; } @@ -76,42 +76,42 @@ class Breadcrumbs extends SingletonFactory implements \Countable, \Iterator { } /** - * @see \Countable::count() + * @see \Countable::count() */ public function count() { return count($this->items); } /** - * @see \Iterator::current() + * @see \Iterator::current() */ public function current() { return $this->items[$this->index]; } /** - * @see \Iterator::key() + * @see \Iterator::key() */ public function key() { return $this->index; } /** - * @see \Iterator::valid() + * @see \Iterator::valid() */ public function valid() { return isset($this->items[$this->index]); } /** - * @see \Iterator::rewind() + * @see \Iterator::rewind() */ public function rewind() { $this->index = 0; } /** - * @see \Iterator::next() + * @see \Iterator::next() */ public function next() { $this->index++; diff --git a/wcfsetup/install/files/lib/system/breadcrumb/IBreadcrumbProvider.class.php b/wcfsetup/install/files/lib/system/breadcrumb/IBreadcrumbProvider.class.php index 7e46cc9768..de02ab1306 100644 --- a/wcfsetup/install/files/lib/system/breadcrumb/IBreadcrumbProvider.class.php +++ b/wcfsetup/install/files/lib/system/breadcrumb/IBreadcrumbProvider.class.php @@ -3,13 +3,13 @@ namespace wcf\system\breadcrumb; /** * Interface for breadcrumb provider. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.breadcrumb - * @category Community Framework + * @category Community Framework */ interface IBreadcrumbProvider { /** diff --git a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php index ae1914e190..e5560feb9d 100644 --- a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php +++ b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php @@ -7,16 +7,16 @@ use wcf\system\SingletonFactory; * CacheHandler holds all registered cache resources. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache - * @category Community Framework + * @category Community Framework */ class CacheHandler extends SingletonFactory { /** * registered cache resources - * @var array + * @var array */ protected $cacheResources = array(); @@ -78,7 +78,7 @@ class CacheHandler extends SingletonFactory { /** * Marks cached files as obsolete. - * + * * @param string $directory * @param string $filepattern */ @@ -88,7 +88,7 @@ class CacheHandler extends SingletonFactory { /** * Returns a cached variable. - * + * * @param string $cache * @param string $variable * @return mixed $value @@ -153,7 +153,7 @@ class CacheHandler extends SingletonFactory { /** * Returns the cache source object. - * + * * @return wcf\system\cache\source\ICacheSource */ public function getCacheSource() { diff --git a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php index b3b6bf648a..6fe33e3757 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php @@ -8,22 +8,22 @@ use wcf\system\WCF; * Caches the acp menu items tree. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ACPMenuCacheBuilder implements ICacheBuilder { protected $optionCategoryStructure = array(); - + /** * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); $data = array(); - + // get all menu items and filter menu items with low priority $sql = "SELECT menuItem, menuItemID FROM wcf".WCF_N."_acp_menu_item menu_item diff --git a/wcfsetup/install/files/lib/system/cache/builder/ACPSearchProviderCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ACPSearchProviderCacheBuilder.class.php index 7c7802b5dc..e3b62225f5 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ACPSearchProviderCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ACPSearchProviderCacheBuilder.class.php @@ -11,11 +11,11 @@ use wcf\system\package\PackageDependencyHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ACPSearchProviderCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $providerList = new ACPSearchProviderList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php index a930b58868..9041840629 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php @@ -10,15 +10,15 @@ use wcf\system\WCF; * Caches applications. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ApplicationCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php index 13e67e0bcc..362efc9fe6 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CategoryCacheBuilder.class.php @@ -11,11 +11,11 @@ use wcf\system\package\PackageDependencyHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class CategoryCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $list = new CategoryList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/CleanupAdapterCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CleanupAdapterCacheBuilder.class.php index 725411bab2..9159226217 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CleanupAdapterCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CleanupAdapterCacheBuilder.class.php @@ -10,11 +10,11 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class CleanupAdapterCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/ClipboardActionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ClipboardActionCacheBuilder.class.php index 49e1d3f4da..7d08de5214 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ClipboardActionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ClipboardActionCacheBuilder.class.php @@ -7,15 +7,15 @@ use wcf\system\package\PackageDependencyHandler; * Caches clipboard actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ClipboardActionCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $actionList = new ClipboardActionList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php index 305f326eec..e5a4ad4dba 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * Caches clipboard pages. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ClipboardPageCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $conditions = new PreparedStatementConditionBuilder(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/CoreObjectCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CoreObjectCacheBuilder.class.php index f840d61533..0dabcc1e18 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CoreObjectCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CoreObjectCacheBuilder.class.php @@ -7,11 +7,11 @@ use wcf\system\package\PackageDependencyHandler; * Caches the core objects. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class CoreObjectCacheBuilder implements ICacheBuilder { /** diff --git a/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php index 359741c70e..8c1ac21d3f 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * Caches cronjob information. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class CronjobCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { // get next execution time diff --git a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php index 92bc42407c..6a2207a53c 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php @@ -7,15 +7,15 @@ use wcf\system\WCF; * Caches the event listeners. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class EventListenerCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/ICacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ICacheBuilder.class.php index 9c36c122a8..6d36ce3c54 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ICacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ICacheBuilder.class.php @@ -5,18 +5,18 @@ namespace wcf\system\cache\builder; * A CacheBuilder provides data to the CacheHandler that ought to be cached. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache - * @category Community Framework + * @category Community Framework */ interface ICacheBuilder { /** * Returns the data that ought to be cached. - * - * @param array $cacheResource - * @return array + * + * @param array $cacheResource + * @return array */ public function getData(array $cacheResource); } diff --git a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php index 8afc9060c2..c86ee7aae4 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php @@ -10,11 +10,11 @@ use wcf\util\FileUtil; * Caches the paths of icons. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class IconCacheBuilder implements ICacheBuilder { /** @@ -23,7 +23,7 @@ class IconCacheBuilder implements ICacheBuilder { public function getData(array $cacheResource) { list($cache, $packageID, $styleID) = explode('-', $cacheResource['cache']); $data = array(); - + // get active package $activePackage = new Package($packageID); $activePackageDir = FileUtil::getRealPath(WCF_DIR.$activePackage->packageDir); diff --git a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php index 92412c4ff1..933676e23a 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php @@ -9,15 +9,15 @@ use wcf\system\WCF; * and the id of the default language. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class LanguageCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $data = array( diff --git a/wcfsetup/install/files/lib/system/cache/builder/ObjectTypeCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ObjectTypeCacheBuilder.class.php index fcba671c26..ff1a45bfb5 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/ObjectTypeCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/ObjectTypeCacheBuilder.class.php @@ -8,11 +8,11 @@ use wcf\system\WCF; * Caches object types and object type definitions. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class ObjectTypeCacheBuilder implements ICacheBuilder { /** @@ -25,7 +25,7 @@ class ObjectTypeCacheBuilder implements ICacheBuilder { 'definitions' => array(), 'objectTypes' => array() ); - + // get definitions $sql = "SELECT object_type_definition.* FROM wcf".WCF_N."_package_dependency package_dependency, @@ -46,7 +46,7 @@ class ObjectTypeCacheBuilder implements ICacheBuilder { $data['categories'][$row['categoryName']][] = $row['definitionID']; } } - + // get object types $sql = "SELECT object_type.* FROM wcf".WCF_N."_package_dependency package_dependency, diff --git a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php index 2e2db2f837..caec5d0482 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * Caches the options and option categories * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class OptionCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $information = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/PackageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/PackageCacheBuilder.class.php index c9b083b42d..0c7107cecc 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/PackageCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/PackageCacheBuilder.class.php @@ -6,15 +6,15 @@ use wcf\data\package\PackageList; * Caches all registered packages. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class PackageCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $packageList = new PackageList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/PackageDependencyCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/PackageDependencyCacheBuilder.class.php index b98592489f..e22b1eb2e1 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/PackageDependencyCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/PackageDependencyCacheBuilder.class.php @@ -6,15 +6,15 @@ use wcf\system\WCF; * Caches the dependencies of a package. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class PackageDependencyCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php index ad997fb6fe..21cc619781 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php @@ -8,15 +8,15 @@ use wcf\system\WCF; * Caches the page menu items. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class PageMenuCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php index 0dd72b6524..334ef4633d 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php @@ -11,11 +11,11 @@ use wcf\system\package\PackageDependencyHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class SitemapCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $sitemapList = new SitemapList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/SpiderCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/SpiderCacheBuilder.class.php index f8d5529d82..a0b99731f4 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/SpiderCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/SpiderCacheBuilder.class.php @@ -6,15 +6,15 @@ use wcf\data\spider\SpiderList; * Caches the list of search engine spiders. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class SpiderCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $spiderList = new SpiderList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/StyleCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/StyleCacheBuilder.class.php index 98f0f23436..bf486d3e9e 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/StyleCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/StyleCacheBuilder.class.php @@ -7,15 +7,15 @@ use wcf\system\WCF; * Caches the styles and style variables. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class StyleCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $data = array( diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateCacheBuilder.class.php index 6594c3b613..8e3c980219 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateCacheBuilder.class.php @@ -6,15 +6,15 @@ use wcf\system\WCF; * Caches the structure of templates. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class TemplateCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $information = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateGroupCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateGroupCacheBuilder.class.php index d3afdd9b40..58d886760e 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateGroupCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateGroupCacheBuilder.class.php @@ -6,15 +6,15 @@ use wcf\data\template\group\TemplateGroupList; * Caches template groups. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class TemplateGroupCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { $templateGroupList = new TemplateGroupList(); diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php index f3ce33dcae..59f0b62808 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php @@ -7,11 +7,11 @@ use wcf\system\package\PackageDependencyHandler; * Caches template listener information. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class TemplateListenerCacheBuilder implements ICacheBuilder { /** diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php index 4c1c0814fc..ffa08a0cfd 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCodeCacheBuilder.class.php @@ -7,7 +7,7 @@ use wcf\system\package\PackageDependencyHandler; * Caches template listener code. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder @@ -15,7 +15,7 @@ use wcf\system\package\PackageDependencyHandler; */ class TemplateListenerCodeCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($packageID, $environment, $templateName) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupCacheBuilder.class.php index 04fb8b5025..a5aeee28b8 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupCacheBuilder.class.php @@ -6,19 +6,22 @@ use wcf\data\user\group\UserGroupList; * Caches all user groups. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class UserGroupCacheBuilder implements ICacheBuilder { /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { - $data = array('types' => array(), 'groups' => array()); - + $data = array( + 'types' => array(), + 'groups' => array() + ); + // get all user groups $groupList = new UserGroupList(); $groupList->sqlLimit = 0; diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php index e0ce079f63..f4c2e03be0 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php @@ -10,11 +10,11 @@ use wcf\util\StringUtil; * Caches the merged group options of a group combination. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.builder - * @category Community Framework + * @category Community Framework */ class UserGroupPermissionCacheBuilder implements ICacheBuilder { /** @@ -24,7 +24,7 @@ class UserGroupPermissionCacheBuilder implements ICacheBuilder { protected $typeObjects = array(); /** - * @see wcf\system\cache\ICacheBuilder::getData() + * @see wcf\system\cache\ICacheBuilder::getData() */ public function getData(array $cacheResource) { list($cache, $packageID, $groupIDs) = explode('-', $cacheResource['cache']); diff --git a/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php index b3f933d3d3..69516664bf 100644 --- a/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php @@ -11,7 +11,7 @@ use wcf\util\FileUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.source - * @category Community Framework + * @category Community Framework */ class ApcCacheSource implements ICacheSource { /** diff --git a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php index 4d59bf3db7..02bfbf3207 100644 --- a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php @@ -12,23 +12,21 @@ use wcf\util\FileUtil; * DiskCacheSource is an implementation of CacheSource that stores the cache as simple files in the file system. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.source - * @category Community Framework + * @category Community Framework */ class DiskCacheSource implements ICacheSource { /** - * Loaded cache - * + * loaded cache * @var array */ protected $cache = null; /** - * List of loaded resources - * + * list of loaded resources * @var array */ protected $loaded = array(); @@ -79,7 +77,7 @@ class DiskCacheSource implements ICacheSource { if (!@touch($cacheResource['file'], 1)) { @unlink($cacheResource['file']); } - + // reset open cache if (isset($this->cache[$cacheResource['cache']])) { unset($this->cache[$cacheResource['cache']]); @@ -91,7 +89,7 @@ class DiskCacheSource implements ICacheSource { } /** - * @see wcf\system\cache\source\ICacheSource::clear() + * @see wcf\system\cache\source\ICacheSource::clear() */ public function clear($directory, $filepattern) { // unify parameters @@ -102,7 +100,7 @@ class DiskCacheSource implements ICacheSource { if (substr($directory, -1) != '/') { $directory .= '/'; } - + DirectoryUtil::getInstance($directory)->executeCallback(new Callback(function ($filename) { if (!@touch($filename, 1)) { @unlink($filename); @@ -112,9 +110,9 @@ class DiskCacheSource implements ICacheSource { /** * Determines wheater the cache needs to be rebuild or not. - * - * @param array $cacheResource - * @return boolean $needRebuilt + * + * @param array $cacheResource + * @return boolean */ protected function needRebuild(array $cacheResource) { // cache does not exist @@ -144,7 +142,7 @@ class DiskCacheSource implements ICacheSource { /** * Loads a cached resource. * - * @param array $cacheResource + * @param array $cacheResource */ public function load(array $cacheResource) { if (!isset($this->loaded[$cacheResource['file']])) { @@ -165,7 +163,7 @@ class DiskCacheSource implements ICacheSource { /** * Loads the file of a cached resource. * - * @param array $cacheResource + * @param array $cacheResource */ protected function loadCacheFile(array $cacheResource) { // get file contents @@ -184,14 +182,14 @@ class DiskCacheSource implements ICacheSource { } /** - * @see wcf\system\cache\source\ICacheSource::close() + * @see wcf\system\cache\source\ICacheSource::close() */ public function close() { // does nothing } /** - * @see wcf\system\cache\source\ICacheSource::flush() + * @see wcf\system\cache\source\ICacheSource::flush() */ public function flush() { $sql = "SELECT package.packageDir diff --git a/wcfsetup/install/files/lib/system/cache/source/ICacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/ICacheSource.class.php index 49f60e08fa..12496f56e4 100644 --- a/wcfsetup/install/files/lib/system/cache/source/ICacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/ICacheSource.class.php @@ -5,16 +5,16 @@ namespace wcf\system\cache\source; * Any cache sources should implement this interface. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.source - * @category Community Framework + * @category Community Framework */ interface ICacheSource { /** * Returns a cached variable. - * + * * @param array $cacheResource * @return mixed */ @@ -22,7 +22,7 @@ interface ICacheSource { /** * Stores a variable in the cache. - * + * * @param array $cacheResource * @param mixed $value */ @@ -30,14 +30,14 @@ interface ICacheSource { /** * Deletes a variable in the cache. - * + * * @param array $cacheResource */ public function delete(array $cacheResource); /** * Marks cached files as obsolete. - * + * * @param string $directory * @param string $filepattern */ diff --git a/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php b/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php index 3ef59bf571..ca4bb53d1e 100644 --- a/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php @@ -8,16 +8,15 @@ use wcf\util\StringUtil; * Provides a global adapter for accessing the memcache server. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.source - * @category Community Framework + * @category Community Framework */ class MemcacheAdapter extends SingletonFactory { /** * memcache object - * * @var Memcache */ private $memcache = null; @@ -29,7 +28,7 @@ class MemcacheAdapter extends SingletonFactory { if (!class_exists('Memcache')) { throw new SystemException('memcache support is not enabled.'); } - + // init memcache $this->memcache = new \Memcache(); @@ -58,7 +57,7 @@ class MemcacheAdapter extends SingletonFactory { /** * Returns the memcache object. * - * @return Memcache + * @return Memcache */ public function getMemcache() { return $this->memcache; diff --git a/wcfsetup/install/files/lib/system/cache/source/MemcacheCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/MemcacheCacheSource.class.php index ac8c4fc073..3c60ecc396 100644 --- a/wcfsetup/install/files/lib/system/cache/source/MemcacheCacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/MemcacheCacheSource.class.php @@ -7,37 +7,33 @@ use wcf\util\FileUtil; * MemcacheCacheSource is an implementation of CacheSource that uses a Memcache server to store cached variables. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cache.source - * @category Community Framework + * @category Community Framework */ class MemcacheCacheSource implements ICacheSource { /** * MemcacheAdapter object - * - * @var MemcacheAdapter + * @var wcf\system\cache\source\MemcacheAdapter */ protected $adapter = null; /** * list of cache resources - * * @var array */ protected $cacheResources = null; /** * list of new cache resources - * * @var array */ protected $newLogEntries = array(); /** * list of obsolete resources - * * @var array */ protected $obsoleteLogEntries = array(); @@ -51,7 +47,7 @@ class MemcacheCacheSource implements ICacheSource { /** * Returns the memcache adapter. - * + * * @return MemcacheAdapter */ public function getAdapter() { @@ -108,7 +104,7 @@ class MemcacheCacheSource implements ICacheSource { /** * Adds a cache resource to cache log. - * + * * @param string $cacheResource */ protected function addToLog($cacheResource) { @@ -117,7 +113,7 @@ class MemcacheCacheSource implements ICacheSource { /** * Removes an obsolete cache resource from cache log. - * + * * @param string $cacheResource */ protected function removeFromLog($cacheResource) { @@ -151,7 +147,7 @@ class MemcacheCacheSource implements ICacheSource { } /** - * @see wcf\system\cache\source\ICacheSource::clear() + * @see wcf\system\cache\source\ICacheSource::clear() */ public function clear($directory, $filepattern) { $this->loadLog(); @@ -165,7 +161,7 @@ class MemcacheCacheSource implements ICacheSource { } /** - * @see wcf\system\cache\source\ICacheSource::flush() + * @see wcf\system\cache\source\ICacheSource::flush() */ public function flush() { // clear cache @@ -185,7 +181,9 @@ class MemcacheCacheSource implements ICacheSource { public function close() { // update log $this->updateLog(); + // close connection + // @todo // if ($this->getAdapter() !== null && $this->getAdapter()->getMemcache() !== null) $this->getAdapter()->getMemcache()->close(); } } diff --git a/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php index 39a91722d6..16082ce456 100644 --- a/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php +++ b/wcfsetup/install/files/lib/system/cache/source/NoCacheSource.class.php @@ -17,7 +17,7 @@ class NoCacheSource implements ICacheSource { */ public function get(array $cacheResource) { if (!isset($this->cache[$cacheResource['cache']])) return null; - + return $this->cache[$cacheResource['cache']]; } diff --git a/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php b/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php index c907575f9c..1b7e76198c 100644 --- a/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php +++ b/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php @@ -12,7 +12,7 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.category - * @category Community Framework + * @category Community Framework */ abstract class AbstractCategoryType extends SingletonFactory implements ICategoryType { /** diff --git a/wcfsetup/install/files/lib/system/category/CategoryHandler.class.php b/wcfsetup/install/files/lib/system/category/CategoryHandler.class.php index 0b10892deb..133eecfe71 100644 --- a/wcfsetup/install/files/lib/system/category/CategoryHandler.class.php +++ b/wcfsetup/install/files/lib/system/category/CategoryHandler.class.php @@ -16,7 +16,7 @@ use wcf\system\exception\SystemException; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.category - * @category Community Framework + * @category Community Framework */ class CategoryHandler extends SingletonFactory { /** diff --git a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php index b3524d78ec..8c7df0044c 100644 --- a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php +++ b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php @@ -10,7 +10,7 @@ use wcf\data\category\CategoryEditor; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.category - * @category Community Framework + * @category Community Framework */ interface ICategoryType { /** diff --git a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php index 8d88ad3b5b..27f140a427 100644 --- a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php +++ b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php @@ -12,11 +12,11 @@ use wcf\util\ClassUtil; * Handles cleanup related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cleanup - * @category Community Framework + * @category Community Framework */ class CleanupHandler { /** diff --git a/wcfsetup/install/files/lib/system/cleanup/ICleanupAdapter.class.php b/wcfsetup/install/files/lib/system/cleanup/ICleanupAdapter.class.php index 5cf711ba05..883504383b 100644 --- a/wcfsetup/install/files/lib/system/cleanup/ICleanupAdapter.class.php +++ b/wcfsetup/install/files/lib/system/cleanup/ICleanupAdapter.class.php @@ -5,11 +5,11 @@ namespace wcf\system\cleanup; * Default interface for cleanup adapters. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cleanup - * @category Community Framework + * @category Community Framework */ interface ICleanupAdapter { /** diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardEditorItem.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardEditorItem.class.php index 729128c7d1..261ee9943b 100644 --- a/wcfsetup/install/files/lib/system/clipboard/ClipboardEditorItem.class.php +++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardEditorItem.class.php @@ -4,13 +4,13 @@ use wcf\system\exception\SystemException; /** * Represents a clipboard item for inline editing. - * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.clipboard - * @category Community Framework + * @category Community Framework */ final class ClipboardEditorItem { /** diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php index 99beee71ea..b6e182a08f 100644 --- a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php +++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php @@ -12,11 +12,11 @@ use wcf\util\ClassUtil; * Handles clipboard-related actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.clipboard - * @category Community Framework + * @category Community Framework */ class ClipboardHandler extends SingletonFactory { /** diff --git a/wcfsetup/install/files/lib/system/clipboard/action/IClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/IClipboardAction.class.php index d1b38a96bf..5fc048a09f 100644 --- a/wcfsetup/install/files/lib/system/clipboard/action/IClipboardAction.class.php +++ b/wcfsetup/install/files/lib/system/clipboard/action/IClipboardAction.class.php @@ -5,11 +5,11 @@ namespace wcf\system\clipboard\action; * Basic interface for all clipboard editor actions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.clipboard.action - * @category Community Framework + * @category Community Framework */ interface IClipboardAction { /** diff --git a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php index 0fa1b39761..29cb336d16 100644 --- a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php +++ b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php @@ -11,11 +11,11 @@ use wcf\system\WCF; * Prepares clipboard editor items for user objects. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.clipboard.action - * @category Community Framework + * @category Community Framework */ class UserClipboardAction implements IClipboardAction { /** diff --git a/wcfsetup/install/files/lib/system/cronjob/AbstractCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/AbstractCronjob.class.php index a0d183b465..5348d14172 100644 --- a/wcfsetup/install/files/lib/system/cronjob/AbstractCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/AbstractCronjob.class.php @@ -11,7 +11,7 @@ use wcf\system\event\EventHandler; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ abstract class AbstractCronjob implements ICronjob { /** diff --git a/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php index ed228fedd4..492aaeb192 100644 --- a/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php @@ -7,11 +7,11 @@ use wcf\system\cleanup\CleanupHandler; * Executes cleanup adapters. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class CleanupListenerCronjob implements ICronjob { /** diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php index ac3cfd97de..ac57c5b459 100644 --- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php @@ -15,11 +15,11 @@ use wcf\util\ClassUtil; * Provides functions to execute cronjobs. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class CronjobScheduler extends SingletonFactory { /** @@ -194,7 +194,7 @@ class CronjobScheduler extends SingletonFactory { 'success' => 0, 'error' => $errString )); - } + } else { $logEditor->update(array( 'success' => 1 diff --git a/wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php index 6b87d66308..85dd8e1033 100644 --- a/wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/DailyCleanUpCronjob.class.php @@ -11,11 +11,11 @@ use wcf\system\WCF; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class DailyCleanUpCronjob extends AbstractCronjob { /** - * @see wcf\system\cronjob\ICronjob::execute() + * @see wcf\system\cronjob\ICronjob::execute() */ public function execute(Cronjob $cronjob) { parent::execute($cronjob); diff --git a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php index c8b4459123..4ff0045f33 100644 --- a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php @@ -1,24 +1,22 @@ * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class GetUpdateInfoCronjob implements ICronjob { /** * @see wcf\system\ICronjob::execute() - * @TODO Change path and move method to lib/system/package */ public function execute(Cronjob $cronjob) { - //PackageUpdate::refreshPackageDatabaseAutomatically(); + // TODO } } diff --git a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php index f27d803674..b10c28c226 100644 --- a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php @@ -1,7 +1,6 @@ * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class HourlyCleanUpCronjob extends AbstractCronjob { /** diff --git a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php index 0e1f7d4437..0c3d98ed3d 100644 --- a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php @@ -3,14 +3,14 @@ namespace wcf\system\cronjob; use wcf\data\cronjob\Cronjob; /** - * Any Cronjob should implement this interface. + * Any cronjob should implement this interface. * * @author Siegfried Schweizer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ interface ICronjob { /** diff --git a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php index 727feadda7..464fbd364f 100644 --- a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php @@ -13,15 +13,15 @@ use wcf\util\XML; * @todo Add xsd to spiderlist on server * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class RefreshSearchRobotsCronjob implements ICronjob { /** - * @see wcf\system\ICronjob::execute() + * @see wcf\system\ICronjob::execute() */ public function execute(Cronjob $cronjob) { $filename = FileUtil::downloadFileFromHttp('http://www.woltlab.com/spiderlist/spiderlist.xml', 'spiders'); diff --git a/wcfsetup/install/files/lib/system/cronjob/SessionCleanUpCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/SessionCleanUpCronjob.class.php index a74c3610f8..75acf35c1d 100644 --- a/wcfsetup/install/files/lib/system/cronjob/SessionCleanUpCronjob.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/SessionCleanUpCronjob.class.php @@ -12,11 +12,11 @@ use wcf\data\session\SessionEditor; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.cronjob - * @category Community Framework + * @category Community Framework */ class SessionCleanUpCronjob extends AbstractCronjob { /** - * @see wcf\system\cronjob\ICronjob::execute() + * @see wcf\system\cronjob\ICronjob::execute() */ public function execute(Cronjob $cronjob) { parent::execute($cronjob); diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php index 43da28d1ae..f60a4582b9 100644 --- a/wcfsetup/install/files/lib/system/database/Database.class.php +++ b/wcfsetup/install/files/lib/system/database/Database.class.php @@ -5,64 +5,64 @@ namespace wcf\system\database; * This is an abstract implementation of a database access class using PDO. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database - * @category Community Framework + * @category Community Framework */ abstract class Database { /** - * Name of the class used for prepared statements. + * name of the class used for prepared statements * @var string */ protected $preparedStatementClassName = 'wcf\system\database\statement\PreparedStatement'; - + /** - * Name of the database editor class + * name of the database editor class * @var string */ protected $editorClassName = 'wcf\system\database\editor\DatabaseEditor'; /** * sql server hostname - * @var string + * @var string */ protected $host = ''; /** * sql server post - * @var integer + * @var integer */ protected $port = 0; /** * sql server login name - * @var string + * @var string */ protected $user = ''; /** * sql server login password - * @var string + * @var string */ protected $password = ''; /** * database name - * @var string + * @var string */ protected $database = ''; /** * number of executed queries - * @var integer + * @var integer */ protected $queryCount = 0; /** * database editor object - * @var wcf\system\database\editor\DatabaseEditor + * @var wcf\system\database\editor\DatabaseEditor */ protected $editor = null; @@ -105,10 +105,10 @@ abstract class Database { /** * Returns ID from last insert. - * - * @param string $table + * + * @param string $table * @param string $field - * @return integer last insert ID + * @return integer last insert ID */ public function getInsertID($table, $field) { try { @@ -121,7 +121,7 @@ abstract class Database { /** * Initiates a transaction. - * + * * @return boolean true on success */ public function beginTransaction() { @@ -141,8 +141,8 @@ abstract class Database { /** * Commits a transaction. - * - * @return boolean true on success + * + * @return boolean true on success */ public function commitTransaction() { try { @@ -156,8 +156,8 @@ abstract class Database { /** * Rolls back a transaction. - * - * @return boolean true on success + * + * @return boolean true on success */ public function rollBackTransaction() { try { @@ -171,10 +171,10 @@ abstract class Database { /** * Prepares a statement for execution and returns a statement object. - * + * * @param string $statement * @param integer $limit - * @param integer $offset + * @param integer $offset * @return wcf\system\database\statement\PreparedStatement */ public function prepareStatement($statement, $limit = 0, $offset = 0) { @@ -200,30 +200,30 @@ abstract class Database { * @param string $query * @param integer $limit * @param integer $offset - * @return string $query + * @return string */ public function handleLimitParameter($query, $limit = 0, $offset = 0) { if ($limit != 0) { $query .= " LIMIT " . $limit . " OFFSET " . $offset; } - + return $query; } /** * Returns the number of the last error. * - * @return integer + * @return integer */ public function getErrorNumber() { if ($this->pdo !== null) return $this->pdo->errorCode(); return 0; } - + /** * Returns the description of the last error. * - * @return string + * @return string */ public function getErrorDesc() { if ($this->pdo !== null) { @@ -232,16 +232,16 @@ abstract class Database { } return ''; } - + /** * Gets the current database type. - * - * @return string + * + * @return string */ public function getDBType() { return get_class($this); } - + /** * Escapes a string for use in sql query. * @@ -254,7 +254,7 @@ abstract class Database { /** * Gets the sql version. - * + * * @return string */ public function getVersion() { @@ -264,13 +264,13 @@ abstract class Database { } } catch (\PDOException $e) {} - + return 'unknown'; } /** * Gets the database name. - * + * * @return string */ public function getDatabaseName() { @@ -279,7 +279,7 @@ abstract class Database { /** * Returns the name of the database user. - * + * * @param string user name */ public function getUser() { @@ -288,7 +288,7 @@ abstract class Database { /** * Returns the amount of executed sql queries. - * + * * @return integer */ public function getQueryCount() { diff --git a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php index 0630af8585..16a4b4c9e2 100644 --- a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php +++ b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php @@ -8,55 +8,55 @@ use wcf\util\StringUtil; * DatabaseException is a specific SystemException for database errors. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database - * @category Community Framework + * @category Community Framework */ class DatabaseException extends SystemException { /** * error number - * @var integer + * @var integer */ protected $errorNumber = null; /** * error description - * @var string + * @var string */ protected $errorDesc = null; /** * sql version number - * @var string + * @var string */ protected $sqlVersion = null; /** * sql type - * @var string + * @var string */ protected $DBType = null; /** - * Database object - * @var Database + * database object + * @var wcf\system\database\Database */ protected $db = null; /** - * PreparedStatement object - * @var PreparedStatement + * prepared statement object + * @var wcf\system\database\statement\PreparedStatement */ protected $preparedStatement = null; /** * Creates a new DatabaseException. * - * @param string $message error message - * @param Database $db affected db object - * @param PreparedStatement $preparedStatement affected prepared statement + * @param string $message error message + * @param wcf\system\database\Database $db affected db object + * @param wcf\system\database\statement\PreparedStatement $preparedStatement affected prepared statement */ public function __construct($message, Database $db, PreparedStatement $preparedStatement = null) { $this->db = $db; diff --git a/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php b/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php index a34932d0c1..963188a266 100644 --- a/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php +++ b/wcfsetup/install/files/lib/system/database/MySQLDatabase.class.php @@ -5,20 +5,20 @@ namespace wcf\system\database; * This is the database implementation for MySQL4.1 or higher using PDO. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database - * @category Community Framework + * @category Community Framework */ class MySQLDatabase extends Database { /** - * @see wcf\system\database\Database::$editorClassName + * @see wcf\system\database\Database::$editorClassName */ protected $editorClassName = 'wcf\system\database\editor\MySQLDatabaseEditor'; /** - * @see wcf\system\database\Database::connect() + * @see wcf\system\database\Database::connect() */ public function connect() { if (!$this->port) $this->port = 3306; // mysql default port @@ -65,14 +65,14 @@ class MySQLDatabase extends Database { } /** - * @see wcf\system\database\Database::isSupported() + * @see wcf\system\database\Database::isSupported() */ public static function isSupported() { return (extension_loaded('PDO') && extension_loaded('pdo_mysql')); } /** - * @see wcf\system\database\Database::handleLimitParameter() + * @see wcf\system\database\Database::handleLimitParameter() */ public function handleLimitParameter($query, $limit = 0, $offset = 0) { if ($limit != 0) { @@ -84,7 +84,7 @@ class MySQLDatabase extends Database { } /** - * @see wcf\system\database\PDODatabase::setAttributes() + * @see wcf\system\database\PDODatabase::setAttributes() */ protected function setAttributes() { parent::setAttributes(); diff --git a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php index 0af0f8f0be..653f438c47 100644 --- a/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php +++ b/wcfsetup/install/files/lib/system/database/PostgreSQLDatabase.class.php @@ -6,20 +6,20 @@ use wcf\util\StringStack; * This is the database implementation for PostgreSQL. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database - * @category Community Framework + * @category Community Framework */ class PostgreSQLDatabase extends Database { /** - * @see wcf\system\database\Database::$editorClassName + * @see wcf\system\database\Database::$editorClassName */ protected $editorClassName = 'wcf\system\database\editor\PostgreSQLDatabaseEditor'; /** - * @see wcf\system\database\Database::connect() + * @see wcf\system\database\Database::connect() */ public function connect() { if (!$this->port) $this->port = 5432; // postgresql default port @@ -50,7 +50,7 @@ class PostgreSQLDatabase extends Database { } /** - * @see wcf\system\database\Database::isSupported() + * @see wcf\system\database\Database::isSupported() */ public static function isSupported() { return (extension_loaded('PDO') && extension_loaded('pdo_pgsql')); @@ -65,7 +65,7 @@ class PostgreSQLDatabase extends Database { } /** - * @see wcf\system\database\Database::getInsertID() + * @see wcf\system\database\Database::getInsertID() */ public function getInsertID($table, $field) { try { @@ -101,7 +101,7 @@ class PostgreSQLDatabase extends Database { } /** - * @see wcf\system\database\Database::escapeString() + * @see wcf\system\database\Database::escapeString() */ public function escapeString($string) { $string = str_replace("\x00", "\\x00", $string); // escape nul bytes diff --git a/wcfsetup/install/files/lib/system/database/editor/DatabaseEditor.class.php b/wcfsetup/install/files/lib/system/database/editor/DatabaseEditor.class.php index afdc91ccae..cf96aab34f 100644 --- a/wcfsetup/install/files/lib/system/database/editor/DatabaseEditor.class.php +++ b/wcfsetup/install/files/lib/system/database/editor/DatabaseEditor.class.php @@ -4,26 +4,25 @@ use wcf\system\database\Database; /** * This is an abstract implementation of a database editor class. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.editor - * @category Community Framework + * @category Community Framework */ abstract class DatabaseEditor { /** * database object - * - * @var Database + * @var wcf\system\database\Database */ protected $dbObj = null; /** * Creates a new DatabaseEditor object. * - * @param Database $dbObj + * @param wcf\system\database\Database $dbObj */ public function __construct(Database $dbObj) { $this->dbObj = $dbObj; @@ -34,7 +33,7 @@ abstract class DatabaseEditor { * * @return array $existingTables */ - public abstract function getTableNames(); + abstract public function getTableNames(); /** * Returns the columns of a table. @@ -42,7 +41,7 @@ abstract class DatabaseEditor { * @param string $tableName * @return array $columns */ - public abstract function getColumns($tableName); + abstract public function getColumns($tableName); /** * Returns the indices of a table. @@ -50,7 +49,7 @@ abstract class DatabaseEditor { * @param string $tableName * @return array $indices */ - public abstract function getIndices($tableName); + abstract public function getIndices($tableName); /** * Creates a new database table. @@ -59,14 +58,14 @@ abstract class DatabaseEditor { * @param array $columns * @param array $indices */ - public abstract function createTable($tableName, $columns, $indices = array()); + abstract public function createTable($tableName, $columns, $indices = array()); /** * Drops a database table. * * @param string $tableName */ - public abstract function dropTable($tableName); + abstract public function dropTable($tableName); /** * Adds a new column to an existing database table. @@ -75,17 +74,17 @@ abstract class DatabaseEditor { * @param string $columnName * @param array $columnData */ - public abstract function addColumn($tableName, $columnName, $columnData); + abstract public function addColumn($tableName, $columnName, $columnData); /** * Alters an existing column. - * + * * @param string $tableName * @param string $oldColumnName * @param string $newColumnName * @param array $newColumnData */ - public abstract function alterColumn($tableName, $oldColumnName, $newColumnName, $newColumnData); + abstract public function alterColumn($tableName, $oldColumnName, $newColumnName, $newColumnData); /** * Drops an existing column. @@ -93,7 +92,7 @@ abstract class DatabaseEditor { * @param string $tableName * @param string $columnName */ - public abstract function dropColumn($tableName, $columnName); + abstract public function dropColumn($tableName, $columnName); /** * Adds a new index to an existing database table. @@ -102,7 +101,7 @@ abstract class DatabaseEditor { * @param string $indexName * @param array $indexData */ - public abstract function addIndex($tableName, $indexName, $indexData); + abstract public function addIndex($tableName, $indexName, $indexData); /** * Adds a new foreign key to an existing database table. @@ -111,7 +110,7 @@ abstract class DatabaseEditor { * @param string $indexName * @param array $indexData */ - public abstract function addForeignKey($tableName, $indexName, $indexData); + abstract public function addForeignKey($tableName, $indexName, $indexData); /** * Drops an existing index. @@ -119,7 +118,7 @@ abstract class DatabaseEditor { * @param string $tableName * @param string $indexName */ - public abstract function dropIndex($tableName, $indexName); + abstract public function dropIndex($tableName, $indexName); /** * Drops an existing foreign key. @@ -127,12 +126,12 @@ abstract class DatabaseEditor { * @param string $tableName * @param string $indexName */ - public abstract function dropForeignKey($tableName, $indexName); + abstract public function dropForeignKey($tableName, $indexName); /** * Drops all given databases. * * @param array $conflictedTables */ - public abstract function dropConflictedTables(array $conflictedTables); + abstract public function dropConflictedTables(array $conflictedTables); } diff --git a/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php b/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php index 41cb6b4e5d..86fdfb36fa 100644 --- a/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php +++ b/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php @@ -6,15 +6,15 @@ use wcf\system\database\util\PreparedStatementConditionBuilder; * This is the database editor implementation for MySQL4.1 or higher. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.editor - * @category Community Framework + * @category Community Framework */ class MySQLDatabaseEditor extends DatabaseEditor { /** - * @see wcf\system\database\editor\DatabaseEditor::getTableNames() + * @see wcf\system\database\editor\DatabaseEditor::getTableNames() */ public function getTableNames() { $existingTables = array(); @@ -28,7 +28,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::getColumns() + * @see wcf\system\database\editor\DatabaseEditor::getColumns() */ public function getColumns($tableName) { $columns = array(); @@ -36,13 +36,13 @@ class MySQLDatabaseEditor extends DatabaseEditor { $statement = $this->dbObj->prepareStatement($sql); $statement->execute(); while ($row = $statement->fetchArray()) { - $columns[] = $row['Field']; - } - return $columns; + $columns[] = $row['Field']; + } + return $columns; } /** - * @see wcf\system\database\editor\DatabaseEditor::getIndices() + * @see wcf\system\database\editor\DatabaseEditor::getIndices() */ public function getIndices($tableName) { $indices = array(); @@ -50,14 +50,14 @@ class MySQLDatabaseEditor extends DatabaseEditor { $statement = $this->dbObj->prepareStatement($sql); $statement->execute(); while ($row = $statement->fetchArray()) { - $indices[] = $row['Key_name']; - } - - return $indices; + $indices[] = $row['Key_name']; + } + + return $indices; } /** - * @see wcf\system\database\editor\DatabaseEditor::createTable() + * @see wcf\system\database\editor\DatabaseEditor::createTable() */ public function createTable($tableName, $columns, $indices = array()) { $columnDefinition = $indexDefinition = ''; @@ -87,7 +87,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropTable() + * @see wcf\system\database\editor\DatabaseEditor::dropTable() */ public function dropTable($tableName) { $sql = "DROP TABLE IF EXISTS ".$tableName; @@ -96,7 +96,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addColumn() + * @see wcf\system\database\editor\DatabaseEditor::addColumn() */ public function addColumn($tableName, $columnName, $columnData) { $sql = "ALTER TABLE ".$tableName." ADD COLUMN ".$this->buildColumnDefinition($columnName, $columnData); @@ -105,7 +105,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::alterColumn() + * @see wcf\system\database\editor\DatabaseEditor::alterColumn() */ public function alterColumn($tableName, $oldColumnName, $newColumnName, $newColumnData) { $sql = "ALTER TABLE ".$tableName." CHANGE COLUMN ".$oldColumnName." ".$this->buildColumnDefinition($newColumnName, $newColumnData); @@ -114,7 +114,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropColumn() + * @see wcf\system\database\editor\DatabaseEditor::dropColumn() */ public function dropColumn($tableName, $columnName) { $sql = "ALTER TABLE ".$tableName." DROP COLUMN ".$columnName; @@ -123,7 +123,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addIndex() + * @see wcf\system\database\editor\DatabaseEditor::addIndex() */ public function addIndex($tableName, $indexName, $indexData) { $sql = "ALTER TABLE ".$tableName." ADD ".$this->buildIndexDefinition($indexName, $indexData); @@ -132,7 +132,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addIndex() + * @see wcf\system\database\editor\DatabaseEditor::addIndex() */ public function addForeignKey($tableName, $indexName, $indexData) { $sql = "ALTER TABLE ".$tableName." ADD"; @@ -157,7 +157,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropIndex() + * @see wcf\system\database\editor\DatabaseEditor::dropIndex() */ public function dropIndex($tableName, $indexName) { $sql = "ALTER TABLE ".$tableName." DROP INDEX ".$indexName; @@ -166,7 +166,7 @@ class MySQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropForeignKey() + * @see wcf\system\database\editor\DatabaseEditor::dropForeignKey() */ public function dropForeignKey($tableName, $indexName) { $sql = "ALTER TABLE ".$tableName." DROP FOREIGN KEY `".$indexName."`"; diff --git a/wcfsetup/install/files/lib/system/database/editor/PostgreSQLDatabaseEditor.class.php b/wcfsetup/install/files/lib/system/database/editor/PostgreSQLDatabaseEditor.class.php index c9aa50680c..5e80bc7617 100644 --- a/wcfsetup/install/files/lib/system/database/editor/PostgreSQLDatabaseEditor.class.php +++ b/wcfsetup/install/files/lib/system/database/editor/PostgreSQLDatabaseEditor.class.php @@ -5,17 +5,17 @@ use wcf\util\ArrayUtil; /** * This is the database editor implementation for PostgreSQL 8.0 or higher. - * + * * @author Marcel Werk - * @copyright 2001-2010 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.editor - * @category Community Framework + * @category Community Framework */ class PostgreSQLDatabaseEditor extends DatabaseEditor { /** - * @see wcf\system\database\editor\DatabaseEditor::getTableNames() + * @see wcf\system\database\editor\DatabaseEditor::getTableNames() */ public function getTableNames() { $existingTables = array(); @@ -32,7 +32,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::getColumns() + * @see wcf\system\database\editor\DatabaseEditor::getColumns() */ public function getColumns($tableName) { $columns = array(); @@ -45,14 +45,14 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { $statement = $this->dbObj->prepareStatement($sql); $statement->execute(array($tableName)); while ($row = $statement->fetchArray()) { - $columns[] = $row['attname']; - } - - return $columns; + $columns[] = $row['attname']; + } + + return $columns; } /** - * @see wcf\system\database\editor\DatabaseEditor::getIndices() + * @see wcf\system\database\editor\DatabaseEditor::getIndices() */ public function getIndices($tableName) { $indices = array(); @@ -62,10 +62,10 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { $statement = $this->dbObj->prepareStatement($sql); $statement->execute(array($tableName)); while ($row = $statement->fetchArray()) { - $indices[] = $row['indexname']; - } - - return $indices; + $indices[] = $row['indexname']; + } + + return $indices; } /** @@ -103,7 +103,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::createTable() + * @see wcf\system\database\editor\DatabaseEditor::createTable() */ public function createTable($tableName, $columns, $indices = array()) { $columnDefinition = $indexDefinition = ''; @@ -140,7 +140,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropTable() + * @see wcf\system\database\editor\DatabaseEditor::dropTable() */ public function dropTable($tableName) { $sql = "DROP TABLE IF EXISTS ".$tableName." CASCADE"; @@ -149,7 +149,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addColumn() + * @see wcf\system\database\editor\DatabaseEditor::addColumn() */ public function addColumn($tableName, $columnName, $columnData) { $sql = "ALTER TABLE ".$tableName." ADD COLUMN ".$this->buildColumnDefinition($columnName, $columnData); @@ -158,7 +158,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::alterColumn() + * @see wcf\system\database\editor\DatabaseEditor::alterColumn() */ public function alterColumn($tableName, $oldColumnName, $newColumnName, $newColumnData) { // change column name if necessary @@ -167,7 +167,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { $statement = $this->dbObj->prepareStatement($sql); $statement->execute(); } - + // get column information $columnData = $this->getColumnData($tableName, $newColumnName); @@ -178,7 +178,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { if (!empty($alterStatements)) $alterStatements .= ','; $alterStatements .= "ALTER COLUMN ".$newColumnName." TYPE ".$this->buildColumnType($newColumnData); } - + // change not null status if (empty($columnData['notNull']) && !empty($newColumnData['notNull'])) { if (!empty($alterStatements)) $alterStatements .= ','; @@ -188,7 +188,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { if (!empty($alterStatements)) $alterStatements .= ','; $alterStatements .= "ALTER COLUMN ".$newColumnName." DROP NOT NULL"; } - + // change default value if ((isset($columnData['default']) && $columnData['default'] !== '') && (!isset($newColumnData['default']) || $newColumnData['default'] === '')) { if (!empty($alterStatements)) $alterStatements .= ','; @@ -208,7 +208,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropColumn() + * @see wcf\system\database\editor\DatabaseEditor::dropColumn() */ public function dropColumn($tableName, $columnName) { $sql = "ALTER TABLE ".$tableName." DROP COLUMN ".$columnName." CASCADE"; @@ -217,7 +217,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addIndex() + * @see wcf\system\database\editor\DatabaseEditor::addIndex() */ public function addIndex($tableName, $indexName, $indexData) { $columns = ArrayUtil::trim(explode(',', $indexData['columns'])); @@ -271,7 +271,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::addIndex() + * @see wcf\system\database\editor\DatabaseEditor::addIndex() */ public function addForeignKey($tableName, $indexName, $indexData) { $sql = "ALTER TABLE ".$tableName." ADD"; @@ -296,7 +296,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropIndex() + * @see wcf\system\database\editor\DatabaseEditor::dropIndex() */ public function dropIndex($tableName, $indexName) { $sql = "DROP INDEX IF EXISTS ".$tableName."_".$indexName."_key CASCADE"; @@ -305,7 +305,7 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { } /** - * @see wcf\system\database\editor\DatabaseEditor::dropForeignKey() + * @see wcf\system\database\editor\DatabaseEditor::dropForeignKey() */ public function dropForeignKey($tableName, $indexName) { // TODO: Could it be, that this method is not required because Postgre is clever enough to delete references anyway? @@ -378,33 +378,51 @@ class PostgreSQLDatabaseEditor extends DatabaseEditor { switch ($mySQLType) { // numeric types case 'tinyint': - case 'smallint': return 'smallint'; + case 'smallint': + return 'smallint'; + case 'mediumint': - case 'int': return 'integer'; - case 'bigint': return 'bigint'; - case 'float': return 'real'; - case 'double': return 'double precision'; - case 'decimal': - case 'numeric': return 'numeric'; + case 'int': + return 'integer'; + + case 'bigint': + return 'bigint'; + + case 'float': + return 'real'; + + case 'double': + return 'double precision'; + + case 'decimal': + case 'numeric': + return 'numeric'; // string types - case 'char': return 'character'; - case 'varchar': return 'character varying'; - case 'tinytext': + case 'char': + return 'character'; + + case 'varchar': + return 'character varying'; + + case 'tinytext': case 'text': case 'mediumtext': - case 'longtext': return 'text'; + case 'longtext': + return 'text'; // blobs - case 'binary': + case 'binary': case 'varbinary': case 'tinyblob': case 'blob': case 'mediumblob': - case 'longblob': return 'bytea'; + case 'longblob': + return 'bytea'; // enum - case 'enum': return 'character varying'; + case 'enum': + return 'character varying'; } throw new DatabaseException("Unknown / unsupported data type '".$mySQLType."'", $this->dbObj); diff --git a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php index c068d9840a..38f7f647de 100644 --- a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php +++ b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php @@ -10,16 +10,15 @@ use wcf\system\WCF; * This is an implementation of prepared statements based upon pdo statements. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.statement - * @category Community Framework + * @category Community Framework */ class PreparedStatement { /** * database object - * * @var wcf\system\database\Database */ protected $database = null; @@ -32,14 +31,13 @@ class PreparedStatement { /** * pdo statement object - * * @var \PDOStatement */ protected $pdoStatement = null; /** * SQL query - * @var string + * @var string */ protected $query = ''; @@ -58,7 +56,7 @@ class PreparedStatement { /** * Delegates inaccessible methods calls to the decorated object. - * + * * @param string $name * @param array $arguments * @return mixed @@ -79,7 +77,7 @@ class PreparedStatement { /** * Executes a prepared statement within a transaction. * CAUTION: Transactions disabled for now, use manual transaction if you like - * + * * @param array $parameters */ public function execute(array $parameters = array()) { @@ -105,7 +103,7 @@ class PreparedStatement { /** * Executes a prepared statement. - * + * * @param array $parameters */ public function executeUnbuffered(array $parameters = array()) { @@ -127,9 +125,9 @@ class PreparedStatement { /** * Fetches the next row from a result set in an array. - * - * @param integer $type fetch type - * @return mixed + * + * @param integer $type fetch type + * @return mixed */ public function fetchArray($type = null) { // get fetch style @@ -140,9 +138,9 @@ class PreparedStatement { /** * Fetches the next row from a result set in a database object. - * + * * @param string $className - * @return wcf\data\DatabaseObject + * @return wcf\data\DatabaseObject */ public function fetchObject($className) { $row = $this->fetchArray(); @@ -155,9 +153,9 @@ class PreparedStatement { /** * Fetches the all rows from a result set into database objects. - * + * * @param string $className - * @return array + * @return array */ public function fetchObjects($className) { $objects = array(); @@ -170,8 +168,8 @@ class PreparedStatement { /** * Counts number of affected rows by the last sql statement (INSERT, UPDATE or DELETE). - * - * @return integer number of affected rows + * + * @return integer number of affected rows */ public function getAffectedRows() { try { @@ -185,30 +183,32 @@ class PreparedStatement { /** * Returns the number of the last error. * - * @return integer + * @return integer */ public function getErrorNumber() { if ($this->pdoStatement !== null) return $this->pdoStatement->errorCode(); + return 0; } - + /** * Returns the description of the last error. * - * @return string + * @return string */ public function getErrorDesc() { if ($this->pdoStatement !== null) { $errorInfoArray = $this->pdoStatement->errorInfo(); if (isset($errorInfoArray[2])) return $errorInfoArray[2]; } + return ''; } /** * Returns the SQL query of this statement. * - * @return string + * @return string */ public function getSQLQuery() { return $this->query; diff --git a/wcfsetup/install/files/lib/system/database/util/ConditionBuilder.class.php b/wcfsetup/install/files/lib/system/database/util/ConditionBuilder.class.php index 97ab6b2a38..f20b3f8ced 100644 --- a/wcfsetup/install/files/lib/system/database/util/ConditionBuilder.class.php +++ b/wcfsetup/install/files/lib/system/database/util/ConditionBuilder.class.php @@ -3,24 +3,24 @@ namespace wcf\system\database\util; /** * Builds a sql query 'where' condition. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.util - * @category Community Framework + * @category Community Framework */ class ConditionBuilder { /** * conditions string - * @var string + * @var string */ protected $conditions = ''; /** * must be true to add the 'WHERE' keyword automatically - * @var boolean + * @var boolean */ protected $addWhereKeyword = true; diff --git a/wcfsetup/install/files/lib/system/database/util/PreparedStatementConditionBuilder.class.php b/wcfsetup/install/files/lib/system/database/util/PreparedStatementConditionBuilder.class.php index 17ea88280a..b3b79c3dc7 100644 --- a/wcfsetup/install/files/lib/system/database/util/PreparedStatementConditionBuilder.class.php +++ b/wcfsetup/install/files/lib/system/database/util/PreparedStatementConditionBuilder.class.php @@ -6,16 +6,16 @@ use wcf\system\exception\SystemException; * Builds a sql query 'where' condition for prepared statements. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.util - * @category Community Framework + * @category Community Framework */ class PreparedStatementConditionBuilder extends ConditionBuilder { /** * input parameters - * @var array + * @var array */ protected $parameters = array(); diff --git a/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php b/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php index ffaa048d57..b9a611c386 100644 --- a/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php +++ b/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php @@ -10,17 +10,16 @@ use wcf\util\StringUtil; * Given queries will be parsed, converted and executed in the active database. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.database.util - * @category Community Framework + * @category Community Framework */ class SQLParser { /** * list of sql queries - * - * @var array + * @var array */ protected $queryArray = array(); @@ -100,7 +99,7 @@ class SQLParser { else { throw new SystemException("Unsupported SQL statement '".$query."'"); } - + // find indices if (preg_match_all('~(?:\(|,)\s*(?:(?:(?:(UNIQUE|FULLTEXT)(?:\s+(?:INDEX|KEY))?|(?:INDEX|KEY))(?:\s+(\w+))?)|(PRIMARY) KEY)\s+\((\s*\w+\s*(?:,\s*\w+\s*)*)\)~is', $query, $matches)) { for ($i = 0, $j = count($matches[0]); $i < $j; $i++) { @@ -113,8 +112,7 @@ class SQLParser { $this->executeCreateTableStatement($tableName, $columns, $indices); } - - break; + break; case 'ALTER TABLE': // add index @@ -166,7 +164,7 @@ class SQLParser { else { throw new SystemException("Unsupported SQL statement '".$query."'"); } - break; + break; case 'CREATE INDEX': if (preg_match('~^CREATE\s+(?:(UNIQUE|FULLTEXT)\s+)?INDEX\s+(\w+)\s+ON\s+(\w+)\s+\((\s*\w+\s*(?:,\s*\w+\s*)*)\)~is', $query, $match)) { @@ -175,8 +173,8 @@ class SQLParser { else { throw new SystemException("Unsupported SQL statement '".$query."'"); } - break; - + break; + case 'DROP INDEX': if (preg_match('~^DROP\s+INDEX\s+(\w+)\s+ON\s+(\w+)~i', $query, $match)) { $this->executeDropIndexStatement($match[2], $match[1]); @@ -184,7 +182,7 @@ class SQLParser { else { throw new SystemException("Unsupported SQL statement '".$query."'"); } - break; + break; case 'DROP TABLE': if (preg_match('~^DROP\s+TABLE\s+(?:IF\s+EXISTS\s+)?(\w+)~i', $query, $match)) { @@ -193,14 +191,14 @@ class SQLParser { else { throw new SystemException("Unsupported SQL statement '".$query."'"); } - break; + break; // standard sql; execute directly case 'INSERT': case 'UPDATE': case 'DELETE': $this->executeStandardStatement($query); - break; + break; } } diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php index f4e2d02929..7c58634b03 100644 --- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php +++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php @@ -9,40 +9,40 @@ use wcf\util\ClassUtil; * EventHandler executes all registered actions for a specific event. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.event - * @category Community Framework + * @category Community Framework */ class EventHandler extends SingletonFactory { /** * registered actions - * @var array + * @var array */ protected $actions = null; /** * registered inherit actions - * @var array + * @var array */ protected $inheritedActions = null; /** * instances of registerd actions - * @var array + * @var array */ protected $actionsObjects = array(); /** * instances of registered inherit actions - * @var array + * @var array */ protected $inheritedActionsObjects = array(); /** * instances of listener objects - * @var array + * @var array */ protected $listenerObjects = array(); @@ -77,7 +77,7 @@ class EventHandler extends SingletonFactory { /** * Executes all inherited listeners for the given event. - * + * * @param mixed $eventObj * @param string $eventName * @param string $className @@ -87,7 +87,7 @@ class EventHandler extends SingletonFactory { // create objects of the actions if (!isset($this->inheritedActionsObjects[$name]) || !is_array($this->inheritedActionsObjects[$name])) { $this->inheritedActionsObjects[$name] = array(); - + // get parent classes $familyTree = array(); $member = (is_object($eventObj) ? get_class($eventObj) : $eventObj); @@ -95,14 +95,14 @@ class EventHandler extends SingletonFactory { $familyTree[] = $member; $member = get_parent_class($member); } - + foreach ($familyTree as $member) { if (isset($this->inheritedActions[$member])) { $actions = $this->inheritedActions[$member]; if (isset($actions[$eventName]) && count($actions[$eventName]) > 0) { foreach ($actions[$eventName] as $action) { if (isset($this->inheritedActionsObjects[$name][$action['listenerClassName']])) continue; - + // get class object if (isset($this->listenerObjects[$action['listenerClassName']])) { $object = $this->listenerObjects[$action['listenerClassName']]; @@ -116,7 +116,7 @@ class EventHandler extends SingletonFactory { if (!ClassUtil::isInstanceOf($action['listenerClassName'], 'wcf\system\event\IEventListener')) { throw new SystemException("'".$action['listenerClassName']."' should implement interface wcf\system\event\IEventListener"); } - + $object = new $action['listenerClassName']; $this->listenerObjects[$action['listenerClassName']] = $object; } @@ -136,7 +136,7 @@ class EventHandler extends SingletonFactory { /** * Executes all registered listeners for the given event. - * + * * @param mixed $eventObj * @param string $eventName */ @@ -152,7 +152,7 @@ class EventHandler extends SingletonFactory { // generate action name $name = self::generateKey($className, $eventName); - + // execute inherited actions first if (count($this->inheritedActions) > 0) { $this->executeInheritedActions($eventObj, $eventName, $className, $name); @@ -164,11 +164,11 @@ class EventHandler extends SingletonFactory { // no action registered return false; } - + $this->actionsObjects[$name] = array(); foreach ($this->actions[$name] as $action) { if (isset($this->actionsObjects[$name][$action['listenerClassName']])) continue; - + // get class object if (isset($this->listenerObjects[$action['listenerClassName']])) { $object = $this->listenerObjects[$action['listenerClassName']]; @@ -181,7 +181,7 @@ class EventHandler extends SingletonFactory { if (!ClassUtil::isInstanceOf($action['listenerClassName'], 'wcf\system\event\IEventListener')) { throw new SystemException("'".$action['listenerClassName']."' should implement interface wcf\system\event\IEventListener"); } - + $object = new $action['listenerClassName']; $this->listenerObjects[$action['listenerClassName']] = $object; } @@ -198,7 +198,7 @@ class EventHandler extends SingletonFactory { /** * Generates an unique name for an action. - * + * * @param string $className * @param string $eventName */ diff --git a/wcfsetup/install/files/lib/system/event/IEventListener.class.php b/wcfsetup/install/files/lib/system/event/IEventListener.class.php index 12581bb71d..80539abdf4 100644 --- a/wcfsetup/install/files/lib/system/event/IEventListener.class.php +++ b/wcfsetup/install/files/lib/system/event/IEventListener.class.php @@ -5,11 +5,11 @@ namespace wcf\system\event; * EventListeners can be registered for a specific event in many controller objects. * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.event - * @category Community Framework + * @category Community Framework */ interface IEventListener { /** diff --git a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php index 87d740d98c..2165a88fd3 100644 --- a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php +++ b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php @@ -10,15 +10,15 @@ use wcf\system\WCF; * Creates the session access log. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.event.listener - * @category Community Framework + * @category Community Framework */ class SessionAccessLogListener implements IEventListener { /** - * @see wcf\system\event\IEventListener::execute() + * @see wcf\system\event\IEventListener::execute() */ public function execute($eventObj, $className, $eventName) { if (WCF::getUser()->userID && WCF::getSession()->getPermission('admin.general.canUseAcp') && !defined(get_class($eventObj).'::DO_NOT_LOG')) { diff --git a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php index eecd80e892..75a7f987b5 100644 --- a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php +++ b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php @@ -7,11 +7,11 @@ use wcf\util\JSON; * AJAXException provides JSON-encoded exceptions. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class AJAXException extends LoggedException { /** diff --git a/wcfsetup/install/files/lib/system/exception/IPrintableException.class.php b/wcfsetup/install/files/lib/system/exception/IPrintableException.class.php index c4c6f00338..ad034ea929 100644 --- a/wcfsetup/install/files/lib/system/exception/IPrintableException.class.php +++ b/wcfsetup/install/files/lib/system/exception/IPrintableException.class.php @@ -5,11 +5,11 @@ namespace wcf\system\exception; * WCF::handleException() calls the show method on exceptions that implement this interface. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ interface IPrintableException { /** diff --git a/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php b/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php index 57c7a1cd92..b5a9cd4244 100644 --- a/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php +++ b/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php @@ -6,11 +6,11 @@ use wcf\system\WCF; * IllegalLinkException shows the unknown link error page. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class IllegalLinkException extends NamedUserException { /** diff --git a/wcfsetup/install/files/lib/system/exception/LoggedException.class.php b/wcfsetup/install/files/lib/system/exception/LoggedException.class.php index 7bfa98e8f1..f9aee59093 100644 --- a/wcfsetup/install/files/lib/system/exception/LoggedException.class.php +++ b/wcfsetup/install/files/lib/system/exception/LoggedException.class.php @@ -6,22 +6,20 @@ use wcf\util\StringUtil; /** * A logged exceptions prevents information disclosures and provides an easy * way to log errors. - * + * * @author Tim Düsterhus, Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class LoggedException extends \Exception { - /** - * Suppresses the original error message. - * - * @see \Exception::getMessage() + * @see \Exception::getMessage() */ public function _getMessage() { + // suppresses the original error message if (!WCF::debugModeIsEnabled()) { return 'An error occured. Sorry.'; } diff --git a/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php b/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php index 1549fede10..02ee09cf6e 100644 --- a/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php +++ b/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php @@ -6,11 +6,11 @@ use wcf\system\WCF; * NamedUserException shows a (well) styled page with the given error message. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class NamedUserException extends UserException { /** diff --git a/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php b/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php index 1737660323..39b8eac1d8 100644 --- a/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php +++ b/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php @@ -6,11 +6,11 @@ use wcf\system\WCF; * A PermissionDeniedException is thrown when a user has no permission to access to a specific area. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class PermissionDeniedException extends UserException { /** @@ -19,7 +19,7 @@ class PermissionDeniedException extends UserException { public function __construct() { parent::__construct(WCF::getLanguage()->get('wcf.global.error.permissionDenied')); } - + /** * Prints a permission denied exception. */ diff --git a/wcfsetup/install/files/lib/system/exception/SystemException.class.php b/wcfsetup/install/files/lib/system/exception/SystemException.class.php index f4ae20345f..c7ecb11d53 100644 --- a/wcfsetup/install/files/lib/system/exception/SystemException.class.php +++ b/wcfsetup/install/files/lib/system/exception/SystemException.class.php @@ -5,36 +5,36 @@ use wcf\util\StringUtil; /** * A SystemException is thrown when an unexpected error occurs. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class SystemException extends LoggedException implements IPrintableException { /** * error description - * @var string + * @var string */ protected $description = null; /** * additional information - * @var string + * @var string */ protected $information = ''; /** * additional information - * @var string + * @var string */ protected $functions = ''; /** * Creates a new SystemException. - * + * * @param string $message error message * @param integer $code error code * @param string $description description of the error @@ -47,7 +47,7 @@ class SystemException extends LoggedException implements IPrintableException { /** * Returns the description of this exception. - * + * * @return string */ public function getDescription() { @@ -66,7 +66,7 @@ class SystemException extends LoggedException implements IPrintableException { } /** - * @see wcf\system\exception\IPrintableException::show() + * @see wcf\system\exception\IPrintableException::show() */ public function show() { // log error @@ -185,7 +185,7 @@ class SystemException extends LoggedException implements IPrintableException {
    - + * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ abstract class UserException extends LoggedException implements IPrintableException { /** - * @see wcf\system\exception\IPrintableException::show() + * @see wcf\system\exception\IPrintableException::show() */ public function show() { if (WCF::debugModeIsEnabled()) { diff --git a/wcfsetup/install/files/lib/system/exception/UserInputException.class.php b/wcfsetup/install/files/lib/system/exception/UserInputException.class.php index 072c09415c..8b4a8c8ee9 100644 --- a/wcfsetup/install/files/lib/system/exception/UserInputException.class.php +++ b/wcfsetup/install/files/lib/system/exception/UserInputException.class.php @@ -5,24 +5,22 @@ namespace wcf\system\exception; * UserInputException handles all formular input errors. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class UserInputException extends UserException { /** - * Name of error field. - * + * name of error field * @var string */ protected $field = null; /** - * Error type. - * - * @var string + * error type + * @var string */ protected $type = null; diff --git a/wcfsetup/install/files/lib/system/exception/ValidateActionException.class.php b/wcfsetup/install/files/lib/system/exception/ValidateActionException.class.php index 3a839781e5..2e0e29520c 100644 --- a/wcfsetup/install/files/lib/system/exception/ValidateActionException.class.php +++ b/wcfsetup/install/files/lib/system/exception/ValidateActionException.class.php @@ -9,7 +9,7 @@ namespace wcf\system\exception; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.exception - * @category Community Framework + * @category Community Framework */ class ValidateActionException extends \Exception { /** diff --git a/wcfsetup/install/files/lib/system/form/FormDocument.class.php b/wcfsetup/install/files/lib/system/form/FormDocument.class.php index 3736c8c7a4..5401b4f9a1 100644 --- a/wcfsetup/install/files/lib/system/form/FormDocument.class.php +++ b/wcfsetup/install/files/lib/system/form/FormDocument.class.php @@ -4,13 +4,13 @@ use wcf\util\StringUtil; /** * FormDocument holds the page structure based upon form element containers. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form - * @category Community Framework + * @category Community Framework */ class FormDocument { /** @@ -27,7 +27,7 @@ class FormDocument { /** * Creates a new instance of FormDocument. - * + * * @param string $name */ public function __construct($name) { @@ -36,7 +36,7 @@ class FormDocument { /** * Returns form document name. - * + * * @return string */ public function getName() { @@ -45,7 +45,7 @@ class FormDocument { /** * Appends a FormElementContainer object. - * + * * @param wcf\system\form\IFormElementContainer $container */ public function appendContainer(IFormElementContainer $container) { @@ -54,7 +54,7 @@ class FormDocument { /** * Prepends a FormElementContainer object. - * + * * @param wcf\system\form\IFormElementContainer $container */ public function prependContainer(IFormElementContainer $container) { @@ -63,7 +63,7 @@ class FormDocument { /** * Returns assigned FormElementContainer objects. - * + * * @return array */ public function getContainers() { @@ -72,7 +72,7 @@ class FormDocument { /** * Returns the value of container's child element with given name. - * + * * @param string $key * @return mixed */ @@ -89,7 +89,7 @@ class FormDocument { /** * Returns HTML-representation of current document. - * + * * @return string */ public function getHTML() { diff --git a/wcfsetup/install/files/lib/system/form/IFormElement.class.php b/wcfsetup/install/files/lib/system/form/IFormElement.class.php index 295abcc61c..a303c25d82 100644 --- a/wcfsetup/install/files/lib/system/form/IFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/IFormElement.class.php @@ -3,60 +3,60 @@ namespace wcf\system\form; /** * Interface for form elements. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form - * @category Community Framework + * @category Community Framework */ interface IFormElement { /** * Creates a new object of type FormElement. - * + * * @param wcf\system\form\IFormElementContainer $parent */ public function __construct(IFormElementContainer $parent); /** * Returns help message. - * + * * @return string */ public function getDescription(); /** * Sets help message. - * + * * @param string $description */ public function setDescription($description); /** * Returns label. - * + * * @return string */ public function getLabel(); /** * Sets label. - * + * * @param string $label */ public function setLabel($label); /** * Returns element's parent container element. - * + * * @return wcf\system\form\IFormElementContainer */ public function getParent(); /** * Returns HTML-representation of current form element. - * + * * @param string $formName * @return string */ diff --git a/wcfsetup/install/files/lib/system/form/IFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/IFormElementContainer.class.php index 9c4dfe414e..b54f58019a 100644 --- a/wcfsetup/install/files/lib/system/form/IFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/IFormElementContainer.class.php @@ -3,46 +3,46 @@ namespace wcf\system\form; /** * Interface for form element containers. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form - * @category Community Framework + * @category Community Framework */ interface IFormElementContainer { /** * Returns help message. - * + * * @return string */ public function getDescription(); /** * Sets help message. - * + * * @param string $description */ public function setDescription($description); /** * Returns label. - * + * * @return string */ public function getLabel(); /** * Sets label. - * + * * @param string $label */ public function setLabel($label); /** * Returns the value of child element with given name. - * + * * @param string $key * @return mixed */ @@ -50,35 +50,35 @@ interface IFormElementContainer { /** * Returns a list of child elements. - * + * * @return array */ public function getChildren(); /** * Appends a new child to stack. - * + * * @param wcf\system\form\IFormElement $element */ public function appendChild(IFormElement $element); /** * Preprens a new child to stack. - * + * * @param wcf\system\form\IFormElement $element */ public function prependChild(IFormElement $element); /** * Handles a POST or GET request. - * + * * @param array $variables */ public function handleRequest(array $variables); /** * Returns HTML-representation of current form element container. - * + * * @param string $formName * @return string */ diff --git a/wcfsetup/install/files/lib/system/form/container/AbstractFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/AbstractFormElementContainer.class.php index a8115d71d6..06d9ac7277 100644 --- a/wcfsetup/install/files/lib/system/form/container/AbstractFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/container/AbstractFormElementContainer.class.php @@ -7,13 +7,13 @@ use wcf\util\StringUtil; /** * Basic implementation for form element containers. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.container - * @category Community Framework + * @category Community Framework */ abstract class AbstractFormElementContainer implements IFormElementContainer { /** @@ -114,7 +114,7 @@ abstract class AbstractFormElementContainer implements IFormElementContainer { } /** - * @see wcf\system\form\IFormElementContainer::setError() + * @see wcf\system\form\IFormElementContainer::setError() */ public function setError($name, $error) { foreach ($this->children as $element) { diff --git a/wcfsetup/install/files/lib/system/form/container/GroupFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/GroupFormElementContainer.class.php index f64489c4c2..18b9d47d4f 100644 --- a/wcfsetup/install/files/lib/system/form/container/GroupFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/container/GroupFormElementContainer.class.php @@ -3,13 +3,13 @@ namespace wcf\system\form\container; /** * Provides a group form element container. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form - * @category Community Framework + * @category Community Framework */ class GroupFormElementContainer extends AbstractFormElementContainer { /** diff --git a/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php index 237421cc36..bda265a0ae 100644 --- a/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php @@ -3,13 +3,13 @@ namespace wcf\system\form\container; /** * Provides a multiple selection form element container. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.container - * @category Community Framework + * @category Community Framework */ class MultipleSelectionFormElementContainer extends SelectionFormElementContainer { /** @@ -20,7 +20,7 @@ class MultipleSelectionFormElementContainer extends SelectionFormElementContaine /** * Sets container value. - * + * * @param array $value */ public function setValue(array $value) { diff --git a/wcfsetup/install/files/lib/system/form/container/SelectionFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/SelectionFormElementContainer.class.php index b6140acbf7..38f43c18bc 100644 --- a/wcfsetup/install/files/lib/system/form/container/SelectionFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/container/SelectionFormElementContainer.class.php @@ -4,13 +4,13 @@ use wcf\util\StringUtil; /** * Basic implementation for form selection element containers. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.container - * @category Community Framework + * @category Community Framework */ abstract class SelectionFormElementContainer extends AbstractFormElementContainer { /** @@ -21,7 +21,7 @@ abstract class SelectionFormElementContainer extends AbstractFormElementContaine /** * Sets container name. - * + * * @param string $name */ public function setName($name) { @@ -30,7 +30,7 @@ abstract class SelectionFormElementContainer extends AbstractFormElementContaine /** * Returns container name - * + * * @return string */ public function getName() { diff --git a/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php index 6c8d5bfbf3..c8e690cc4d 100644 --- a/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php @@ -4,13 +4,13 @@ use wcf\util\StringUtil; /** * Provides a single selection form element container. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.container - * @category Community Framework + * @category Community Framework */ class SingleSelectionFormElementContainer extends SelectionFormElementContainer { /** @@ -21,7 +21,7 @@ class SingleSelectionFormElementContainer extends SelectionFormElementContainer /** * Sets container value. - * + * * @param string $value */ public function setValue($value) { @@ -30,7 +30,7 @@ class SingleSelectionFormElementContainer extends SelectionFormElementContainer /** * Returns container value. - * + * * @return string */ public function getValue() { diff --git a/wcfsetup/install/files/lib/system/form/element/AbstractFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/AbstractFormElement.class.php index 766dfd6dff..9a68c6358b 100644 --- a/wcfsetup/install/files/lib/system/form/element/AbstractFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/AbstractFormElement.class.php @@ -6,13 +6,13 @@ use wcf\util\StringUtil; /** * Basic implementation for form elements. - * + * * @author Alexander Ebert * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ abstract class AbstractFormElement implements IFormElement { /** diff --git a/wcfsetup/install/files/lib/system/form/element/AbstractNamedFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/AbstractNamedFormElement.class.php index 56fbfe66eb..61e0c39e61 100644 --- a/wcfsetup/install/files/lib/system/form/element/AbstractNamedFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/AbstractNamedFormElement.class.php @@ -4,13 +4,13 @@ use wcf\util\StringUtil; /** * Basic implementation for named form elements. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ abstract class AbstractNamedFormElement extends AbstractFormElement { /** @@ -27,7 +27,7 @@ abstract class AbstractNamedFormElement extends AbstractFormElement { /** * Sets element name. - * + * * @param string $name */ public function setName($name) { @@ -36,7 +36,7 @@ abstract class AbstractNamedFormElement extends AbstractFormElement { /** * Returns element name - * + * * @return string */ public function getName() { @@ -45,7 +45,7 @@ abstract class AbstractNamedFormElement extends AbstractFormElement { /** * Sets element value. - * + * * @param string $value */ public function setValue($value) { @@ -57,7 +57,7 @@ abstract class AbstractNamedFormElement extends AbstractFormElement { /** * Returns element value. - * + * * @return string */ public function getValue() { diff --git a/wcfsetup/install/files/lib/system/form/element/LabelFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/LabelFormElement.class.php index e78ab587d8..cfc147a84e 100644 --- a/wcfsetup/install/files/lib/system/form/element/LabelFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/LabelFormElement.class.php @@ -4,13 +4,13 @@ use wcf\util\StringUtil; /** * Provides a label form element. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ class LabelFormElement extends AbstractFormElement { /** @@ -21,7 +21,7 @@ class LabelFormElement extends AbstractFormElement { /** * Sets element text. - * + * * @param string $text */ public function setText($text) { @@ -30,7 +30,7 @@ class LabelFormElement extends AbstractFormElement { /** * Returns element text. - * + * * @return string */ public function getText() { diff --git a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php index ed7c4da65e..8e7663d47e 100644 --- a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php @@ -3,13 +3,13 @@ namespace wcf\system\form\element; /** * Provides a checkbox form element. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ class MultipleSelectionFormElement extends AbstractNamedFormElement { /** diff --git a/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php index 2fd0f314b9..b95bc7bb0f 100644 --- a/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php @@ -3,13 +3,13 @@ namespace wcf\system\form\element; /** * Provides a password input form element. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ class PasswordInputFormElement extends AbstractNamedFormElement { /** diff --git a/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php index bd0d4868b5..c40567096c 100644 --- a/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php @@ -3,13 +3,13 @@ namespace wcf\system\form\element; /** * Provides a radio form element. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ class SingleSelectionFormElement extends AbstractNamedFormElement { /** diff --git a/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php index 2f171a1a78..1115b26e69 100644 --- a/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php +++ b/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php @@ -5,11 +5,11 @@ namespace wcf\system\form\element; * Provides a text input form element. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.form.element - * @category Community Framework + * @category Community Framework */ class TextInputFormElement extends AbstractNamedFormElement { /** diff --git a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php index f45998a9f2..886aa0d1ec 100644 --- a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php +++ b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php @@ -7,12 +7,12 @@ use wcf\system\SingletonFactory; /** * Handler for all available image adapters. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.image - * @category Community Framework + * @category Community Framework */ class ImageHandler extends SingletonFactory { /** @@ -53,7 +53,7 @@ class ImageHandler extends SingletonFactory { * Returns a new ImageAdapter instance. * * @return wcf\system\image\adapter\ImageAdapter; - */ + */ public function getAdapter() { return new ImageAdapter($this->adapterClassName); } diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php index 4d6283f19a..08b291dee0 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php @@ -5,17 +5,18 @@ use wcf\system\exception\SystemException; /** * Image adapter for bundled GD imaging library. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.image.adapter - * @category Community Framework + * @category Community Framework */ class GDImageAdapter implements IImageAdapter { /** * active color - */ + * @var integer + */ protected $color = null; /** @@ -87,7 +88,7 @@ class GDImageAdapter implements IImageAdapter { } /** - * @see wcf\system\image\adapter\IImageAdapter::createEmptyImage() + * @see wcf\system\image\adapter\IImageAdapter::createEmptyImage() */ public function createEmptyImage($width, $height) { $this->image = imageCreate($width, $height); diff --git a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php index 449dc7ce3f..3aee7b2e62 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php @@ -4,12 +4,12 @@ namespace wcf\system\image\adapter; /** * Basic interface for all image adapters. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.image.adapter - * @category Community Framework + * @category Community Framework */ interface IImageAdapter { /** diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php index 9e6b8d68fa..e09d7c2df1 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php @@ -5,12 +5,12 @@ use wcf\system\exception\SystemException; /** * Wrapper for image adapters. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.image.adapter - * @category Community Framework + * @category Community Framework */ class ImageAdapter implements IImageAdapter { /** diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php index 71c6450d0d..6fe2bdcd39 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php @@ -5,12 +5,12 @@ use wcf\system\exception\SystemException; /** * Image adapter for ImageMagick imaging library. * - * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @author Alexander Ebert + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.image.adapter - * @category Community Framework + * @category Community Framework */ class ImagickImageAdapter implements IImageAdapter { /** diff --git a/wcfsetup/install/files/lib/system/io/FTP.class.php b/wcfsetup/install/files/lib/system/io/FTP.class.php index be432616ed..4af4206307 100644 --- a/wcfsetup/install/files/lib/system/io/FTP.class.php +++ b/wcfsetup/install/files/lib/system/io/FTP.class.php @@ -4,27 +4,27 @@ use wcf\system\exception\SystemException; /** * The FTP class handles all ftp operations. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class FTP { /** * file pointer resource - * @var resource + * @var resource */ protected $resource = null; - + /** * Opens a new ftp connection to given host. * - * @param string $host - * @param string $port - * @param integer $timeout + * @param string $host + * @param string $port + * @param integer $timeout */ public function __construct($host = 'localhost', $port = 21, $timeout = 30) { $this->resource = ftp_connect($host, $port, $timeout); @@ -32,12 +32,12 @@ class FTP { throw new SystemException('Can not connect to ' . $host); } } - + /** * Calls the specified function on the open ftp connection. * - * @param string $function - * @param array $arguments + * @param string $function + * @param array $arguments */ public function __call($function, $arguments) { array_unshift($arguments, $this->resource); diff --git a/wcfsetup/install/files/lib/system/io/File.class.php b/wcfsetup/install/files/lib/system/io/File.class.php index 329ee554cb..325badc470 100644 --- a/wcfsetup/install/files/lib/system/io/File.class.php +++ b/wcfsetup/install/files/lib/system/io/File.class.php @@ -21,26 +21,26 @@ use wcf\system\exception\SystemException; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class File { /** * file pointer resource - * @var resource + * @var resource */ protected $resource = null; /** * filename - * @var string + * @var string */ protected $filename = ''; /** * Opens a new file. * - * @param string $filename - * @param string $mode + * @param string $filename + * @param string $mode * @param array $options */ public function __construct($filename, $mode = 'wb', $options = array()) { @@ -61,8 +61,8 @@ class File { * Calls the specified function on the open file. * Do not call this function directly. Use $file->write('') instead. * - * @param string $function - * @param array $arguments + * @param string $function + * @param array $arguments */ public function __call($function, $arguments) { if (function_exists('f' . $function)) { diff --git a/wcfsetup/install/files/lib/system/io/GZipFile.class.php b/wcfsetup/install/files/lib/system/io/GZipFile.class.php index b4ee7e5a79..2026643a17 100644 --- a/wcfsetup/install/files/lib/system/io/GZipFile.class.php +++ b/wcfsetup/install/files/lib/system/io/GZipFile.class.php @@ -4,20 +4,20 @@ use wcf\system\exception\SystemException; /** * The File class handles all file operations on a gzip file. - * + * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class GZipFile extends File { /** * Opens a gzip file. * - * @param string $filename - * @param string $mode + * @param string $filename + * @param string $mode */ public function __construct($filename, $mode = 'wb') { $this->filename = $filename; @@ -30,17 +30,17 @@ class GZipFile extends File { /** * Calls the specified function on the open file. * - * @param string $function - * @param array $arguments + * @param string $function + * @param array $arguments */ public function __call($function, $arguments) { if (function_exists('gz' . $function)) { array_unshift($arguments, $this->resource); - return call_user_func_array('gz' . $function, $arguments); + return call_user_func_array('gz' . $function, $arguments); } else if (function_exists($function)) { array_unshift($arguments, $this->filename); - return call_user_func_array($function, $arguments); + return call_user_func_array($function, $arguments); } else { throw new SystemException('Can not call method ' . $function); diff --git a/wcfsetup/install/files/lib/system/io/IArchive.class.php b/wcfsetup/install/files/lib/system/io/IArchive.class.php index 566ed3ddbf..2c39dcd873 100644 --- a/wcfsetup/install/files/lib/system/io/IArchive.class.php +++ b/wcfsetup/install/files/lib/system/io/IArchive.class.php @@ -9,13 +9,13 @@ namespace wcf\system\io; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ interface IArchive { /** * Returns the table of contents (TOC) list for this archive. * - * @return array list of content + * @return array list of content */ public function getContentList(); @@ -23,7 +23,7 @@ interface IArchive { * Returns an associative array with information about a specific file * in the archive. * - * @param mixed $index index or name of the requested file + * @param mixed $index index or name of the requested file * @return array */ public function getFileInfo($index); @@ -32,8 +32,8 @@ interface IArchive { * Extracts a specific file and returns the content as string. Returns * false if extraction failed. * - * @param mixed $index index or name of the requested file - * @return string content of the requested file + * @param mixed $index index or name of the requested file + * @return string content of the requested file */ public function extractToString($index); @@ -41,9 +41,9 @@ interface IArchive { * Extracts a specific file and writes its content to the file specified * with $destination. * - * @param mixed $index index or name of the requested file - * @param string $destination - * @return boolean $success + * @param mixed $index index or name of the requested file + * @param string $destination + * @return boolean $success */ public function extract($index, $destination); @@ -51,8 +51,8 @@ interface IArchive { * Searchs a file in the archive and returns the numeric file index. * Returns false if not found. * - * @param string $filename - * @return integer index of the requested file + * @param string $filename + * @return integer index of the requested file */ public function getIndexByFilename($filename); } diff --git a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php index 9bc3052356..c80c737044 100644 --- a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php +++ b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php @@ -6,34 +6,34 @@ use wcf\system\exception\SystemException; * The RemoteFile class opens a connection to a remote host as a file. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class RemoteFile extends File { /** * host address - * @var string + * @var string */ protected $host = ''; /** * port - * @var integer + * @var integer */ protected $port = 0; /** * error number - * @var integer + * @var integer */ protected $errorNumber = 0; /** * error description - * @var string + * @var string */ protected $errorDesc = ''; @@ -58,7 +58,7 @@ class RemoteFile extends File { /** * Returns the error number of the last error. * - * @return integer + * @return integer */ public function getErrorNumber() { return $this->errorNumber; diff --git a/wcfsetup/install/files/lib/system/io/Tar.class.php b/wcfsetup/install/files/lib/system/io/Tar.class.php index 0e8fa1bac8..62d37c90db 100644 --- a/wcfsetup/install/files/lib/system/io/Tar.class.php +++ b/wcfsetup/install/files/lib/system/io/Tar.class.php @@ -15,11 +15,11 @@ use wcf\util\FileUtil; * } * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class Tar implements IArchive { /** @@ -68,7 +68,7 @@ class Tar implements IArchive { * Creates a new Tar object. * archiveName must be tarball or gzipped tarball * - * @param string $archiveName + * @param string $archiveName */ public function __construct($archiveName) { if (!is_file($archiveName)) { @@ -108,7 +108,7 @@ class Tar implements IArchive { $this->opened = true; } } - + /** * Closes the opened file. */ @@ -119,7 +119,7 @@ class Tar implements IArchive { } } - /** + /** * @see wcf\system\io\IArchive::getContentList() */ public function getContentList() { @@ -130,7 +130,7 @@ class Tar implements IArchive { return $this->contentList; } - /** + /** * @see wcf\system\io\IArchive::getFileInfo() */ public function getFileInfo($fileIndex) { @@ -144,7 +144,7 @@ class Tar implements IArchive { return $this->contentList[$fileIndex]; } - /** + /** * @see wcf\system\io\IArchive::getIndexByFilename() */ public function getIndexByFilename($filename) { @@ -156,7 +156,7 @@ class Tar implements IArchive { return false; } - /** + /** * @see wcf\system\io\IArchive::extractToString() */ public function extractToString($index) { @@ -188,7 +188,7 @@ class Tar implements IArchive { return $content; } - /** + /** * @see wcf\system\io\IArchive::extract() */ public function extract($index, $destination) { @@ -238,7 +238,7 @@ class Tar implements IArchive { } return true; - } + } /** * Reads table of contents (TOC) from tar archive. @@ -282,9 +282,9 @@ class Tar implements IArchive { /** * Unpacks file header for one file entry. - * - * @param string $binaryData - * @return array $fileheader + * + * @param string $binaryData + * @return array $fileheader */ protected function readHeader($binaryData) { if (strlen($binaryData) != 512) { @@ -343,7 +343,7 @@ class Tar implements IArchive { /** * Returns true, if this tar is (g)zipped. * - * @return boolean + * @return boolean */ public function isZipped() { return $this->isZipped; diff --git a/wcfsetup/install/files/lib/system/io/TarWriter.class.php b/wcfsetup/install/files/lib/system/io/TarWriter.class.php index 0a73f18e58..edd053b3fd 100644 --- a/wcfsetup/install/files/lib/system/io/TarWriter.class.php +++ b/wcfsetup/install/files/lib/system/io/TarWriter.class.php @@ -14,11 +14,11 @@ use wcf\util\StringUtil; * $tar->create(); * * @author Marcel Werk - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class TarWriter extends Tar { /** @@ -65,16 +65,16 @@ class TarWriter extends Tar { if (empty($filename)) return false; $filename = FileUtil::unifyDirSeperator($filename); - + if (!$this->writeHeaderBlock($filename, strlen($string), TIME_NOW, 33279)) { return false; } - + $i = 0; while (($buffer = substr($string, (($i++) * 512), 512)) != '') { $this->file->write(pack("a512", $buffer)); } - + return true; } @@ -95,29 +95,29 @@ class TarWriter extends Tar { // unify dir seperator $addDir = FileUtil::unifyDirSeperator($addDir); $removeDir = FileUtil::unifyDirSeperator($removeDir); - + foreach ($files as $filename) { if (!$result) { break; } - + if (!$filename || $filename == $this->archiveName) { - continue; + continue; } - + if (!file_exists($filename)) { throw new SystemException("Unable to find file '".$filename."'", 11002); } - + // add file if (!$this->addFile($filename, $addDir, $removeDir)) { return false; } - + // handle directories if (@is_dir($filename)) { $handle = opendir($filename); - + while (($dirFile = readdir($handle)) !== false) { if (($dirFile != '.') && ($dirFile != '..')) { if ($filename != ".") $dirFile = $filename.'/'.$dirFile; @@ -128,10 +128,10 @@ class TarWriter extends Tar { closedir($handle); } } - + return $result; } - + /** * Adds a file to the tar archive. * @@ -214,32 +214,32 @@ class TarWriter extends Tar { return false; } } - + if ($typeFlag == "5") { $size = sprintf("%11s ", decOct(0)); } else { $size = sprintf("%11s ", decOct($size)); } - + $uid = sprintf("%6s ", decOct($uid)); $gid = sprintf("%6s ", decOct($gid)); $permissions = sprintf("%6s ", decOct($permissions)); $mtime = sprintf("%11s", decOct($mtime)); - + $binaryDataFirst = pack('a100a8a8a8a12A12', $filename, $permissions, $uid, $gid, $size, $mtime); $binaryDataLast = pack('a1a100a6a2a32a32a8a8a155a12', $typeFlag, '', '', '', '', '', '', '', '', ''); - + // calculate the checksum $checksum = 0; for ($i = 0; $i < 148; $i++) $checksum += ord(substr($binaryDataFirst, $i, 1)); for ($i = 148; $i < 156; $i++) $checksum += ord(' '); - for ($i = 156, $j = 0; $i < 512; $i++, $j++) $checksum += ord(substr($binaryDataLast, $j, 1)); - - $this->file->write($binaryDataFirst, 148); + for ($i = 156, $j = 0; $i < 512; $i++, $j++) $checksum += ord(substr($binaryDataLast, $j, 1)); + + $this->file->write($binaryDataFirst, 148); $this->file->write(pack("a8", sprintf("%6s ", decOct($checksum))), 8); // write the checksum $this->file->write($binaryDataLast, 356); - + return true; } @@ -254,22 +254,22 @@ class TarWriter extends Tar { $typeFlag = 'L'; $binaryDataFirst = pack("a100a8a8a8a12A12", '././@LongLink', 0, 0, 0, $size, 0); $binaryDataLast = pack("a1a100a6a2a32a32a8a8a155a12", $typeFlag, '', '', '', '', '', '', '', '', ''); - + // calculate the checksum - $checksum = 0; + $checksum = 0; for ($i = 0; $i < 148; $i++) $checksum += ord(substr($binaryDataFirst, $i, 1)); for ($i = 148; $i < 156; $i++) $checksum += ord(' '); for ($i = 156, $j = 0; $i < 512; $i++, $j++) $checksum += ord(substr($binaryDataLast, $j, 1)); - + $this->file->write($binaryDataFirst, 148); $this->file->write(pack("a8", sprintf("%6s ", decOct($checksum))), 8); // write the checksum $this->file->write($binaryDataLast, 356); - + $i = 0; while (($buffer = substr($filename, (($i++) * 512), 512)) != '') { $this->file->write(pack("a512", $buffer)); } - + return true; } } diff --git a/wcfsetup/install/files/lib/system/io/Zip.class.php b/wcfsetup/install/files/lib/system/io/Zip.class.php index 348cc518ee..2950ed4637 100644 --- a/wcfsetup/install/files/lib/system/io/Zip.class.php +++ b/wcfsetup/install/files/lib/system/io/Zip.class.php @@ -4,14 +4,14 @@ use wcf\system\exception\SystemException; use wcf\util\FileUtil; /** - * Reads .zip-Files + * Reads zip files. * * @author Tim Düsterhus * @copyright 2012 Tim Düsterhus * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class Zip extends File implements IArchive { const LOCAL_FILE_SIGNATURE = "\x50\x4b\x03\x04"; @@ -19,14 +19,14 @@ class Zip extends File implements IArchive { const EOF_SIGNATURE = "\x50\x4b\x05\x06"; /** - * @see \wcf\system\io\File + * @see wcf\system\io\File::__construct() */ public function __construct($filename) { parent::__construct($filename, 'rb'); } /** - * @see wcf\system\io\IArchive::getIndexByFilename() + * @see wcf\system\io\IArchive::getIndexByFilename() */ public function getIndexByFilename($filename) { $this->jumpToCentralDirectory(); @@ -37,7 +37,7 @@ class Zip extends File implements IArchive { } /** - * @see wcf\system\io\IArchive::getContentList() + * @see wcf\system\io\IArchive::getContentList() */ public function getContentList() { $this->jumpToCentralDirectory(); @@ -47,7 +47,7 @@ class Zip extends File implements IArchive { } /** - * @see wcf\system\io\IArchive::getFileInfo() + * @see wcf\system\io\IArchive::getFileInfo() */ public function getFileInfo($offset) { if (!is_int($offset)) $offset = $this->getIndexByFilename($offset); @@ -75,7 +75,7 @@ class Zip extends File implements IArchive { } /** - * @see wcf\system\io\IArchive::extractToString() + * @see wcf\system\io\IArchive::extractToString() */ public function extractToString($offset) { if (!is_int($offset)) $offset = $this->getIndexByFilename($offset); @@ -92,7 +92,7 @@ class Zip extends File implements IArchive { } /** - * @see wcf\system\io\IArchive::extract() + * @see wcf\system\io\IArchive::extract() */ public function extract($offset, $destination) { if (!is_int($offset)) $offset = $this->getIndexByFilename($offset); @@ -148,7 +148,7 @@ class Zip extends File implements IArchive { } /** - * Reads the Central Directory and returns it. + * Reads the central directory and returns it. * * @param integer $offset where to start reading * @return array @@ -259,7 +259,7 @@ class Zip extends File implements IArchive { /** * Reads a file and returns it. - * + * * @param integer $offset where to start reading * @return array */ diff --git a/wcfsetup/install/files/lib/system/io/ZipWriter.class.php b/wcfsetup/install/files/lib/system/io/ZipWriter.class.php index 79a06865b7..738c84afdd 100644 --- a/wcfsetup/install/files/lib/system/io/ZipWriter.class.php +++ b/wcfsetup/install/files/lib/system/io/ZipWriter.class.php @@ -6,18 +6,18 @@ use wcf\util\StringUtil; * Creates a Zip file archive. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.io - * @category Community Framework + * @category Community Framework */ class ZipWriter { protected $headers = array(); protected $data = array(); protected $endOfData = "\x50\x4b\x05\x06\x00\x00\x00\x00"; protected $lastOffset = 0; - + /** * Adds a folder to the Zip archive. * @@ -26,13 +26,13 @@ class ZipWriter { public function addDir($name) { // replace backward slashes with forward slashes in the dirname $name = StringUtil::replace("\\", "/", $name); - + // construct the general header information for the directory $header = "\x50\x4b\x03\x04"; $header .= "\x0a\x00\x00\x00"; $header .= "\x00\x00\x00\x00"; $header .= "\x00\x00"; - + // construct the directory header specific information $header .= pack("V", 0); $header .= pack("V", 0); @@ -43,13 +43,13 @@ class ZipWriter { $header .= pack("V", 0); $header .= pack("V", 0); $header .= pack("V", 0); - + // store the complete header information into the $headers array $this->headers[] = $header; - + // calculate the new offset that will be used the next time a segment is added $newOffset = strlen(implode('', $this->headers)); - + // construct the general header for the central index record $record = "\x50\x4b\x01\x02"; $record .= "\x00\x00\x0a\x00"; @@ -68,12 +68,12 @@ class ZipWriter { $record .= pack("V", 16 ); $record .= pack("V", $this->lastOffset); $record .= $name; - + // save the central index record in the array $data $this->data[] = $record; $this->lastOffset = $newOffset; } - + /** * Adds a file to the Zip archive. * @@ -97,7 +97,7 @@ class ZipWriter { // calculate the size of the file being compressed $compressedData = substr($compressedData, 2, - 4); $sizeCompressed = strlen($compressedData); - + // construct the general header for the file record complete with checksum information, etc. $header = "\x50\x4b\x03\x04"; $header .= "\x14\x00\x00\x00"; @@ -117,10 +117,10 @@ class ZipWriter { //$header .= pack("V", $crc); //$header .= pack("V", $sizeCompressed); //$header .= pack("V", $sizeUncompressed); - + // store the completed file record in the $headers array $this->headers[] = $header; - + // calculate the new offset for the central index record $newOffset = strlen(implode('', $this->headers)); @@ -139,16 +139,16 @@ class ZipWriter { $record .= pack("v", 0); $record .= pack("V", 32); $record .= pack("V", $this->lastOffset); - + // update the offset for the next record to be stored $this->lastOffset = $newOffset; - + $record .= $name; - + // store the record in the $data array $this->data[] = $record; } - + /** * Constructs the final Zip file structure and return it. * @@ -160,7 +160,7 @@ class ZipWriter { // implode the $data array into a single string $data = implode('', $this->data); - + // construct the final Zip file structure and return it return $headers. diff --git a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php index 999d35534e..e3f3ded9ea 100644 --- a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php +++ b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php @@ -8,13 +8,13 @@ use wcf\system\WCF; /** * Provides internationalization support for input fields. - * + * * @author Alexander Ebert * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.language - * @category Community Framework + * @category Community Framework */ class I18nHandler extends SingletonFactory { /** @@ -54,12 +54,12 @@ class I18nHandler extends SingletonFactory { protected $elementOptions = array(); /** - * @see wcf\system\SingletonFactory::init() + * @see wcf\system\SingletonFactory::init() */ protected function init() { $this->availableLanguages = LanguageFactory::getInstance()->getLanguages(); } - + /** * Registers a new element id, returns false if element id is already set. * diff --git a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php index 13ec864442..e1ab76055b 100644 --- a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php +++ b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php @@ -10,13 +10,13 @@ use wcf\system\WCF; /** * Handles language related functions. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.language - * @category Community Framework + * @category Community Framework */ class LanguageFactory extends SingletonFactory { /** @@ -46,7 +46,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns a Language object for the language with the given id. - * + * * @param integer $languageID * @return wcf\data\language\Language */ @@ -64,7 +64,7 @@ class LanguageFactory extends SingletonFactory { /** * Gets the preferred language of the current user. - * + * * @param integer $languageID * @return wcf\data\language\Language */ @@ -79,8 +79,9 @@ class LanguageFactory extends SingletonFactory { } /** - * Returns an instance of Language or NULL for a given language code. - * + * Returns the language with the given language code or null if no such + * language exists. + * * @param string $languageCode * @return wcf\data\language\Language */ @@ -104,7 +105,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns true if the language category with the given name exists. - * + * * @param string $categoryName * @return boolean */ @@ -114,7 +115,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns the language category with the given name. - * + * * @param string $categoryName * @return wcf\data\language\category\LanguageCategory */ @@ -161,7 +162,7 @@ class LanguageFactory extends SingletonFactory { /** * Determines the preferred language of the current user. - * + * * @param array $availableLanguageCodes * @param string $defaultLanguageCode * @return string @@ -185,7 +186,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns the active scripting compiler object. - * + * * @return wcf\system\template\TemplateScriptingCompiler */ public function getScriptingCompiler() { @@ -221,7 +222,7 @@ class LanguageFactory extends SingletonFactory { /** * Removes additional language identifier from given language code. * Converts e.g. 'de-informal' to 'de'. - * + * * @param string $languageCode * @return string $languageCode */ @@ -231,7 +232,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns the default language id - * + * * @return integer */ public function getDefaultLanguageID() { @@ -240,7 +241,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns all available languages for package with the given id. - * + * * @param integer $packageID * @return array */ @@ -259,7 +260,7 @@ class LanguageFactory extends SingletonFactory { /** * Returns all available content languages for given package. - * + * * @param integer $packageID * @return array */ @@ -279,7 +280,7 @@ class LanguageFactory extends SingletonFactory { /** * Makes given language the default language. - * + * * @param integer $languageID */ public function makeDefault($languageID) { diff --git a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php index 969db550cd..7c8a75c141 100644 --- a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php +++ b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php @@ -12,23 +12,23 @@ use wcf\util\XML; * Processes language item import from language servers. * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.language - * @category Community Framework + * @category Community Framework */ class LanguageServerProcessor extends SingletonFactory { /** * language object * @var wcf\data\language\Language - */ + */ protected $language = null; /** * Imports language variables for a language from given language servers. * - * @param wcf\data\language\Language $language + * @param wcf\data\language\Language $language * @param array $languageServers */ public function import(Language $language, array $languageServers) { @@ -67,7 +67,7 @@ class LanguageServerProcessor extends SingletonFactory { * * @param string $location * @param array $packageList - */ + */ protected function importLanguageFile($location, array $packageList) { // get proxy $options = array(); @@ -102,19 +102,19 @@ class LanguageServerProcessor extends SingletonFactory { // send content type and length $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; - $request .= "Content-Length: ".strlen($postString)."\r\n"; - // if it is a POST request, there MUST be a blank line before the POST data, but there MUST NOT be - // another blank line before, and of course there must be another blank line at the end of the request! - $request .= "\r\n"; - if (!empty($postString)) $request .= $postString."\r\n"; + $request .= "Content-Length: ".strlen($postString)."\r\n"; + // if it is a POST request, there MUST be a blank line before the POST data, but there MUST NOT be + // another blank line before, and of course there must be another blank line at the end of the request! + $request .= "\r\n"; + if (!empty($postString)) $request .= $postString."\r\n"; // send close - $request .= "Connection: Close\r\n\r\n"; - - // send request - $remoteFile->puts($request); + $request .= "Connection: Close\r\n\r\n"; + + // send request + $remoteFile->puts($request); // define response vars - $header = $content = ''; + $header = $content = ''; // fetch the response. while (!$remoteFile->eof()) { @@ -292,7 +292,7 @@ class LanguageServerProcessor extends SingletonFactory { * * @param array $variables * @return array - */ + */ protected function importCategories(array $variables) { // get categories $categoryNames = array(); diff --git a/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php b/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php index 04c29b9f3e..675356a10c 100644 --- a/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php +++ b/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php @@ -9,13 +9,13 @@ use wcf\system\WCF; /** * Handles modification logs. - * + * * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.log.modification - * @category Community Framework + * @category Community Framework */ class ModificationLogHandler extends SingletonFactory { /** diff --git a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php index 93d14f5f68..7f67a0c6ce 100644 --- a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php @@ -3,17 +3,21 @@ namespace wcf\system\mail; use wcf\system\io\File; /** - * DebugMailSender is a debug implementation of mailsender. - * It writes e-mails in a log file. + * DebugMailSender is a debug implementation of mailsender which writes emails in + * a log file. * * @author Michael Schaefer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.mail - * @category Community Framework + * @category Community Framework */ class DebugMailSender extends MailSender { + /** + * log file + * @var wcf\system\io\File + */ protected $log = null; /** @@ -32,7 +36,7 @@ class DebugMailSender extends MailSender { /** * Prints the given mail. * - * @param Mail $mail + * @param wcf\system\mail\Mail $mail * @return string */ protected static function printMail(Mail $mail) { diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php index 0cb7329196..755960f86f 100644 --- a/wcfsetup/install/files/lib/system/mail/Mail.class.php +++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php @@ -11,7 +11,7 @@ use wcf\util\StringUtil; * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.mail - * @category Community Framework + * @category Community Framework */ class Mail { protected $header = ''; @@ -28,7 +28,7 @@ class Mail { protected $body = ''; public static $crlf = "\n"; - + /** * Creates a new Mail object. * @@ -45,25 +45,24 @@ class Mail { public function __construct($to = '', $subject = '', $message = '', $from = '', $cc = '', $bcc = '', $attachments = array(), $priority = '', $header = '') { $this->setBoundary(); - if (empty($from)) $from = array(MAIL_FROM_NAME => MAIL_FROM_ADDRESS); - if (empty($priority)) $priority = 3; - + if (empty($from)) $from = array(MAIL_FROM_NAME => MAIL_FROM_ADDRESS); + if (empty($priority)) $priority = 3; + $this->setFrom($from); $this->setSubject($subject); $this->setMessage($message); $this->setPriority($priority); $this->setHeader($header); - if (!empty($to)) $this->addTo($to); - if (!empty($cc)) $this->addCC($cc); - if (!empty($bcc)) $this->addBCC($bcc); + if (!empty($to)) $this->addTo($to); + if (!empty($cc)) $this->addCC($cc); + if (!empty($bcc)) $this->addBCC($bcc); if (count($attachments) > 0) $this->setAttachments($attachments); } /** - * Creates a Basic Header for the Mail - * Returns this Header to the function which invoke this class + * Creates and returns a basic header for the email. * * @return string mail header */ @@ -94,8 +93,7 @@ class Mail { } /** - * Creates the Recipients List (To, CC, BCC) - * Returns this List to the function which invoke this class + * Creates and returned the recipients list (TO, CC, BCC). * * @param boolean $withTo * @return string @@ -109,8 +107,7 @@ class Mail { } /** - * Creates the Body (Message, Attachments) for the Mail - * Returns the created Body to the function which invoke this class + * Creates and returned the body (Message, Attachments) for the email. * * @return string mail body */ @@ -181,7 +178,7 @@ class Mail { } return $email; } - + /** * Sends this mail. */ diff --git a/wcfsetup/install/files/lib/system/mail/MailSender.class.php b/wcfsetup/install/files/lib/system/mail/MailSender.class.php index 4c7f7208e0..b887e51f20 100644 --- a/wcfsetup/install/files/lib/system/mail/MailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/MailSender.class.php @@ -2,19 +2,19 @@ namespace wcf\system\mail; /** - * Mailsender sends e-mails. + * Mailsender sends emails. * * @author Michael Schaefer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.mail - * @category Community Framework + * @category Community Framework */ abstract class MailSender { /** * unique mail server instance - * @var MailSender + * @var wcf\system\mail\MailSender */ protected static $instance = null; @@ -28,15 +28,15 @@ abstract class MailSender { switch (MAIL_SEND_METHOD) { case 'php': self::$instance = new PHPMailSender(); - break; + break; case 'smtp': self::$instance = new SMTPMailSender(); - break; + break; case 'debug': self::$instance = new DebugMailSender(); - break; + break; } } @@ -46,7 +46,7 @@ abstract class MailSender { /** * Sends an e-mail. * - * @param Mail $mail + * @param wcf\system\mail\Mail $mail */ - public abstract function sendMail(Mail $mail); + abstract public function sendMail(Mail $mail); } diff --git a/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php index 309018118e..86aa61d802 100644 --- a/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php @@ -2,18 +2,18 @@ namespace wcf\system\mail; /** - * Sends a Mail with the php mail function. + * Sends a mail with the php mail function. * * @author Michael Schaefer - * @copyright 2001-2009 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.mail - * @category Community Framework + * @category Community Framework */ class PHPMailSender extends MailSender { /** - * @see wcf\system\mail\MailSender::sendMail() + * @see wcf\system\mail\MailSender::sendMail() */ public function sendMail(Mail $mail) { if (MAIL_USE_F_PARAM) return @mb_send_mail($mail->getToString(), $mail->getSubject(), $mail->getBody(), $mail->getHeader(), '-f'.MAIL_FROM_ADDRESS); diff --git a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php index c8a0b84e05..64d96b5568 100644 --- a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php @@ -7,11 +7,11 @@ use wcf\system\io\RemoteFile; * Sends a Mail with a connection to a smtp server. * * @author Michael Schaefer - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.mail - * @category Community Framework + * @category Community Framework */ class SMTPMailSender extends MailSender { protected $connection = null; @@ -32,7 +32,7 @@ class SMTPMailSender extends MailSender { public function __destruct() { $this->disconnect(); } - + /** * Connects to the smtp-server */ @@ -101,7 +101,7 @@ class SMTPMailSender extends MailSender { } /** - * @see wcf\system\mail\MailSender::sendMail() + * @see wcf\system\mail\MailSender::sendMail() */ public function sendMail(Mail $mail) { $this->recipients = array(); @@ -152,7 +152,7 @@ class SMTPMailSender extends MailSender { ."Message-ID: <".md5(uniqid())."@".$_SERVER['SERVER_NAME'].">".Mail::$crlf ."Subject: ".Mail::encodeMIMEHeader($mail->getSubject()).Mail::$crlf .$mail->getHeader(); - + $this->write($header); $this->write(""); $this->write($mail->getBody()); @@ -171,7 +171,7 @@ class SMTPMailSender extends MailSender { if ($this->connection === null) { return; } - + $this->write("QUIT"); $this->read(); $this->connection->close(); diff --git a/wcfsetup/install/files/lib/system/menu/ITreeMenuItem.class.php b/wcfsetup/install/files/lib/system/menu/ITreeMenuItem.class.php index 1186249aba..f840ed3c3b 100644 --- a/wcfsetup/install/files/lib/system/menu/ITreeMenuItem.class.php +++ b/wcfsetup/install/files/lib/system/menu/ITreeMenuItem.class.php @@ -3,13 +3,13 @@ namespace wcf\system\menu; /** * Any tree menu item should implement this interface. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu - * @category Community Framework + * @category Community Framework */ interface ITreeMenuItem { /** diff --git a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php index 8240270c7d..5178f51d74 100644 --- a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php @@ -6,33 +6,33 @@ use wcf\system\WCF; /** * Basis class for a tree menu. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu - * @category Community Framework + * @category Community Framework */ abstract class TreeMenu extends SingletonFactory { /** * list of visible menu items - * @var array + * @var array */ public $menuItemList = array(); /** * list of the names of the active menu items - * @var array + * @var array */ public $activeMenuItems = array(); /** * list of all menu items - * @var array + * @var array */ public $menuItems = null; - + /** * @see wcf\system\SingletonFactory::init() */ @@ -153,7 +153,7 @@ abstract class TreeMenu extends SingletonFactory { } /** - * Sets the active menu item. + * Sets the active menu item. * This should be done before the menu.tpl template calls the function getMenu(). * * This function should be used in each script which uses a template that includes the menu.tpl. diff --git a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php index 1a837f8d30..0298552557 100644 --- a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php @@ -5,13 +5,13 @@ use wcf\system\menu\TreeMenu; /** * Builds the acp menu. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu.acp - * @category Community Framework + * @category Community Framework */ class ACPMenu extends TreeMenu { /** diff --git a/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php b/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php index 8f3d54b1a6..a1b74f58ce 100644 --- a/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php +++ b/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php @@ -6,11 +6,11 @@ use wcf\data\DatabaseObjectDecorator; * Provides default implementations for page menu item providers. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu.page - * @category Community Framework + * @category Community Framework */ class DefaultPageMenuItemProvider extends DatabaseObjectDecorator implements IPageMenuItemProvider { /** diff --git a/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php b/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php index 3334d8cf5f..448f750757 100644 --- a/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php +++ b/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php @@ -4,13 +4,13 @@ use wcf\data\IDatabaseObjectProcessor; /** * Any page menu item provider should implement this interface. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu.page - * @category Community Framework + * @category Community Framework */ interface IPageMenuItemProvider extends IDatabaseObjectProcessor { /** diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php index 46e2c70a88..54fd2b230f 100644 --- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php @@ -7,17 +7,17 @@ use wcf\system\menu\TreeMenu; /** * Builds the page menu. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.menu.page - * @category Community Framework + * @category Community Framework */ class PageMenu extends TreeMenu { /** - * @see wcf\system\SingletonFactory::init() + * @see wcf\system\SingletonFactory::init() */ protected function init() { // get menu items from cache diff --git a/wcfsetup/install/files/lib/system/option/AbstractOptionType.class.php b/wcfsetup/install/files/lib/system/option/AbstractOptionType.class.php index 695e0de089..c8a041d225 100644 --- a/wcfsetup/install/files/lib/system/option/AbstractOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/AbstractOptionType.class.php @@ -4,13 +4,13 @@ use wcf\data\option\Option; /** * Provides a default implementation for object types. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ abstract class AbstractOptionType implements IOptionType { /** @@ -20,19 +20,19 @@ abstract class AbstractOptionType implements IOptionType { protected $supportI18n = false; /** - * @see wcf\system\option\IOptionType::validate() + * @see wcf\system\option\IOptionType::validate() */ public function validate(Option $option, $newValue) {} /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { return $newValue; } /** - * @see wcf\system\option\IOptionType::getCSSClassName() + * @see wcf\system\option\IOptionType::getCSSClassName() */ public function getCSSClassName() { return ''; diff --git a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php index 1dd3448837..47b106663e 100644 --- a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php @@ -6,17 +6,17 @@ use wcf\system\WCF; /** * BooleanOptionType is an implementation of IOptionType for boolean values. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOption { /** - * @see wcf\system\option\IOptionType::getFormElement() + * @see wcf\system\option\IOptionType::getFormElement() */ public function getFormElement(Option $option, $value) { $options = Option::parseEnableOptions($option->enableOptions); @@ -31,7 +31,7 @@ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOpt } /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { if ($newValue !== null) return 1; @@ -39,21 +39,21 @@ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOpt } /** - * @see wcf\system\option\IOptionType::getCSSClassName() + * @see wcf\system\option\IOptionType::getCSSClassName() */ public function getCSSClassName() { return 'reversed'; } /** - * @see wcf\system\option\ISearchableUserOption::getSearchFormElement() + * @see wcf\system\option\ISearchableUserOption::getSearchFormElement() */ public function getSearchFormElement(Option $option, $value) { return $this->getFormElement($option, $value); } /** - * @see wcf\system\option\ISearchableUserOption::getCondition() + * @see wcf\system\option\ISearchableUserOption::getCondition() */ public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) { $value = intval($value); diff --git a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php index 7fd359cdfd..fc8b841c4a 100644 --- a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php @@ -5,27 +5,27 @@ use wcf\system\exception\UserInputException; /** * DateOptionType is an implementation of IOptionType for date inputs. - * + * * @author Marcel Werk * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class DateOptionType extends TextOptionType { /** - * @see wcf\system\option\TextOptionType::$inputType + * @see wcf\system\option\TextOptionType::$inputType */ protected $inputType = 'date'; /** - * @see wcf\system\option\TextOptionType::$inputClass + * @see wcf\system\option\TextOptionType::$inputClass */ protected $inputClass = ''; /** - * @see wcf\system\option\IOptionType::getFormElement() + * @see wcf\system\option\IOptionType::getFormElement() */ public function validate(Option $option, $newValue) { if (empty($newValue)) return; diff --git a/wcfsetup/install/files/lib/system/option/FileSizeOptionType.class.php b/wcfsetup/install/files/lib/system/option/FileSizeOptionType.class.php index fbff747d62..de188b88d5 100644 --- a/wcfsetup/install/files/lib/system/option/FileSizeOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/FileSizeOptionType.class.php @@ -7,7 +7,7 @@ use wcf\util\StringUtil; /** * FileSizeOptionType is an implementation of IOptionType for file sizes. - * + * * @author Tim Düsterhus * @copyright 2011 Tim Düsterhus * @license GNU Lesser General Public License @@ -17,7 +17,7 @@ use wcf\util\StringUtil; */ class FileSizeOptionType extends IntegerOptionType { /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { $number = StringUtil::replace(WCF::getLanguage()->get('wcf.global.thousandsSeparator'), '', $newValue); @@ -52,7 +52,7 @@ class FileSizeOptionType extends IntegerOptionType { } /** - * @see wcf\system\option\IOptionType::getFormElement() + * @see wcf\system\option\IOptionType::getFormElement() */ public function getFormElement(Option $option, $value) { $value = FileUtil::formatFileSize($value); diff --git a/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php b/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php index 503ca5473b..e1f6c1fe02 100644 --- a/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php @@ -5,17 +5,17 @@ use wcf\system\WCF; /** * FloatOptionType is an implementation of IOptionType for float fields. - * + * * @author Tobias Friebel * @copyright 2001-2011 Tobias Friebel * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class FloatOptionType extends TextOptionType { /** - * @see wcf\system\option\IOptionType::getFormElement() + * @see wcf\system\option\IOptionType::getFormElement() */ public function getFormElement(Option $option, $value) { $value = str_replace('.', WCF::getLanguage()->get('wcf.global.decimalPoint'), $value); @@ -24,7 +24,7 @@ class FloatOptionType extends TextOptionType { } /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { $newValue = str_replace(' ', '', $newValue); diff --git a/wcfsetup/install/files/lib/system/option/IOptionHandler.class.php b/wcfsetup/install/files/lib/system/option/IOptionHandler.class.php index ddabfe6bb1..9a7a7baaab 100644 --- a/wcfsetup/install/files/lib/system/option/IOptionHandler.class.php +++ b/wcfsetup/install/files/lib/system/option/IOptionHandler.class.php @@ -3,13 +3,13 @@ namespace wcf\system\option; /** * Default interface for option handlers. - * + * * @author Alexander Ebert - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ interface IOptionHandler { /** diff --git a/wcfsetup/install/files/lib/system/option/IOptionType.class.php b/wcfsetup/install/files/lib/system/option/IOptionType.class.php index b44ae87023..7ec9d10acc 100644 --- a/wcfsetup/install/files/lib/system/option/IOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/IOptionType.class.php @@ -4,13 +4,13 @@ use wcf\data\option\Option; /** * Any option type has to implement this interface. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ interface IOptionType { /** diff --git a/wcfsetup/install/files/lib/system/option/ISearchableUserOption.class.php b/wcfsetup/install/files/lib/system/option/ISearchableUserOption.class.php index fe8940e5c7..f4ddae2e80 100644 --- a/wcfsetup/install/files/lib/system/option/ISearchableUserOption.class.php +++ b/wcfsetup/install/files/lib/system/option/ISearchableUserOption.class.php @@ -5,13 +5,13 @@ use wcf\system\database\util\PreparedStatementConditionBuilder; /** * Any searchable option type should implement this interface. - * + * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ interface ISearchableUserOption { /** diff --git a/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php b/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php index 06ecd1fbdb..622482a0aa 100644 --- a/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php @@ -6,15 +6,15 @@ use wcf\data\option\Option; * IntegerOptionType is an implementation of IOptionType for integer fields. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class IntegerOptionType extends TextOptionType { /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { return intval($newValue); diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php index af3f05efc8..cf3af34a81 100644 --- a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php @@ -7,18 +7,19 @@ use wcf\system\WCF; use wcf\util\ArrayUtil; /** - * MultiSelectOptionType is an implementation of IOptionType for multiple 'select' tags. + * MultiSelectOptionType is an implementation of IOptionType for multiple 'select' + * tags. * * @author Marcel Werk - * @copyright 2001-2011 WoltLab GmbH + * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class MultiSelectOptionType extends SelectOptionType { /** - * @see wcf\system\option\IOptionType::getFormElement() + * @see wcf\system\option\IOptionType::getFormElement() */ public function getFormElement(Option $option, $value) { WCF::getTPL()->assign(array( @@ -30,7 +31,7 @@ class MultiSelectOptionType extends SelectOptionType { } /** - * @see wcf\system\option\IOptionType::validate() + * @see wcf\system\option\IOptionType::validate() */ public function validate(Option $option, $newValue) { if (!is_array($newValue)) $newValue = array(); @@ -43,7 +44,7 @@ class MultiSelectOptionType extends SelectOptionType { } /** - * @see wcf\system\option\IOptionType::getData() + * @see wcf\system\option\IOptionType::getData() */ public function getData(Option $option, $newValue) { if (!is_array($newValue)) $newValue = array(); @@ -51,7 +52,7 @@ class MultiSelectOptionType extends SelectOptionType { } /** - * @see wcf\system\option\ISearchableUserOption::getCondition() + * @see wcf\system\option\ISearchableUserOption::getCondition() */ public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) { if (!is_array($value) || !count($value)) return false; diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php index 2429ff8ef9..0adc91e52e 100644 --- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php +++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php @@ -11,66 +11,66 @@ use wcf\util\ClassUtil; /** * Handles options. - * + * * @author Alexander Ebert * @copyright 2001-2011 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage system.option - * @category Community Framework + * @category Community Framework */ class OptionHandler implements IOptionHandler { /** * cache name - * @var string + * @var string */ public $cacheName = ''; /** * cache class name - * @var string + * @var string */ public $cacheClass = ''; /** * list of all option categories - * @var array + * @var array */ public $cachedCategories = null; /** * list of all options - * @var array + * @var array */ public $cachedOptions = null; /** * category structure - * @var array + * @var array */ public $cachedCategoryStructure = null; /** * option structure - * @var array + * @var array */ public $cachedOptionToCategories = null; /** - * Name of the active option category. - * @var string + * name of the active option category + * @var string */ public $categoryName = ''; /** - * Options of the active category. - * @var array