Misc fixes
authorRoland Haeder <roland@mxchange.org>
Tue, 7 Apr 2015 16:06:12 +0000 (18:06 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 7 Apr 2015 16:06:12 +0000 (18:06 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
21 files changed:
application/shipsimu/config.php
application/shipsimu/main/filter/verifier/.htaccess [deleted file]
application/shipsimu/main/filter/verifier/class_BirthdayVerifierFilter.php [deleted file]
application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_logout.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_status_problem.ctp
application/shipsimu/templates/de/code/block_company_data.ctp
application/shipsimu/templates/de/code/block_persona_data.ctp
application/shipsimu/templates/de/code/captch_graphic_code.ctp
application/shipsimu/templates/de/code/confirm_link.ctp
application/shipsimu/templates/de/code/government_failed_main.ctp
application/shipsimu/templates/de/code/login_failed.ctp
application/shipsimu/templates/de/code/login_form.ctp
application/shipsimu/templates/de/code/login_main.ctp
application/shipsimu/templates/de/code/logout_done.ctp
application/shipsimu/templates/de/code/register_form.ctp
core

index 5c39891..948efec 100644 (file)
@@ -392,7 +392,7 @@ $cfg->setConfigEntry('company_db_wrapper_class', 'CompanyDatabaseWrapper');
 $cfg->setConfigEntry('user_points_db_wrapper_class', 'UserPointsDatabaseWrapper');
 
 // CFG: USER-GOVERNMENT-WRAPPER-CLASS
-$cfg->setConfigEntry('user_gov_wrapper_class', 'UserGovernmentDatabaseWrapper');
+$cfg->setConfigEntry('user_government_wrapper_class', 'UserGovernmentDatabaseWrapper');
 
 // CFG: PAYMENT-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('payment_db_wrapper_class', 'PaymentsDatabaseWrapper');
@@ -455,13 +455,13 @@ $cfg->setConfigEntry('government_startup_help_limit', 3);
 $cfg->setConfigEntry('government_training_limit', 2);
 
 // CFG: HTML-BLOCK-HELPER
-$cfg->setConfigEntry('html_block_helper', 'HtmlBlockHelper');
+$cfg->setConfigEntry('html_block_helper_class', 'HtmlBlockHelper');
 
 // CFG: HTML-FORM-HELPER
-$cfg->setConfigEntry('html_form_helper', 'HtmlFormHelper');
+$cfg->setConfigEntry('html_form_helper_class', 'HtmlFormHelper');
 
 // CFG: HTML-LINK-HELPER
-$cfg->setConfigEntry('html_link_helper', 'HtmlLinkHelper');
+$cfg->setConfigEntry('html_link_helper_class', 'HtmlLinkHelper');
 
 // CFG: HTML-CMD-GOVERNMENT-FAILED-RESOLVER-CLASS
 $cfg->setConfigEntry('html_cmd_government_failed_resolver_class', 'HtmlGovernmentFailedCommandResolver');
diff --git a/application/shipsimu/main/filter/verifier/.htaccess b/application/shipsimu/main/filter/verifier/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/shipsimu/main/filter/verifier/class_BirthdayVerifierFilter.php b/application/shipsimu/main/filter/verifier/class_BirthdayVerifierFilter.php
deleted file mode 100644 (file)
index 51bb4db..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * A verifier filter for birthday data
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu 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 <http://www.gnu.org/licenses/>.
- */
-class BirthdayVerifierFilter extends BaseShipSimuFilter 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 static final function createBirthdayVerifierFilter () {
-               // Get a new instance
-               $filterInstance = new BirthdayVerifierFilter();
-
-               // 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) {
-               // Execute the parent execute method
-               parent::execute($requestInstance, $responseInstance);
-
-               // Day of birth set?
-               if (!$requestInstance->isRequestElementSet('birth_day')) {
-                       // Day of birth isn't set
-                       $requestInstance->requestIsValid(false);
-
-                       // Add a message to the response
-                       $responseInstance->addFatalMessage('day_of_birth_unset');
-               } // END - if
-
-               // Month of birth set?
-               if (!$requestInstance->isRequestElementSet('birth_month')) {
-                       // Month of birth isn't set
-                       $requestInstance->requestIsValid(false);
-
-                       // Add a message to the response
-                       $responseInstance->addFatalMessage('month_of_birth_unset');
-               } // END - if
-
-               // Year of birth set?
-               if (!$requestInstance->isRequestElementSet('birth_year')) {
-                       // Year of birth isn't set
-                       $requestInstance->requestIsValid(false);
-
-                       // Add a message to the response
-                       $responseInstance->addFatalMessage('year_of_birth_unset');
-               } // END - if
-
-               // Is the request still valid?
-               if (!$requestInstance->isRequestValid()) {
-                       // Abort here
-                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
-
-               // Now comes the final check
-               $birthCheck = mktime(
-                       0,
-                       0,
-                       0,
-                       $requestInstance->getRequestElement('birth_day'),
-                       $requestInstance->getRequestElement('birth_month'),
-                       $requestInstance->getRequestElement('birth_year')
-               );
-
-               // Is there a number or such? (we don't care about the value itself here)
-               if (empty($birthCheck)) {
-                       // Validation has failed
-                       $requestInstance->requestIsValid(false);
-
-                       // Add a message to the response
-                       $responseInstance->addFatalMessage('birthday_invalid');
-
-                       // Abort here
-                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
-       }
-}
-
-// [EOF]
-?>
index 2fe6d33..ebe2fbd 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get a link helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'list_companies'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'list_companies'));
 
 // Prefetch the user data
 $linkInstance->prefetchValueInstance('user');
index 6a7e31c..99c68f7 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_government_startup'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_government_startup'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -41,7 +41,7 @@ $helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&u
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'shipsimu_profile'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
index 4a188e9..555c036 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_government_training'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_government_training'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -41,7 +41,7 @@ $helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&u
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'shipsimu_profile'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
index c8c0c3b..bc534f8 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout_now'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'logout_now'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('logout_now');
@@ -9,7 +9,7 @@ $helperInstance->addLinkWithTextById('logout_now');
 $helperInstance->flushContent();
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'return_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'return_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('return_login');
index d8bccde..ccd073b 100644 (file)
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, "shipsimu_profile"));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, "shipsimu_profile"));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
index 7436740..0481264 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Neue Helper-Instanz holen
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_refill'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_refill'));
 
 // Pre-fetch payment types
 $helperInstance->prefetchValueInstance('payments');
