Filters added to refill form command
authorRoland Häder <roland@mxchange.org>
Sat, 16 Aug 2008 20:53:31 +0000 (20:53 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 16 Aug 2008 20:53:31 +0000 (20:53 +0000)
.gitattributes
application/blog/config.php
application/ship-simu/config.php
application/ship-simu/main/actions/web/class_WebLoginMoneyRefillAction.php
application/ship-simu/main/commands/web/class_WebMoneyRefillFormCommand.php
inc/classes/main/filter/verifier/class_EmailValidatorFilter.php [deleted file]

index be68929..eaa20f6 100644 (file)
@@ -563,7 +563,6 @@ inc/classes/main/filter/validator/class_UserNameValidatorFilter.php -text
 inc/classes/main/filter/verifier/.htaccess -text
 inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php -text
-inc/classes/main/filter/verifier/class_EmailValidatorFilter.php -text
 inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php -text
index 2725282..cf43842 100644 (file)
@@ -115,6 +115,9 @@ $cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app=blog&p
 // CFG: CONFIRM-CODE-INVALID-URL
 $cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app=blog&page=status&status=confirm_code_invalid");
 
+// CFG: USER-NOT-FOUND-URL
+$cfg->setConfigEntry('user_not_found_url', "index.php?app=ship-simu&page=status&status=user_not_found");
+
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', "welcome");
 
index 1091e90..27ff4d9 100644 (file)
@@ -115,6 +115,9 @@ $cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app=ship-s
 // CFG: CONFIRM-CODE-INVALID-URL
 $cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app=ship-simu&page=status&status=confirm_code_invalid");
 
+// CFG: USER-NOT-FOUND-URL
+$cfg->setConfigEntry('user_not_found_url', "index.php?app=ship-simu&page=status&status=user_not_found");
+
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', "welcome");
 
index 7f63754..543d3fe 100644 (file)
@@ -71,6 +71,8 @@ class WebLoginMoneyRefillAction extends BaseAction implements Commandable, Regis
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+
+               // Is the refill page active?
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
        }
 }
index 31593a8..06e2e31 100644 (file)
@@ -72,7 +72,14 @@ class WebMoneyRefillFormCommand extends BaseCommand implements Commandable {
         * @return      void
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               $this->partialStub("Please implement this method.");
+               // Add user auth filter (we don't need an update of the user here because it will be redirected)
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+
+               // Add user status filter here
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+
+               // Is the refill page active?
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
        }
 }
 
diff --git a/inc/classes/main/filter/verifier/class_EmailValidatorFilter.php b/inc/classes/main/filter/verifier/class_EmailValidatorFilter.php
deleted file mode 100644 (file)
index feb819e..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * A concrete filter for validating the email address. This filter may intercept
- * the filter chain if no email address is given or if the supplied email has an
- * invalid form. It could also intercept the filter chain if the email address
- * is already used by some one if configuration requires this.
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 EmailValidatorFilter extends BaseFilter implements Filterable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this filter class
-        *
-        * @return      $filterInstance         An instance of this filter class
-        */
-       public final static function createEmailValidatorFilter () {
-               // Get a new instance
-               $filterInstance = new EmailValidatorFilter();
-
-               // Return the instance
-               return $filterInstance;
-       }
-
-       /**
-        * Executes the filter with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Get Email from request
-               $email = $requestInstance->getRequestElement('email');
-
-               // Is the Email set?
-               if ((is_null($email)) || ($this->getConfigInstance()->readConfig('register_email_unique') === "Y")) {
-                       // Try it again
-                       $email1 = $requestInstance->getRequestElement('email1');
-                       $email2 = $requestInstance->getRequestElement('email2');
-
-                       // Is the email still not set?
-                       if ((is_null($email1)) || (is_null($email2))) {
-                               // Not found in form so stop the filtering process
-                               $requestInstance->requestIsValid(false);
-
-                               // Add a message to the response
-                               $responseInstance->addFatalMessage('email_unset');
-
-                               // Abort here
-                               return false;
-                       } elseif ((empty($email1)) || (empty($email2))) {
-                               // Email is empty
-                               $requestInstance->requestIsValid(false);
-
-                               // Is the email empty?
-                               if (empty($email1)) {
-                                       // Add a message to the response
-                                       $responseInstance->addFatalMessage('email1_empty');
-                               } // END - if
-
-                               // Is the confirmation empty?
-                               if (empty($email2)) {
-                                       // Add a message to the response
-                                       $responseInstance->addFatalMessage('email2_empty');
-                               } // END - if
-
-                               // Abort here
-                               return false;
-                       } elseif ($this->ifEmailIsTaken($email1)) {
-                               // Email is already taken
-                               $requestInstance->requestIsValid(false);
-
-                               // Add a message to the response
-                               $responseInstance->addFatalMessage('email_taken');
-
-                               // Abort here
-                               return false;
-                       } elseif ($email1 != $email2) {
-                               // Emails didn't match
-                               $requestInstance->requestIsValid(false);
-
-                               // Add a message to the response
-                               $responseInstance->addFatalMessage('emails_mismatch');
-
-                               // Abort here
-                               return false;
-                       } // END - elseif
-               } elseif (empty($email)) {
-                       // Empty field!
-                       $requestInstance->requestIsValid(false);
-
-                       // Add a message to the response
-                       $responseInstance->addFatalMessage('email_empty');
-
-                       // Abort here
-                       return false;
-               } // END - elseif
-       }
-
-       /**
-        * Check wether the email as already been taken
-        *
-        * @param       $email                  Email to check for existence
-        * @return      $alreadyTaken   Wether the email has been taken
-        */
-       private function ifEmailIsTaken ($email) {
-               // Default is already taken
-               $alreadyTaken = true;
-
-               // Initialize instance
-               $userInstance = null;
-
-               // Get a registry instance
-               $registry = Registry::getRegistry();
-
-               // Is the user already there?
-               if ($registry->instanceExists('user')) {
-                       // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
-                       $userInstance->setEmailAddress($email);
-               } else {
-                       // If this instance is created then the username *does* exist
-                       $userInstance = call_user_func_array(array($this->getConfigInstance()->readConfig('user_class'), 'createMemberByEmail'), array($email));
-
-                       // Remember this user instance in our registry for later usage
-                       $registry->addInstance('user', $userInstance);
-               }
-
-               // Does the email exist?
-               if (!$userInstance->ifEmailAddressExists()) {
-                       // This email has not being used yet
-                       $alreadyTaken = false;
-               }
-
-               // Return the result
-               return $alreadyTaken;
-       }
-}
-
-// [EOF]
-?>