Fixes and double->single converted

[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 b3825dabd733d4aa7e5b5afa4e71fff909a13e50..ef173181f0acb042e645749d28bbf781224b153b 100644 (file)
--- a/inc/classes/main/filter/class_FilterChain.php
+++ b/inc/classes/main/filter/class_FilterChain.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @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
  *
@@ -21,12 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class FilterChain extends BaseFrameworkSystem {
-       /**
-        * All filters together
-        */
-       private $filters = array();
-
+class FilterChain extends BaseFrameworkSystem implements Registerable {
        /**
         * Protected constructor
         *
@@ -35,10 +30,6 @@ class FilterChain extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -46,7 +37,7 @@ class FilterChain extends BaseFrameworkSystem {
         *
         * @return      $chainInstance  An instance of this class
         */
-       public final static function createFilterChain () {
+       public static final function createFilterChain () {
                // Get a new instance
                $chainInstance = new FilterChain();
 
@@ -61,7 +52,16 @@ class FilterChain extends BaseFrameworkSystem {
         * @return      void
         */
        public final function addFilter (Filterable $filterInstance) {
-               $this->filters[] = $filterInstance;
+               $this->pushValueToGenericArrayElement('filters', 'generic', 'dummy', $filterInstance);
+       }
+
+       /**
+        * Getter for filters array
+        *
+        * @return      $filters        The filters array holding all filter instances
+        */
+       protected function getFilters () {
+               return $this->getGenericArray('filters');
        }
 
        /**
@@ -73,15 +73,16 @@ class FilterChain extends BaseFrameworkSystem {
         */
        public function processFilters (Requestable $requestInstance, Responseable $responseInstance) {
                // Run all filters
-               //* DEBUG */ echo "COUNT=".count($this->filters)."<br />\n";
-               foreach ($this->filters as $filterInstance) {
+               //* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('COUNT=' . $this->countGenericArray('filters'));
+               foreach ($this->getFilters() as $filterInstance) {
                        // Try to execute this filter
                        try {
-                               //* DEBUG */ echo "FILTER: ".$filterInstance->__toString().": Processing started.<br />\n";
+                               //* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing started.');
                                $filterInstance->execute($requestInstance, $responseInstance);
-                               //* DEBUG */ echo "FILTER: ".$filterInstance->__toString().": Processing ended.<br />\n";
+                               //* DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing ended.');
                        } catch (FilterChainException $e) {
                                // This exception can be thrown to just skip any further processing
+                               self::createDebugInstance(__CLASS__)->debugOutput('Failed to execute lase filter ' . $filterInstance->__toString() . ': ' . $e->getMessage());
                                break;
                        }
                } // END - foreach