index 39ad0a5..813840f 100644 (file)
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'resend_link'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'resend_link'));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
@@ -30,7 +30,7 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
 $helperInstance->flushContent();
 
 // Build the form for confirmation
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'confirm_code'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'confirm_code'));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
index bb52c0a..2505b54 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'company'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'company'));
 
 // Set link text
 $helperInstance->addActionLinkById('company', 'company');
index ae725dc..07ff64c 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'profile'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'profile'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
index 942d94c..6e89dfc 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'captcha_code', false, false));
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'captcha_code', false, false));
 
 // Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
index c1dbfb5..bf8e6a6 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'direct_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'direct_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('direct_login');
index ca56cea..6411bfb 100644 (file)
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'persona_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper_class', array($this, 'persona_data'));
 
 // Set the data source instance which must exist in registry
 $blockInstance->prefetchValueInstance('user');
@@ -27,7 +27,7 @@ $blockInstance->flushContent();
 //////////////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'company_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper_class', array($this, 'company_data'));
 
 // Set the data source instance
 $blockInstance->prefetchValueInstance('company', 'user');
@@ -63,7 +63,7 @@ if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'logout'));
 
 // Add action
 $linkInstance->addActionLinkById('logout', 'logout');
index 12257fc..699b5a5 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'login_retry'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'login_retry'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('login_retry');
index db78583..9de613a 100644 (file)
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_user_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_user_login'));
 
 // Formular deaktiviert?
 if ($helperInstance->ifLoginIsEnabled()) {
@@ -53,7 +53,7 @@ $helperInstance->flushContent();
 // Ist Gastlogin erlaubt?
 if ($helperInstance->ifGuestLoginAllowed()) {
        // Neue Helper-Instanz holen
-       $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_guest_login'));
+       $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_guest_login'));
        $helperInstance->addInputHiddenConfiguredField('user', 'guest_login');
        $helperInstance->addInputHiddenConfiguredField('passwd', 'guest_login');
 
@@ -70,7 +70,7 @@ if ($helperInstance->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'register'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'register'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('register_login');
index e555eac..8c17459 100644 (file)
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'persona_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper_class', array($this, 'persona_data'));
 
 // Set the data source instance which must exist in registry
 $blockInstance->prefetchValueInstance('user', 'user_points');
@@ -28,7 +28,7 @@ $blockInstance->flushContent();
 //////////////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'company_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper_class', array($this, 'company_data'));
 
 // Set the data source instance
 $blockInstance->prefetchValueInstance('company', 'user');
@@ -64,7 +64,7 @@ if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'logout'));
 
 // Add action
 $linkInstance->addActionLinkById('logout', 'logout');
index 9b45511..59c8cbc 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'relogin'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'relogin'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('relogin');
index 7860f3b..738b3b8 100644 (file)
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_register'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'shipsimu_register'));
 
 // Always ask at least for nickname and password
 $helperInstance->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
diff --git a/core b/core
index 7b1fd34..920fe04 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7b1fd34316273e96f97816746a071d509e7ca085
+Subproject commit 920fe04a04cf304a705cd06212b5d4739aadc4c4