From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 21 May 2015 21:10:45 +0000 (+0200)
Subject: Add TDatabaseObjectOptions and TDatabaseObjectPermissions traits
X-Git-Tag: 3.0.0_Beta_1~2359
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1b907f345397a5604f8ceca8af257d61938639a;p=GitHub%2FWoltLab%2FWCF.git

Add TDatabaseObjectOptions and TDatabaseObjectPermissions traits
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1984f657ee..3a7bfd2442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,5 +4,6 @@
 
 ### 2.2.0 Alpha 1 (XXXX-YY-ZZ)
 
+* Add `wcf\data\TDatabaseObjectOptions` and `wcf\data\TDatabaseObjectPermissions` for database object-bound options and permissions validation.
 * `wcf\system\cache\builder\EventListenerCacheBuilder` returns `wcf\data\event\listener\EventListener` objects instead of data arrays.
 
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
index 3fddd8aacc..6150d7e5d0 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
@@ -89,7 +89,7 @@ class UserGroupOptionForm extends AbstractForm {
 		}
 		
 		// verify options and permissions for current option
-		if ($this->verifyPermissions($this->userGroupOption)) {
+		if ($this->userGroupOption->validateOptions() && $this->userGroupOption->validatePermissions()) {
 			// read all categories
 			$categoryList = new UserGroupOptionCategoryList();
 			$categoryList->readObjects();
@@ -102,7 +102,7 @@ class UserGroupOptionForm extends AbstractForm {
 			// verify categories
 			$category = $categories[$this->userGroupOption->categoryName];
 			while ($category != null) {
-				if (!$this->verifyPermissions($category)) {
+				if (!$category->validateOptions() || !$category->validatePermissions()) {
 					throw new PermissionDeniedException();
 				}
 				
@@ -255,6 +255,8 @@ class UserGroupOptionForm extends AbstractForm {
 	 * 
 	 * @param	\wcf\data\DatabaseObject		$object
 	 * @return	boolean
+	 * 
+	 * @deprecated	since 2.2
 	 */
 	protected function verifyPermissions(DatabaseObject $object) {
 		// check the options of this item
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 58a9ccc1c7..782cde862b 100644
--- a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\object\type;
 use wcf\data\ProcessibleDatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
 use wcf\util\ClassUtil;
 
@@ -15,6 +17,9 @@ use wcf\util\ClassUtil;
  * @category	Community Framework
  */
 class ObjectType extends ProcessibleDatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * @see	\wcf\data\DatabaseObject::$databaseTableName
 	 */
diff --git a/wcfsetup/install/files/lib/data/option/Option.class.php b/wcfsetup/install/files/lib/data/option/Option.class.php
index c08cbed930..84387a8a00 100644
--- a/wcfsetup/install/files/lib/data/option/Option.class.php
+++ b/wcfsetup/install/files/lib/data/option/Option.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\option;
 use wcf\data\DatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -15,6 +17,9 @@ use wcf\util\StringUtil;
  * @category	Community Framework
  */
 class Option extends DatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * @see	\wcf\data\DatabaseObject::$databaseTableName
 	 */
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 23c39e545d..dc5881211e 100644
--- a/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php
+++ b/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\option\category;
 use wcf\data\DatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 
 /**
  * Represents an option category.
@@ -13,6 +15,9 @@ use wcf\data\DatabaseObject;
  * @category	Community Framework
  */
 class OptionCategory extends DatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * @see	\wcf\data\DatabaseObject::$databaseTableName
 	 */
diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
index 14bf14a66d..651a0257bf 100644
--- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
+++ b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\sitemap;
 use wcf\data\DatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
 use wcf\util\ClassUtil;
@@ -16,6 +18,9 @@ use wcf\util\ClassUtil;
  * @category	Community Framework
  */
 class Sitemap extends DatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * ISitemapProvider object
 	 * @var	\wcf\system\sitemap\ISitemapProvider
@@ -60,34 +65,6 @@ class Sitemap extends DatabaseObject {
 	 * @return	boolean
 	 */
 	public function isAccessible() {
-		// check the options of this item
-		$hasEnabledOption = true;
-		if ($this->options) {
-			$hasEnabledOption = false;
-			$options = explode(',', strtoupper($this->options));
-			foreach ($options as $option) {
-				if (defined($option) && constant($option)) {
-					$hasEnabledOption = true;
-					break;
-				}
-			}
-		}
-		if (!$hasEnabledOption) return false;
-		
-		// check the permission of this item for the active user
-		$hasPermission = true;
-		if ($this->permissions) {
-			$hasPermission = false;
-			$permissions = explode(',', $this->permissions);
-			foreach ($permissions as $permission) {
-				if (WCF::getSession()->getPermission($permission)) {
-					$hasPermission = true;
-					break;
-				}
-			}
-		}
-		if (!$hasPermission) return false;
-		
-		return true;
+		return $this->validateOptions() && $this->validatePermissions();
 	}
 }
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 f3173b7dd5..e6be27ee05 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
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\user\group\option\category;
 use wcf\data\DatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 
 /**
  * Represents a user group options category.
@@ -13,6 +15,9 @@ use wcf\data\DatabaseObject;
  * @category	Community Framework
  */
 class UserGroupOptionCategory extends DatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * @see	\wcf\data\DatabaseObject::$databaseTableName
 	 */
diff --git a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php
index 7600a0451e..9b8e912015 100644
--- a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\user\notification\event;
 use wcf\data\ProcessibleDatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 
 /**
  * Represents a user notification event.
@@ -13,6 +15,9 @@ use wcf\data\ProcessibleDatabaseObject;
  * @category	Community Framework
  */
 class UserNotificationEvent extends ProcessibleDatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * @see	\wcf\data\DatabaseObject::$databaseTableName
 	 */
diff --git a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
index b6728b4bdf..aca02ed7dc 100644
--- a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\user\profile\menu\item;
 use wcf\data\DatabaseObject;
+use wcf\data\TDatabaseObjectOptions;
+use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
 use wcf\util\ClassUtil;
 
@@ -15,6 +17,9 @@ use wcf\util\ClassUtil;
  * @category	Community Framework
  */
 class UserProfileMenuItem extends DatabaseObject {
+	use TDatabaseObjectOptions;
+	use TDatabaseObjectPermissions;
+	
 	/**
 	 * content manager
 	 * @var	\wcf\system\menu\user\profile\content\IUserProfileContent
diff --git a/wcfsetup/install/files/lib/page/TaggedPage.class.php b/wcfsetup/install/files/lib/page/TaggedPage.class.php
index 3325d97057..298805917d 100644
--- a/wcfsetup/install/files/lib/page/TaggedPage.class.php
+++ b/wcfsetup/install/files/lib/page/TaggedPage.class.php
@@ -74,34 +74,8 @@ class TaggedPage extends MultipleLinkPage {
 		// filter taggable object types by options and permissions
 		$this->availableObjectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.tagging.taggableObject');
 		foreach ($this->availableObjectTypes as $key => $objectType) {
-			if ($objectType->options) {
-				$hasEnabledOption = false;
-				$options = explode(',', strtoupper($objectType->options));
-				foreach ($options as $option) {
-					if (defined($option) && constant($option)) {
-						$hasEnabledOption = true;
-						break;
-					}
-				}
-				
-				if (!$hasEnabledOption) {
-					unset($this->availableObjectTypes[$key]);
-				}
-			}
-			
-			if ($objectType->permissions) {
-				$hasPermission = false;
-				$permissions = explode(',', $objectType->permissions);
-				foreach ($permissions as $permission) {
-					if (WCF::getSession()->getPermission($permission)) {
-						$hasPermission = true;
-						break;
-					}
-				}
-				
-				if (!$hasPermission) {
-					unset($this->availableObjectTypes[$key]);
-				}
+			if (!$objectType->validateOptions() || !$objectType->validatePermissions()) {
+				unset($this->availableObjectTypes[$key]);
 			}
 		}
 		
diff --git a/wcfsetup/install/files/lib/system/ad/AdHandler.class.php b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
index a6e6ed44d6..4a7f3d74fe 100644
--- a/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
+++ b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
@@ -93,14 +93,8 @@ class AdHandler extends SingletonFactory {
 		
 		// filter by options
 		foreach ($objectTypes as $objectTypeName => $objectType) {
-			if ($objectType->options) {
-				$options = explode(',', strtoupper($objectType->options));
-				foreach ($options as $option) {
-					if (!defined($option) || !constant($option)) {
-						unset($objectTypes[$objectTypeName]);
-						break;
-					}
-				}
+			if (!$objectType->validateOptions()) {
+				unset($objectTypes[$objectTypeName]);
 			}
 		}
 		
diff --git a/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php b/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
index f0f88f6d9d..55a94a23b6 100644
--- a/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
@@ -72,35 +72,7 @@ class UserProfileMenu extends SingletonFactory {
 	 * @return	boolean
 	 */
 	protected function checkMenuItem(UserProfileMenuItem $item) {
-		// check the options of this item
-		$hasEnabledOption = true;
-		if (!empty($item->options)) {
-			$hasEnabledOption = false;
-			$options = explode(',', strtoupper($item->options));
-			foreach ($options as $option) {
-				if (defined($option) && constant($option)) {
-					$hasEnabledOption = true;
-					break;
-				}
-			}
-		}
-		if (!$hasEnabledOption) return false;
-		
-		// check the permission of this item for the active user
-		$hasPermission = true;
-		if (!empty($item->permissions)) {
-			$hasPermission = false;
-			$permissions = explode(',', $item->permissions);
-			foreach ($permissions as $permission) {
-				if (WCF::getSession()->getPermission($permission)) {
-					$hasPermission = true;
-					break;
-				}
-			}
-		}
-		if (!$hasPermission) return false;
-		
-		return true;
+		return $item->validateOptions() && $item->validatePermissions();
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
index 0328fdeba9..dc3742d276 100644
--- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
@@ -443,34 +443,7 @@ class OptionHandler implements IOptionHandler {
 	 * @return	boolean
 	 */
 	protected function checkCategory(OptionCategory $category) {
-		if ($category->permissions) {
-			$hasPermission = false;
-			$permissions = explode(',', $category->permissions);
-			foreach ($permissions as $permission) {
-				if (WCF::getSession()->getPermission($permission)) {
-					$hasPermission = true;
-					break;
-				}
-			}
-			
-			if (!$hasPermission) return false;
-			
-		}
-		
-		if ($category->options) {
-			$hasEnabledOption = false;
-			$options = explode(',', strtoupper($category->options));
-			foreach ($options as $option) {
-				if (defined($option) && constant($option)) {
-					$hasEnabledOption = true;
-					break;
-				}
-			}
-			
-			if (!$hasEnabledOption) return false;
-		}
-		
-		return true;
+		return $category->validateOptions() && $category->validatePermissions();
 	}
 	
 	/**
@@ -480,38 +453,7 @@ class OptionHandler implements IOptionHandler {
 	 * @return	boolean
 	 */
 	protected function checkOption(Option $option) {
-		if ($option->permissions) {
-			$hasPermission = false;
-			$permissions = explode(',', $option->permissions);
-			foreach ($permissions as $permission) {
-				if (WCF::getSession()->getPermission($permission)) {
-					$hasPermission = true;
-					break;
-				}
-			}
-			
-			if (!$hasPermission) return false;
-			
-		}
-		
-		if ($option->options) {
-			$hasEnabledOption = false;
-			$__options = explode(',', strtoupper($option->options));
-			foreach ($__options as $__option) {
-				if (defined($__option) && constant($__option)) {
-					$hasEnabledOption = true;
-					break;
-				}
-			}
-			
-			if (!$hasEnabledOption) return false;
-		}
-		
-		if (!$this->checkVisibility($option)) {
-			return false;
-		}
-		
-		return true;
+		return $option->validateOptions() && $option->validatePermissions() && $this->checkVisibility($option);
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/page/PageManager.class.php b/wcfsetup/install/files/lib/system/page/PageManager.class.php
index 30073db04f..e118bd8aca 100644
--- a/wcfsetup/install/files/lib/system/page/PageManager.class.php
+++ b/wcfsetup/install/files/lib/system/page/PageManager.class.php
@@ -68,14 +68,8 @@ class PageManager extends SingletonFactory {
 		
 		// filter by options
 		foreach ($objectTypes as $objectTypeName => $objectType) {
-			if ($objectType->options) {
-				$options = explode(',', strtoupper($objectType->options));
-				foreach ($options as $option) {
-					if (!defined($option) || !constant($option)) {
-						unset($objectTypes[$objectTypeName]);
-						break;
-					}
-				}
+			if (!$objectType->validateOptions()) {
+				unset($objectTypes[$objectTypeName]);
 			}
 		}
 		
diff --git a/wcfsetup/install/files/lib/system/search/acp/AbstractACPSearchResultProvider.class.php b/wcfsetup/install/files/lib/system/search/acp/AbstractACPSearchResultProvider.class.php
index 4d5703056a..de8cd47744 100644
--- a/wcfsetup/install/files/lib/system/search/acp/AbstractACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/AbstractACPSearchResultProvider.class.php
@@ -17,7 +17,7 @@ abstract class AbstractACPSearchResultProvider {
 	/**
 	 * Validates object options and permissions.
 	 * 
-	 * @param	\wcf\data\DatabaseObject		$object
+	 * @param	\wcf\data\DatabaseObject	$object
 	 * @param	string				$optionsColumnName
 	 * @param	string				$permissionsColumnName
 	 * @return	boolean
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
index b39dc41753..bc3df9c90c 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
@@ -114,31 +114,7 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp
 	 * @see	\wcf\system\user\notification\event\IUserNotificationEvent::isVisible()
 	 */
 	public function isVisible() {
-		if ($this->options) {
-			$hasEnabledOption = false;
-			$options = explode(',', strtoupper($this->options));
-			foreach ($options as $option) {
-				if (defined($option) && constant($option)) {
-					$hasEnabledOption = true;
-					break;
-				}
-			}
-			if (!$hasEnabledOption) return false;
-		}
-		
-		$hasPermission = true;
-		if ($this->permissions) {
-			$hasPermission = false;
-			$permissions = explode(',', $this->permissions);
-			foreach ($permissions as $permission) {
-				if (WCF::getSession()->getPermission($permission)) {
-					$hasPermission = true;
-				break;
-				}
-			}
-		}
-		if (!$hasPermission) return false;
-		return true;
+		return $this->getDecoratedObject()->validateOptions() & $this->getDecoratedObject()->validatePermissions();
 	}
 	
 	/**