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

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 363450b24c62e20aca0d0312a4a93a969458e2ac..b3197bc612fadca35c4b8371fb6c570ec9b97b79 100644 (file)
--- 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 995ebf7d502e4b5d80bf18e21390307ef013109f..1e37e8c570ddfec7dbb0794f13d80a515df0f0cd 100644 (file)
--- 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 6cd2c445129e090225b83935c4597b3bfd9e4740..6e19673762937ddef5d651615f98893c5f6ec4a3 100644 (file)
--- a/application/ship-simu/main/controller/web/class_WebCompanyController.php
+++ b/application/ship-simu/main/controller/web/class_WebCompanyController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Controller for failed government requests
+ * Controller for company requests
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @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 1b3522b0636e79e4c004a5956cc1649c61940faf..96eed3621e693c7fd285f555476c20fdfa39e5bc 100644 (file)
--- 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 c5d644805cdb5b2b824d95ade93739b847277bf4..70c32e8c680372149dcfa48cad209e2c84b8a43b 100644 (file)
--- 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 8b5398e8c1a2d69f445287955ef2ef9a01ce8b2c..e870c007d4ca42cdb95b3bd77942f1f90f0b6d59 100644 (file)
--- 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?