'page' and 'command' were both the same (command), so better name it same way.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index c94407f83d46375bd67957062f8d0a523e5bcd62..8f93e18806e8cf211ae56a08ebd736c549875de2 100644 (file)
--- a/application/selector/class_ApplicationHelper.php
+++ b/application/selector/class_ApplicationHelper.php
@@ -177,15 +177,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $this->setResponseInstance($responseInstance);
 
                // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
+               $commandName = $requestInstance->getRequestElement('command');
 
                // If it is null then get default command
                if (is_null($commandName)) {
                        // Get default command
-                       $commandName = $responseInstance->getDefaultCommand();
+                       $commandName = $responseInstance->determineDefaultCommand();
 
                        // Set it in request
-                       $requestInstance->setRequestElement('page', $commandName);
+                       $requestInstance->setRequestElement('command', $commandName);
                } // END - if
 
                // Get a controller resolver

diff --git a/application/selector/config.php b/application/selector/config.php
index 9aad2f9009a913030efcb461b4921fb8d6571caa..2770167216faf9fb49185daedd34b5acf5bef725 100644 (file)
--- a/application/selector/config.php
+++ b/application/selector/config.php
@@ -35,7 +35,7 @@ $cfg->setConfigEntry('default_selector_html_command', 'home');
 $cfg->setConfigEntry('default_image_command', 'build');
 
 // CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&page=do_form');
+$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form');
 
 // CFG: FORM-METHOD
 $cfg->setConfigEntry('form_method', 'post');

diff --git a/application/shipsimu/class_ApplicationHelper.php b/application/shipsimu/class_ApplicationHelper.php
index c94407f83d46375bd67957062f8d0a523e5bcd62..8f93e18806e8cf211ae56a08ebd736c549875de2 100644 (file)
--- a/application/shipsimu/class_ApplicationHelper.php
+++ b/application/shipsimu/class_ApplicationHelper.php
@@ -177,15 +177,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $this->setResponseInstance($responseInstance);
 
                // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
+               $commandName = $requestInstance->getRequestElement('command');
 
                // If it is null then get default command
                if (is_null($commandName)) {
                        // Get default command
-                       $commandName = $responseInstance->getDefaultCommand();
+                       $commandName = $responseInstance->determineDefaultCommand();
 
                        // Set it in request
-                       $requestInstance->setRequestElement('page', $commandName);
+                       $requestInstance->setRequestElement('command', $commandName);
                } // END - if
 
                // Get a controller resolver

diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php
index 4b22332cf8a90f18a9331bcb56a7b62c2947301e..e71abb754d466746a820046cfc0926b147623211 100644 (file)
--- a/application/shipsimu/config.php
+++ b/application/shipsimu/config.php
@@ -38,7 +38,7 @@ $cfg->setConfigEntry('default_html_command', 'home');
 $cfg->setConfigEntry('default_image_command', 'build');
 
 // CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&page=do_form');
+$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form');
 
 // CFG: FORM-METHOD
 $cfg->setConfigEntry('form_method', 'post');
@@ -104,91 +104,91 @@ $cfg->setConfigEntry('login_helper_class', 'ShipSimuLoginHelper');
 $cfg->setConfigEntry('auth_method_class', 'CookieAuth');
 
 // CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&page=login_failed');
+$cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&command=login_failed');
 
 // CFG: LOGIN-FAILED-LOGIN-RETRY-ACTION-URL
-$cfg->setConfigEntry('login_failed_login_retry_action_url', 'index.php?app={?app_short_name?}&page=login&note=login_failed');
+$cfg->setConfigEntry('login_failed_login_retry_action_url', 'index.php?app={?app_short_name?}&command=login&note=login_failed');
 
 // CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', 'index.php?app={?app_short_name?}&page=logout_done');
+$cfg->setConfigEntry('logout_done_url', 'index.php?app={?app_short_name?}&command=logout_done');
 
 // CFG: ACTION-STATUS-PROBLEM
 $cfg->setConfigEntry('action_status_problem', 'status_problem');
 
 // CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=status_problem&status=general');
+$cfg->setConfigEntry('login_user_status_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=status_problem&status=general');
 
 // CFG: LOGIN-USER-STATUS-GUEST-URL
-$cfg->setConfigEntry('login_user_status_guest_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=status_problem&status=guest');
+$cfg->setConfigEntry('login_user_status_guest_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=status_problem&status=guest');
 
 // CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=unconfirmed_problem');
+$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=unconfirmed_problem');
 
 // CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=unconfirmed_email_missing');
+$cfg->setConfigEntry('user_unconfirmed_email_missing_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=unconfirmed_email_missing');
 
 // CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=confirm_code_invalid');
