* invalid form. It could also intercept our filter chain if email address is
* already used by some one if configuration requires this.
*
- * @author Roland Haeder <webmaster@ship-simu.org>
+ * @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core 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
*
* @return $filterInstance An instance of this filter class
*/
- public final static function createEmailValidatorFilter () {
+ public static final function createEmailValidatorFilter () {
// Get a new instance
$filterInstance = new EmailValidatorFilter();
$email = $requestInstance->getRequestElement('email');
// Is the Email set?
- if ((is_null($email)) || ($this->getConfigInstance()->readConfig('register_email_unique') === "Y")) {
+ if ((is_null($email)) || ($this->getConfigInstance()->getConfigEntry('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);
+ $requestInstance->requestIsValid(FALSE);
// Add a message to the response
$responseInstance->addFatalMessage('email_unset');
throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
} elseif ((empty($email1)) || (empty($email2))) {
// Email is empty
- $requestInstance->requestIsValid(false);
+ $requestInstance->requestIsValid(FALSE);
// Is the email empty?
if (empty($email1)) {
throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
} elseif ($this->ifEmailIsTaken($email1)) {
// Email is already taken
- $requestInstance->requestIsValid(false);
+ $requestInstance->requestIsValid(FALSE);
// Add a message to the response
$responseInstance->addFatalMessage('email_taken');
throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
} elseif ($email1 != $email2) {
// Emails didn't match
- $requestInstance->requestIsValid(false);
+ $requestInstance->requestIsValid(FALSE);
// Add a message to the response
$responseInstance->addFatalMessage('emails_mismatch');
} // END - elseif
} elseif (empty($email)) {
// Empty field!
- $requestInstance->requestIsValid(false);
+ $requestInstance->requestIsValid(FALSE);
// Add a message to the response
$responseInstance->addFatalMessage('email_empty');
}
/**
- * Check wether the email as already been taken
+ * Check whether the email as already been taken
*
* @param $email Email to check for existence
- * @return $alreadyTaken Wether the email has been taken
+ * @return $alreadyTaken Whether the email has been taken
*/
private function ifEmailIsTaken ($email) {
// Default is already taken
- $alreadyTaken = true;
+ $alreadyTaken = TRUE;
// Initialize instance
- $userInstance = null;
+ $userInstance = NULL;
// Get a registry instance
$registry = Registry::getRegistry();
$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));
+ $userInstance = call_user_func_array(array($this->getConfigInstance()->getConfigEntry('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() === false) {
+ if ($userInstance->ifEmailAddressExists() === FALSE) {
// This email has not being used yet
- $alreadyTaken = false;
+ $alreadyTaken = FALSE;
}
// Return the result