From f56dcedfa08c2774f95d5a5c38d7aed8b848e3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Fri, 4 Nov 2011 16:34:16 +0000
Subject: [PATCH] Dissociate confirm mail sent and norman mail sent error case
 in mail reset (#377)

---
 .../lib/Lemonldap/NG/Handler/Status.pm        |  1 +
 modules/lemonldap-ng-portal/example/mail.pl   | 45 ++++++++++++-------
 .../example/skins/impact/mail.tpl             |  8 +++-
 .../example/skins/pastel/mail.tpl             | 10 ++++-
 .../lib/Lemonldap/NG/Portal/MailReset.pm      |  3 +-
 .../lib/Lemonldap/NG/Portal/Simple.pm         |  4 +-
 .../lib/Lemonldap/NG/Portal/_i18n.pm          |  4 ++
 7 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Status.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Status.pm
index 801cded0f..f695f79f9 100644
--- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Status.pm
+++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Status.pm
@@ -89,6 +89,7 @@ sub portalTab {
         69 => 'PORTAL_MAILFIRSTACCESS',
         70 => 'PORTAL_MAILNOTFOUND',
         71 => 'PORTAL_PASSWORDFIRSTACCESS',
+        72 => 'PORTAL_MAILCONFIRMOK',
     };
 }
 
diff --git a/modules/lemonldap-ng-portal/example/mail.pl b/modules/lemonldap-ng-portal/example/mail.pl
index 86299c9f7..0137d84b3 100755
--- a/modules/lemonldap-ng-portal/example/mail.pl
+++ b/modules/lemonldap-ng-portal/example/mail.pl
@@ -58,36 +58,49 @@ if (
   )
 {
 
-    $template->param( DISPLAY_FORM          => 1 );
-    $template->param( DISPLAY_RESEND_FORM   => 0 );
-    $template->param( DISPLAY_MAILSENT      => 0 );
-    $template->param( DISPLAY_PASSWORD_FORM => 0 );
+    $template->param( DISPLAY_FORM            => 1 );
+    $template->param( DISPLAY_RESEND_FORM     => 0 );
+    $template->param( DISPLAY_CONFIRMMAILSENT => 0 );
+    $template->param( DISPLAY_MAILSENT        => 0 );
+    $template->param( DISPLAY_PASSWORD_FORM   => 0 );
 }
 
 # Display mail confirmation resent form
 if ( $portal->{error} == PE_MAILCONFIRMATION_ALREADY_SENT ) {
-    $template->param( DISPLAY_FORM          => 0 );
-    $template->param( DISPLAY_RESEND_FORM   => 1 );
-    $template->param( DISPLAY_MAILSENT      => 0 );
-    $template->param( DISPLAY_PASSWORD_FORM => 0 );
+    $template->param( DISPLAY_FORM            => 0 );
+    $template->param( DISPLAY_RESEND_FORM     => 1 );
+    $template->param( DISPLAY_CONFIRMMAILSENT => 0 );
+    $template->param( DISPLAY_MAILSENT        => 0 );
+    $template->param( DISPLAY_PASSWORD_FORM   => 0 );
+}
+
+# Display confirmation mail sent
+if ( $portal->{error} == PE_MAILCONFIRMOK ) {
+    $template->param( DISPLAY_FORM            => 0 );
+    $template->param( DISPLAY_RESEND_FORM     => 0 );
+    $template->param( DISPLAY_CONFIRMMAILSENT => 1 );
+    $template->param( DISPLAY_MAILSENT        => 0 );
+    $template->param( DISPLAY_PASSWORD_FORM   => 0 );
 }
 
 # Display mail sent
 if ( $portal->{error} == PE_MAILOK ) {
-    $template->param( DISPLAY_FORM          => 0 );
-    $template->param( DISPLAY_RESEND_FORM   => 0 );
-    $template->param( DISPLAY_MAILSENT      => 1 );
-    $template->param( DISPLAY_PASSWORD_FORM => 0 );
+    $template->param( DISPLAY_FORM            => 0 );
+    $template->param( DISPLAY_RESEND_FORM     => 0 );
+    $template->param( DISPLAY_CONFIRMMAILSENT => 0 );
+    $template->param( DISPLAY_MAILSENT        => 1 );
+    $template->param( DISPLAY_PASSWORD_FORM   => 0 );
 }
 
 # Display password change form
 if ( $portal->{mail_token}
     and ( $portal->{error} != PE_MAILERROR and $portal->{error} != PE_MAILOK ) )
 {
-    $template->param( DISPLAY_FORM          => 0 );
-    $template->param( DISPLAY_RESEND_FORM   => 0 );
-    $template->param( DISPLAY_MAILSENT      => 0 );
-    $template->param( DISPLAY_PASSWORD_FORM => 1 );
+    $template->param( DISPLAY_FORM            => 0 );
+    $template->param( DISPLAY_RESEND_FORM     => 0 );
+    $template->param( DISPLAY_CONFIRMMAILSENT => 0 );
+    $template->param( DISPLAY_MAILSENT        => 0 );
+    $template->param( DISPLAY_PASSWORD_FORM   => 1 );
 }
 
 print $portal->header('text/html; charset=utf8');
diff --git a/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl b/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
index ffedf0213..0fd5bfcb0 100644
--- a/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
@@ -89,7 +89,7 @@
       </form>
       </TMPL_IF>
 
-      <TMPL_IF NAME="DISPLAY_MAILSENT">
+      <TMPL_IF NAME="DISPLAY_CONFIRMMAILSENT">
       <div id="content-all-info">
       <lang en="A message has been sent to your mail address." fr="Un message a été envoyé à votre adresse mail." />
       <lang en="This message contains a link to reset your password, this link is valid until " fr="Ce message contient un lien pour réinitialiser votre mot de passe, ce lien est valide jusqu'au " />
