From: Roland Haeder <roland@mxchange.org>
Date: Mon, 6 Apr 2015 22:50:12 +0000 (+0200)
Subject: Fixed a lot more 'web' to 'html' + updated 'core'.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4247dc3b1a2a1654b6eaf87f720ab976e7a9503e;p=shipsimu.git

Fixed a lot more 'web' to 'html' + updated 'core'.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/application/selector/config.php b/application/selector/config.php
index 2770167..49fe491 100644
--- a/application/selector/config.php
+++ b/application/selector/config.php
@@ -31,9 +31,6 @@ $cfg->setConfigEntry('header_charset', 'utf-8');
 // CFG: DEFAULT-SELECTOR-HTML-COMMAND
 $cfg->setConfigEntry('default_selector_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');
 
diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php
index e71abb7..5c39891 100644
--- a/application/shipsimu/config.php
+++ b/application/shipsimu/config.php
@@ -34,9 +34,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 +328,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);
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp
index b9df5fc..2fe6d33 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a link helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'list_companies'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'list_companies'));
 
 // Prefetch the user data
 $linkInstance->prefetchValueInstance('user');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
index e300a01..6a7e31c 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_government_startup'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_government_startup'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -41,7 +41,7 @@ $helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&u
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp
index 7c921ff..4a188e9 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_government_training'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_government_training'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -41,7 +41,7 @@ $helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&u
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'shipsimu_profile'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'profile');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_logout.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_logout.ctp
index 5443af2..c8c0c3b 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_logout.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout_now'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('logout_now');
@@ -9,7 +9,7 @@ $helperInstance->addLinkWithTextById('logout_now');
 $helperInstance->flushContent();
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'return_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('return_login');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp
index 8037a4e..d8bccde 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "shipsimu_profile"));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, "shipsimu_profile"));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp
index fdc7c4e..7436740 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp
@@ -1,6 +1,6 @@
 <?php
 // Neue Helper-Instanz holen
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_refill'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_refill'));
 
 // Pre-fetch payment types
 $helperInstance->prefetchValueInstance('payments');
diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_status_problem.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_status_problem.ctp
index df4a8de..39ad0a5 100644
--- a/application/shipsimu/templates/de/code/action_ship_simu_login_status_problem.ctp
+++ b/application/shipsimu/templates/de/code/action_ship_simu_login_status_problem.ctp
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'resend_link'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'resend_link'));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
@@ -30,7 +30,7 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
 $helperInstance->flushContent();
 
 // Build the form for confirmation
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'confirm_code'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'confirm_code'));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
diff --git a/application/shipsimu/templates/de/code/block_company_data.ctp b/application/shipsimu/templates/de/code/block_company_data.ctp
index 9752acf..bb52c0a 100644
--- a/application/shipsimu/templates/de/code/block_company_data.ctp
+++ b/application/shipsimu/templates/de/code/block_company_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'company'));
 
 // Set link text
 $helperInstance->addActionLinkById('company', 'company');
diff --git a/application/shipsimu/templates/de/code/block_persona_data.ctp b/application/shipsimu/templates/de/code/block_persona_data.ctp
index bff6bfa..ae725dc 100644
--- a/application/shipsimu/templates/de/code/block_persona_data.ctp
+++ b/application/shipsimu/templates/de/code/block_persona_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'profile'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
diff --git a/application/shipsimu/templates/de/code/captch_graphic_code.ctp b/application/shipsimu/templates/de/code/captch_graphic_code.ctp
index 3cb8a40..942d94c 100644
--- a/application/shipsimu/templates/de/code/captch_graphic_code.ctp
+++ b/application/shipsimu/templates/de/code/captch_graphic_code.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'captcha_code', false, false));
 
 // Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
