From fc9b7edc51818d2ab4155c8a4763679d87b9b7a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Aug 2009 22:19:14 +0000 Subject: [PATCH] Missing birthday elements added, missing config added - Missing birth_day, birth_month and birth_year added to registration and profile command class - A lot missing configuration entries added - Some more double quotes converted to single quotes --- application/ship-simu/config.php | 24 +++++++++++++++++++ .../web/class_WebShipsimuProfileCommand.php | 5 +++- .../web/class_WebCompanyController.php | 2 +- .../main/login/class_ShipSimuGuestLogin.php | 2 +- .../main/login/class_ShipSimuUserLogin.php | 3 +-- .../class_ShipSimuRegistration.php | 11 ++++++++- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php index 363450b..b3197bc 100644 --- a/application/ship-simu/config.php +++ b/application/ship-simu/config.php @@ -181,6 +181,12 @@ $cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_shor // CFG: LOGIN-REGISTER-ACTION-URL $cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&page=register'); +// CFG: CONFIRM-DIRECT-LOGIN-ACTION-URL +$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&page=login_area'); + +// CFG: WEB-CMD-USER-IS-NULL-URL +$cfg->setConfigEntry('web_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&page=problem&problem=user_null'); + // CFG: NEWS-READER-HOME-CLASS $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); @@ -457,6 +463,24 @@ $cfg->setConfigEntry('web_cmd_government_failed_resolver_class', 'WebGovernmentF // CFG: WEB-CMD-COMPANY-RESOLVER-CLASS $cfg->setConfigEntry('web_cmd_company_resolver_class', 'WebCompanyCommandResolver'); +// CFG: WEB-CMD-HOME-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_home_resolver_class', 'WebCommandResolver'); + +// CFG: WEB-CMD-REGISTER-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_register_resolver_class', 'WebCommandResolver'); + +// CFG: WEB-CMD-DO-FORM-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_do_form_resolver_class', 'WebCommandResolver'); + +// CFG: WEB-CMD-LOGIN-AREA-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_login_area_resolver_class', 'WebCommandResolver'); + +// CFG: WEB-CMD-CONFIRM-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_confirm_resolver_class', 'WebCommandResolver'); + +// CFG: WEB-CMD-PROBLEM-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_problem_resolver_class', 'WebCommandResolver'); + // CFG: REFILL-REQUEST-CURRENCY-PAYMENT-TYPE $cfg->setConfigEntry('refill_request_currency_payment_type', 'test'); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php index 995ebf7..1e37e8c 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php @@ -43,7 +43,10 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { 'yahoo', 'aol', 'msn', - 'rules' + 'rules', + 'birth_day', + 'birth_month', + 'birth_year' ); /** diff --git a/application/ship-simu/main/controller/web/class_WebCompanyController.php b/application/ship-simu/main/controller/web/class_WebCompanyController.php index 6cd2c44..6e19673 100644 --- a/application/ship-simu/main/controller/web/class_WebCompanyController.php +++ b/application/ship-simu/main/controller/web/class_WebCompanyController.php @@ -1,6 +1,6 @@ * @version 0.0.0 diff --git a/application/ship-simu/main/login/class_ShipSimuGuestLogin.php b/application/ship-simu/main/login/class_ShipSimuGuestLogin.php index 1b3522b..96eed36 100644 --- a/application/ship-simu/main/login/class_ShipSimuGuestLogin.php +++ b/application/ship-simu/main/login/class_ShipSimuGuestLogin.php @@ -25,7 +25,7 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser { /** * The hashed password */ - private $hashedPassword = ""; + private $hashedPassword = ''; /** * Protected constructor diff --git a/application/ship-simu/main/login/class_ShipSimuUserLogin.php b/application/ship-simu/main/login/class_ShipSimuUserLogin.php index c5d6448..70c32e8 100644 --- a/application/ship-simu/main/login/class_ShipSimuUserLogin.php +++ b/application/ship-simu/main/login/class_ShipSimuUserLogin.php @@ -25,7 +25,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser { /** * The hashed password */ - private $hashedPassword = ""; + private $hashedPassword = ''; /** * Protected constructor @@ -81,7 +81,6 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser { // Is the password correct? if ($userInstance->ifPasswordHashMatches($requestInstance) === false) { // Mismatching password - $userInstance->debugInstance(); throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); } // END - if diff --git a/application/ship-simu/main/registration/class_ShipSimuRegistration.php b/application/ship-simu/main/registration/class_ShipSimuRegistration.php index 8b5398e..e870c00 100644 --- a/application/ship-simu/main/registration/class_ShipSimuRegistration.php +++ b/application/ship-simu/main/registration/class_ShipSimuRegistration.php @@ -43,7 +43,10 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { 'jabber', 'yahoo', 'aol', - 'msn' + 'msn', + 'birth_day', + 'birth_month', + 'birth_year' ); /** @@ -171,9 +174,15 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { if (is_string($alias)) { // Yes, so use it $criteriaInstance->addCriteria($alias, $this->getRequestInstance()->getRequestElement($element)); + + // Debug message + //* DEBUG: */ $this->debugOutput('ALIAS: alias='.$alias.',element='.$element.'='.$this->getRequestInstance()->getRequestElement($element)); } else { // No, default entry $criteriaInstance->addCriteria($element, $this->getRequestInstance()->getRequestElement($element)); + + // Debug message + //* DEBUG: */ $this->debugOutput('DEFAULT: element='.$element.'='.$this->getRequestInstance()->getRequestElement($element)); } // Is this a guest account? -- 2.39.5