X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Ffilter%2Fpage%2Fclass_RefillPageFilter.php;h=d4680ba72a669bf0444580ef64c10a2020dc056b;hp=448605b1f9602c5c1470d6ad65489770ba5083f2;hb=4f70843ae8428f051d70ccff5bb43fc4c03dda8d;hpb=679093554f4404cde8c01a536a6efcb9a8b2937d

diff --git a/application/ship-simu/main/filter/page/class_RefillPageFilter.php b/application/ship-simu/main/filter/page/class_RefillPageFilter.php
index 448605b..d4680ba 100644
--- a/application/ship-simu/main/filter/page/class_RefillPageFilter.php
+++ b/application/ship-simu/main/filter/page/class_RefillPageFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for money refill page
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu 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
@@ -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 RefillPageFilter extends BaseFrameworkSystem implements Filterable {
+class RefillPageFilter extends BaseShipSimuFilter implements Filterable {
 	/**
 	 * Protected constructor
 	 *
@@ -30,18 +30,14 @@ class RefillPageFilter extends BaseFrameworkSystem implements Filterable {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @return	$filterInstance		An instance of this filter class
+	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createRefillPageFilter () {
+	public static final function createRefillPageFilter () {
 		// Get a new instance
 		$filterInstance = new RefillPageFilter();
 
@@ -55,10 +51,14 @@ class RefillPageFilter extends BaseFrameworkSystem implements Filterable {
 	 * @param	$requestInstance	An instance of a class with an Requestable interface
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
+	 * @throws	FilterChainException	If this filter fails to operate
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+		// Execute the parent execute method
+		parent::execute($requestInstance, $responseInstance);
+
 		// Is the configuration variable set?
-		if ($this->getConfigInstance()->readConfig('refill_page_active') === "N") {
+		if ($this->getConfigInstance()->getConfigEntry('refill_page_active') === "N") {
 			// Password is empty
 			$requestInstance->requestIsValid(false);
 
@@ -66,7 +66,7 @@ class RefillPageFilter extends BaseFrameworkSystem implements Filterable {
 			$responseInstance->addFatalMessage('refill_page_not_active');
 
 			// Abort here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 	}
 }