From ce048f13c7bbd9b5f4d8c834ac3be6e42141d70c Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 15 Aug 2011 16:48:38 +0200 Subject: [PATCH] Fixed namespace --- .../install/files/lib/acp/form/UserGroupAddForm.class.php | 6 +++--- .../builder/CacheBuilderUserGroupPermission.class.php | 8 ++++---- .../group}/BooleanUserGroupOptionType.class.php | 6 +++--- .../group}/IUserGroupOptionType.class.php | 4 ++-- .../group}/InfiniteIntegerUserGroupOptionType.class.php | 6 +++--- .../InfiniteInverseIntegerUserGroupOptionType.class.php | 6 +++--- .../group}/IntegerUserGroupOptionType.class.php | 6 +++--- .../group}/InverseIntegerUserGroupOptionType.class.php | 6 +++--- .../group}/TextUserGroupOptionType.class.php | 6 +++--- .../group}/TextareaUserGroupOptionType.class.php | 6 +++--- .../group}/UserGroupsUserGroupOptionType.class.php | 6 +++--- .../UserGroupOptionsPackageInstallationPlugin.class.php | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/BooleanUserGroupOptionType.class.php (82%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/IUserGroupOptionType.class.php (87%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/InfiniteIntegerUserGroupOptionType.class.php (82%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/InfiniteInverseIntegerUserGroupOptionType.class.php (83%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/IntegerUserGroupOptionType.class.php (80%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/InverseIntegerUserGroupOptionType.class.php (80%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/TextUserGroupOptionType.class.php (82%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/TextareaUserGroupOptionType.class.php (83%) rename wcfsetup/install/files/lib/system/option/{userGroup => user/group}/UserGroupsUserGroupOptionType.class.php (93%) diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php index 6b152416ff..650565b9bd 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php @@ -187,14 +187,14 @@ class UserGroupAddForm extends AbstractOptionListForm { */ protected function getTypeObject($type) { if (!isset($this->typeObjects[$type])) { - $className = 'wcf\system\option\userGroup\\'.StringUtil::firstCharToUpperCase($type).'UserGroupOptionType'; + $className = 'wcf\system\option\user\group\\'.StringUtil::firstCharToUpperCase($type).'UserGroupOptionType'; // create instance if (!class_exists($className)) { throw new SystemException("unable to find class '".$className."'"); } - if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\userGroup\IUserGroupOptionType')) { - throw new SystemException("'".$className."' should implement wcf\system\option\userGroup\IUserGroupOptionType"); + if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) { + throw new SystemException("'".$className."' should implement wcf\system\option\user\group\IUserGroupOptionType"); } $this->typeObjects[$type] = new $className(); } diff --git a/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php index 8e01a5fd76..62014222c1 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php @@ -101,18 +101,18 @@ class CacheBuilderUserGroupPermission implements ICacheBuilder { * Returns an object of the requested group option type. * * @param string $type - * @return wcf\system\option\userGroup\IUserGroupOptionType + * @return wcf\system\option\user\group\IUserGroupOptionType */ protected function getTypeObject($type) { if (!isset($this->typeObjects[$type])) { - $className = 'wcf\system\option\userGroup\\'.StringUtil::firstCharToUpperCase($type).'UserGroupOptionType'; + $className = 'wcf\system\option\user\group\\'.StringUtil::firstCharToUpperCase($type).'UserGroupOptionType'; // validate class if (!class_exists($className)) { throw new SystemException("unable to find class '".$className."'"); } - if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\userGroup\IUserGroupOptionType')) { - throw new SystemException("'".$className."' should implement wcf\system\option\userGroup\IUserGroupOptionType"); + if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) { + throw new SystemException("'".$className."' should implement wcf\system\option\user\group\IUserGroupOptionType"); } // create instance diff --git a/wcfsetup/install/files/lib/system/option/userGroup/BooleanUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php similarity index 82% rename from wcfsetup/install/files/lib/system/option/userGroup/BooleanUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php index 82e30199cd..43cf644071 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/BooleanUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class BooleanUserGroupOptionType extends BooleanOptionType implements IUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { foreach ($values as $value) { diff --git a/wcfsetup/install/files/lib/system/option/userGroup/IUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/IUserGroupOptionType.class.php similarity index 87% rename from wcfsetup/install/files/lib/system/option/userGroup/IUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/IUserGroupOptionType.class.php index 1700ca5abc..447bac5cd0 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/IUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/IUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ interface IUserGroupOptionType extends IOptionType { diff --git a/wcfsetup/install/files/lib/system/option/userGroup/InfiniteIntegerUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/InfiniteIntegerUserGroupOptionType.class.php similarity index 82% rename from wcfsetup/install/files/lib/system/option/userGroup/InfiniteIntegerUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/InfiniteIntegerUserGroupOptionType.class.php index 317541682f..bbe1d6eacd 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/InfiniteIntegerUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/InfiniteIntegerUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class InfiniteIntegerUserGroupOptionType extends IntegerUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { if (in_array(-1, $values)) return -1; diff --git a/wcfsetup/install/files/lib/system/option/userGroup/InfiniteInverseIntegerUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/InfiniteInverseIntegerUserGroupOptionType.class.php similarity index 83% rename from wcfsetup/install/files/lib/system/option/userGroup/InfiniteInverseIntegerUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/InfiniteInverseIntegerUserGroupOptionType.class.php index 33a1543610..4d7bdc286f 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/InfiniteInverseIntegerUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/InfiniteInverseIntegerUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class InfiniteInverseIntegerUserGroupOptionType extends InverseIntegerUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { foreach ($values as $key => $value) { diff --git a/wcfsetup/install/files/lib/system/option/userGroup/IntegerUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/IntegerUserGroupOptionType.class.php similarity index 80% rename from wcfsetup/install/files/lib/system/option/userGroup/IntegerUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/IntegerUserGroupOptionType.class.php index 4ff7b8fa1d..9d8c087223 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/IntegerUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/IntegerUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class IntegerUserGroupOptionType extends IntegerOptionType implements IUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user.group\IUserGroupOptionType::merge() */ public function merge(array $values) { return max($values); diff --git a/wcfsetup/install/files/lib/system/option/userGroup/InverseIntegerUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/InverseIntegerUserGroupOptionType.class.php similarity index 80% rename from wcfsetup/install/files/lib/system/option/userGroup/InverseIntegerUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/InverseIntegerUserGroupOptionType.class.php index e05c19e86e..48408ba5ba 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/InverseIntegerUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/InverseIntegerUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class InverseIntegerUserGroupOptionType extends IntegerOptionType implements IUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { return min($values); diff --git a/wcfsetup/install/files/lib/system/option/userGroup/TextUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/TextUserGroupOptionType.class.php similarity index 82% rename from wcfsetup/install/files/lib/system/option/userGroup/TextUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/TextUserGroupOptionType.class.php index 03a2e21ed0..729ad21f54 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/TextUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/TextUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class TextUserGroupOptionType extends TextOptionType implements IUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { $result = ''; diff --git a/wcfsetup/install/files/lib/system/option/userGroup/TextareaUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/TextareaUserGroupOptionType.class.php similarity index 83% rename from wcfsetup/install/files/lib/system/option/userGroup/TextareaUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/TextareaUserGroupOptionType.class.php index 87bd510a93..81354864e6 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/TextareaUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/TextareaUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class TextareaUserGroupOptionType extends TextareaOptionType implements IUserGroupOptionType { /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { $result = ''; diff --git a/wcfsetup/install/files/lib/system/option/userGroup/UserGroupsUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php similarity index 93% rename from wcfsetup/install/files/lib/system/option/userGroup/UserGroupsUserGroupOptionType.class.php rename to wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php index 7d6e00a1a7..1c53a47fbc 100644 --- a/wcfsetup/install/files/lib/system/option/userGroup/UserGroupsUserGroupOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php @@ -1,5 +1,5 @@ * @package com.woltlab.wcf - * @subpackage system.option.userGroup + * @subpackage system.option.user.group * @category Community Framework */ class UserGroupsUserGroupOptionType extends AbstractOptionType implements IUserGroupOptionType { @@ -66,7 +66,7 @@ class UserGroupsUserGroupOptionType extends AbstractOptionType implements IUserG } /** - * @see wcf\system\option\userGroup\IUserGroupOptionType::merge() + * @see wcf\system\option\user\group\IUserGroupOptionType::merge() */ public function merge(array $values) { $result = array(); diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionsPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionsPackageInstallationPlugin.class.php index c906ff73a2..e8953f8215 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionsPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionsPackageInstallationPlugin.class.php @@ -62,7 +62,7 @@ class UserGroupOptionsPackageInstallationPlugin extends AbstractOptionPackageIns if (isset($option['options'])) $options = $option['options']; // check if optionType exists - $className = 'wcf\system\option\userGroup\\'.StringUtil::firstCharToUpperCase($optionType).'UserGroupOptionType'; + $className = 'wcf\system\option\user\group\\'.StringUtil::firstCharToUpperCase($optionType).'UserGroupOptionType'; if (!class_exists($className)) { throw new SystemException("unable to find class '".$className."'"); } -- 2.20.1