Deprecated parameter removed
authorRoland Häder <roland@mxchange.org>
Fri, 31 Jul 2009 19:09:17 +0000 (19:09 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 31 Jul 2009 19:09:17 +0000 (19:09 +0000)
application/ship-simu/config.php
application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
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/action_ship_simu_login_logout.ctp
application/ship-simu/templates/de/code/block_company_data.ctp
application/ship-simu/templates/de/code/block_persona_data.ctp
application/ship-simu/templates/de/code/confirm_link.ctp
application/ship-simu/templates/de/code/login_failed.ctp
application/ship-simu/templates/de/code/login_main.ctp
application/ship-simu/templates/de/code/logout_done.ctp

index 9a6774f..6e77dcc 100644 (file)
@@ -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");
 
index 49bc3a4..64d8847 100644 (file)
@@ -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');
index b3ccea5..3cd8efa 100644 (file)
@@ -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?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile');
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
index 650dfba..aafaf04 100644 (file)
@@ -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?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
index f46f1a7..5443af2 100644 (file)
@@ -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');
index 2c36aa4..9752acf 100644 (file)
@@ -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');
index 4965145..db011d4 100644 (file)
@@ -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');
index e8e784b..25f6e67 100644 (file)
@@ -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');
index 99f180c..166c48e 100644 (file)
@@ -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');
index 0ad51a2..eb13861 100644 (file)
@@ -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?}&amp;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>
 
index 16fa377..9843f50 100644 (file)
@@ -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');