Continued:

- fixed some config entries, some are named after protocol being used
- added missing directory (.gitkeep)
- updated 'core' framework

diff --git a/application/selector/config.php b/application/selector/config.php
index b5a704b59d68a80d848c1d79656a7c5996c9d97d..54610f2e0a8657558ebbf7f414f6e80b867892bd 100644 (file)
--- a/application/selector/config.php
+++ b/application/selector/config.php
@@ -28,8 +28,8 @@ $cfg = FrameworkConfiguration::getSelfInstance();
 // CFG: HEADER-CHARSET
 $cfg->setConfigEntry('header_charset', 'utf-8');
 
-// CFG: DEFAULT-SELECTOR-HTML-COMMAND
-$cfg->setConfigEntry('default_selector_html_command', 'home');
+// CFG: DEFAULT-SELECTOR-HTTP-COMMAND
+$cfg->setConfigEntry('default_selector_http_command', 'home');
 
 // CFG: FORM-ACTION
 $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form');

diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php
index 266c54c0764916b4788e85f3855ab18aabaead36..60a4e37e514929cff55467975e6f4eb2dad47d96 100644 (file)
--- a/application/shipsimu/config.php
+++ b/application/shipsimu/config.php
@@ -31,11 +31,11 @@ $cfg = FrameworkBootstrap::getConfigurationInstance();
 // CFG: HEADER-CHARSET
 $cfg->setConfigEntry('header_charset', 'utf-8');
 
-// CFG: DEFAULT-SHIP-SIMU-HTML-COMMAND
-$cfg->setConfigEntry('default_ship_simu_html_command', 'home');
+// CFG: DEFAULT-SHIPSIMU-HTTP-COMMAND
+$cfg->setConfigEntry('default_shipsimu_http_command', 'home');
 
-// CFG: DEFAULT-HTML-COMMAND
-$cfg->setConfigEntry('default_html_command', 'home');
+// CFG: DEFAULT-HTTP-COMMAND
+$cfg->setConfigEntry('default_http_command', 'home');
 
 // CFG: FORM-ACTION
 $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form');
@@ -448,8 +448,8 @@ $cfg->setConfigEntry('refill_page_active', 'Y');
 // CFG: REFILL-PAGE-MIN-CURRENCY-AMOUNT
 $cfg->setConfigEntry('refill_page_min_currency_amount', 1000);
 
-// CFG: SHIP-SIMU-LOGIN-FILL-PAYMENT-DISCOVERY
-$cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', 'LocalPaymentDiscovery');
+// CFG: SHIPSIMU-LOGIN-FILL-PAYMENT-DISCOVERY
+$cfg->setConfigEntry('shipsimu_login_refill_payment_discovery', 'LocalPaymentDiscovery');
 
 // CFG: GOVERNMENT-STARTUP-HELP-LIMIT
 $cfg->setConfigEntry('government_startup_help_limit', 3);

diff --git a/application/shipsimu/language/.gitkeep b/application/shipsimu/language/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/core b/core
index 1287590bb4dff94252b1c45f320d93ce65eb5495..280798f3e8db2f8d5f6d0330081ec63e04414330 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1287590bb4dff94252b1c45f320d93ce65eb5495
+Subproject commit 280798f3e8db2f8d5f6d0330081ec63e04414330