From ef38707408ea157b96bb4b5b2c6eabcac3e70e5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 2 Feb 2019 02:30:31 +0100 Subject: [PATCH] Continued: - renamed addFieldText() to addFieldLabel() - no need for this namespace ... - updated 'core' framework to latest commit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../html/class_CityHtmlConfirmController.php | 2 +- .../class_CityHtmlLoginFailedController.php | 2 +- .../html/class_CityHtmlLogoutController.php | 2 +- .../class_CityHtmlLogoutDoneController.php | 2 +- .../html/class_CityHtmlRegisterController.php | 2 +- .../form/class_CityHtmlDoFormController.php | 2 +- application/city/exceptions.php | 26 +++++++------ .../code/action_city_login_city_map.ctp | 2 +- ...ion_city_login_government_startup_help.ctp | 2 +- .../action_city_login_government_training.ctp | 2 +- .../code/action_city_login_profile.ctp | 36 +++++++++--------- .../code/action_city_login_status_problem.ctp | 2 +- .../templates/code/captch_graphic_code.ctp | 2 +- .../city/templates/code/login_form.ctp | 22 ++++++----- .../city/templates/code/register_form.ctp | 38 +++++++++---------- core | 2 +- 16 files changed, 76 insertions(+), 70 deletions(-) diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php index 02d4df6..30add5e 100644 --- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php +++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php @@ -1,6 +1,6 @@ Unknown'; @@ -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 3bbc9e2..492fd31 100644 --- 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 e82aeb5..c5b0513 100644 --- 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 c8eb7b9..3fb8090 100644 --- 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 81d09ea..7e7f075 100644 --- 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: ifEmailChangeAllowed()) { $helperInstance->addFormGroup('email', "Änderung deiner Email-Addresse:"); $helperInstance->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese ändern mö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 ä // Persoenliche Daten mit in der Anmeldung abfragen? if ($helperInstance->ifRegisterIncludesPersonaData()) { $helperInstance->addFormSubGroup('persona', "Wenn du magst, dann vervollstä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ön erhälst du interessante Prämien - ausschliesslich per Email - zum Geburtstag zugesandt! Gü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 "Ja, ich akzeptiere die aktuellen Spielregeln" 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ätigung der Ä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 ed9cf2f..8a28992 100644 --- 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 12bb24c..060cef1 100644 --- 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 419c843..0bff557 100644 --- 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] ?>
- Einloggen zu {?app_full_name?} +

Einloggen zu {?app_full_name?}

-
-
+
+
{?city_user_login?}
-
+
{?city_guest_login?}
-
- Noch kein Spieleaccount? {?register?} +
+
+ Noch kein Spieleaccount? {?register?} +
diff --git a/application/city/templates/code/register_form.ctp b/application/city/templates/code/register_form.ctp index 92d16a0..c8041e1 100644 --- 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ötig, wenn du auch Email-Benachrichtigungen (*1) haben mö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ä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ön erhälst du interessante Prämien - ausschliesslich per Email - zum Geburtstag zugesandt! Gü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 "Ja, ich akzeptiere die aktuellen Spielregeln" 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 127bdb6..1956ac6 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 127bdb651654211cc566ed06b6080004bb691b6d +Subproject commit 1956ac6a5f89588c5cf1e10c0cbd0a14915c4646 -- 2.39.5