Added post-filter support.

[core.git] / inc / classes / main / filter / class_FilterChain.php

diff --git a/inc/classes/main/filter/class_FilterChain.php b/inc/classes/main/filter/class_FilterChain.php
index ef173181f0acb042e645749d28bbf781224b153b..e80c956d88383d933a7a4da57c28fb2ce478a094 100644 (file)
--- 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 - 2012 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
@@ -52,20 +52,60 @@ class FilterChain extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public final function addFilter (Filterable $filterInstance) {
-               $this->pushValueToGenericArrayElement('filters', 'generic', 'dummy', $filterInstance);
+               $this->pushValueToGenericArrayKey('filters', 'generic', 'dummy', $filterInstance);
        }
 
        /**
-        * Getter for filters array
+        * Add a new post-filter
+        *
+        * @param       $filerInstance  An instance of a post-filter class
+        * @return      void
+        */
+       public final function addPostFilter (Filterable $filterInstance) {
+               $this->pushValueToGenericArrayKey('filters', 'post', 'dummy', $filterInstance);
+       }
+
+       /**
+        * "Getter" for filters array
         *
         * @return      $filters        The filters array holding all filter instances
         */
        protected function getFilters () {
-               return $this->getGenericArray('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
+        * "Getter" for post-filters array
+        *
+        * @return      $filters        The filters array holding all post-filter instances
+        */
+       protected function getPostFilters () {
+               // Default is nothing found
+               $filters = array();
+
+               // Are some filters set?
+               if ($this->isValidGenericArrayKey('filters', 'post', 'dummy')) {
+                       // Then get them
+                       $filters = $this->getGenericArrayKey('filters', 'post', 'dummy');
+               } // END - if
+
+               // Return it
+               return $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
@@ -75,6 +115,9 @@ class FilterChain extends BaseFrameworkSystem implements Registerable {
                // Run all 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 */ self::createDebugInstance(__CLASS__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing started.');