Continued:

- renamed addFieldText() to addFieldLabel()
- no need for this namespace ...
- updated 'core' framework to latest commit

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
index 02d4df61175ecb354a80e2b2946a98de1038df06..30add5eebb7c53f901f82e82241fc827260e33b3 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php
+++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\Confirmed;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php
index 0d0596239a0b40a21f3ea6a93a98efd7246698f8..9a8da4445e2ce77700ae25ba1305047bc638df42 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php
+++ b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\LoginFailed;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/classes/controller/html/class_CityHtmlLogoutController.php b/application/city/classes/controller/html/class_CityHtmlLogoutController.php
index 7fd8b7162b18c15d7bd57bdf4170f6a5a1f615d6..1e7d226fbde34c813772ac419434a3f0766f4daf 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlLogoutController.php
+++ b/application/city/classes/controller/html/class_CityHtmlLogoutController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\Logout;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php
index 6f4385f1d22a43b15cd796b621bd8eac105c45da..b98695e284a0c7f50c75a8485987aaded671961b 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php
+++ b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\LogoutDone;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/classes/controller/html/class_CityHtmlRegisterController.php b/application/city/classes/controller/html/class_CityHtmlRegisterController.php
index a6dff23996157292c815b5bb238a96e22dc30215..fe6b17b3dc36cf855f60a2e9e7bee5c413c9d301 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlRegisterController.php
+++ b/application/city/classes/controller/html/class_CityHtmlRegisterController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\Register;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
index 56415cb5dbd854d118526e6f8e790cf378665a44..d9ffedd0b80f017bc59f5b70e2ee6dfbb8950612 100644 (file)
--- a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
+++ b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Controller\DoForm;
+namespace Org\Mxchange\City\Controller;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;

diff --git a/application/city/exceptions.php b/application/city/exceptions.php
index 12c5c09b8ba1ac7501b3f6c7da6f5bcc8b2fba21..7f4482f57a864e80b12e8c177e1dcddaf025477c 100644 (file)
--- a/application/city/exceptions.php
+++ b/application/city/exceptions.php
@@ -1,5 +1,6 @@
 <?php
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Assertion\AssertionException;
 use Org\Mxchange\CoreFramework\Generic\FrameworkException;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
@@ -26,7 +27,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  */
 
 // The node's own exception handler
