Errors in confirmation/company link fixed

[shipsimu.git] / application / ship-simu / templates / de / code / action_ship_simu_login_status_problem.ctp

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 5d69da5d66ecefea97e4a04ac719419c6b988d75..df4a8de462ee70f597608d0081d51daf4969a295 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 = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend"));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'resend_link'));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
@@ -29,10 +29,13 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
 // Flush content and automatically close the form
 $helperInstance->flushContent();
 
-if ($helperInstance->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
+// Build the form for confirmation
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'confirm_code'));
 
+// Pre-fetch field data with a given registry key
+$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:");
@@ -42,10 +45,13 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
        $helperInstance->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
        $helperInstance->addInputResetButton("Nochmal eingeben");
        $helperInstance->addInputSubmitButton("Bestätigungscode absenden");
+} else {
+       // Add message
+       $helperInstance->addFormNote('status_not_unconfirmed', "Möglicherweise hast du einen Bestätigungslink angeklickt, obwohl dein Account bereits freigegeben oder gesperrt ist.");
+}
 
-       // Flush content and automatically close the form
-       $helperInstance->flushContent();
-} // END - if
+// Flush content and automatically close the form
+$helperInstance->flushContent();
 
 // [EOC]
 ?>
@@ -59,8 +65,12 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
        kannst dir nun den Bestätigungslink erneut aussenden lassen, oder den
        Bestätigungscode unten eingeben.
 
-       <div id="resend_box">
-               {?resend?}
+       <div id="resend_link_box">
+               {?resend_link?}
+       </div>
+
+       <div id="confirm_code_header">
+               Weitere M&ouml;glichkeiten:
        </div>
 
        <div id="confirm_code_box">