From d903606d88748fc3beddd0edca8b05c41456ad47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Fri, 4 Nov 2011 10:43:36 +0000
Subject: [PATCH] Display confirmation link expiration date in mail reset
 template (#378)

---
 modules/lemonldap-ng-portal/example/mail.pl        | 14 ++++++++++++++
 .../example/skins/impact/mail.tpl                  |  8 ++++++++
 .../example/skins/pastel/mail.tpl                  | 12 ++++++++++++
 .../lib/Lemonldap/NG/Portal/MailReset.pm           |  9 +++++----
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/modules/lemonldap-ng-portal/example/mail.pl b/modules/lemonldap-ng-portal/example/mail.pl
index ec8871300..3ae89e854 100755
--- a/modules/lemonldap-ng-portal/example/mail.pl
+++ b/modules/lemonldap-ng-portal/example/mail.pl
@@ -28,6 +28,8 @@ $template->param( AUTH_ERROR      => $portal->error );
 $template->param( AUTH_ERROR_TYPE => $portal->error_type );
 $template->param( CHOICE_PARAM    => $portal->{authChoiceParam} );
 $template->param( CHOICE_VALUE    => $portal->{_authChoice} );
+$template->param( EXPMAILDATE     => $portal->{expMailDate} );
+$template->param( EXPMAILTIME     => $portal->{expMailTime} );
 $template->param(
     MAIL => $portal->checkXSSAttack( 'mail', $portal->{mail} )
     ? ""
@@ -52,6 +54,7 @@ if (
 
     $template->param( DISPLAY_FORM          => 1 );
     $template->param( DISPLAY_RESEND_FORM   => 0 );
+    $template->param( DISPLAY_MAILSENT      => 0 );
     $template->param( DISPLAY_PASSWORD_FORM => 0 );
 }
 
@@ -59,14 +62,25 @@ if (
 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 );
 }
 
+# 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 );
+}
+
+# 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 );
 }
 
diff --git a/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl b/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
index ac0bdffc0..233045ba8 100644
--- a/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/impact/mail.tpl
@@ -84,6 +84,14 @@
       </form>
       </TMPL_IF>
 
+      <TMPL_IF NAME="DISPLAY_MAILSENT">
+      <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 " />
+      <TMPL_VAR NAME="EXPMAILDATE">.
+      </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 d8c5bac5a..6ecf4d146 100644
--- a/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl
+++ b/modules/lemonldap-ng-portal/example/skins/pastel/mail.tpl
@@ -86,6 +86,18 @@
         </div>
 	</TMPL_IF>
 
+	<TMPL_IF NAME="DISPLAY_MAILSENT">
+        <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." />
+	</h3>
+	<p>
+	<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 " />
+	<TMPL_VAR NAME="EXPMAILDATE">.
+	</p>
+	</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 f8a2b1515..61e0fe3e5 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
@@ -253,12 +253,13 @@ sub sendConfirmationMail {
 
     $self->lmLog( "Mail expiration timestamp: $expTimestamp", 'debug' );
 
-    my $expMailDate = &POSIX::strftime( "%d/%m/%Y", localtime $expTimestamp );
-    my $expMailTime = &POSIX::strftime( "%H:%M",    localtime $expTimestamp );
+    $self->{expMailDate} =
+      &POSIX::strftime( "%d/%m/%Y", localtime $expTimestamp );
+    $self->{expMailTime} = &POSIX::strftime( "%H:%M", localtime $expTimestamp );
 
     # Replace variables in body
-    $body =~ s/\$expMailDate/$expMailDate/g;
-    $body =~ s/\$expMailTime/$expMailTime/g;
+    $body =~ s/\$expMailDate/$self->{expMailDate}/g;
+    $body =~ s/\$expMailTime/$self->{expMailTime}/g;
     $body =~ s/\$url/$url/g;
     $body =~ s/\$(\w+)/decode("utf8",$self->{sessionInfo}->{$1})/ge;