First password than CAPTCHA is now being asked, training form extended

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 5c18fdc8afbff9048cb6ba94ecce75beaf104e45..363d86349aeeb85b4436360f7fdc614af6a61f91 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -283,6 +283,9 @@ $cfg->setConfigEntry('shipsimu_refill_captcha', "GraphicalCodeCaptcha");
 // CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA
 $cfg->setConfigEntry('shipsimu_goverment_startup_captcha', "GraphicalCodeCaptcha");
 
+// CFG: SHIPSIMU-GOVERMENT-TRAINING-CAPTCHA
+$cfg->setConfigEntry('shipsimu_goverment_training_captcha', "GraphicalCodeCaptcha");
+
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);
 
@@ -310,6 +313,9 @@ $cfg->setConfigEntry('shipsimu_refill_captcha_secured', "Y");
 // CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA-SECURED
 $cfg->setConfigEntry('shipsimu_goverment_startup_captcha_secured', "Y");
 
+// CFG: SHIPSIMU-GOVERMENT-TRAINING-CAPTCHA-SECURED
+$cfg->setConfigEntry('shipsimu_goverment_training_captcha_secured', "Y");
+
 // CFG: BLOCK-SHOWS-REGISTRATION
 $cfg->setConfigEntry('block_shows_registration', "Y");
 

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 2d3e27c1b86bb2e9e5743d46798999b0c0a8e076..1b6443e057ce149e0296ad57f0470819b2236c8d 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
@@ -20,17 +20,17 @@ $helperInstance->addFormNote('birthday', "Geburtstag: <span class=\"persona_data
 // Add link placeholder for profile page
 $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile_link?}");
 
+// Ask again for current account password
+$helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein derzeitiges Passwort ein.");
+$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
+$helperInstance->addInputPasswordField('password');
+
 // CAPTCHA enabled?
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung von Starthilfe ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du die Starthilfe beantragen kannst.");
        $helperInstance->addCaptcha();
 } // END - if
 
-// Ask again for current account password
-$helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein derzeitiges Passwort ein.");
-$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
-$helperInstance->addInputPasswordField('password');
-
 // Final notices
 $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
 $helperInstance->addInputResetButton("Alles nochmal eingeben");

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 6be1c9bfad5275a1ee1b51ea36e67128c7f214be..a103b9d307bfaee297d7fb248f469f20c0386f6c 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 = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_training_form'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_goverment_training'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -11,6 +11,17 @@ $helperInstance->addFormNote('reality_warning', "WARNUNG: Bitte dieses Formular
 // Add group for personal data
 $helperInstance->addFormGroup('persona_data', "Deine pers&ouml;nliche Daten, die f&uuml;r die Kursusteilnahme n&ouml;tig sind:");
 
+// Ask again for current account password
+$helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein derzeitiges Passwort ein.");
+$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
+$helperInstance->addInputPasswordField('password');
+
+// CAPTCHA enabled?
+if ($helperInstance->ifFormSecuredWithCaptcha()) {
+       $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen.");
+       $helperInstance->addCaptcha();
+} // END - if
+
 // Display email, surname and family name
 $helperInstance->addFormNote('surname', "Vorname: <span class=\"persona_data\">".$helperInstance->getValueField('surname')."</span>");
 $helperInstance->addFormNote('family', "Nachname: <span class=\"persona_data\">".$helperInstance->getValueField('family')."</span>");
@@ -39,6 +50,6 @@ $linkInstance->flushContent();
        </div>
 
        <div id="goverment_form">
-               {?shipsimu_training_form?}
+               {?shipsimu_goverment_training?}
        </div>
 </div>