+$cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=confirm_code_invalid');
 
 // CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&page=login_area&action=status_problem&status=user_not_found');
+$cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=user_not_found');
 
 // 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->setConfigEntry('login_government_startup_failed_url', 'index.php?app={?app_short_name?}&command=government_failed&failed=startup');
 
 // 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->setConfigEntry('login_government_training_failed_url', 'index.php?app={?app_short_name?}&command=government_failed&failed=training');
 
 // CFG: REFILL-PAGE-CURRENCY-DONE-URL
-$cfg->setConfigEntry('refill_page_done_url', 'index.php?app={?app_short_name?}&page=login_area&status=refill_done&done={?refill_done?}&amount={?amount?}');
+$cfg->setConfigEntry('refill_page_done_url', 'index.php?app={?app_short_name?}&command=login_area&status=refill_done&done={?refill_done?}&amount={?amount?}');
 
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', 'welcome');
 
 // CFG: LOGIN-AREA-LOGOUT-ACTION-URL
-$cfg->setConfigEntry('login_area_logout_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('login_area_logout_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: GOVERNMENT-FAILED-LOGOUT-ACTION-URL
-$cfg->setConfigEntry('government_failed_logout_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('government_failed_logout_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: LOGIN-AREA-PROFILE-ACTION-URL
-$cfg->setConfigEntry('login_area_profile_action_url', 'index.php?app={?app_short_name?}&page=login_area&status=profile');
+$cfg->setConfigEntry('login_area_profile_action_url', 'index.php?app={?app_short_name?}&command=login_area&status=profile');
 
 // CFG: GOVERNMENT-FAILED-PROFILE-ACTION-URL
-$cfg->setConfigEntry('government_failed_profile_action_url', 'index.php?app={?app_short_name?}&page=login_area&status=profile');
+$cfg->setConfigEntry('government_failed_profile_action_url', 'index.php?app={?app_short_name?}&command=login_area&status=profile');
 
 // CFG: LOGIN-AREA-COMPANY-ACTION-URL
-$cfg->setConfigEntry('login_area_company_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('login_area_company_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: GOVERNMENT-FAILED-COMPANY-ACTION-URL
-$cfg->setConfigEntry('government_failed_company_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('government_failed_company_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: LOGIN-AREA-LIST-COMPANIES-ACTION-URL
-$cfg->setConfigEntry('login_area_list_companies_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('login_area_list_companies_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: LOGIN-AREA-LOGOUT-NOW-ACTION-URL
-$cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_short_name?}&page=logout');
+$cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_short_name?}&command=logout');
 
 // CFG: LOGIN-AREA-RETURN-LOGIN-ACTION-URL
-$cfg->setConfigEntry('login_area_return_login_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('login_area_return_login_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: LOGIN-AREA-SHIPSIMU-PROFILE-ACTION-URL
-$cfg->setConfigEntry('login_area_shipsimu_profile_action_url', 'index.php?app={?app_short_name?}&page=login_area&action=profile');
+$cfg->setConfigEntry('login_area_shipsimu_profile_action_url', 'index.php?app={?app_short_name?}&command=login_area&action=profile');
 
 // CFG: LOGOUT_DONE-RELOGIN-ACTION-URL
-$cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&page=login');
+$cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&command=login');
 
 // CFG: LOGIN-REGISTER-ACTION-URL
-$cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&page=register');
+$cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&command=register');
 
 // CFG: CONFIRM-DIRECT-LOGIN-ACTION-URL
-$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&command=login_area');
 
 // CFG: HTML-CMD-USER-IS-NULL-URL
-$cfg->setConfigEntry('html_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&page=problem&problem=user_null');
+$cfg->setConfigEntry('html_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&command=problem&problem=user_null');
 
 // CFG: NEWS-READER-HOME-CLASS
 $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader');
@@ -503,7 +503,7 @@ $cfg->setConfigEntry('html_cmd_logout_done_resolver_class', 'HtmlCommandResolver
 $cfg->setConfigEntry('refill_request_currency_payment_type', 'test');
 
 // CFG: LOGIN-REGISTER-LOGIN-FORM
-$cfg->setConfigEntry('login_register_login_form', 'index.php?app={?app_short_name?}&page=register');
+$cfg->setConfigEntry('login_register_login_form', 'index.php?app={?app_short_name?}&command=register');
 
 // CFG: HOME-MENU-CLASS
 $cfg->setConfigEntry('home_menu_class', 'ShipSimuHomeMenu');

diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
index 45bcc3206766c2e65feba64cc5e4fad35d91f968..fe8fc080edec587f34e4b61a77295ee32a0e56fd 100644 (file)
--- a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
+++ b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
@@ -108,7 +108,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($requestInstance->getRequestElement('page') . '_' . $requestInstance->getRequestElement('failed') . '_title'));
+               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($requestInstance->getRequestElement('command') . '_' . $requestInstance->getRequestElement('failed') . '_title'));
 
                // Construct the menu in every command. We could do this in BaseCommand class. But this means
                // *every* command has a navigation system and that is want we don't want.

diff --git a/application/shipsimu/templates/de/code/captch_graphic_code.ctp b/application/shipsimu/templates/de/code/captch_graphic_code.ctp
index 30fd716fff816236d7a2f2c03ed592f23582753b..3cb8a40a2b2aa92276134deb6847da708255d55d 100644 (file)
--- a/application/shipsimu/templates/de/code/captch_graphic_code.ctp
+++ b/application/shipsimu/templates/de/code/captch_graphic_code.ctp
@@ -15,7 +15,7 @@ $captchaHelper->flushContent();
 // [EOC]
 ?>
 <div class="captcha_image">
-       <img src="{?base_url?}/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image"
+       <img src="{?base_url?}/index.php?app={?app_short_name?}&amp;command=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image"
         alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
 </div>
 <div class="captcha_code">

diff --git a/application/shipsimu/templates/de/emails/text_resend_link.tpl b/application/shipsimu/templates/de/emails/text_resend_link.tpl
index 67e109d78d6302f33b2124fbda3c13f6974f6ece..404c77d59e8c99cb691efc66b4c9a7bf585ff09e 100644 (file)
--- a/application/shipsimu/templates/de/emails/text_resend_link.tpl
+++ b/application/shipsimu/templates/de/emails/text_resend_link.tpl
@@ -11,7 +11,7 @@ Du (oder ein anderer) hattest soeben deinen Bestätigungslink erneut angefor
 
 Hier ist nun dein Bestätigungslink. Der alte aus der Anmeldemail ist somit nicht mehr gültig!
 
-{?base_url?}/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
+{?base_url?}/index.php?app={?app_short_name?}&command=confirm&username={?username?}&confirm={?confirm_hash?}
 
 Solltest du die URL nicht anklicken können, versuche diese in die Adresszeile deines Browsers zu kopieren.
 

diff --git a/application/shipsimu/templates/de/menu/generic_menu_entries.xml b/application/shipsimu/templates/de/menu/generic_menu_entries.xml
index 65c742ef0089b6ad21ffd9aeb2a4187bf228129b..96be7795e357fceb6e2ed11882c8b8a3259c3d8e 100644 (file)
--- a/application/shipsimu/templates/de/menu/generic_menu_entries.xml
+++ b/application/shipsimu/templates/de/menu/generic_menu_entries.xml
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                                <anchor-id><![CDATA[menu_login]]></anchor-id>
                                                <anchor-text><![CDATA[Einloggen]]></anchor-text>
                                                <anchor-title><![CDATA[Zum Spiel {?app_name?} einloggen]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=login]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=login]]></anchor-href>
                                        </anchor>
                                </entry>
                                <entry>
@@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                                <anchor-id><![CDATA[menu_register]]></anchor-id>
                                                <anchor-text><![CDATA[Anmeldung]]></anchor-text>
                                                <anchor-title><![CDATA[Zur Anmeldeseite]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=register]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=register]]></anchor-href>
                                        </anchor>
                                </entry>
                                <entry>
