X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=application%2Fship-simu%2Fmain%2Ffilter%2Fvalidator%2Fclass_RefillRequestValidatorFilter.php;h=f5ca9e0f902cea95de53f5df1a215d591f457dcd;hb=89ff4c699c54479da87bcae0d61af52d4219ddf2;hp=1bcd9323bdca823a0731d4fe075a9d4e3bf9080c;hpb=173a20fb725d49bf6de24a4afa43001f86375683;p=shipsimu.git

diff --git a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
index 1bcd932..f5ca9e0 100644
--- a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
+++ b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
@@ -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 MoneyRefillRequestValidatorFilter extends BaseFrameworkSystem implements Filterable {
+class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filterable {
 	/**
 	 * Protected constructor
 	 *
@@ -30,10 +30,6 @@ class MoneyRefillRequestValidatorFilter extends BaseFrameworkSystem implements F
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -41,9 +37,9 @@ class MoneyRefillRequestValidatorFilter extends BaseFrameworkSystem implements F
 	 *
 	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public final static function createMoneyRefillRequestValidatorFilter () {
+	public final static function createRefillRequestValidatorFilter () {
 		// Get a new instance
-		$filterInstance = new MoneyRefillRequestValidatorFilter();
+		$filterInstance = new RefillRequestValidatorFilter();
 
 		// Return the instance
 		return $filterInstance;
@@ -55,11 +51,15 @@ class MoneyRefillRequestValidatorFilter extends BaseFrameworkSystem implements F
 	 * @param	$requestInstance	An instance of a class with an Requestable interface
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
-	 * @todo	0% done
+	 * @todo	Maybe we need to added some more generic tests on the request here?
+	 * @throws	FilterChainException	If this filter fails to operate
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+		// Execute the parent execute method
+		parent::execute($requestInstance, $responseInstance);
+
 		// Are all required request fields set?
-		if ((!$requestInstance->isRequestElementSet('type')) || (!$requestInstance->isRequestElementSet('amount'))) {
+		if (($requestInstance->isRequestElementSet('type') === false) || ($requestInstance->isRequestElementSet('amount') === false)) {
 			// Something important is missing
 			$requestInstance->requestIsValid(false);
 
@@ -67,9 +67,8 @@ class MoneyRefillRequestValidatorFilter extends BaseFrameworkSystem implements F
 			$responseInstance->addFatalMessage('refill_page_required_fields_missing');
 
 			// Abort here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
-		die("OK!");
 	}
 }