Deprecated parameter removed

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 9a6774fa93876131750d3f41ad3fdda1fb228949..6e77dcc64c7a1f7e037d592a632aa287f09061e5 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -133,6 +133,15 @@ $cfg->setConfigEntry('refill_page_done_url', "index.php?app={?app_short_name?}&p
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', "welcome");
 
+// CFG: LOGIN-AREA-LOGOUT-ACTION
+$cfg->setConfigEntry('login_area_logout_action', "logout");
+
+// CFG: LOGIN-AREA-PROFILE-ACTION
+$cfg->setConfigEntry('login_area_profile_action', "profile");
+
+// CFG: LOGIN-AREA-COMPANY-ACTION
+$cfg->setConfigEntry('login_area_company_action', "company");
+
 // CFG: NEWS-READER-HOME-CLASS
 $cfg->setConfigEntry('news_reader_home_class', "DefaultNewsReader");
 

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
index 49bc3a4419f51ca91c052c980cf31b7211a63dbe..64d88476eabb104422b6dbdadef97f137abb14fa 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a link helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'companys', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'companys'));
 
 // Prefetch the user data
 $linkInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
index b3ccea504b4aa6f29fa1039485eaa9c915f4467b..3cd8efa001d42b38356b97ade45aab12afbf2ee0 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
@@ -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('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile');
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
index 650dfbaa2ce7bfb9b4a82be291b431c018f83785..aafaf047f92ac3885ae3f29e0698693bd3958c36 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
@@ -34,7 +34,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_prof
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
index f46f1a7aacbdf8da547218412c208d623434eac3..5443af247b7f6ca2636fd73ae9b4562cecdf167b 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now', 'index.php?app={?app_short_name?}&amp;page=logout'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', 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('web_link_helper', array($this, 'return_login', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('return_login');

diff --git a/application/ship-simu/templates/de/code/block_company_data.ctp b/application/ship-simu/templates/de/code/block_company_data.ctp
index 2c36aa4bac86ca548fb75657e7c90d55b02a9598..9752acf9b942b5520edde65a10cc56ee6e6b6c67 100644 (file)
--- a/application/ship-simu/templates/de/code/block_company_data.ctp
+++ b/application/ship-simu/templates/de/code/block_company_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company'));
 
 // Set link text
 $helperInstance->addActionLinkById('company', 'company');

diff --git a/application/ship-simu/templates/de/code/block_persona_data.ctp b/application/ship-simu/templates/de/code/block_persona_data.ctp
index 4965145b1c3aedc84dbb227230782d1be22a3447..db011d454e025b347491f348e7758dfd27347673 100644 (file)
--- a/application/ship-simu/templates/de/code/block_persona_data.ctp
+++ b/application/ship-simu/templates/de/code/block_persona_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/confirm_link.ctp b/application/ship-simu/templates/de/code/confirm_link.ctp
index e8e784bb78dccfa1cb411570ba7749a25a80de64..25f6e674f5ef98f4e0bdafc8801bf2ca4459f088 100644 (file)
--- a/application/ship-simu/templates/de/code/confirm_link.ctp
+++ b/application/ship-simu/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('direct_login');

diff --git a/application/ship-simu/templates/de/code/login_failed.ctp b/application/ship-simu/templates/de/code/login_failed.ctp
index 99f180cc7e3f1afdbc6aa6786e648e9fffcbbf79..166c48ee5216b7bf4e0770d295b0450b8151c32c 100644 (file)
--- a/application/ship-simu/templates/de/code/login_failed.ctp
+++ b/application/ship-simu/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('login_retry');

diff --git a/application/ship-simu/templates/de/code/login_main.ctp b/application/ship-simu/templates/de/code/login_main.ctp
index 0ad51a2f849bff1b6a5656fe7f01d57b3e6cd72e..eb1386187e77da5ff945c4aaa9205b50296b789e 100644 (file)
--- a/application/ship-simu/templates/de/code/login_main.ctp
+++ b/application/ship-simu/templates/de/code/login_main.ctp
@@ -63,7 +63,7 @@ if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action', 'index.php?app={?app_short_name?}&page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout'));
 
 // Add action
 $linkInstance->addActionLinkById('logout', 'logout');
@@ -91,7 +91,7 @@ $linkInstance->flushContent();
        </div>
 
        <div id="logout">
-               {?logout_action?}
+               {?logout?}
        </div>
 </div>
 

diff --git a/application/ship-simu/templates/de/code/logout_done.ctp b/application/ship-simu/templates/de/code/logout_done.ctp
index 16fa3770d2b4bfed94809cc9ec38b7b71959a02c..9843f5040bb10601ac9c2045e66cf88821b58cc6 100644 (file)
--- a/application/ship-simu/templates/de/code/logout_done.ctp
+++ b/application/ship-simu/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('relogin');