All helper are now configurable

diff --git a/application/admin/config.php b/application/admin/config.php
index 31c0846fa5b5c73dcf88ca1a2d8549821a899f3e..e4522febcdba76ede4ef69cd17b92901ca88e966 100644 (file)
--- a/application/admin/config.php
+++ b/application/admin/config.php
@@ -241,5 +241,14 @@ $cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
 // CFG: ADMIN-EMAIL
 $cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
 
+// CFG: WEB-BLOCK-HELPER
+$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
+
+// CFG: WEB-FORM-HELPER
+$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
+
+// CFG: WEB-LINK-HELPER
+$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
+
 // [EOF]
 ?>

diff --git a/application/admin/templates/de/code/action_admin_login_logout.ctp b/application/admin/templates/de/code/action_admin_login_logout.ctp
index 07431f53efe96d01b0bfafe8f9fc6c8757f0e27a..475b058032c8d89a42b18cd77878af177f5662d0 100644 (file)
--- a/application/admin/templates/de/code/action_admin_login_logout.ctp
+++ b/application/admin/templates/de/code/action_admin_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
 $helper->addLinkWithTextById('logout_now_link_text');
@@ -9,7 +9,7 @@ $helper->addLinkWithTextById('logout_now_link_text');
 $helper->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
 $helper->addLinkWithTextById('return_login_link_text');

diff --git a/application/admin/templates/de/code/action_admin_login_profile.ctp b/application/admin/templates/de/code/action_admin_login_profile.ctp
index 7e7fd47b6678db59f85bfa618acb53cfa8513cd1..70d5d4f0609fc4970a1f138857c93808878a3fdd 100644 (file)
--- a/application/admin/templates/de/code/action_admin_login_profile.ctp
+++ b/application/admin/templates/de/code/action_admin_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.
-$helper = WebFormHelper::createWebFormHelper($this, "admin_profile");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "admin_profile"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');