-function city_exception_handler ($exceptionInstance) {
+function tests_exception_handler ($exceptionInstance) {
        // Is it an object and a valid instance?
        if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Exception)) {
                // Init variable
@@ -37,11 +38,14 @@ function city_exception_handler ($exceptionInstance) {
                        // Init argument string
                        $argsString = '';
 
-                       // Convert arguments type into human-readable
-                       foreach ($traceArray['args'] as $arg) {
-                               $argsString .= ', ' . gettype($arg);
-                       } // END - foreach
-                       $argsString = substr($argsString, 2);
+                       // Some argument found?
+                       if (isset($traceArray['args'])) {
+                               // Convert arguments type into human-readable
+                               foreach ($traceArray['args'] as $arg) {
+                                       $argsString .= ', ' . gettype($arg);
+                               } // END - foreach
+                               $argsString = substr($argsString, 2);
+                       } // END - if
 
                        // Set missing file/line
                        if (!isset($traceArray['file']))  $traceArray['file']  = 'unknown';
@@ -101,7 +105,7 @@ Backtrace:
 }
 
 // Error handler
-function city_error_handler ($errno, $errstr, $errfile, $errline, array $errcontext) {
+function tests_error_handler ($errno, $errstr, $errfile, $errline, array $errcontext) {
        // Construct the message
        $message = sprintf('File: %s, Line: %s, Code: %s, Message: %s',
                basename($errfile),
@@ -115,7 +119,7 @@ function city_error_handler ($errno, $errstr, $errfile, $errline, array $errcont
 } // END - function
 
 // Assertion handler
-function city_assert_handler ($file, $line, $code) {
+function tests_assert_handler ($file, $line, $code) {
        // Empty code?
        if ($code === '') {
                $code = '<em>Unknown</em>';
@@ -136,14 +140,14 @@ function city_assert_handler ($file, $line, $code) {
 } // END - function
 
 // Set error handler
-//set_error_handler('city_error_handler');
+//set_error_handler('tests_error_handler');
 
 // Set the new handler
-set_exception_handler('city_exception_handler');
+set_exception_handler('tests_exception_handler');
 
 // Init assert handling
 assert_options(ASSERT_ACTIVE    , true);
 assert_options(ASSERT_WARNING   , false);
 assert_options(ASSERT_BAIL      , true);
 assert_options(ASSERT_QUIET_EVAL, false);
-assert_options(ASSERT_CALLBACK  , 'city_assert_handler');
+assert_options(ASSERT_CALLBACK  , 'tests_assert_handler');

diff --git a/application/city/templates/code/action_city_login_city_map.ctp b/application/city/templates/code/action_city_login_city_map.ctp
index 3bbc9e29efe8dc13b1b8db7782d9262551a71606..492fd312a52842b90085bd4012774d1415b2f0d6 100644 (file)
--- a/application/city/templates/code/action_city_login_city_map.ctp
+++ b/application/city/templates/code/action_city_login_city_map.ctp
@@ -28,7 +28,7 @@ if ($userInstance->isGuest()) {
 
        // City name input field
        $helperInstance->addFormSubGroup('city_name', "Bitte gebe den Namen der Stadt ein.");
-       $helperInstance->addFieldText('city_name', "Dein Stadtname:");
+       $helperInstance->addFieldLabel('city_name', "Dein Stadtname:");
        $helperInstance->addInputTextField('city_name');
 
        // CAPTCHA enabled?

diff --git a/application/city/templates/code/action_city_login_government_startup_help.ctp b/application/city/templates/code/action_city_login_government_startup_help.ctp
index e82aeb557cfde5cea68c24b5a6e8bd816803b1f2..c5b0513b9b24f1b75f0d95a49a83ba7b67e2c153 100644 (file)
--- a/application/city/templates/code/action_city_login_government_startup_help.ctp
+++ b/application/city/templates/code/action_city_login_government_startup_help.ctp
@@ -25,7 +25,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?city_profile?
 
 // Ask again for current account password
 $helperInstance->addFormGroup('password', "Bitte gebe zur Bestätigung dein derzeitiges Passwort ein.");
-$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
+$helperInstance->addFieldLabel('password', "Derzeitiges Passwort:");
 $helperInstance->addInputPasswordField('password');
 
 // CAPTCHA enabled?

diff --git a/application/city/templates/code/action_city_login_government_training.ctp b/application/city/templates/code/action_city_login_government_training.ctp
index c8eb7b9bd09436a164810362f31b5272148c686f..3fb80901cafaeea6fea32af0fcebf5c26c1f0040 100644 (file)
--- a/application/city/templates/code/action_city_login_government_training.ctp
+++ b/application/city/templates/code/action_city_login_government_training.ctp
@@ -16,7 +16,7 @@ $helperInstance->addFormGroup('persona_data', "Deine persönliche Daten, die
 
 // Ask again for current account password
 $helperInstance->addFormGroup('password', "Bitte gebe zur Bestätigung dein derzeitiges Passwort ein.");
-$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
+$helperInstance->addFieldLabel('password', "Derzeitiges Passwort:");
 $helperInstance->addInputPasswordField('password');
 
 // Display email, surname and family name

diff --git a/application/city/templates/code/action_city_login_profile.ctp b/application/city/templates/code/action_city_login_profile.ctp
index 81d09ea6a14caaf7d2bbb1c00cca3e8e0a118fb9..7e7f0750251039b187367154286753917f24ecbd 100644 (file)
--- a/application/city/templates/code/action_city_login_profile.ctp
+++ b/application/city/templates/code/action_city_login_profile.ctp
@@ -13,9 +13,9 @@ $helperInstance->prefetchValueInstance('user');
 // Password can only be changed when the old one is entered and new one twice!
 $helperInstance->addFormGroup('pass', "Neues Passwort einrichten:");
 $helperInstance->addFormSubGroup('pass', "Bitte gebe zum Ändern deines Passwortes zweimal das gewünschte neue Passwort ein.");
-$helperInstance->addFieldText('pass1', "Neues Passwort:");
+$helperInstance->addFieldLabel('pass1', "Neues Passwort:");
 $helperInstance->addInputPasswordField('pass1');
-$helperInstance->addFieldText('pass2', "Neues Passwort, Wiederholung:");
+$helperInstance->addFieldLabel('pass2', "Neues Passwort, Wiederholung:");
 $helperInstance->addInputPasswordField('pass2');
 
 // Display current email
@@ -25,9 +25,9 @@ $helperInstance->addFormNote('current_email', "Derzeitige Email-Adresse: <span c
 if ($helperInstance->ifEmailChangeAllowed()) {
        $helperInstance->addFormGroup('email', "&Auml;nderung deiner Email-Addresse:");
        $helperInstance->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese &auml;ndern m&ouml;chtest!");
-       $helperInstance->addFieldText('email1', "Email-Adresse:");
+       $helperInstance->addFieldLabel('email1', "Email-Adresse:");
        $helperInstance->addInputTextField('email1');
-       $helperInstance->addFieldText('email2', "Wiederholung Email-Adresse:");
+       $helperInstance->addFieldLabel('email2', "Wiederholung Email-Adresse:");
        $helperInstance->addInputTextField('email2');
 
        if ($helperInstance->ifEmailMustBeUnique()) {
@@ -45,29 +45,29 @@ $helperInstance->addFormGroup('profile', "Hier kannst du deine Profildaten &auml
 // Persoenliche Daten mit in der Anmeldung abfragen?
 if ($helperInstance->ifRegisterIncludesPersonaData()) {
        $helperInstance->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-       $helperInstance->addFieldText('surname', "Dein Vorname:");
+       $helperInstance->addFieldLabel('surname', "Dein Vorname:");
        $helperInstance->addInputTextFieldWithDefault('surname');
-       $helperInstance->addFieldText('family', "Dein Nachname:");
+       $helperInstance->addFieldLabel('family', "Dein Nachname:");
        $helperInstance->addInputTextFieldWithDefault('family');
-       $helperInstance->addFieldText('street', "Strasse und Hausnummer:");
+       $helperInstance->addFieldLabel('street', "Strasse und Hausnummer:");
        $helperInstance->addInputTextFieldWithDefault('street');
-       $helperInstance->addFieldText('city', "Wohnort:");
+       $helperInstance->addFieldLabel('city', "Wohnort:");
        $helperInstance->addInputTextFieldWithDefault('city');
 
        // Include birthday?
        if ($helperInstance->ifProfileIncludesBirthDay()) {
                $helperInstance->addFormSubGroup('birthday', "Verrate uns doch dein Geburtsdatum, als Dankesch&ouml;n erh&auml;lst du interessante Pr&auml;mien - ausschliesslich per Email - zum Geburtstag zugesandt! G&uuml;ltiges Format: TT.MM.JJJJ");
                $helperInstance->addInputTextField('birth_day');
-               $helperInstance->addFieldText('birth_day', ".");
+               $helperInstance->addFieldLabel('birth_day', ".");
                $helperInstance->addInputTextField('birth_month');
-               $helperInstance->addFieldText('birth_day', ".");
+               $helperInstance->addFieldLabel('birth_day', ".");
                $helperInstance->addInputTextField('birth_year');
        } // END - if
 } // END - if
 
 // Add sub group for zip code
 $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-$helperInstance->addFieldText('zip', "Postleitzahl:");
+$helperInstance->addFieldLabel('zip', "Postleitzahl:");
 $helperInstance->addInputTextFieldWithDefault('zip');
 
 // Add sub group for chat protocols
@@ -75,31 +75,31 @@ $helperInstance->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern
 
 // Add ICQ chat?
 if ($helperInstance->ifChatEnabled('icq')) {
-       $helperInstance->addFieldText('icq', "ICQ-Nummer:");
+       $helperInstance->addFieldLabel('icq', "ICQ-Nummer:");
        $helperInstance->addInputTextFieldWithDefault('icq');
 } // END - if
 
 // Add Jabber chat?
 if ($helperInstance->ifChatEnabled('jabber')) {
-       $helperInstance->addFieldText('jabber', "Jabber:");
+       $helperInstance->addFieldLabel('jabber', "Jabber:");
        $helperInstance->addInputTextFieldWithDefault('jabber');
 } // END - if
 
 // Add Yahoo! chat?
 if ($helperInstance->ifChatEnabled('yahoo')) {
-       $helperInstance->addFieldText('yahoo', "Yahoo!:");
+       $helperInstance->addFieldLabel('yahoo', "Yahoo!:");
        $helperInstance->addInputTextFieldWithDefault('yahoo');
 } // END - if
 
 // Add AOL chat?
 if ($helperInstance->ifChatEnabled('aol')) {
-       $helperInstance->addFieldText('aol', "AOL-Screenname:");
+       $helperInstance->addFieldLabel('aol', "AOL-Screenname:");
        $helperInstance->addInputTextFieldWithDefault('aol');
 } // END - if
 
 // Add MSN chat?
 if ($helperInstance->ifChatEnabled('msn')) {
-       $helperInstance->addFieldText('msn', "MSN:");
+       $helperInstance->addFieldLabel('msn', "MSN:");
        $helperInstance->addInputTextFieldWithDefault('msn');
 } // END - if
 
@@ -110,7 +110,7 @@ if (!$helperInstance->ifRegisterRequiresEmailVerification()) {
 // Rules already accepted?
 if ($helperInstance->ifRulesHaveChanged()) {
        $helperInstance->addFormGroup('rules', "Bitte lese dir die Spieleregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Spielregeln&quot; an.");
-       $helperInstance->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Spielregeln:");
+       $helperInstance->addFieldLabel('rules', "Ja, ich akzeptiere die aktuellen Spielregeln:");
        $helperInstance->addInputCheckboxField('rules', false);
 } else {
        $helperInstance->addFormNote('rules_accepted', "Du hast die aktuellen Spielregeln akzeptiert. Vielen Dank!");
@@ -125,7 +125,7 @@ if ($helperInstance->ifFormSecuredWithCaptcha()) {
 
 // Ask again for current account password
 $helperInstance->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
-$helperInstance->addFieldText('pass_old', "Derzeitiges Passwort:");
+$helperInstance->addFieldLabel('pass_old', "Derzeitiges Passwort:");
 $helperInstance->addInputPasswordField('pass_old');
 
 // Final notices

diff --git a/application/city/templates/code/action_city_login_status_problem.ctp b/application/city/templates/code/action_city_login_status_problem.ctp
index ed9cf2fe3db2ab8916ece5fda02b12221d9e3584..8a289924222a466ba3508f1f503498862afcbec6 100644 (file)
--- a/application/city/templates/code/action_city_login_status_problem.ctp
+++ b/application/city/templates/code/action_city_login_status_problem.ctp
@@ -41,7 +41,7 @@ $helperInstance->prefetchValueInstance('user');
 if ($helperInstance->ifUserAccountUnconfirmed()) {
        // 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.");
-       $helperInstance->addFieldText('code', "Bestätigungscode aus der Mail:");
+       $helperInstance->addFieldLabel('code', "Bestätigungscode aus der Mail:");
        $helperInstance->addInputTextField('code');
 
        // Add submit button

diff --git a/application/city/templates/code/captch_graphic_code.ctp b/application/city/templates/code/captch_graphic_code.ctp
index 12bb24c765e5dfd5feb24e44597f0cda991074bf..060cef114b61ec4c8a60c1dbe7c2d75a5b69eedf 100644 (file)
--- a/application/city/templates/code/captch_graphic_code.ctp
+++ b/application/city/templates/code/captch_graphic_code.ctp
@@ -6,7 +6,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 $captchaHelper = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'captcha_code', false, false));
 
 // Add input field with text for CAPTCHA code
-$captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
+$captchaHelper->addFieldLabel('captcha_code', "Bitte wiederhole den Code:");
 $captchaHelper->addInputTextField('c_code');
 
 // Add hidden field with validation hash

diff --git a/application/city/templates/code/login_form.ctp b/application/city/templates/code/login_form.ctp
index 419c8439bbee6f054a1d8c39b6d5aae8337aba1b..0bff557832b9ebde5789e80f9d577740335a78a1 100644 (file)
--- a/application/city/templates/code/login_form.ctp
+++ b/application/city/templates/code/login_form.ctp
@@ -16,23 +16,23 @@ if ($helperInstance->ifLoginIsEnabled()) {
        if ($helperInstance->ifLoginWithUsername()) {
                // Login with user name only
                $helperInstance->addFormSubGroup('username', "Bitte mit deinem Nickname einloggen.");
-               $helperInstance->addFieldText('username', "Dein Nickname:");
+               $helperInstance->addFieldLabel('username', "Dein Nickname:");
                $helperInstance->addInputTextField('username');
        } elseif ($helperInstance->ifLoginWithEmail()) {
                // Login with email address only
                $helperInstance->addFormSubGroup('email', "Bitte mit deiner Email-Adresse einloggen.");
-               $helperInstance->addFieldText('email', "Deine Email-Addresse:");
+               $helperInstance->addFieldLabel('email', "Deine Email-Addresse:");
                $helperInstance->addInputTextField('email');
        } else {
                // Login with email address or user name
                $helperInstance->addFormSubGroup('user_email', "Bitte mit deinem Nickname oder Email-Adresse einloggen.");
-               $helperInstance->addFieldText('user_email', "Dein Nickname/Email:");
+               $helperInstance->addFieldLabel('user_email', "Dein Nickname/Email:");
                $helperInstance->addInputTextField('user_email');
        }
 
        // Add password input field
        $helperInstance->addFormSubGroup('pass', "Gebe dein Passwort von der Anmeldung ein.");
-       $helperInstance->addFieldText('pass', "Dein Passwort:");
+       $helperInstance->addFieldLabel('pass', "Dein Passwort:");
        $helperInstance->addInputPasswordField('pass');
 
        // CAPTCHA enabled?
@@ -85,19 +85,21 @@ $helperInstance->flushContent();
 // [EOC]
 ?>
 <div id="content_header">
-       Einloggen zu <span class="app_name">{?app_full_name?}</span>
+       <h3>Einloggen zu <span class="app_name">{?app_full_name?}</span></h3>
 </div>
 
-<div id="content_body">
-       <div id="login_box">
+<div id="content_body" class="row">
+       <div id="login_box" class="col-md-6">
                {?city_user_login?}
        </div>
 
-       <div id="guest_login">
+       <div id="guest_login" class="col-md-6">
                {?city_guest_login?}
        </div>
 </div>
 
-<div id="content_footer">
-       Noch kein Spieleaccount? {?register?}
+<div id="content_footer" class="row">
+       <div class="col-md-12">
+               Noch kein Spieleaccount? {?register?}
+       </div>
 </div>

diff --git a/application/city/templates/code/register_form.ctp b/application/city/templates/code/register_form.ctp
index 92d16a0fd5ecfacd876943fc5148938e2050afd8..c8041e140bae38762f7957084ab76a17406cb215 100644 (file)
--- a/application/city/templates/code/register_form.ctp
+++ b/application/city/templates/code/register_form.ctp
@@ -10,20 +10,20 @@ $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_
 // Always ask at least for nickname and password
 $helperInstance->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");
 $helperInstance->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares geprüft. Später bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
-$helperInstance->addFieldText('username', "Nickname im Spiel:");
+$helperInstance->addFieldLabel('username', "Nickname im Spiel:");
 $helperInstance->addInputTextField('username');
 $helperInstance->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Später bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortstärke anzeigt.");
-$helperInstance->addFieldText('pass1', "Passwort:");
+$helperInstance->addFieldLabel('pass1', "Passwort:");
 $helperInstance->addInputPasswordField('pass1');
-$helperInstance->addFieldText('pass2', "Passwortwiederholung:");
+$helperInstance->addFieldLabel('pass2', "Passwortwiederholung:");
 $helperInstance->addInputPasswordField('pass2');
 
 // Does this registration require an email?
 if ($helperInstance->ifRegisterRequiresEmailVerification()) {
        $helperInstance->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Bestätigung) ein, damit wir dir deinen Freischaltlink zusenden können.");
-       $helperInstance->addFieldText('email1', "Email-Adresse:");
+       $helperInstance->addFieldLabel('email1', "Email-Adresse:");
        $helperInstance->addInputTextField('email1');
-       $helperInstance->addFieldText('email2', "Wiederholung Email-Adresse:");
+       $helperInstance->addFieldLabel('email2', "Wiederholung Email-Adresse:");
        $helperInstance->addInputTextField('email2');
 
        // Must the email address be unique in this system?
@@ -38,7 +38,7 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
 
        if (!$helperInstance->ifRegisterRequiresEmailVerification()) {
                $helperInstance->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
-               $helperInstance->addFieldText('email1', "Email-Adresse:");
+               $helperInstance->addFieldLabel('email1', "Email-Adresse:");
                $helperInstance->addInputTextField('email1');
 
                // Must the email address be unique in this system?
@@ -50,54 +50,54 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
        // Persoenliche Daten mit in der Anmeldung abfragen?
        if ($helperInstance->ifRegisterIncludesPersonaData()) {
                $helperInstance->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-               $helperInstance->addFieldText('surname', "Dein Vorname:");
+               $helperInstance->addFieldLabel('surname', "Dein Vorname:");
                $helperInstance->addInputTextField('surname');
-               $helperInstance->addFieldText('family', "Dein Nachname:");
+               $helperInstance->addFieldLabel('family', "Dein Nachname:");
                $helperInstance->addInputTextField('family');
-               $helperInstance->addFieldText('street', "Strasse und Hausnummer:");
+               $helperInstance->addFieldLabel('street', "Strasse und Hausnummer:");
                $helperInstance->addInputTextField('street');
-               $helperInstance->addFieldText('city', "Wohnort:");
+               $helperInstance->addFieldLabel('city', "Wohnort:");
                $helperInstance->addInputTextField('city');
 
                // Include birthday?
                if ($helperInstance->ifProfileIncludesBirthDay()) {
                        $helperInstance->addFormSubGroup('birthday', "Verrate uns doch dein Geburtsdatum, als Dankesch&ouml;n erh&auml;lst du interessante Pr&auml;mien - ausschliesslich per Email - zum Geburtstag zugesandt! G&uuml;ltiges Format: TT.MM.JJJJ");
                        $helperInstance->addInputTextField('birth_day');
-                       $helperInstance->addFieldText('birth_day', ".");
+                       $helperInstance->addFieldLabel('birth_day', ".");
                        $helperInstance->addInputTextField('birth_month');
-                       $helperInstance->addFieldText('birth_day', ".");
+                       $helperInstance->addFieldLabel('birth_day', ".");
                        $helperInstance->addInputTextField('birth_year');
                } // END - if
        } // END - if
 
        $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-       $helperInstance->addFieldText('zip', "Postleitzahl:");
+       $helperInstance->addFieldLabel('zip', "Postleitzahl:");
        $helperInstance->addInputTextField('zip');
 
        $helperInstance->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
 
        if ($helperInstance->ifChatEnabled('icq')) {
-               $helperInstance->addFieldText('icq', "ICQ-Nummer:");
+               $helperInstance->addFieldLabel('icq', "ICQ-Nummer:");
                $helperInstance->addInputTextField('icq');
        } // END - if
 
        if ($helperInstance->ifChatEnabled('jabber')) {
-               $helperInstance->addFieldText('jabber', "Jabber:");
+               $helperInstance->addFieldLabel('jabber', "Jabber:");
                $helperInstance->addInputTextField('jabber');
        } // END - if
 
        if ($helperInstance->ifChatEnabled('yahoo')) {
-               $helperInstance->addFieldText('yahoo', "Yahoo!:");
+               $helperInstance->addFieldLabel('yahoo', "Yahoo!:");
                $helperInstance->addInputTextField('yahoo');
        } // END - if
 
        if ($helperInstance->ifChatEnabled('aol')) {
-               $helperInstance->addFieldText('aol', "AOL-Screenname:");
+               $helperInstance->addFieldLabel('aol', "AOL-Screenname:");
                $helperInstance->addInputTextField('aol');
        } // END - if
 
        if ($helperInstance->ifChatEnabled('msn')) {
-               $helperInstance->addFieldText('msn', "MSN:");
+               $helperInstance->addFieldLabel('msn', "MSN:");
                $helperInstance->addInputTextField('msn');
        } // END - if
 
@@ -109,7 +109,7 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
 
 // Spielregeln abfragen
 $helperInstance->addFormGroup('rules', "Bitte lese dir die Spieleregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Spielregeln&quot; an.");
-$helperInstance->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Spielregeln:");
+$helperInstance->addFieldLabel('rules', "Ja, ich akzeptiere die aktuellen Spielregeln:");
 $helperInstance->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?

diff --git a/core b/core
index 127bdb651654211cc566ed06b6080004bb691b6d..1956ac6a5f89588c5cf1e10c0cbd0a14915c4646 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 127bdb651654211cc566ed06b6080004bb691b6d
+Subproject commit 1956ac6a5f89588c5cf1e10c0cbd0a14915c4646