Continued:

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

diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php
index e71abb754d466746a820046cfc0926b147623211..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,9 +37,6 @@ $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;command=do_form');
 
@@ -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');