diff --git a/application/shipsimu/templates/de/code/confirm_link.ctp b/application/shipsimu/templates/de/code/confirm_link.ctp
index 25f6e67..c1dbfb5 100644
--- a/application/shipsimu/templates/de/code/confirm_link.ctp
+++ b/application/shipsimu/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'direct_login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('direct_login');
diff --git a/application/shipsimu/templates/de/code/government_failed_main.ctp b/application/shipsimu/templates/de/code/government_failed_main.ctp
index b073132..ca56cea 100644
--- a/application/shipsimu/templates/de/code/government_failed_main.ctp
+++ b/application/shipsimu/templates/de/code/government_failed_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'persona_data'));
 
 // Set the data source instance which must exist in registry
 $blockInstance->prefetchValueInstance('user');
@@ -27,7 +27,7 @@ $blockInstance->flushContent();
 //////////////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'company_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'company_data'));
 
 // Set the data source instance
 $blockInstance->prefetchValueInstance('company', 'user');
@@ -63,7 +63,7 @@ if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout'));
 
 // Add action
 $linkInstance->addActionLinkById('logout', 'logout');
diff --git a/application/shipsimu/templates/de/code/login_failed.ctp b/application/shipsimu/templates/de/code/login_failed.ctp
index 166c48e..12257fc 100644
--- a/application/shipsimu/templates/de/code/login_failed.ctp
+++ b/application/shipsimu/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'login_retry'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('login_retry');
diff --git a/application/shipsimu/templates/de/code/login_form.ctp b/application/shipsimu/templates/de/code/login_form.ctp
index ae60048..db78583 100644
--- a/application/shipsimu/templates/de/code/login_form.ctp
+++ b/application/shipsimu/templates/de/code/login_form.ctp
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_user_login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_user_login'));
 
 // Formular deaktiviert?
 if ($helperInstance->ifLoginIsEnabled()) {
@@ -53,7 +53,7 @@ $helperInstance->flushContent();
 // Ist Gastlogin erlaubt?
 if ($helperInstance->ifGuestLoginAllowed()) {
 	// Neue Helper-Instanz holen
-	$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_guest_login'));
+	$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_guest_login'));
 	$helperInstance->addInputHiddenConfiguredField('user', 'guest_login');
 	$helperInstance->addInputHiddenConfiguredField('passwd', 'guest_login');
 
@@ -70,7 +70,7 @@ if ($helperInstance->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'register'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('register_login');
diff --git a/application/shipsimu/templates/de/code/login_main.ctp b/application/shipsimu/templates/de/code/login_main.ctp
index 56adbab..e555eac 100644
--- a/application/shipsimu/templates/de/code/login_main.ctp
+++ b/application/shipsimu/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'persona_data'));
 
 // Set the data source instance which must exist in registry
 $blockInstance->prefetchValueInstance('user', 'user_points');
@@ -28,7 +28,7 @@ $blockInstance->flushContent();
 //////////////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'company_data'));
+$blockInstance = ObjectFactory::createObjectByConfiguredName('html_block_helper', array($this, 'company_data'));
 
 // Set the data source instance
 $blockInstance->prefetchValueInstance('company', 'user');
@@ -64,7 +64,7 @@ if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'logout'));
 
 // Add action
 $linkInstance->addActionLinkById('logout', 'logout');
diff --git a/application/shipsimu/templates/de/code/logout_done.ctp b/application/shipsimu/templates/de/code/logout_done.ctp
index 9843f50..9b45511 100644
--- a/application/shipsimu/templates/de/code/logout_done.ctp
+++ b/application/shipsimu/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper', array($this, 'relogin'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('relogin');
diff --git a/application/shipsimu/templates/de/code/register_form.ctp b/application/shipsimu/templates/de/code/register_form.ctp
index 90dca57..7860f3b 100644
--- a/application/shipsimu/templates/de/code/register_form.ctp
+++ b/application/shipsimu/templates/de/code/register_form.ctp
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_register'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper', array($this, 'shipsimu_register'));
 
 // Always ask at least for nickname and password
 $helperInstance->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
diff --git a/core b/core
index 3b3947b..7b1fd34 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d
+Subproject commit 7b1fd34316273e96f97816746a071d509e7ca085