From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 2 Jun 2013 14:44:06 +0000 (+0200)
Subject: Removed obsolete code
X-Git-Tag: 2.0.0_Beta_3~47
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fe45e041ecaabc42ba1205b01a25cb41ba242cc;p=GitHub%2FWoltLab%2FWCF.git

Removed obsolete code
---

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.User.js b/wcfsetup/install/files/acp/js/WCF.ACP.User.js
index 0ab753289d..7f597c6963 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.User.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.User.js
@@ -59,7 +59,7 @@ WCF.ACP.User.EnableHandler = {
 	disable: function(userIDs) {
 		this._proxy.setOption('data', {
 			actionName: 'disable',
-			className: 'wcf\\data\\user\\ExtendedUserAction',
+			className: 'wcf\\data\\user\\UserAction',
 			objectIDs: userIDs
 		});
 		this._proxy.sendRequest();
@@ -73,7 +73,7 @@ WCF.ACP.User.EnableHandler = {
 	enable: function(userIDs) {
 		this._proxy.setOption('data', {
 			actionName: 'enable',
-			className: 'wcf\\data\\user\\ExtendedUserAction',
+			className: 'wcf\\data\\user\\UserAction',
 			objectIDs: userIDs
 		});
 		this._proxy.sendRequest();
diff --git a/wcfsetup/install/files/lib/data/user/ExtendedUserAction.class.php b/wcfsetup/install/files/lib/data/user/ExtendedUserAction.class.php
deleted file mode 100644
index b73e80dc49..0000000000
--- a/wcfsetup/install/files/lib/data/user/ExtendedUserAction.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-namespace wcf\data\user;
-use wcf\data\user\group\UserGroup;
-use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\WCF;
-use wcf\util\UserRegistrationUtil;
-
-/**
- * Executes user-related actions.
- * 
- * @author	Marcel Werk
- * @copyright	2001-2013 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf.user
- * @subpackage	data.user
- * @category	Community Framework
- */
-class ExtendedUserAction extends AbstractDatabaseObjectAction {
-	/**
-	 * @see	wcf\data\AbstractDatabaseObjectAction::$className
-	 */
-	public $className = 'wcf\data\user\UserEditor';
-	
-	/**
-	 * Validates the enable action.
-	 */
-	public function validateEnable() {
-		WCF::getSession()->checkPermissions(array('admin.user.canEnableUser'));
-	}
-	
-	/**
-	 * Validates the disable action.
-	 */
-	public function validateDisable() {
-		$this->validateEnable();
-	}
-	
-	/**
-	 * Enables users.
-	 */
-	public function enable() {
-		if (empty($this->objects)) $this->readObjects();
-		
-		$action = new UserAction($this->objects, 'update', array(
-			'data' => array(
-				'activationCode' => 0
-			),
-			'groups' => array(
-				UserGroup::USERS
-			),
-			'removeGroups' => array(
-				UserGroup::GUESTS
-			)
-		));
-		$action->executeAction();
-		
-		// update user rank
-		if (MODULE_USER_RANK) {
-			$action = new UserProfileAction($this->objects, 'updateUserRank');
-			$action->executeAction();
-		}
-		// update user online marking
-		$action = new UserProfileAction($this->objects, 'updateUserOnlineMarking');
-		$action->executeAction();
-	}
-	
-	/**
-	 * Disables users.
-	 */
-	public function disable() {
-		if (empty($this->objects)) $this->readObjects();
-		
-		$action = new UserAction($this->objects, 'update', array(
-			'data' => array(
-				'activationCode' => UserRegistrationUtil::getActivationCode()
-			),
-			'removeGroups' => array(
-				UserGroup::USERS
-			),
-			'groups' => array(
-				UserGroup::GUESTS
-			)
-		));
-		$action->executeAction();
-		
-		// update user rank
-		if (MODULE_USER_RANK) {
-			$action = new UserProfileAction($this->objects, 'updateUserRank');
-			$action->executeAction();
-		}
-		// update user online marking
-		$action = new UserProfileAction($this->objects, 'updateUserOnlineMarking');
-		$action->executeAction();
-	}
-}
diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index a96d19efdd..fe83e8ed38 100644
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -13,6 +13,7 @@ use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
+use wcf\util\UserRegistrationUtil;
 
 /**
  * Executes user-related actions.
@@ -428,4 +429,76 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
 			ClipboardHandler::getInstance()->unmark($userIDs, ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user'));
 		}
 	}
+	
+	/**
+	 * Validates the enable action.
+	 */
+	public function validateEnable() {
+		WCF::getSession()->checkPermissions(array('admin.user.canEnableUser'));
+	}
+	
+	/**
+	 * Validates the disable action.
+	 */
+	public function validateDisable() {
+		$this->validateEnable();
+	}
+	
+	/**
+	 * Enables users.
+	 */
+	public function enable() {
+		if (empty($this->objects)) $this->readObjects();
+	
+		$action = new UserAction($this->objects, 'update', array(
+			'data' => array(
+				'activationCode' => 0
+			),
+			'groups' => array(
+				UserGroup::USERS
+			),
+			'removeGroups' => array(
+				UserGroup::GUESTS
+			)
+		));
+		$action->executeAction();
+	
+		// update user rank
+		if (MODULE_USER_RANK) {
+			$action = new UserProfileAction($this->objects, 'updateUserRank');
+			$action->executeAction();
+		}
+		// update user online marking
+		$action = new UserProfileAction($this->objects, 'updateUserOnlineMarking');
+		$action->executeAction();
+	}
+	
+	/**
+	 * Disables users.
+	 */
+	public function disable() {
+		if (empty($this->objects)) $this->readObjects();
+	
+		$action = new UserAction($this->objects, 'update', array(
+			'data' => array(
+				'activationCode' => UserRegistrationUtil::getActivationCode()
+			),
+			'removeGroups' => array(
+				UserGroup::USERS
+			),
+			'groups' => array(
+				UserGroup::GUESTS
+			)
+		));
+		$action->executeAction();
+	
+		// update user rank
+		if (MODULE_USER_RANK) {
+			$action = new UserProfileAction($this->objects, 'updateUserRank');
+			$action->executeAction();
+		}
+		// update user online marking
+		$action = new UserProfileAction($this->objects, 'updateUserOnlineMarking');
+		$action->executeAction();
+	}
 }
diff --git a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php
index a2dd27d15f..7b8eb1299d 100644
--- a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\group\UserGroup;
-use wcf\data\user\ExtendedUserAction;
+use wcf\data\user\UserAction;
 use wcf\data\user\User;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\NamedUserException;
@@ -80,7 +80,7 @@ class RegisterActivationForm extends AbstractForm {
 		parent::save();
 		
 		// enable user
-		$this->objectAction = new ExtendedUserAction(array($this->user), 'enable');
+		$this->objectAction = new UserAction(array($this->user), 'enable');
 		$this->objectAction->executeAction();
 		$this->saved();