Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several...

[shipsimu.git] / application / ship-simu / config.php

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 5af398ba58d82b31d677c4b9d3a0b79ef12e99b9..e9a8f794d9da0155b421ba55ac6b7abe02e21afa 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -23,7 +23,7 @@
  */
 
 // Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: HEADER-CHARSET
 $cfg->setConfigEntry('header_charset', 'utf-8');
@@ -92,7 +92,7 @@ $cfg->setConfigEntry('user_status_guest', 'GUEST');
 $cfg->setConfigEntry('user_status_confirmed', 'CONFIRMED');
 
 // CFG: USER-STATUS-LOCKED
-//$cfg->setConfigEntry('user_status_locked', 'LOCKED');
+$cfg->setConfigEntry('user_status_locked', 'LOCKED');
 
 // CFG: LOGIN-HELPER-CLASS
 $cfg->setConfigEntry('login_helper_class', 'ShipSimuLoginHelper');
@@ -106,26 +106,32 @@ $cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&page
 // CFG: LOGIN-FAILED-URL
 $cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&page=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: 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=login_area&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=login_area&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');
@@ -166,12 +172,21 @@ $cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_sh
 // 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: 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: LOGOUT_DONE-RELOGIN-ACTION-URL
 $cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&page=login');
 
 // CFG: LOGIN-REGISTER-ACTION-URL
 $cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&page=register');
 
+// CFG: CONFIRM-DIRECT-LOGIN-ACTION-URL
+$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&page=login_area');
+
+// CFG: WEB-CMD-USER-IS-NULL-URL
+$cfg->setConfigEntry('web_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&page=problem&problem=user_null');
+
 // CFG: NEWS-READER-HOME-CLASS
 $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader');
 
@@ -235,6 +250,9 @@ $cfg->setConfigEntry('captcha_register_verifier_filter', 'GraphicalCodeCaptchaVe
 // CFG: CAPTCHA-REFILL-VERFIER-FILTER
 $cfg->setConfigEntry('captcha_refill_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
 
+// CFG: CAPTCHA-GOVERNMENT-VERFIER-FILTER
+$cfg->setConfigEntry('captcha_government_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+
 // CFG: CAPTCHA-PROFILE-VERFIER-FILTER
 $cfg->setConfigEntry('captcha_profile_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
 
@@ -388,6 +406,12 @@ $cfg->setConfigEntry('mail_template_class', 'MailTemplateEngine');
 // CFG: IMAGE-TEMPLATE-CLASS
 $cfg->setConfigEntry('image_template_class', 'ImageTemplateEngine');
 
+// CFG: MENU-TEMPLATE-CLASS
+$cfg->setConfigEntry('menu_template_class', 'MenuTemplateEngine');
+
+// CFG: MENU-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('menu_template_extension', '.xml');
+
 // CFG: ADMIN-EMAIL
 $cfg->setConfigEntry('admin_email', 'you@some-hoster.invalid');
 
@@ -427,6 +451,9 @@ $cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', 'LocalPaymentDi
 // CFG: GOVERNMENT-STARTUP-HELP-LIMIT
 $cfg->setConfigEntry('government_startup_help_limit', 3);
 
+// CFG: GOVERNMENT-TRAINING-LIMIT
+$cfg->setConfigEntry('government_training_limit', 2);
+
 // CFG: WEB-BLOCK-HELPER
 $cfg->setConfigEntry('web_block_helper', 'WebBlockHelper');
 
@@ -439,9 +466,36 @@ $cfg->setConfigEntry('web_link_helper', 'WebLinkHelper');
 // CFG: WEB-CMD-GOVERNMENT-FAILED-RESOLVER-CLASS
 $cfg->setConfigEntry('web_cmd_government_failed_resolver_class', 'WebGovernmentFailedCommandResolver');
 
+// CFG: WEB-CMD-LOGIN-FAILED-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_login_failed_resolver_class', 'WebCommandResolver');
+
 // CFG: WEB-CMD-COMPANY-RESOLVER-CLASS
 $cfg->setConfigEntry('web_cmd_company_resolver_class', 'WebCompanyCommandResolver');
 
+// CFG: WEB-CMD-HOME-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_home_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-REGISTER-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_register_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-DO-FORM-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_do_form_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-LOGIN-AREA-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_login_area_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-CONFIRM-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_confirm_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-PROBLEM-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_problem_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-LOGOUT-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_logout_resolver_class', 'WebCommandResolver');
+
+// CFG: WEB-CMD-LOGOUT-DONE-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_logout_done_resolver_class', 'WebCommandResolver');
+
 // CFG: REFILL-REQUEST-CURRENCY-PAYMENT-TYPE
 $cfg->setConfigEntry('refill_request_currency_payment_type', 'test');
 
@@ -451,6 +505,12 @@ $cfg->setConfigEntry('login_register_login_form', 'index.php?app={?app_short_nam
 // CFG: HOME-MENU-CLASS
 $cfg->setConfigEntry('home_menu_class', 'ShipSimuHomeMenu');
 
+// CFG: LOGIN-FAILED-MENU-CLASS
+$cfg->setConfigEntry('login_failed_menu_class', 'ShipSimuLoginFailedMenu');
+
+// CFG: STATUS-MENU-CLASS
+$cfg->setConfigEntry('status_menu_class', 'ShipSimuStatusMenu');
+
 // CFG: LOGIN-MENU-CLASS
 $cfg->setConfigEntry('login_menu_class', 'ShipSimuLoginMenu');
 
@@ -460,11 +520,20 @@ $cfg->setConfigEntry('logout_menu_class', 'ShipSimuLogoutMenu');
 // CFG: REGISTER-MENU-CLASS
 $cfg->setConfigEntry('register_menu_class', 'ShipSimuRegisterMenu');
 
+// CFG: CONFIRM-MENU-CLASS
+$cfg->setConfigEntry('confirm_menu_class', 'ShipSimuConfirmMenu');
+
 // CFG: LOGIN-AREA-MENU-CLASS
 $cfg->setConfigEntry('login_area_menu_class', 'ShipSimuLoginAreaMenu');
 
 // CFG: GOVERNMENT-FAILED-AREA-MENU-CLASS
 $cfg->setConfigEntry('government_failed_area_menu_class', 'ShipSimuGovernmentFailedAreaMenu');
 
+// CFG: MONEYBANK-ACTIVATED
+$cfg->setConfigEntry('moneybank_activated', 'Y');
+
+// CFG: MONEYBANK-OPENING-CLASS
+$cfg->setConfigEntry('moneybank_opening_class', 'MoneyBankRealtimeOpening');
+
 // [EOF]
 ?>