diff --git a/application/admin/templates/de/code/action_admin_status_problem.ctp b/application/admin/templates/de/code/action_admin_status_problem.ctp
index 4c57125810ebca8e9a879a88191341cffe090400..665be0e55473c23ad5506e1fc18a7d117558aa0f 100644 (file)
--- a/application/admin/templates/de/code/action_admin_status_problem.ctp
+++ b/application/admin/templates/de/code/action_admin_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.
-$helper = WebFormHelper::createWebFormHelper($this, "resend_link");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');
@@ -25,7 +25,7 @@ $helper->flushContent();
 
 if ($helper->ifUserAccountUnconfirmed()) {
        // Build the form for confirmation
-       $helper = WebFormHelper::createWebFormHelper($this, "confirm_code");
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
 
        // Add code box
        $helper->addFormGroup('code', "Bitte gebe hier den Bestätigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");

diff --git a/application/admin/templates/de/code/block_persona_data.ctp b/application/admin/templates/de/code/block_persona_data.ctp
index e92df8a6b4996cc4a8987e2aa4d4265dd3e46168..0f057e9ed5c5acd0a3000fb0cc5f0649560b2879 100644 (file)
--- a/application/admin/templates/de/code/block_persona_data.ctp
+++ b/application/admin/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 = WebLinkHelper::createWebLinkHelper($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/admin/templates/de/code/captch_graphic_code.ctp b/application/admin/templates/de/code/captch_graphic_code.ctp
index 210db8f80a8ce2385e845f19062b4506181039de..cf0e6e7c6e83c57e4d4f1b481bf27ae257cad6ea 100644 (file)
--- a/application/admin/templates/de/code/captch_graphic_code.ctp
+++ b/application/admin/templates/de/code/captch_graphic_code.ctp
@@ -1,9 +1,15 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = WebFormHelper::createWebFormHelper($this, 'captcha_code', false, false);
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+
+// Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
+
+// Add hidden field with validation hash
 $captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
+
+// Flush content
 $captchaHelper->flushContent();
 
 // [EOF]

diff --git a/application/admin/templates/de/code/login_failed.ctp b/application/admin/templates/de/code/login_failed.ctp
index e7f7d75d1af24526cb32c757393f1a889c52d233..378a9572d58d11865c998a22aa42e6e8139df7d7 100644 (file)
--- a/application/admin/templates/de/code/login_failed.ctp
+++ b/application/admin/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('login_retry_link_text');

diff --git a/application/admin/templates/de/code/login_form.ctp b/application/admin/templates/de/code/login_form.ctp
index afdf7b08b57d742b2988cc681b2443cccdf18596..e685c54b36a1119dc8fc33fd5052872c1df207a5 100644 (file)
--- a/application/admin/templates/de/code/login_form.ctp
+++ b/application/admin/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'admin_user_login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'admin_user_login'));
 
 // Formular deaktiviert?
 if ($helper->ifLoginIsEnabled()) {
@@ -51,7 +51,7 @@ if ($helper->ifLoginIsEnabled()) {
 $helper->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
 $helper->addLinkWithTextById('register_login_form_link_text');

diff --git a/application/admin/templates/de/code/login_main.ctp b/application/admin/templates/de/code/login_main.ctp
index edfdab6547c59ec1e9b23b94100350559c0ec66a..ab8fc97501a37f7f93039d83172e5472c84b6243 100644 (file)
--- a/application/admin/templates/de/code/login_main.ctp
+++ b/application/admin/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = WebBlockHelper::createWebBlockHelper($this, 'persona_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
 
 // Set the data source instance which must exist in registry
 $blockInstance->prefetchValueInstance('user');
@@ -23,7 +23,7 @@ if ($blockInstance->ifIncludeRegistrationStamp()) {
 $blockInstance->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
 $helper->addActionLink('logout', "Ausloggen");

diff --git a/application/admin/templates/de/code/logout_done.ctp b/application/admin/templates/de/code/logout_done.ctp
index 63798fdb7e40061fd8df9cd2ea5caff0639864c9..b55ffb11392d8f37adf360de46e6f30bb58d7c9c 100644 (file)
--- a/application/admin/templates/de/code/logout_done.ctp
+++ b/application/admin/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('relogin_link_text');

diff --git a/application/admin/templates/de/code/register_form.ctp b/application/admin/templates/de/code/register_form.ctp
index 4ba36c11441311b7a28a361a6051b65297ec09c4..db6352c90e7ef6683047d4bd52a49a6d6419e76c 100644 (file)
--- a/application/admin/templates/de/code/register_form.ctp
+++ b/application/admin/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'admin_register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'admin_register'));
 
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");

diff --git a/application/blog/config.php b/application/blog/config.php
index a2900e6b6330678f2e4c0f00250983d620b040c9..7d84d501510577d94729fb7146714e9f84759566 100644 (file)
--- a/application/blog/config.php
+++ b/application/blog/config.php
@@ -247,5 +247,14 @@ $cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
 // CFG: ADMIN-EMAIL
 $cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
 
+// CFG: WEB-BLOCK-HELPER
+$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
+
+// CFG: WEB-FORM-HELPER
+$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
+
+// CFG: WEB-LINK-HELPER
+$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
+
 // [EOF]
 ?>

diff --git a/application/blog/templates/de/code/action_blog_login_logout.ctp b/application/blog/templates/de/code/action_blog_login_logout.ctp
index 4dd47d9625b7e7058e423d627a6874e74620beed..09f289ec3de83119e56dad03e3b0134aaa8f8fdb 100644 (file)
--- a/application/blog/templates/de/code/action_blog_login_logout.ctp
+++ b/application/blog/templates/de/code/action_blog_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
 $helper->addLinkWithTextById('logout_now_link_text');
@@ -9,7 +9,7 @@ $helper->addLinkWithTextById('logout_now_link_text');
 $helper->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
 $helper->addLinkWithTextById('return_login_link_text');

diff --git a/application/blog/templates/de/code/action_blog_login_profile.ctp b/application/blog/templates/de/code/action_blog_login_profile.ctp
index 51d442f928adc17eab536c7f21a5460f7c8ccf4e..bf242b0a208a8c2d5a54caa3c88e301373c62d13 100644 (file)
--- a/application/blog/templates/de/code/action_blog_login_profile.ctp
+++ b/application/blog/templates/de/code/action_blog_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.
-$helper = WebFormHelper::createWebFormHelper($this, "blog_profile");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "blog_profile"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');

diff --git a/application/blog/templates/de/code/action_blog_login_status_problem.ctp b/application/blog/templates/de/code/action_blog_login_status_problem.ctp
index 88a47b1523350a460df692f714a8fc7a8247da3b..7eaa4479b4a6fcd41ff5d04e403ff5499b6c71c6 100644 (file)
--- a/application/blog/templates/de/code/action_blog_login_status_problem.ctp
+++ b/application/blog/templates/de/code/action_blog_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.
-$helper = WebFormHelper::createWebFormHelper($this, "resend_link");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');
@@ -31,7 +31,7 @@ $helper->flushContent();
 
 if ($helper->ifUserAccountUnconfirmed()) {
        // Build the form for confirmation
-       $helper = WebFormHelper::createWebFormHelper($this, "confirm_code");
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
 
        // Add code box
        $helper->addFormGroup('code', "Bitte gebe hier den Bestätigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");

diff --git a/application/blog/templates/de/code/block_persona_data.ctp b/application/blog/templates/de/code/block_persona_data.ctp
index e92df8a6b4996cc4a8987e2aa4d4265dd3e46168..0f057e9ed5c5acd0a3000fb0cc5f0649560b2879 100644 (file)
--- a/application/blog/templates/de/code/block_persona_data.ctp
+++ b/application/blog/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 = WebLinkHelper::createWebLinkHelper($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/blog/templates/de/code/captch_graphic_code.ctp b/application/blog/templates/de/code/captch_graphic_code.ctp
index 210db8f80a8ce2385e845f19062b4506181039de..cf0e6e7c6e83c57e4d4f1b481bf27ae257cad6ea 100644 (file)
--- a/application/blog/templates/de/code/captch_graphic_code.ctp
+++ b/application/blog/templates/de/code/captch_graphic_code.ctp
@@ -1,9 +1,15 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = WebFormHelper::createWebFormHelper($this, 'captcha_code', false, false);
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+
+// Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
+
+// Add hidden field with validation hash
 $captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
+
+// Flush content
 $captchaHelper->flushContent();
 
 // [EOF]

diff --git a/application/blog/templates/de/code/confirm_link.ctp b/application/blog/templates/de/code/confirm_link.ctp
index eaf8060723cffd9ef4f039766c40bdaa0946b820..bd8712323ddbcbc779ecb12e7541a4f87a284554 100644 (file)
--- a/application/blog/templates/de/code/confirm_link.ctp
+++ b/application/blog/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('direct_login_link_text');

diff --git a/application/blog/templates/de/code/login_failed.ctp b/application/blog/templates/de/code/login_failed.ctp
index dc67766febefac81569e651aef8fd13965b4a423..09b28f026fe4a29a02af32772d0e0d440931aa9f 100644 (file)
--- a/application/blog/templates/de/code/login_failed.ctp
+++ b/application/blog/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('login_retry_link_text');

diff --git a/application/blog/templates/de/code/login_form.ctp b/application/blog/templates/de/code/login_form.ctp
index dca65410a1003dffa718663f5065f0b9f36b9a20..b22633ac3e1ccba7bddac3c3937094fbe4b25523 100644 (file)
--- a/application/blog/templates/de/code/login_form.ctp
+++ b/application/blog/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'blog_user_login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_user_login'));
 
 // Formular deaktiviert?
 if ($helper->ifLoginIsEnabled()) {
@@ -53,7 +53,7 @@ $helper->flushContent();
 // Ist Gastlogin erlaubt?
 if ($helper->ifGuestLoginAllowed()) {
        // Neue Helper-Instanz holen
-       $helper = WebFormHelper::createWebFormHelper($this, 'blog_guest_login');
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_guest_login'));
        $helper->addInputHiddenConfiguredField('user', 'guest_login');
        $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
 
@@ -70,7 +70,7 @@ if ($helper->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
 $helper->addLinkWithTextById('register_login_form_link_text');

diff --git a/application/blog/templates/de/code/login_main.ctp b/application/blog/templates/de/code/login_main.ctp
index df6c2ba1eab660da21d1b83d1a240010ac8ed48b..1713892aea65f20ad9360b761b7f0146dae92b93 100644 (file)
--- a/application/blog/templates/de/code/login_main.ctp
+++ b/application/blog/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = WebBlockHelper::createWebBlockHelper($this, 'persona_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebBlockHelper::createWebBlockHelper($this, 'company_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
 $helper->addActionLink('logout', "Ausloggen");

diff --git a/application/blog/templates/de/code/logout_done.ctp b/application/blog/templates/de/code/logout_done.ctp
index be8a24b434d116301db2c63cf94b7236edeadb32..5f910e0a2dd6cb137bd0424f6c714578e20bffcc 100644 (file)
--- a/application/blog/templates/de/code/logout_done.ctp
+++ b/application/blog/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('relogin_link_text');

diff --git a/application/blog/templates/de/code/register_form.ctp b/application/blog/templates/de/code/register_form.ctp
index a1304b7e5d33c7de3a069ecddc354ce357938424..5e5e350464adcb87cd28b17e87503a1964287b2f 100644 (file)
--- a/application/blog/templates/de/code/register_form.ctp
+++ b/application/blog/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'blog_register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_register'));
 
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 058397fcd062e6cdf725df72d8c75c13889c3b74..24f8cd7676b6f27113af6d9f8f3da5cc5f812eee 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -325,5 +325,14 @@ $cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', "LocalPaymentDi
 // CFG: GOVERMENT-STARTUP-HELP-LIMIT
 $cfg->setConfigEntry('goverment_startup_help_limit', 3);
 
+// CFG: WEB-BLOCK-HELPER
+$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
+
+// CFG: WEB-FORM-HELPER
+$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
+
+// CFG: WEB-LINK-HELPER
+$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
+
 // [EOF]
 ?>

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
index 00ec77a5fb4e1d55a59105749aee5c165a1bd265..814df41032e6997f0006f8bd904bccecb8620ea4 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a link helper instance
-$linkInstance = WebLinkHelper::createWebLinkHelper($this, 'company_links', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company_links', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch the user data
 $linkInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_startup_help.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_startup_help.ctp
index 8a73e0cba37fc53ba3768d37112e0b32f640d985..b89a42e6904a9e29649919f45574b1a733d07c94 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_startup_help.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_startup_help.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = WebFormHelper::createWebFormHelper($this, 'shipsimu_startup_form');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_startup_form'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_training.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_training.ctp
index e168ef9cb7cbca5e60347bf7f30663d70e68ff7d..802ea9efb03dca7fa8ee2fc4746ff3f1f668a746 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_training.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_goverment_training.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
-$helperInstance = WebFormHelper::createWebFormHelper($this, 'shipsimu_training_form');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_training_form'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -22,7 +22,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_prof
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = WebLinkHelper::createWebLinkHelper($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Add action
 $linkInstance->addActionLinkById('profile', 'goto_profile_link');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
index 748db6715323b079892bb8014e8dfbfff60c2b3d..39d2105883bddc0500ed2285e49ddf932ad4a252 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = WebLinkHelper::createWebLinkHelper($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('logout_now_link_text');
@@ -9,7 +9,7 @@ $helperInstance->addLinkWithTextById('logout_now_link_text');
 $helperInstance->flushContent();
 
 // Get helper instance
-$helperInstance = WebLinkHelper::createWebLinkHelper($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('return_login_link_text');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
index b97e27f5d09a2330378ff29f9ae68c52e1e183f3..bac87351cb11112531941b90ea4f5450682c0cf1 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
+++ b/application/ship-simu/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 = WebFormHelper::createWebFormHelper($this, "shipsimu_profile");
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "shipsimu_profile"));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp
index b7af0c34c5ed38fd1fa872b57f9b2ffb69913039..5b79c9856b4a20aa0a10ec97f2bd8a9421314ca0 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp
@@ -1,6 +1,6 @@
 <?php
 // Neue Helper-Instanz holen
-$helperInstance = WebFormHelper::createWebFormHelper($this, 'refill_form');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'refill_form'));
 
 // Pre-fetch payment types
 $helperInstance->prefetchValueInstance('payments');

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp
index a87303c47f88da0cc4c636cf3cff202da00cb563..f3db301fdb13a4a38aa6d137bf989196c2299d19 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp
+++ b/application/ship-simu/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 = WebFormHelper::createWebFormHelper($this, "resend_link");
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
@@ -31,7 +31,7 @@ $helperInstance->flushContent();
 
 if ($helperInstance->ifUserAccountUnconfirmed()) {
        // Build the form for confirmation
-       $helperInstance = WebFormHelper::createWebFormHelper($this, "confirm_code");
+       $helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
 
        // Add code box
        $helperInstance->addFormGroup('code', "Bitte gebe hier den Bestätigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");

diff --git a/application/ship-simu/templates/de/code/block_persona_data.ctp b/application/ship-simu/templates/de/code/block_persona_data.ctp
index def6835801782bef41271f64e3d33addf87ab030..536d5a4af96c3a4d9628216a42f2ae75b9e80310 100644 (file)
--- a/application/ship-simu/templates/de/code/block_persona_data.ctp
+++ b/application/ship-simu/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 = WebLinkHelper::createWebLinkHelper($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/ship-simu/templates/de/code/captch_graphic_code.ctp b/application/ship-simu/templates/de/code/captch_graphic_code.ctp
index 210db8f80a8ce2385e845f19062b4506181039de..cf0e6e7c6e83c57e4d4f1b481bf27ae257cad6ea 100644 (file)
--- a/application/ship-simu/templates/de/code/captch_graphic_code.ctp
+++ b/application/ship-simu/templates/de/code/captch_graphic_code.ctp
@@ -1,9 +1,15 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = WebFormHelper::createWebFormHelper($this, 'captcha_code', false, false);
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+
+// Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
+
+// Add hidden field with validation hash
 $captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
+
+// Flush content
 $captchaHelper->flushContent();
 
 // [EOF]

diff --git a/application/ship-simu/templates/de/code/confirm_link.ctp b/application/ship-simu/templates/de/code/confirm_link.ctp
index cf2d03f39bd9629c7ea7217ad7c76f36208de0da..8e813fe7c8cd82e8d3bd341ea320c88ff91aa4cd 100644 (file)
--- a/application/ship-simu/templates/de/code/confirm_link.ctp
+++ b/application/ship-simu/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = WebLinkHelper::createWebLinkHelper($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('direct_login_link_text');

diff --git a/application/ship-simu/templates/de/code/login_failed.ctp b/application/ship-simu/templates/de/code/login_failed.ctp
index 39bca5a3212f96f33a2ed4b5e2bcbb3b01a89ee2..a2c96e6944d2f37c9cd74b7ee2eeb81a0a12b177 100644 (file)
--- a/application/ship-simu/templates/de/code/login_failed.ctp
+++ b/application/ship-simu/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = WebLinkHelper::createWebLinkHelper($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('login_retry_text');

diff --git a/application/ship-simu/templates/de/code/login_form.ctp b/application/ship-simu/templates/de/code/login_form.ctp
index 86f81d35824ef6c9cdbdc6d12a14a80d325a9360..d8675032ddce44108589b01857c8ea6b9ac54698 100644 (file)
--- a/application/ship-simu/templates/de/code/login_form.ctp
+++ b/application/ship-simu/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 = WebFormHelper::createWebFormHelper($this, 'shipsimu_user_login');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebFormHelper::createWebFormHelper($this, 'shipsimu_guest_login');
+       $helperInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebLinkHelper::createWebLinkHelper($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('register_login_form_link_text');

diff --git a/application/ship-simu/templates/de/code/login_main.ctp b/application/ship-simu/templates/de/code/login_main.ctp
index 74c9e747b2380f25e8a18b4af754170d658964e3..e8b0044f1db2669d0d6bce6351226024dbccb557 100644 (file)
--- a/application/ship-simu/templates/de/code/login_main.ctp
+++ b/application/ship-simu/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = WebBlockHelper::createWebBlockHelper($this, 'persona_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebBlockHelper::createWebBlockHelper($this, 'company_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebLinkHelper::createWebLinkHelper($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area');
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
 $linkInstance->addLinkGroup('logout', "");

diff --git a/application/ship-simu/templates/de/code/logout_done.ctp b/application/ship-simu/templates/de/code/logout_done.ctp
index 8e44f11559248b33f746cd10bc79ef6d50963455..844da68940ba1cce8edb8a2e9a3a9df9ee4607b1 100644 (file)
--- a/application/ship-simu/templates/de/code/logout_done.ctp
+++ b/application/ship-simu/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helperInstance = WebLinkHelper::createWebLinkHelper($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helperInstance->addLinkWithTextById('relogin_link_text');

diff --git a/application/ship-simu/templates/de/code/register_form.ctp b/application/ship-simu/templates/de/code/register_form.ctp
index 70dc67d688d0adf3a9dd15ffa1386222e832693e..7aeed88e0a49af090173ee851b68c5861feb2a0d 100644 (file)
--- a/application/ship-simu/templates/de/code/register_form.ctp
+++ b/application/ship-simu/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 = WebFormHelper::createWebFormHelper($this, 'shipsimu_register');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_register'));
 
 // Always ask at least for nickname and password
 $helperInstance->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");

diff --git a/application/shoutbox/config.php b/application/shoutbox/config.php
index c77e1a3ccf77e99eb0da9ffee2c0c48e8792762d..466c9e6a8a621affef5ab9cc4a8aa7d5a2e231ff 100644 (file)
--- a/application/shoutbox/config.php
+++ b/application/shoutbox/config.php
@@ -247,5 +247,14 @@ $cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
 // CFG: ADMIN-EMAIL
 $cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
 
+// CFG: WEB-BLOCK-HELPER
+$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
+
+// CFG: WEB-FORM-HELPER
+$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
+
+// CFG: WEB-LINK-HELPER
+$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
+
 // [EOF]
 ?>

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp
index fcf3d4512159522b1ace8f03dfd77d1a20a3f589..ac650abe19974a13ece078a4ee30db9bcdff709d 100644 (file)
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp
+++ b/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
 $helper->addLinkWithTextById('logout_now_link_text');
@@ -9,7 +9,7 @@ $helper->addLinkWithTextById('logout_now_link_text');
 $helper->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
 $helper->addLinkWithTextById('return_login_link_text');

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp
index 3babf81a1da54141478bf0b9da52d5d6522d8b79..9caa52ed4b43d1ab99da239d3eb733b2b841ea03 100644 (file)
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp
+++ b/application/shoutbox/templates/de/code/action_shoutbox_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.
-$helper = WebFormHelper::createWebFormHelper($this, "shoutbox_profile");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "shoutbox_profile"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp
index 88a47b1523350a460df692f714a8fc7a8247da3b..7eaa4479b4a6fcd41ff5d04e403ff5499b6c71c6 100644 (file)
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp
+++ b/application/shoutbox/templates/de/code/action_shoutbox_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.
-$helper = WebFormHelper::createWebFormHelper($this, "resend_link");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');
@@ -31,7 +31,7 @@ $helper->flushContent();
 
 if ($helper->ifUserAccountUnconfirmed()) {
        // Build the form for confirmation
-       $helper = WebFormHelper::createWebFormHelper($this, "confirm_code");
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
 
        // Add code box
        $helper->addFormGroup('code', "Bitte gebe hier den Bestätigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");

diff --git a/application/shoutbox/templates/de/code/block_persona_data.ctp b/application/shoutbox/templates/de/code/block_persona_data.ctp
index e92df8a6b4996cc4a8987e2aa4d4265dd3e46168..0f057e9ed5c5acd0a3000fb0cc5f0649560b2879 100644 (file)
--- a/application/shoutbox/templates/de/code/block_persona_data.ctp
+++ b/application/shoutbox/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 = WebLinkHelper::createWebLinkHelper($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/shoutbox/templates/de/code/captch_graphic_code.ctp b/application/shoutbox/templates/de/code/captch_graphic_code.ctp
index 210db8f80a8ce2385e845f19062b4506181039de..cf0e6e7c6e83c57e4d4f1b481bf27ae257cad6ea 100644 (file)
--- a/application/shoutbox/templates/de/code/captch_graphic_code.ctp
+++ b/application/shoutbox/templates/de/code/captch_graphic_code.ctp
@@ -1,9 +1,15 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = WebFormHelper::createWebFormHelper($this, 'captcha_code', false, false);
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+
+// Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
+
+// Add hidden field with validation hash
 $captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
+
+// Flush content
 $captchaHelper->flushContent();
 
 // [EOF]

diff --git a/application/shoutbox/templates/de/code/confirm_link.ctp b/application/shoutbox/templates/de/code/confirm_link.ctp
index a399741e3af6e3fa26556764bcbe5c4239601f85..154274613d01ec3a31dc99b17baf8775d70b07ee 100644 (file)
--- a/application/shoutbox/templates/de/code/confirm_link.ctp
+++ b/application/shoutbox/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('direct_login_link_text');

diff --git a/application/shoutbox/templates/de/code/login_failed.ctp b/application/shoutbox/templates/de/code/login_failed.ctp
index f8c909774dea19eb507b9874e4102e4216125e02..fbc47b4468081e017d2ed5cf0ce91dbc0ae03ecf 100644 (file)
--- a/application/shoutbox/templates/de/code/login_failed.ctp
+++ b/application/shoutbox/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('login_retry_link_text');

diff --git a/application/shoutbox/templates/de/code/login_form.ctp b/application/shoutbox/templates/de/code/login_form.ctp
index 68cbe473b652a0ae68ca8ef35b852455d53147cf..e0a72b00406a9e8bbb7c92a3724e7fe0b907f1ea 100644 (file)
--- a/application/shoutbox/templates/de/code/login_form.ctp
+++ b/application/shoutbox/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'shoutbox_user_login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_user_login'));
 
 // Formular deaktiviert?
 if ($helper->ifLoginIsEnabled()) {
@@ -53,7 +53,7 @@ $helper->flushContent();
 // Ist Gastlogin erlaubt?
 if ($helper->ifGuestLoginAllowed()) {
        // Neue Helper-Instanz holen
-       $helper = WebFormHelper::createWebFormHelper($this, 'shoutbox_guest_login');
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_guest_login'));
        $helper->addInputHiddenConfiguredField('user', 'guest_login');
        $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
 
@@ -70,7 +70,7 @@ if ($helper->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
 $helper->addLinkWithTextById('register_login_form_link_text');

diff --git a/application/shoutbox/templates/de/code/login_main.ctp b/application/shoutbox/templates/de/code/login_main.ctp
index df6c2ba1eab660da21d1b83d1a240010ac8ed48b..1713892aea65f20ad9360b761b7f0146dae92b93 100644 (file)
--- a/application/shoutbox/templates/de/code/login_main.ctp
+++ b/application/shoutbox/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = WebBlockHelper::createWebBlockHelper($this, 'persona_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebBlockHelper::createWebBlockHelper($this, 'company_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
 $helper->addActionLink('logout', "Ausloggen");

diff --git a/application/shoutbox/templates/de/code/logout_done.ctp b/application/shoutbox/templates/de/code/logout_done.ctp
index 614898134ab3eaf6711ca6585b354140432bc430..41014b0b357278951c4d5ba94be5f6d225f4e3f2 100644 (file)
--- a/application/shoutbox/templates/de/code/logout_done.ctp
+++ b/application/shoutbox/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('relogin_link_text');

diff --git a/application/shoutbox/templates/de/code/register_form.ctp b/application/shoutbox/templates/de/code/register_form.ctp
index 7314501968f6273207daff14c92e89e79a9308fe..377d53e88e290528be50f98a019a5bf195768cf9 100644 (file)
--- a/application/shoutbox/templates/de/code/register_form.ctp
+++ b/application/shoutbox/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'shoutbox_register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_register'));
 
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");

diff --git a/application/todo/config.php b/application/todo/config.php
index 02f9e7b4535e96f0ef344a8e79e1b7148bc61589..8b664b0d08ce4b50ff5da7bff96d13b9c39092cc 100644 (file)
--- a/application/todo/config.php
+++ b/application/todo/config.php
@@ -247,5 +247,14 @@ $cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
 // CFG: ADMIN-EMAIL
 $cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
 
+// CFG: WEB-BLOCK-HELPER
+$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
+
+// CFG: WEB-FORM-HELPER
+$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
+
+// CFG: WEB-LINK-HELPER
+$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
+
 // [EOF]
 ?>

diff --git a/application/todo/templates/de/code/action_todo_login_logout.ctp b/application/todo/templates/de/code/action_todo_login_logout.ctp
index 8d96247c4ec59926b62d09a617541d292216f958..cfb4289ecd8e3984f4f7d428c41947b0cd22ca7a 100644 (file)
--- a/application/todo/templates/de/code/action_todo_login_logout.ctp
+++ b/application/todo/templates/de/code/action_todo_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
 $helper->addLinkWithTextById('logout_now_link_text');
@@ -9,7 +9,7 @@ $helper->addLinkWithTextById('logout_now_link_text');
 $helper->flushContent();
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
 $helper->addLinkWithTextById('return_login_link_text');

diff --git a/application/todo/templates/de/code/action_todo_login_profile.ctp b/application/todo/templates/de/code/action_todo_login_profile.ctp
index 5337a196ec81ebad2c85d78c6b29bab68f3dccc5..153c1a21af8d5409629d70bec772f5bd3181749d 100644 (file)
--- a/application/todo/templates/de/code/action_todo_login_profile.ctp
+++ b/application/todo/templates/de/code/action_todo_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.
-$helper = WebFormHelper::createWebFormHelper($this, "todo_profile");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "todo_profile"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');

diff --git a/application/todo/templates/de/code/action_todo_login_status_problem.ctp b/application/todo/templates/de/code/action_todo_login_status_problem.ctp
index 88a47b1523350a460df692f714a8fc7a8247da3b..7eaa4479b4a6fcd41ff5d04e403ff5499b6c71c6 100644 (file)
--- a/application/todo/templates/de/code/action_todo_login_status_problem.ctp
+++ b/application/todo/templates/de/code/action_todo_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.
-$helper = WebFormHelper::createWebFormHelper($this, "resend_link");
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
 
 // Pre-fetch field data with a given registry key
 $helper->prefetchValueInstance('user');
@@ -31,7 +31,7 @@ $helper->flushContent();
 
 if ($helper->ifUserAccountUnconfirmed()) {
        // Build the form for confirmation
-       $helper = WebFormHelper::createWebFormHelper($this, "confirm_code");
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
 
        // Add code box
        $helper->addFormGroup('code', "Bitte gebe hier den Bestätigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");

diff --git a/application/todo/templates/de/code/block_persona_data.ctp b/application/todo/templates/de/code/block_persona_data.ctp
index e92df8a6b4996cc4a8987e2aa4d4265dd3e46168..0f057e9ed5c5acd0a3000fb0cc5f0649560b2879 100644 (file)
--- a/application/todo/templates/de/code/block_persona_data.ctp
+++ b/application/todo/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 = WebLinkHelper::createWebLinkHelper($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area');
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');

diff --git a/application/todo/templates/de/code/captch_graphic_code.ctp b/application/todo/templates/de/code/captch_graphic_code.ctp
index 210db8f80a8ce2385e845f19062b4506181039de..cf0e6e7c6e83c57e4d4f1b481bf27ae257cad6ea 100644 (file)
--- a/application/todo/templates/de/code/captch_graphic_code.ctp
+++ b/application/todo/templates/de/code/captch_graphic_code.ctp
@@ -1,9 +1,15 @@
 <?php
 // Get a helper instance without a form tag
-$captchaHelper = WebFormHelper::createWebFormHelper($this, 'captcha_code', false, false);
+$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
+
+// Add input field with text for CAPTCHA code
 $captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
+
+// Add hidden field with validation hash
 $captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
+
+// Flush content
 $captchaHelper->flushContent();
 
 // [EOF]

diff --git a/application/todo/templates/de/code/confirm_link.ctp b/application/todo/templates/de/code/confirm_link.ctp
index b6fa7424eae1083a208f5087b186d73fd16e5a00..4e96afe093dd4b5f64dad023adaa02d8e1088155 100644 (file)
--- a/application/todo/templates/de/code/confirm_link.ctp
+++ b/application/todo/templates/de/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('direct_login_link_text');

diff --git a/application/todo/templates/de/code/login_failed.ctp b/application/todo/templates/de/code/login_failed.ctp
index 4255c189136ff5900f85d02d181bbde1b5548fb7..c066f43b4fe291a6e26d0ce376372d36a0da436c 100644 (file)
--- a/application/todo/templates/de/code/login_failed.ctp
+++ b/application/todo/templates/de/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('login_retry_link_text');

diff --git a/application/todo/templates/de/code/login_form.ctp b/application/todo/templates/de/code/login_form.ctp
index 31e62d141ed5c716b53ab9d58823b7f48c6bd590..9ccba17f36819b48c36994a65566fe760b9422e6 100644 (file)
--- a/application/todo/templates/de/code/login_form.ctp
+++ b/application/todo/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'todo_user_login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_user_login'));
 
 // Formular deaktiviert?
 if ($helper->ifLoginIsEnabled()) {
@@ -53,7 +53,7 @@ $helper->flushContent();
 // Ist Gastlogin erlaubt?
 if ($helper->ifGuestLoginAllowed()) {
        // Neue Helper-Instanz holen
-       $helper = WebFormHelper::createWebFormHelper($this, 'todo_guest_login');
+       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_guest_login'));
        $helper->addInputHiddenConfiguredField('user', 'guest_login');
        $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
 
@@ -70,7 +70,7 @@ if ($helper->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
 $helper->addLinkWithTextById('register_login_form_link_text');

diff --git a/application/todo/templates/de/code/login_main.ctp b/application/todo/templates/de/code/login_main.ctp
index df6c2ba1eab660da21d1b83d1a240010ac8ed48b..1713892aea65f20ad9360b761b7f0146dae92b93 100644 (file)
--- a/application/todo/templates/de/code/login_main.ctp
+++ b/application/todo/templates/de/code/login_main.ctp
@@ -4,7 +4,7 @@
 ///////////////////////////////
 
 // Get a new instance for personal data
-$blockInstance = WebBlockHelper::createWebBlockHelper($this, 'persona_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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 = WebBlockHelper::createWebBlockHelper($this, 'company_data');
+$blockInstance = ObjectFactory::createObjectByConfiguredName('web_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
-$helper = WebLinkHelper::createWebLinkHelper($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
 $helper->addActionLink('logout', "Ausloggen");

diff --git a/application/todo/templates/de/code/logout_done.ctp b/application/todo/templates/de/code/logout_done.ctp
index 4898b72b0d3303ca7427e93d4e2e1b8c408bc75f..4747b9538d91f9f3df13a8c54fa14fe420c67695 100644 (file)
--- a/application/todo/templates/de/code/logout_done.ctp
+++ b/application/todo/templates/de/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get helper instance
-$helper = WebLinkHelper::createWebLinkHelper($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login');
+$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
 $helper->addLinkWithTextById('relogin_link_text');

diff --git a/application/todo/templates/de/code/register_form.ctp b/application/todo/templates/de/code/register_form.ctp
index 4d8296119227f56b747e9521846316b634e60023..dd6b6ad6a597a38ace4e15c2017c04030962e386 100644 (file)
--- a/application/todo/templates/de/code/register_form.ctp
+++ b/application/todo/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.
-$helper = WebFormHelper::createWebFormHelper($this, 'todo_register');
+$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_register'));
 
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");