From ddead341812b4924bc1591780090444c6f58e9a5 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 18 Apr 2015 11:58:26 +0200 Subject: [PATCH] Added new factory (unfinished) + some fixes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../class_LoginAfterRegistrationAction.php | 3 +- inc/classes/main/factories/login/.htaccess | 1 + .../factories/login/class_LoginFactory.php | 66 +++++++++++++++++++ .../verifier/class_BirthdayVerifierFilter.php | 6 +- 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 inc/classes/main/factories/login/.htaccess create mode 100644 inc/classes/main/factories/login/class_LoginFactory.php diff --git a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php index 036e2758..f41843c8 100644 --- a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php +++ b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php @@ -54,7 +54,8 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get a login class from factory - $loginInstance = ObjectFactory::createObjectByConfiguredName('user_login_class'); + $loginInstance = LoginFactory::createLoginObjectByRequest($requestInstance); + die('
'.print_r($loginInstance, TRUE).'
'); // Login the user by the request instance $loginInstance->doLogin($requestInstance, $responseInstance); diff --git a/inc/classes/main/factories/login/.htaccess b/inc/classes/main/factories/login/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/main/factories/login/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/classes/main/factories/login/class_LoginFactory.php b/inc/classes/main/factories/login/class_LoginFactory.php new file mode 100644 index 00000000..1bc38692 --- /dev/null +++ b/inc/classes/main/factories/login/class_LoginFactory.php @@ -0,0 +1,66 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @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 + * 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 . + */ +class LoginFactory extends ObjectFactory { + /** + * Returns a singleton login instance for given request instance. + * + * @param $requestInstance An instance of a Requestable class + * @return $wrapperInstance A database wrapper instance + */ + public static final function createWrapperByConfiguredName (Requestable $requestInstance) { + // + die('requestInstance=
'.print_r($requestInstance, TRUE).'
'); + + // Get registry instance + $registryInstance = Registry::getRegistry(); + + // Do we have an instance in the registry? + if ($registryInstance->instanceExists($wrapperName)) { + // Then use this instance + $wrapperInstance = $registryInstance->getInstance($wrapperName); + } else { + // Get the registry instance + $wrapperInstance = self::createObjectByConfiguredName($wrapperName); + + // Set the instance in registry for further use + $registryInstance->addInstance($wrapperName, $wrapperInstance); + } + + // Return the instance + return $wrapperInstance; + } + + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } +} + +// [EOF] +?> diff --git a/inc/classes/main/filter/verifier/class_BirthdayVerifierFilter.php b/inc/classes/main/filter/verifier/class_BirthdayVerifierFilter.php index e024d8f9..eb7122df 100644 --- a/inc/classes/main/filter/verifier/class_BirthdayVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_BirthdayVerifierFilter.php @@ -91,9 +91,9 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable { 0, 0, 0, - $requestInstance->getRequestElement('birth_day'), - $requestInstance->getRequestElement('birth_month'), - $requestInstance->getRequestElement('birth_year') + (int) $requestInstance->getRequestElement('birth_day'), + (int) $requestInstance->getRequestElement('birth_month'), + (int) $requestInstance->getRequestElement('birth_year') ); // Is there a number or such? (we don't care about the value itself here) -- 2.30.2