Continued:

[shipsimu.git] / application / shipsimu / config.php

diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php
index 4b22332cf8a90f18a9331bcb56a7b62c2947301e..72cccec0c85b9979f8127485330a2bb458601f7f 100644 (file)
--- a/application/shipsimu/config.php
+++ b/application/shipsimu/config.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+
 /**
  * Additional/overwritten configuration parts
  *
@@ -23,7 +26,7 @@
  */
 
 // Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getSelfInstance();
+$cfg = FrameworkBootstrap::getConfigurationInstance();
 
 // CFG: HEADER-CHARSET
 $cfg->setConfigEntry('header_charset', 'utf-8');
@@ -34,11 +37,8 @@ $cfg->setConfigEntry('default_ship_simu_html_command', 'home');
 // CFG: DEFAULT-HTML-COMMAND
 $cfg->setConfigEntry('default_html_command', 'home');
 
-// CFG: DEFAULT-IMAGE-COMMAND
-$cfg->setConfigEntry('default_image_command', 'build');
-
 // CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&amp;page=do_form');
+$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&amp;command=do_form');
 
 // CFG: FORM-METHOD
 $cfg->setConfigEntry('form_method', 'post');
@@ -104,91 +104,91 @@ $cfg->setConfigEntry('login_helper_class', 'ShipSimuLoginHelper');
 $cfg->setConfigEntry('auth_method_class', 'CookieAuth');
 
 // CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&amp;page=login_failed');
+$cfg->setConfigEntry('login_failed_url', 'index.php?app={?app_short_name?}&amp;command=login_failed');
 
 // CFG: LOGIN-FAILED-LOGIN-RETRY-ACTION-URL
-$cfg->setConfigEntry('login_failed_login_retry_action_url', 'index.php?app={?app_short_name?}&amp;page=login&amp;note=login_failed');
+$cfg->setConfigEntry('login_failed_login_retry_action_url', 'index.php?app={?app_short_name?}&amp;command=login&amp;note=login_failed');
 
 // CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', 'index.php?app={?app_short_name?}&amp;page=logout_done');
+$cfg->setConfigEntry('logout_done_url', 'index.php?app={?app_short_name?}&amp;command=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?}&amp;page=login_area&amp;action=status_problem&amp;status=status_problem&amp;status=general');
+$cfg->setConfigEntry('login_user_status_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=status_problem&amp;status=general');
 
 // CFG: LOGIN-USER-STATUS-GUEST-URL
-$cfg->setConfigEntry('login_user_status_guest_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=status_problem&amp;status=status_problem&amp;status=guest');
+$cfg->setConfigEntry('login_user_status_guest_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=status_problem&amp;status=guest');
 
 // CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=status_problem&amp;status=unconfirmed_problem');
+$cfg->setConfigEntry('user_not_unconfirmed_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=unconfirmed_problem');
 
 // CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=status_problem&amp;status=unconfirmed_email_missing');
+$cfg->setConfigEntry('user_unconfirmed_email_missing_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=unconfirmed_email_missing');
 
 // CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=status_problem&amp;status=confirm_code_invalid');
+$cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=confirm_code_invalid');
 
 // CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=status_problem&amp;status=user_not_found');
+$cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=status_problem&amp;status=user_not_found');
 
 // CFG: LOGIN-GOVERNMENT-STARTUP-FAILED-URL
-$cfg->setConfigEntry('login_government_startup_failed_url', 'index.php?app={?app_short_name?}&amp;page=government_failed&amp;failed=startup');
+$cfg->setConfigEntry('login_government_startup_failed_url', 'index.php?app={?app_short_name?}&amp;command=government_failed&amp;failed=startup');
 
 // CFG: LOGIN-GOVERNMENT-TRAINING-FAILED-URL
-$cfg->setConfigEntry('login_government_training_failed_url', 'index.php?app={?app_short_name?}&amp;page=government_failed&amp;failed=training');
+$cfg->setConfigEntry('login_government_training_failed_url', 'index.php?app={?app_short_name?}&amp;command=government_failed&amp;failed=training');
 
 // CFG: REFILL-PAGE-CURRENCY-DONE-URL
-$cfg->setConfigEntry('refill_page_done_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;status=refill_done&amp;done={?refill_done?}&amount={?amount?}');
+$cfg->setConfigEntry('refill_page_done_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;status=refill_done&amp;done={?refill_done?}&amount={?amount?}');
 
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', 'welcome');
 
 // CFG: LOGIN-AREA-LOGOUT-ACTION-URL
