X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcontroller%2Fclass_BaseController.php;h=28c8de1bc54b0249abb7ca80b676ef4d5105ba38;hb=01cc80f06529313b40cb6858eae3f361c8ed1aee;hp=9e1c43e0b419c51f9a2744df22a6a50c552972ef;hpb=2a80c9474b0a0923b80cd2f18e4558f63d73e2f8;p=core.git

diff --git a/inc/classes/main/controller/class_BaseController.php b/inc/classes/main/controller/class_BaseController.php
index 9e1c43e0..28c8de1b 100644
--- a/inc/classes/main/controller/class_BaseController.php
+++ b/inc/classes/main/controller/class_BaseController.php
@@ -6,7 +6,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -24,14 +24,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseController extends BaseFrameworkSystem implements Registerable {
+	// Exception constants
+	const EXCEPTION_FILTER_CHAIN_INVALID = 0xf10;
+
+	// Names of controller's own filter chains
+	const FILTER_CHAIN_PRE_COMMAND  = 'controller_pre_command';
+	const FILTER_CHAIN_POST_COMMAND = 'controller_post_command';
+
 	/**
 	 * Generic filter chains
 	 */
 	private $filterChains = array();
 
-	// Exception constants
-	const EXCEPTION_FILTER_CHAIN_INVALID = 0xf10;
-
 	/**
 	 * Protected constructor
 	 *
@@ -42,13 +46,9 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 		// Call parent constructor
 		parent::__construct($className);
 
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
-
 		// Initialize both filter chains
-		$this->initFilterChain('pre');
-		$this->initFilterChain('post');
+		$this->initFilterChain(self::FILTER_CHAIN_PRE_COMMAND);
+		$this->initFilterChain(self::FILTER_CHAIN_POST_COMMAND);
 
 		// Add this controller to the registry
 		Registry::getRegistry()->addInstance('controller', $this);
@@ -61,9 +61,9 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	protected function initFilterChain ($filterChain) {
-		//* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ' init: START');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONTROLLER: ' . $filterChain . ' init: START');
 		$this->filterChains[$filterChain] = ObjectFactory::createObjectByConfiguredName('filter_chain_class');
-		//* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ' init: FINISHED');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONTROLLER: ' . $filterChain . ' init: FINISHED');
 	}
 
 	/**
@@ -75,7 +75,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 * @throws	InvalidFilterChainException	If the filter chain is invalid
 	 */
 	protected function addFilter ($filterChain, Filterable $filterInstance) {
-		//* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: START');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: START');
 
 		// Test if the filter is there
 		if (!isset($this->filterChains[$filterChain])) {
@@ -85,7 +85,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 
 		// Add the filter
 		$this->filterChains[$filterChain]->addFilter($filterInstance);
-		//* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: FINISH');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: FINISH');
 	}
 
 	/**
@@ -96,7 +96,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function addPreFilter (Filterable $filterInstance) {
 		// Add the pre filter
-		$this->addFilter('pre', $filterInstance);
+		$this->addFilter(self::FILTER_CHAIN_PRE_COMMAND, $filterInstance);
 	}
 
 	/**
@@ -107,7 +107,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function addPostFilter (Filterable $filterInstance) {
 		// Add the post filter
-		$this->addFilter('post', $filterInstance);
+		$this->addFilter(self::FILTER_CHAIN_POST_COMMAND, $filterInstance);
 	}
 
 	/**
@@ -139,7 +139,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 */
 	protected function executePreFilters (Requestable $requestInstance, Responseable $responseInstance) {
 		// Execute all pre filters
-		$this->executeFilters('pre', $requestInstance, $responseInstance);
+		$this->executeFilters(self::FILTER_CHAIN_PRE_COMMAND, $requestInstance, $responseInstance);
 	}
 
 	/**
@@ -151,7 +151,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	 */
 	protected function executePostFilters (Requestable $requestInstance, Responseable $responseInstance) {
 		// Execute all post filters
-		$this->executeFilters('post', $requestInstance, $responseInstance);
+		$this->executeFilters(self::FILTER_CHAIN_POST_COMMAND, $requestInstance, $responseInstance);
 	}
 }