@@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                                <anchor-id><![CDATA[menu_pillory]]></anchor-id>
                                                <anchor-text><![CDATA[Pranger]]></anchor-text>
                                                <anchor-title><![CDATA[Zum Pranger]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=pillory]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=pillory]]></anchor-href>
                                        </anchor>
                                </entry>
                        </entry-list>
@@ -90,7 +90,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                                <anchor-id><![CDATA[menu_imprint]]></anchor-id>
                                                <anchor-text><![CDATA[Impressum]]></anchor-text>
                                                <anchor-title><![CDATA[Impressum]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=imprint]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=imprint]]></anchor-href>
                                        </anchor>
                                </entry>
                                <entry>
@@ -99,7 +99,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                                <anchor-id><![CDATA[menu_terms]]></anchor-id>
                                                <anchor-text><![CDATA[ANBs]]></anchor-text>
                                                <anchor-title><![CDATA[Allgemeine Nutzungsbedingungen]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=terms]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=terms]]></anchor-href>
                                        </anchor>
                                </entry>
                        </entry-list>

diff --git a/core b/core
index 5577e5acf2839a1bfa9778c3c70381e44e196b19..3b3947b86b38904aa1100b54846c14d3b31cb97d 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 5577e5acf2839a1bfa9778c3c70381e44e196b19
+Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d