X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fclass_FilterChain.php;h=c192bf3f3909fdb0055f84cdfc8a06c52d9c9974;hp=b3825dabd733d4aa7e5b5afa4e71fff909a13e50;hb=ac948286448f4e0d4ef71d2dc8daaac53e8c902b;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/classes/main/filter/class_FilterChain.php b/inc/classes/main/filter/class_FilterChain.php
index b3825dab..c192bf3f 100644
--- 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,7 +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 {
+class FilterChain extends BaseFrameworkSystem implements Registerable {
 	/**
 	 * All filters together
 	 */
@@ -35,10 +35,6 @@ class FilterChain extends BaseFrameworkSystem {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -46,7 +42,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 +57,16 @@ class FilterChain extends BaseFrameworkSystem {
 	 * @return	void
 	 */
 	public final function addFilter (Filterable $filterInstance) {
-		$this->filters[] = $filterInstance;
+		array_push($this->filters, $filterInstance);
+	}
+
+	/**
+	 * Getter for filters array
+	 *
+	 * @return	$filters	The filters array holding all filter instances
+	 */
+	protected function getFilters () {
+		return $this->filters;
 	}
 
 	/**
@@ -73,15 +78,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=' . count($this->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