Class name typo fixed, typo goverment->government fixed
authorRoland Häder <roland@mxchange.org>
Sat, 6 Dec 2008 21:35:49 +0000 (21:35 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 6 Dec 2008 21:35:49 +0000 (21:35 +0000)
15 files changed:
application/ship-simu/config.php
application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php
application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php
application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php
application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php
application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php
application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php
application/ship-simu/main/government/class_SimplifiedGovernment.php
application/ship-simu/main/resolver/web/class_WebGovernmentFailedCommandResolver.php
application/ship-simu/main/user/class_ShipSimuBaseUser.php
application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php
application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
application/ship-simu/templates/de/code/login_failed.ctp

index f21e299b5d14c35f311ca72d1527c1cca9dd5d48..3a33a658b8db4a9bac8ade2a5004f6ae3b128f23 100644 (file)
@@ -124,11 +124,11 @@ $cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name
 // CFG: USER-NOT-FOUND-URL
 $cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
 
-// CFG: LOGIN-GOVERMENT-STARTUP-FAILED-URL
-$cfg->setConfigEntry('login_goverment_startup_failed_url', "index.php?app={?app_short_name?}&page=goverment_failed&failed=startup");
+// CFG: LOGIN-GOVERNMENT-STARTUP-FAILED-URL
+$cfg->setConfigEntry('login_government_startup_failed_url', "index.php?app={?app_short_name?}&page=government_failed&failed=startup");
 
-// CFG: LOGIN-GOVERMENT-TRAINING-FAILED-URL
-$cfg->setConfigEntry('login_goverment_training_failed_url', "index.php?app={?app_short_name?}&page=goverment_failed&failed=training");
+// CFG: LOGIN-GOVERNMENT-TRAINING-FAILED-URL
+$cfg->setConfigEntry('login_government_training_failed_url', "index.php?app={?app_short_name?}&page=government_failed&failed=training");
 
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', "welcome");
@@ -151,14 +151,14 @@ $cfg->setConfigEntry('news_reader_login_area_refill_class', "DefaultNewsReader")
 // CFG: NEWS-READER-LOGIN-AREA-PROFILE-CLASS
 $cfg->setConfigEntry('news_reader_login_area_profile_class', "DefaultNewsReader");
 
-// CFG: NEWS-READER-LOGIN-AREA-GOVERMENT-TRAINING-CLASS
-$cfg->setConfigEntry('news_reader_login_area_goverment_training_class', "DefaultNewsReader");
+// CFG: NEWS-READER-LOGIN-AREA-GOVERNMENT-TRAINING-CLASS
+$cfg->setConfigEntry('news_reader_login_area_government_training_class', "DefaultNewsReader");
 
-// CFG: NEWS-READER-LOGIN-AREA-GOVERMENT-STARTUP-HELP-CLASS
-$cfg->setConfigEntry('news_reader_login_area_goverment_startup_help_class', "DefaultNewsReader");
+// CFG: NEWS-READER-LOGIN-AREA-GOVERNMENT-STARTUP-HELP-CLASS
+$cfg->setConfigEntry('news_reader_login_area_government_startup_help_class', "DefaultNewsReader");
 
-// CFG: NEWS-READER-GOVERMENT-FAILED-CLASS
-$cfg->setConfigEntry('news_reader_goverment_failed_class', "DefaultNewsReader");
+// CFG: NEWS-READER-GOVERNMENT-FAILED-CLASS
+$cfg->setConfigEntry('news_reader_government_failed_class', "DefaultNewsReader");
 
 // CFG: NEWS-DOWNLOAD-FILTER
 $cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");
@@ -214,11 +214,11 @@ $cfg->setConfigEntry('refill_request_currency_book_filter', "RefillRequestCurren
 // CFG: PAYMENT-DISCOVERY-FILTER
 $cfg->setConfigEntry('payment_discovery_filter', "PaymentDiscoveryFilter");
 
-// CFG: GOVERMENT-PAYS-TRAINING-FILTER
-$cfg->setConfigEntry('goverment_pays_training_filter', "ShipSimuGovernmentPaysTrainingFilter");
+// CFG: GOVERNMENT-PAYS-TRAINING-FILTER
+$cfg->setConfigEntry('government_pays_training_filter', "ShipSimuGovernmentPaysTrainingFilter");
 
-// CFG: GOVERMENT-PAYS-STARTUP-HELP-FILTER
-$cfg->setConfigEntry('goverment_pays_startup_help_filter', "ShipSimuGovernmentPaysStartupHelpFilter");
+// CFG: GOVERNMENT-PAYS-STARTUP-HELP-FILTER
+$cfg->setConfigEntry('government_pays_startup_help_filter', "ShipSimuGovernmentPaysStartupHelpFilter");
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
@@ -226,8 +226,8 @@ $cfg->setConfigEntry('news_home_limit', 10);
 // CFG: NEWS-LOGIN-AREA-LIMIT
 $cfg->setConfigEntry('news_login_area_limit', 15);
 
-// CFG: NEWS-GOVERMENT-FAILED-LIMIT
-$cfg->setConfigEntry('news_goverment_failed_limit', 15);
+// CFG: NEWS-GOVERNMENT-FAILED-LIMIT
+$cfg->setConfigEntry('news_government_failed_limit', 15);
 
 // CFG: LOGIN-ENABLED
 $cfg->setConfigEntry('login_enabled', "Y");
@@ -280,11 +280,11 @@ $cfg->setConfigEntry('shipsimu_profile_captcha', "GraphicalCodeCaptcha");
 // CFG: SHIPSIMU-REFILL-CAPTCHA
 $cfg->setConfigEntry('shipsimu_refill_captcha', "GraphicalCodeCaptcha");
 
-// CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA
-$cfg->setConfigEntry('shipsimu_goverment_startup_captcha', "GraphicalCodeCaptcha");
+// CFG: SHIPSIMU-GOVERNMENT-STARTUP-CAPTCHA
+$cfg->setConfigEntry('shipsimu_government_startup_captcha', "GraphicalCodeCaptcha");
 
-// CFG: SHIPSIMU-GOVERMENT-TRAINING-CAPTCHA
-$cfg->setConfigEntry('shipsimu_goverment_training_captcha', "GraphicalCodeCaptcha");
+// CFG: SHIPSIMU-GOVERNMENT-TRAINING-CAPTCHA
+$cfg->setConfigEntry('shipsimu_government_training_captcha', "GraphicalCodeCaptcha");
 
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);
@@ -310,11 +310,11 @@ $cfg->setConfigEntry('shipsimu_profile_captcha_secured', "Y");
 // CFG: SHIPSIMU-REFILL-CAPTCHA-SECURED
 $cfg->setConfigEntry('shipsimu_refill_captcha_secured', "Y");
 
-// CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA-SECURED
-$cfg->setConfigEntry('shipsimu_goverment_startup_captcha_secured', "Y");
+// CFG: SHIPSIMU-GOVERNMENT-STARTUP-CAPTCHA-SECURED
+$cfg->setConfigEntry('shipsimu_government_startup_captcha_secured', "Y");
 
-// CFG: SHIPSIMU-GOVERMENT-TRAINING-CAPTCHA-SECURED
-$cfg->setConfigEntry('shipsimu_goverment_training_captcha_secured', "Y");
+// CFG: SHIPSIMU-GOVERNMENT-TRAINING-CAPTCHA-SECURED
+$cfg->setConfigEntry('shipsimu_government_training_captcha_secured', "Y");
 
 // CFG: BLOCK-SHOWS-REGISTRATION
 $cfg->setConfigEntry('block_shows_registration', "Y");
@@ -328,7 +328,7 @@ $cfg->setConfigEntry('company_db_wrapper_class', "CompanyDatabaseWrapper");
 // CFG: USER-POINTS-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('user_points_db_wrapper_class', "UserPointsDatabaseWrapper");
 
-// CFG: USER-GOVERMENT-WRAPPER-CLASS
+// CFG: USER-GOVERNMENT-WRAPPER-CLASS
 $cfg->setConfigEntry('user_gov_wrapper_class', "UserGovernmentDatabaseWrapper");
 
 // CFG: PAYMENT-DB-WRAPPER-CLASS
@@ -364,8 +364,8 @@ $cfg->setConfigEntry('write_applications_action_points', 10000);
 // CFG: USER-POINTS-CLASS
 $cfg->setConfigEntry('user_ppints_class', "UserPoints");
 
-// CFG: GOVERMENT-CLASS
-$cfg->setConfigEntry('goverment_class', "SimplifiedGovernment");
+// CFG: GOVERNMENT-CLASS
+$cfg->setConfigEntry('government_class', "SimplifiedGovernment");
 
 // CFG: BANK-CLASS
 $cfg->setConfigEntry('bank_class', "MoneyBank");
@@ -379,8 +379,8 @@ $cfg->setConfigEntry('refill_page_min_currency_amount', 1000);
 // CFG: SHIP-SIMU-LOGIN-FILL-PAYMENT-DISCOVERY
 $cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', "LocalPaymentDiscovery");
 
-// CFG: GOVERMENT-STARTUP-HELP-LIMIT
-$cfg->setConfigEntry('goverment_startup_help_limit', 3);
+// CFG: GOVERNMENT-STARTUP-HELP-LIMIT
+$cfg->setConfigEntry('government_startup_help_limit', 3);
 
 // CFG: WEB-BLOCK-HELPER
 $cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
@@ -391,8 +391,8 @@ $cfg->setConfigEntry('web_form_helper', "WebFormHelper");
 // CFG: WEB-LINK-HELPER
 $cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
 
-// CFG: WEB-CMD-GOVERMENT-FAILED-RESOLVER-CLASS
-$cfg->setConfigEntry('web_cmd_goverment_failed_resolver_class', "WebGovernmentFailedCommandResolver");
+// CFG: WEB-CMD-GOVERNMENT-FAILED-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_government_failed_resolver_class', "WebGovernmentFailedCommandResolver");
 
 // [EOF]
 ?>
index 6640bd3e1970e225046977a36b0b3a128b37af84..f46c7c4ad858eac2cfe0d22346c7f3a8e2473b04 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * An action for goverment startup help form
+ * An action for government startup help form
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 WebShipSimuLoginGovermentStartupHelpAction extends BaseShipSimuAction implements Commandable, Registerable {
+class WebShipSimuLoginGovernmentStartupHelpAction extends BaseShipSimuAction implements Commandable, Registerable {
        /**
         * Protected constructor
         *
@@ -38,9 +38,9 @@ class WebShipSimuLoginGovermentStartupHelpAction extends BaseShipSimuAction impl
         * @param       $resolverInstance       An instance of an action resolver
         * @return      $actionInstance         An instance of this action class
         */
-       public final static function createWebShipSimuLoginGovermentStartupHelpAction (ActionResolver $resolverInstance) {
+       public final static function createWebShipSimuLoginGovernmentStartupHelpAction (ActionResolver $resolverInstance) {
                // Get a new instance
-               $actionInstance = new WebShipSimuLoginGovermentStartupHelpAction();
+               $actionInstance = new WebShipSimuLoginGovernmentStartupHelpAction();
 
                // Set the resolver instance
                $actionInstance->setResolverInstance($resolverInstance);
@@ -76,8 +76,8 @@ class WebShipSimuLoginGovermentStartupHelpAction extends BaseShipSimuAction impl
                // Check for user status by default
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
-               // Check if goverment can pay startup help
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('goverment_pays_startup_help_filter'));
+               // Check if government can pay startup help
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_startup_help_filter'));
        }
 }
 
index 3f7c77bb254d5dda293dc6f8a17bc73ef95a928e..9efb4b0527725fbb791dec8f3c04f7799c6ba4b9 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * An action for trainings payed by goverment
+ * An action for trainings payed by government
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 WebShipSimuLoginGovermentTrainingAction extends BaseShipSimuAction implements Commandable, Registerable {
+class WebShipSimuLoginGovernmentTrainingAction extends BaseShipSimuAction implements Commandable, Registerable {
        /**
         * Protected constructor
         *
@@ -38,9 +38,9 @@ class WebShipSimuLoginGovermentTrainingAction extends BaseShipSimuAction impleme
         * @param       $resolverInstance       An instance of an action resolver
         * @return      $actionInstance         An instance of this action class
         */
-       public final static function createWebShipSimuLoginGovermentTrainingAction (ActionResolver $resolverInstance) {
+       public final static function createWebShipSimuLoginGovernmentTrainingAction (ActionResolver $resolverInstance) {
                // Get a new instance
-               $actionInstance = new WebShipSimuLoginGovermentTrainingAction();
+               $actionInstance = new WebShipSimuLoginGovernmentTrainingAction();
 
                // Set the resolver instance
                $actionInstance->setResolverInstance($resolverInstance);
@@ -76,8 +76,8 @@ class WebShipSimuLoginGovermentTrainingAction extends BaseShipSimuAction impleme
                // Check for user status by default
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
-               // Check if goverment can pay a training
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('goverment_pays_training_filter'));
+               // Check if government can pay a training
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_training_filter'));
        }
 }
 
index 7a91f2e2b6b80c0bf9d630256416b942b453c25a..30bfcbe51d685f2bc5437f78bedae85bf719f0be 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /**
  * A command for a failed startup request. This may happen when the user
- * "knows" the correct URL but goverment refuses to pay.
+ * "knows" the correct URL but government refuses to pay.
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -22,7 +22,7 @@
  * 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 WebGovermentFailedStartupCommand extends BaseCommand implements Commandable {
+class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandable {
        /**
         * Protected constructor
         *
@@ -39,9 +39,9 @@ class WebGovermentFailedStartupCommand extends BaseCommand implements Commandabl
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
-       public final static function createWebGovermentFailedStartupCommand (CommandResolver $resolverInstance) {
+       public final static function createWebGovernmentFailedStartupCommand (CommandResolver $resolverInstance) {
                // Get new instance
-               $commandInstance = new WebGovermentFailedStartupCommand();
+               $commandInstance = new WebGovernmentFailedStartupCommand();
 
                // Set the application instance
                $commandInstance->setResolverInstance($resolverInstance);
index 18a3bc00e66d2c1f8d1daf1ca40e382a942d1881..70b580209636a77aee3934506b9f384e8bd4c741 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /**
  * A command for a failed startup request. This may happen when the user
- * "knows" the correct URL but goverment refuses to pay.
+ * "knows" the correct URL but government refuses to pay.
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -22,7 +22,7 @@
  * 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 WebShipsimuGovermentStartupCommand extends BaseCommand implements Commandable {
+class WebShipsimuGovernmentStartupCommand extends BaseCommand implements Commandable {
        /**
         * Protected constructor
         *
@@ -39,9 +39,9 @@ class WebShipsimuGovermentStartupCommand extends BaseCommand implements Commanda
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
-       public final static function createWebShipsimuGovermentStartupCommand (CommandResolver $resolverInstance) {
+       public final static function createWebShipsimuGovernmentStartupCommand (CommandResolver $resolverInstance) {
                // Get new instance
-               $commandInstance = new WebShipsimuGovermentStartupCommand();
+               $commandInstance = new WebShipsimuGovernmentStartupCommand();
 
                // Set the application instance
                $commandInstance->setResolverInstance($resolverInstance);
@@ -77,8 +77,8 @@ class WebShipsimuGovermentStartupCommand extends BaseCommand implements Commanda
                // Add user status filter here
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
-               // Check if goverment can pay startup help
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('goverment_pays_startup_help_filter'));
+               // Check if government can pay startup help
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_startup_help_filter'));
 
                // Verify password
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_filter'));
index d945d9a80eda4615d903cd11c6ef8f63f4882717..806fb4099d5b7f8e42e8463a52b2490ab1f22684 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Controller for failed goverment requests
+ * Controller for failed government requests
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 WebGovermentFailedController extends BaseController implements Controller {
+class WebGovernmentFailedController extends BaseController implements Controller {
        /**
         * Protected constructor
         *
@@ -39,9 +39,9 @@ class WebGovermentFailedController extends BaseController implements Controller
         * @return      $controllerInstance             A prepared instance of this class
         * @todo        Add some filters to this controller
         */
-       public final static function createWebGovermentFailedController (CommandResolver $resolverInstance) {
+       public final static function createWebGovernmentFailedController (CommandResolver $resolverInstance) {
                // Create the instance
-               $controllerInstance = new WebGovermentFailedController();
+               $controllerInstance = new WebGovernmentFailedController();
 
                // Set the command resolver
                $controllerInstance->setResolverInstance($resolverInstance);
index ed1cdea1fa2898c5bb076ab15f797f7e27971fc8..6daa67fa3a7ba90e30b843fe7dee96aca2eed66a 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * A filter for checking if goverment can pay startup helps
+ * A filter for checking if government can pay startup helps
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable {
+class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Protected constructor
         *
@@ -37,9 +37,9 @@ class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implemen
         *
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createShipSimuGovermentPaysStartupHelpFilter () {
+       public final static function createShipSimuGovernmentPaysStartupHelpFilter () {
                // Get a new instance
-               $filterInstance = new ShipSimuGovermentPaysStartupHelpFilter();
+               $filterInstance = new ShipSimuGovernmentPaysStartupHelpFilter();
 
                // Return the instance
                return $filterInstance;
@@ -61,12 +61,12 @@ class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implemen
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Now simply check for it
-               if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovermentPaysStartupHelp() === false)) {
+               if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysStartupHelp() === false)) {
                        // Request is invalid
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_goverment_startup_failed_url');
+                       $responseInstance->redirectToConfiguredUrl('login_government_startup_failed_url');
 
                        // Stop processing here
                        exit();
index 81464998b636eb293d3080265a5e9d8907e3ec8f..50a2b1fa528c5b30325be34b21278b5cbf0d57da 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * A filter for checking if goverment can pay a training for current user
+ * A filter for checking if government can pay a training for current user
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 ShipSimuGovermentPaysTrainingFilter extends BaseShipSimuFilter implements Filterable {
+class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Protected constructor
         *
@@ -37,9 +37,9 @@ class ShipSimuGovermentPaysTrainingFilter extends BaseShipSimuFilter implements
         *
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createShipSimuGovermentPaysTrainingFilter () {
+       public final static function createShipSimuGovernmentPaysTrainingFilter () {
                // Get a new instance
-               $filterInstance = new ShipSimuGovermentPaysTrainingFilter();
+               $filterInstance = new ShipSimuGovernmentPaysTrainingFilter();
 
                // Return the instance
                return $filterInstance;
@@ -61,12 +61,12 @@ class ShipSimuGovermentPaysTrainingFilter extends BaseShipSimuFilter implements
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Now simply check for it
-               if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovermentPaysTraining() === false)) {
+               if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysTraining() === false)) {
                        // Request is invalid
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_goverment_training_failed_url');
+                       $responseInstance->redirectToConfiguredUrl('login_government_training_failed_url');
 
                        // Stop processing here
                        exit();
index fc2751065cba4785a1b484ba18439bfce2969ffc..c5b18f190ca0f5660eeb1b8412111cf5774d7180 100644 (file)
@@ -1,13 +1,13 @@
 <?php
 /**
- * A goverment class with simplified ways...
+ * A government class with simplified ways...
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
- * @todo               Find an interface for goverments
+ * @todo               Find an interface for governments
  *
  * 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
@@ -41,27 +41,27 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
        }
 
        /**
-        * Creates an instance of this goverment class by given user instance
+        * Creates an instance of this government class by given user instance
         *
         * @param       $userInstance           The user instance
-        * @return      $govermentInstance      Instance of the prepared goverment instance
+        * @return      $governmentInstance     Instance of the prepared government instance
         */
        public final static function createSimplifiedGovernment (ManageableAccount $userInstance) {
                // Get a new instance
-               $govermentInstance = new SimplifiedGovernment();
+               $governmentInstance = new SimplifiedGovernment();
 
                // Set the user instance
-               $govermentInstance->setUserInstance($userInstance);
+               $governmentInstance->setUserInstance($userInstance);
 
                // Return the prepared instance
-               return $govermentInstance;
+               return $governmentInstance;
        }
 
        /**
-        * Checks wether the goverment has already payed a training course for te
+        * Checks wether the government has already payed a training course for te
         * current user
         *
-        * @return      $alreadyPayed   Wether the goverment has already payed
+        * @return      $alreadyPayed   Wether the government has already payed
         */
        public function ifGovernmentAlreadyPayedTraining () {
                // Default is not payed
@@ -81,7 +81,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
 
                // Was the query fine?
                if ($resultInstance->getAffectedRows() === 1) {
-                       // Entry was found so the goverment can no more pay a training
+                       // Entry was found so the government can no more pay a training
                        $alreadyPayed = true;
                } // END - if
 
@@ -90,17 +90,17 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
        }
 
        /**
-        * Checks wether the goverment has payed maximum of startup helps to the
+        * Checks wether the government has payed maximum of startup helps to the
         * current user
         *
-        * @return      $maximumPayed   Wether the goverment has already payed
+        * @return      $maximumPayed   Wether the government has already payed
         */
        public function ifGovernmentPayedMaxmimumStartupHelp () {
                // Default is not payed
                $maximumPayed = false;
 
                // Cache startup help limit
-               $helpLimit = $this->getConfigInstance()->readConfig('goverment_startup_help_limit');
+               $helpLimit = $this->getConfigInstance()->readConfig('government_startup_help_limit');
 
                // Now get a search criteria and set the user's name as criteria
                $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
@@ -116,7 +116,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
 
                // Was the query fine?
                if ($resultInstance->getAffectedRows() === $helpLimit) {
-                       // Entry found, so lets have a look if this goverment wants to again...
+                       // Entry found, so lets have a look if this government wants to again...
                        $maximumPayed = true;
                } // END - if
 
index a7e5b38a3689bee4beb595652d03f61a31f45076..dc0288260483e0bceb49d360f7ef81a8689000bb 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * A command resolver for local (non-hubbed) web commands including the failed goverment request
+ * A command resolver for local (non-hubbed) web commands including the failed government request
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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 WebGovermentFailedCommandResolver extends BaseCommandResolver implements CommandResolver {
+class WebGovernmentFailedCommandResolver extends BaseCommandResolver implements CommandResolver {
        /**
         * Last successfull resolved command
         */
@@ -49,9 +49,9 @@ class WebGovermentFailedCommandResolver extends BaseCommandResolver implements C
         * @throws      EmptyVariableException          Thrown if default command is not set
         * @throws      InvalidInterfaceException       Thrown if command does not implement interface Commandable
         */
-       public final static function createWebGovermentFailedCommandResolver ($commandName, ManageableApplication $appInstance) {
+       public final static function createWebGovernmentFailedCommandResolver ($commandName, ManageableApplication $appInstance) {
                // Create the new instance
-               $resolverInstance = new WebGovermentFailedCommandResolver();
+               $resolverInstance = new WebGovernmentFailedCommandResolver();
 
                // Get request instance
                $requestInstance = $appInstance->getRequestInstance();
index 243218adc230a6e40a9277e0ca35b9b177b705f8..e12dfddadfc0a050c575bab4bddcd7ba12ee47ef 100644 (file)
@@ -90,28 +90,28 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
        }
 
        /**
-        * Determines if goverment can still pay a "virtual training course" in general
+        * Determines if government can still pay a "virtual training course" in general
         *
-        * @return      $ifGovHelps             Wether if goverment helps the user with a virtual training course
+        * @return      $ifGovHelps             Wether if government helps the user with a virtual training course
         */
        public function ifGovernmentPaysTraining () {
                // By default they want to help.
                $ifGovHelps = true;
 
-               // First get a goverment instance from registry
-               $govermentInstance = Registry::getRegistry()->getInstance('goverment');
+               // First get a government instance from registry
+               $governmentInstance = Registry::getRegistry()->getInstance('government');
 
                // Is it there?
-               if (is_null($govermentInstance)) {
+               if (is_null($governmentInstance)) {
                        // Then create a new one
-                       $govermentInstance = ObjectFactory::createObjectByConfiguredName('goverment_class', array($this));
+                       $governmentInstance = ObjectFactory::createObjectByConfiguredName('government_class', array($this));
 
                        // Store it in registry
-                       Registry::getRegistry()->addInstance('goverment', $govermentInstance);
+                       Registry::getRegistry()->addInstance('government', $governmentInstance);
                } // END - if
 
-               // Then ask the goverment if they want to pay a "startup help" to the user
-               if ($govermentInstance->ifGovernmentAlreadyPayedTraining()) {
+               // Then ask the government if they want to pay a "startup help" to the user
+               if ($governmentInstance->ifGovernmentAlreadyPayedTraining()) {
                        // Training already given!
                        $ifGovHelps = false;
                } // END - if
@@ -121,28 +121,28 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
        }
 
        /**
-        * Determines if goverment can still pay a "startup help" to the user
+        * Determines if government can still pay a "startup help" to the user
         *
-        * @return      $ifGovHelps             Wether if goverment helps the user with some startup money
+        * @return      $ifGovHelps             Wether if government helps the user with some startup money
         */
        public function ifGovernmentPaysStartupHelp () {
                // By default they want to help.
                $ifGovHelps = true;
 
-               // First get a goverment instance from registry
-               $govermentInstance = Registry::getRegistry()->getInstance('goverment');
+               // First get a government instance from registry
+               $governmentInstance = Registry::getRegistry()->getInstance('government');
 
                // Is it there?
-               if (is_null($govermentInstance)) {
+               if (is_null($governmentInstance)) {
                        // Then create a new one
-                       $govermentInstance = ObjectFactory::createObjectByConfiguredName('goverment_class', array($this));
+                       $governmentInstance = ObjectFactory::createObjectByConfiguredName('government_class', array($this));
 
                        // Store it in registry
-                       Registry::getRegistry()->addInstance('goverment', $govermentInstance);
+                       Registry::getRegistry()->addInstance('government', $governmentInstance);
                } // END - if
 
-               // Then ask the goverment if they want to pay a "startup help" to the user
-               if ($govermentInstance->ifGovernmentPayedMaxmimumStartupHelp()) {
+               // Then ask the government if they want to pay a "startup help" to the user
+               if ($governmentInstance->ifGovernmentPayedMaxmimumStartupHelp()) {
                        // They can't pay anymore to the user (excited amount)
                        $ifGovHelps = false;
                } // END - if
index 8b668c3129c0ad7d0e310bcb63b1bd9bedea150f..b1537af1adb721e0771a85b77af5189b9020bc86 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * A wrapper for database access to goverment->user data
+ * A wrapper for database access to government->user data
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,9 +21,9 @@
  * 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 UserGovermentDatabaseWrapper extends BaseDatabaseWrapper {
+class UserGovernmentDatabaseWrapper extends BaseDatabaseWrapper {
        // Constants for database tables
-       const DB_TABLE_USER_GOVERMENT = "gov_user";
+       const DB_TABLE_USER_GOVERNMENT = "gov_user";
 
        /**
         * Protected constructor
@@ -40,12 +40,12 @@ class UserGovermentDatabaseWrapper extends BaseDatabaseWrapper {
         *
         * @return      $wrapperInstance        An instance of this wrapper class
         */
-       public final static function createUserGovermentDatabaseWrapper () {
+       public final static function createUserGovernmentDatabaseWrapper () {
                // Create a new instance
-               $wrapperInstance = new UserGovermentDatabaseWrapper();
+               $wrapperInstance = new UserGovernmentDatabaseWrapper();
 
                // Set (primary!) table name
-               $wrapperInstance->setTableName(self::DB_TABLE_USER_GOVERMENT);
+               $wrapperInstance->setTableName(self::DB_TABLE_USER_GOVERNMENT);
 
                // Return the instance
                return $wrapperInstance;
index 63a61188cc0353fa46ffe93fc162d8aafb513a2a..475c147c9d005812e02add1222005c000b7c73e7 100644 (file)
@@ -44,7 +44,7 @@ $helperInstance->flushContent();
 $linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Add action
-$linkInstance->addActionLinkById('profile', 'goto_profile_link');
+$linkInstance->addActionLinkById('profile', 'link_text_profile');
 
 // Flush the finished form
 $linkInstance->flushContent();
index cda3466bad6cc4e3e0af26ea0f55af1ab92f77b0..18b29dcfe06583c6d0faffee1f1d7763177c95e6 100644 (file)
@@ -37,7 +37,7 @@ $helperInstance->flushContent();
 $linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Add action
-$linkInstance->addActionLinkById('profile', 'goto_profile_link');
+$linkInstance->addActionLinkById('profile', 'link_text_profile');
 
 // Flush the finished form
 $linkInstance->flushContent();
index b6f1c794329caa4180bbb6cdd4f3c1d6c4b2483f..b982f434ad8fee56a59494263dc144a08f6604c2 100644 (file)
@@ -15,7 +15,10 @@ $helperInstance->flushContent();
 </div>
 
 <div id="content_body">
-       Du bist nicht mehr in <span class="app_name">{?app_full_name?}</span> eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
+       <div id="login_failed_header">
+               Du bist nicht mehr in <span class="app_name">{?app_full_name?}</span> eingeloggt.
+               Dies kann verschiedene Gr&uuml;nde haben:
+       </div>
 
        <ol id="login_failed_list">
                <li>Dein Browser nimmt keine Cookies an.</li>
@@ -26,10 +29,12 @@ $helperInstance->flushContent();
                        weiterhin besteht.</li>
        </ol>
 
-       Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
-       Informationen - <span class="important_note">nicht aber dein Passwort</span>
-       - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
-       Support diesen senden!
+       <div id="login_failed_footer">
+               Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
+               Informationen - <span class="important_note">nicht aber dein Passwort</span>
+               - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
+               Support diesen senden!
+       </div>
 </div>
 
 <div id="content_footer">