X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fclass_FilterChain.php;h=1c2433313f1b99547cef8c701c1d9d92d79e4c6e;hb=6fd01888b51f210394c4b7bb5e0ac2a28efb0c99;hp=1eb1bd7ae5026d00d300a4a6edd87a2ef5bcf965;hpb=b27db9a7336642919dddc3de9695889b05c1b456;p=core.git

diff --git a/inc/classes/main/filter/class_FilterChain.php b/inc/classes/main/filter/class_FilterChain.php
index 1eb1bd7a..1c243331 100644
--- a/inc/classes/main/filter/class_FilterChain.php
+++ b/inc/classes/main/filter/class_FilterChain.php
@@ -2,11 +2,11 @@
 /**
  * A filter chain for pre and post filters
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,11 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class FilterChain extends BaseFrameworkSystem implements Registerable {
-	/**
-	 * All filters together
-	 */
-	private $filters = array();
-
 	/**
 	 * Protected constructor
 	 *
@@ -57,20 +52,31 @@ class FilterChain extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	public final function addFilter (Filterable $filterInstance) {
-		$this->filters[] = $filterInstance;
+		$this->pushValueToGenericArrayKey('filters', 'generic', 'dummy', $filterInstance);
 	}
 
 	/**
-	 * Getter for filters array
+	 * "Getter" for filters array
 	 *
 	 * @return	$filters	The filters array holding all filter instances
 	 */
 	protected function getFilters () {
-		return $this->filters;
+		// Default is nothing found
+		$filters = array();
+
+		// Are some filters set?
+		if ($this->isValidGenericArrayKey('filters', 'generic', 'dummy')) {
+			// Then get them
+			$filters = $this->getGenericArrayKey('filters', 'generic', 'dummy');
+		} // END - if
+
+		// Return it
+		return $filters;
 	}
 
 	/**
-	 * Process all added filters
+	 * Process all added filters. Please note that filters must throw
+	 * FilterChainException if they need to interrupt the filter chain.
 	 *
 	 * @param	$requestInstance	An instance of a request class
 	 * @param	$responseInstance	An instance of a response class
@@ -78,16 +84,19 @@ class FilterChain extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function processFilters (Requestable $requestInstance, Responseable $responseInstance) {
 		// Run all filters
-		//* DEBUG */ $this->debugOutput('COUNT=' . count($this->filters));
+		//* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('COUNT=' . $this->countGenericArray('filters'));
 		foreach ($this->getFilters() as $filterInstance) {
+			// Must be an instance of Filterable
+			assert($filterInstance instanceof Filterable);
+
 			// Try to execute this filter
 			try {
-				//* DEBUG */ $this->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing started.');
+				//* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing started.');
 				$filterInstance->execute($requestInstance, $responseInstance);
-				//* DEBUG */ $this->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing ended.');
+				//* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing ended.');
 			} catch (FilterChainException $e) {
 				// This exception can be thrown to just skip any further processing
-				$this->debugOutput('Failed to execute lase filter ' . $filterInstance->__toString() . ': ' . $e->getMessage());
+				self::createDebugInstance(__CLASS__)->debugOutput('Failed to execute lase filter ' . $filterInstance->__toString() . ': ' . $e->getMessage());
 				break;
 			}
 		} // END - foreach