-$cfg->setConfigEntry('login_area_logout_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('login_area_logout_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: GOVERNMENT-FAILED-LOGOUT-ACTION-URL
-$cfg->setConfigEntry('government_failed_logout_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('government_failed_logout_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: LOGIN-AREA-PROFILE-ACTION-URL
-$cfg->setConfigEntry('login_area_profile_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;status=profile');
+$cfg->setConfigEntry('login_area_profile_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;status=profile');
 
 // CFG: GOVERNMENT-FAILED-PROFILE-ACTION-URL
-$cfg->setConfigEntry('government_failed_profile_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;status=profile');
+$cfg->setConfigEntry('government_failed_profile_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;status=profile');
 
 // CFG: LOGIN-AREA-COMPANY-ACTION-URL
-$cfg->setConfigEntry('login_area_company_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('login_area_company_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: GOVERNMENT-FAILED-COMPANY-ACTION-URL
-$cfg->setConfigEntry('government_failed_company_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('government_failed_company_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: LOGIN-AREA-LIST-COMPANIES-ACTION-URL
-$cfg->setConfigEntry('login_area_list_companies_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('login_area_list_companies_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: LOGIN-AREA-LOGOUT-NOW-ACTION-URL
-$cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_short_name?}&amp;page=logout');
+$cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_short_name?}&amp;command=logout');
 
 // CFG: LOGIN-AREA-RETURN-LOGIN-ACTION-URL
-$cfg->setConfigEntry('login_area_return_login_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('login_area_return_login_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: LOGIN-AREA-SHIPSIMU-PROFILE-ACTION-URL
-$cfg->setConfigEntry('login_area_shipsimu_profile_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=profile');
+$cfg->setConfigEntry('login_area_shipsimu_profile_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area&amp;action=profile');
 
 // CFG: LOGOUT_DONE-RELOGIN-ACTION-URL
-$cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&amp;page=login');
+$cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&amp;command=login');
 
 // CFG: LOGIN-REGISTER-ACTION-URL
-$cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&amp;page=register');
+$cfg->setConfigEntry('login_register_action_url', 'index.php?app={?app_short_name?}&amp;command=register');
 
 // CFG: CONFIRM-DIRECT-LOGIN-ACTION-URL
-$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$cfg->setConfigEntry('confirm_direct_login_action_url', 'index.php?app={?app_short_name?}&amp;command=login_area');
 
 // CFG: HTML-CMD-USER-IS-NULL-URL
-$cfg->setConfigEntry('html_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&amp;page=problem&amp;problem=user_null');
+$cfg->setConfigEntry('html_cmd_user_is_null_url', 'index.php?app={?app_short_name?}&amp;command=problem&amp;problem=user_null');
 
 // CFG: NEWS-READER-HOME-CLASS
 $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader');
@@ -331,26 +331,26 @@ $cfg->setConfigEntry('login_logout_action_class', 'ShipSimuLogoutAction');
 // CFG: LOGIN-PROFILE-ACTION-CLASS
 $cfg->setConfigEntry('login_profile_action_class', 'ShipSimuProfileAction');
 
-// CFG: SHIPSIMU-REGISTER-CAPTCHA
-$cfg->setConfigEntry('shipsimu_register_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-REGISTER-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_register_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-USER-LOGIN-CAPTCHA
-$cfg->setConfigEntry('shipsimu_user_login_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-USER-LOGIN-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_user_login_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-GUEST-LOGIN-CAPTCHA
-$cfg->setConfigEntry('shipsimu_guest_login_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-GUEST-LOGIN-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_guest_login_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-PROFILE-CAPTCHA
-$cfg->setConfigEntry('shipsimu_profile_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-PROFILE-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_profile_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-REFILL-CAPTCHA
-$cfg->setConfigEntry('shipsimu_refill_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-REFILL-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_refill_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-GOVERNMENT-STARTUP-CAPTCHA
-$cfg->setConfigEntry('shipsimu_government_startup_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-GOVERNMENT-STARTUP-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_government_startup_captcha_class', 'GraphicalCodeCaptcha');
 
-// CFG: SHIPSIMU-GOVERNMENT-TRAINING-CAPTCHA
-$cfg->setConfigEntry('shipsimu_government_training_captcha', 'GraphicalCodeCaptcha');
+// CFG: SHIPSIMU-GOVERNMENT-TRAINING-CAPTCHA-CLASS
+$cfg->setConfigEntry('shipsimu_government_training_captcha_class', 'GraphicalCodeCaptcha');
 
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);
@@ -395,7 +395,7 @@ $cfg->setConfigEntry('company_db_wrapper_class', 'CompanyDatabaseWrapper');
 $cfg->setConfigEntry('user_points_db_wrapper_class', 'UserPointsDatabaseWrapper');
 
 // CFG: USER-GOVERNMENT-WRAPPER-CLASS
-$cfg->setConfigEntry('user_gov_wrapper_class', 'UserGovernmentDatabaseWrapper');
+$cfg->setConfigEntry('user_government_wrapper_class', 'UserGovernmentDatabaseWrapper');
 
 // CFG: PAYMENT-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('payment_db_wrapper_class', 'PaymentsDatabaseWrapper');
@@ -458,13 +458,13 @@ $cfg->setConfigEntry('government_startup_help_limit', 3);
 $cfg->setConfigEntry('government_training_limit', 2);
 
 // CFG: HTML-BLOCK-HELPER
-$cfg->setConfigEntry('html_block_helper', 'HtmlBlockHelper');
+$cfg->setConfigEntry('html_block_helper_class', 'HtmlBlockHelper');
 
 // CFG: HTML-FORM-HELPER
-$cfg->setConfigEntry('html_form_helper', 'HtmlFormHelper');
+$cfg->setConfigEntry('html_form_helper_class', 'HtmlFormHelper');
 
 // CFG: HTML-LINK-HELPER
-$cfg->setConfigEntry('html_link_helper', 'HtmlLinkHelper');
+$cfg->setConfigEntry('html_link_helper_class', 'HtmlLinkHelper');
 
 // CFG: HTML-CMD-GOVERNMENT-FAILED-RESOLVER-CLASS
 $cfg->setConfigEntry('html_cmd_government_failed_resolver_class', 'HtmlGovernmentFailedCommandResolver');
@@ -503,7 +503,7 @@ $cfg->setConfigEntry('html_cmd_logout_done_resolver_class', 'HtmlCommandResolver
 $cfg->setConfigEntry('refill_request_currency_payment_type', 'test');
 
 // CFG: LOGIN-REGISTER-LOGIN-FORM
-$cfg->setConfigEntry('login_register_login_form', 'index.php?app={?app_short_name?}&amp;page=register');
+$cfg->setConfigEntry('login_register_login_form', 'index.php?app={?app_short_name?}&amp;command=register');
 
 // CFG: HOME-MENU-CLASS
 $cfg->setConfigEntry('home_menu_class', 'ShipSimuHomeMenu');