@@ -97,6 +97,12 @@
       </div>
       </TMPL_IF>
 
+      <TMPL_IF NAME="DISPLAY_MAILSENT">
+      <div id="content-all-info">
+      <lang en="Your new password has been sent to your mail address." fr="Votre nouveau mot de passe a été envoyé à votre adresse mail." />
+      </div>
+      </TMPL_IF>
+
       <div class="panel-buttons">
         <button type="button" class="positive" tabindex="1" onclick="location.href='<TMPL_VAR NAME="PORTAL_URL">';return false;">
           <lang en="Go to portal" fr="Aller au portail" />
diff --git a/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl b/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl
index 8fa5cdd8d..88082fe63 100644
--- a/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl
@@ -93,7 +93,7 @@
         </div>
 	</TMPL_IF>
 
-	<TMPL_IF NAME="DISPLAY_MAILSENT">
+	<TMPL_IF NAME="DISPLAY_CONFIRMMAILSENT">
         <form action="#" method="post" class="login">
 	<h3>
 	<lang en="A message has been sent to your mail address." fr="Un message a été envoyé à votre adresse mail." />
@@ -105,6 +105,14 @@
 	</form>
 	</TMPL_IF>
 
+	<TMPL_IF NAME="DISPLAY_MAILSENT">
+        <form action="#" method="post" class="login">
+	<h3>
+	<lang en="Your new password has been sent to your mail address." fr="Votre nouveau mot de passe a été envoyé à votre adresse mail." />
+	</h3>
+	</form>
+	</TMPL_IF>
+
         <div class="link">
                 <a href="<TMPL_VAR NAME="PORTAL_URL">">
                         <lang en="Go back to portal" fr="Retourner au portail" />
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
index db5f714bd..28868b7e7 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
@@ -58,6 +58,7 @@ sub process {
         (
                  $self->{error} <= 0
               or $self->{error} == PE_PASSWORD_OK
+              or $self->{error} == PE_MAILCONFIRMOK
               or $self->{error} == PE_MAILOK
         ) ? 0 : 1
     );
@@ -283,7 +284,7 @@ sub sendConfirmationMail {
     return PE_MAILERROR
       unless $self->send_mail( $self->{mailAddress}, $subject, $body, $html );
 
-    PE_MAILOK;
+    PE_MAILCONFIRMOK;
 }
 
 ## @method int changePassword
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
index 5adaad674..ade014a23 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
@@ -141,6 +141,7 @@ use constant {
     PE_MAILFIRSTACCESS                  => 69,
     PE_MAILNOTFOUND                     => 70,
     PE_PASSWORDFIRSTACCESS              => 71,
+    PE_MAILCONFIRMOK                    => 72,
 
     # Portal messages
     PM_USER                  => 0,
@@ -185,7 +186,7 @@ our @EXPORT = qw( PE_IMG_NOK PE_IMG_OK PE_INFO PE_REDIRECT PE_DONE PE_OK
   PE_SAML_LOAD_SP_ERROR PE_SAML_ATTR_ERROR PE_OPENID_EMPTY PE_OPENID_BADID
   PE_MISSINGREQATTR PE_BADPARTNER PE_MAILCONFIRMATION_ALREADY_SENT
   PE_PASSWORDFORMEMPTY PE_CAS_SERVICE_NOT_ALLOWED PE_MAILFIRSTACCESS
-  PE_MAILNOTFOUND PE_PASSWORDFIRSTACCESS
+  PE_MAILNOTFOUND PE_PASSWORDFIRSTACCESS PE_MAILCONFIRMOK
   PM_USER PM_DATE PM_IP PM_SESSIONS_DELETED PM_OTHER_SESSIONS
   PM_REMOVE_OTHER_SESSIONS PM_PP_GRACE PM_PP_EXP_WARNING
   PM_SAML_IDPSELECT PM_SAML_IDPCHOOSEN PM_REMEMBERCHOICE PM_SAML_SPLOGOUT
@@ -801,6 +802,7 @@ sub error_type {
                 PE_OK,              PE_PASSWORD_OK,
                 PE_MAILOK,          PE_LOGOUT_OK,
                 PE_MAILFIRSTACCESS, PE_PASSWORDFIRSTACCESS,
+                PE_MAILCONFIRMOK,
             )
         )
       );
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_i18n.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_i18n.pm
index 6752b7e10..e5d098187 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_i18n.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_i18n.pm
@@ -131,6 +131,7 @@ __END__
 # * PE_MAILFIRSTACCESS                   69
 # * PE_MAILNOTFOUND                      70
 # * PE_PASSWORDFIRSTACCESS               71
+# * PE_MAILCONFIRMOK                     72
 
 # Not used in errors:
 # * PE_DONE                -1
@@ -214,6 +215,7 @@ sub error_fr {
         'Merci de saisir votre adresse mail',
         'Pas d\'utilisateur correspondant',
         'Merci de saisir votre nouveau mot de passe',
+        'Un mail de confirmation vous a été envoyé',
     ];
 }
 
@@ -294,6 +296,7 @@ sub error_en {
         'Please provide your mail address',
         'No matching user',
         'Please provide your new password',
+        'A confirmation mail has been sent',
     ];
 }
 
@@ -375,6 +378,7 @@ sub error_ro {
         'Vă rugăm să introduceţi adresa dvs. de e-mail',
         'No matching user',
         'Please provide your new password',
+        'Un e-mail a fost trimis',
     ];
 }