From f6cad5438c667e40a534401d7f966c4ab0b57e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Tue, 3 Jun 2014 08:13:24 +0000
Subject: [PATCH] Test if password was auto generated before displaying it in
 the mail (#675)

---
 lemonldap-ng-portal/example/skins/common/mail_password.tpl | 4 ++++
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lemonldap-ng-portal/example/skins/common/mail_password.tpl b/lemonldap-ng-portal/example/skins/common/mail_password.tpl
index da5fa96d4..042a8395d 100644
--- a/lemonldap-ng-portal/example/skins/common/mail_password.tpl
+++ b/lemonldap-ng-portal/example/skins/common/mail_password.tpl
@@ -3,9 +3,13 @@
 <p>
 <lang en="Hello" fr="Bonjour" /> $cn,<br />
 <br />
+<TMPL_IF NAME="RESET">
 <lang en="Your new password is" fr="Votre nouveau mot de passe est" /> 
 <span><img src="cid:key:skins/common/key.png" /></span>
 <b>$password</b>
+<TMPL_ELSE>
+<lang en="Your password was changed." fr="Votre mot de passe a été changé." /> 
+</TMPL_IF>
 </p>
 
 <TMPL_INCLUDE NAME="mail_footer.tpl">
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
index 78f1d0c2e..d3adecdf6 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/MailReset.pm
@@ -430,6 +430,7 @@ sub sendPasswordMail {
             filename => $tplfile,
             filter   => sub { $self->translate_template(@_) }
         );
+        $template->param( RESET => $self->{forceReset} );
         $body = $template->output();
         $html = 1;
     }