From f4c6014ad03a206a50248b971917ea9282e56896 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 21 Aug 2009 21:00:33 +0000 Subject: [PATCH] Rewritten again, much better this way. --- application/ship-simu/config.php | 15 +++++++++------ .../main/actions/class_BaseShipSimuAction.php | 2 +- .../main/actions/web/class_WebShipSimuLogin | 8 +++++--- .../class_WebShipSimuLoginStatusProblemAction.php | 8 +++++--- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php index e4e5d2d..4ca3bac 100644 --- a/application/ship-simu/config.php +++ b/application/ship-simu/config.php @@ -109,23 +109,26 @@ $cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&p // CFG: LOGOUT-DONE-URL $cfg->setConfigEntry('logout_done_url', 'index.php?app={?app_short_name?}&page=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=status&status=status_problem&status=general'); +$cfg->setConfigEntry('login_user_status_url', 'index.php?app={?app_short_name?}&page=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=status&status=status_problem&status=guest'); +$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: USER-NOT-UNCONFIRMED-URL -$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem'); +$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&page=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=status&status=unconfirmed_email_missing'); +$cfg->setConfigEntry('user_unconfirmed_email_missing_url', 'index.php?app={?app_short_name?}&page=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=status&status=confirm_code_invalid'); +$cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name?}&page=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=status&status=user_not_found'); +$cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&page=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'); diff --git a/application/ship-simu/main/actions/class_BaseShipSimuAction.php b/application/ship-simu/main/actions/class_BaseShipSimuAction.php index 83fd32c..ea0bb0a 100644 --- a/application/ship-simu/main/actions/class_BaseShipSimuAction.php +++ b/application/ship-simu/main/actions/class_BaseShipSimuAction.php @@ -41,7 +41,7 @@ class BaseShipSimuAction extends BaseAction { * @return void * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + protected function execute (Requestable $requestInstance, Responseable $responseInstance) { // Add code here executed with every action } diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLogin b/application/ship-simu/main/actions/web/class_WebShipSimuLogin index db03e47..d60f442 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLogin +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLogin @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebShipSimuLogin???Action extends BaseAction implements Commandable, Registerable { +class WebShipSimuLogin???Action extends BaseShipSimuAction implements Commandable, Registerable { /** * Protected constructor * @@ -58,8 +58,10 @@ class WebShipSimuLogin???Action extends BaseAction implements Commandable, Regis * @todo 0% done */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Unfinished method - $this->partialStub('Unfinished method.'); + // Execute parent method + parent::execute($requestInstance, $responseInstance); + + // Add your code here } /** diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php index 0a45498..b82d365 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebShipSimuLoginStatusProblemAction extends BaseAction implements Commandable, Registerable { +class WebShipSimuLoginStatusProblemAction extends BaseShipSimuAction implements Commandable, Registerable { /** * Protected constructor * @@ -58,8 +58,10 @@ class WebShipSimuLoginStatusProblemAction extends BaseAction implements Commanda * @todo 0% done */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Unfinished method - $this->partialStub('Unfinished method.'); + // Call parent method + parent::execute($requestInstance, $responseInstance); + + // Add your code } /** -- 2.30.2