'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/admin/config.php b/application/admin/config.php
index e953dab0fbfbf04043e308aea58f6ddff30d7a93..47fd0dcee664f6846f47436b06472fd1c91bedcc 100644 (file)
--- a/application/admin/config.php
+++ b/application/admin/config.php
@@ -35,7 +35,7 @@ $cfg->setConfigEntry('default_web_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');
@@ -95,28 +95,28 @@ $cfg->setConfigEntry('login_helper_class', 'AdminLoginHelper');
 $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: 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: 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');
+$cfg->setConfigEntry('login_user_status_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=status_problem');
 
 // 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-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', 'welcome');

diff --git a/application/admin/templates/de/code/captch_graphic_code.ctp b/application/admin/templates/de/code/captch_graphic_code.ctp
index 101be7f370cd7bc9082118082ae73572ed0fec91..9673178db3e82b557f02cef00a4db29184b3ad3c 100644 (file)
--- a/application/admin/templates/de/code/captch_graphic_code.ctp
+++ b/application/admin/templates/de/code/captch_graphic_code.ctp
@@ -15,7 +15,7 @@ $captchaHelper->flushContent();
 // [EOC]
 ?>
 <div class="captcha_image">
-       <img src="$config[base_url]/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image" alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
+       <img src="$config[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">
        {?captcha_code?}

diff --git a/application/admin/templates/de/emails/text_resend_link.tpl b/application/admin/templates/de/emails/text_resend_link.tpl
index e764146707e2145c560788b931325e59c8a04633..b5695b0d583e7830e29b57bb31a7eb66b6835152 100644 (file)
--- a/application/admin/templates/de/emails/text_resend_link.tpl
+++ b/application/admin/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!
 
-$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
+$config[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/core b/core
index b84edaf9f45857dea7078c230cea0290089c0770..3b3947b86b38904aa1100b54846c14d3b31cb97d 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b84edaf9f45857dea7078c230cea0290089c0770
+Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d