bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-12-18 22:43:47 +01:00
Code Issues Projects Releases Wiki Activity

LSformElement_password : Change mail generation to support attributes in the LSformat of the mail

Browse source
This commit is contained in:
Benjamin Renard 2010-11-18 15:37:50 +01:00
parent a4a6da54d9
commit c65b5a7a21
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public_html/conf/LSobjects/config.LSobjects.LSpeople.php
View file

@ -498,7 +498,7 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
'send' => 1, 'send' => 1,
'ask' => 1, 'ask' => 1,
'subject' => "LSexample : Your new credentials.", 'subject' => "LSexample : Your new credentials.",
'msg' => "Your password has been changed.\nNew password : %{mdp}", 'msg' => "Your password has been changed.\nLogin : %{uid}\nNew password : %{password}",
'mail_attr' => 'mail' 'mail_attr' => 'mail'
) )
), ),

11
public_html/includes/class/class.LSformElement_password.php
View file

@ -79,7 +79,7 @@ class LSformElement_password extends LSformElement {
LSdebug ('send by config'); LSdebug ('send by config');
} }
if ($this -> sendMail && LSsession :: loadLSaddon('mail')) { if ($this -> sendMail && LSsession :: loadLSaddon('mail')) {
$msg = getFData($this -> params['html_options']['mail']['msg'],$return[$this -> name][0]); $msg = $this -> params['html_options']['mail']['msg'];
$subject = $this -> params['html_options']['mail']['subject']; $subject = $this -> params['html_options']['mail']['subject'];
if (isset($_POST['LSformElement_password_'.$this -> name.'_msg'])) { if (isset($_POST['LSformElement_password_'.$this -> name.'_msg'])) {
$msgInfos = json_decode($_POST['LSformElement_password_'.$this -> name.'_msg']); $msgInfos = json_decode($_POST['LSformElement_password_'.$this -> name.'_msg']);
@ -87,7 +87,7 @@ class LSformElement_password extends LSformElement {
$subject = $msgInfos -> subject; $subject = $msgInfos -> subject;
} }
if ($msgInfos -> msg) { if ($msgInfos -> msg) {
$msg = getFData($msgInfos -> msg,$return[$this -> name][0]); $msg = $msgInfos -> msg;
} }
if ($msgInfos -> mail) { if ($msgInfos -> mail) {
$mail = $msgInfos -> mail; $mail = $msgInfos -> mail;
@ -96,7 +96,8 @@ class LSformElement_password extends LSformElement {
$this -> sendMail = array ( $this -> sendMail = array (
'subject' => $subject, 'subject' => $subject,
'msg' => $msg, 'msg' => $msg,
'mail' => $mail 'mail' => $mail,
'pwd' => $return[$this -> name][0]
); );
$this -> attr_html -> attribute -> addObjectEvent('after_modify',$this,'send'); $this -> attr_html -> attribute -> addObjectEvent('after_modify',$this,'send');
} }
@ -181,10 +182,12 @@ class LSformElement_password extends LSformElement {
} }
if (checkEmail($mail,NULL,true)) { if (checkEmail($mail,NULL,true)) {
$this -> attr_html -> attribute -> ldapObject -> registerOtherValue('password',$this -> sendMail['pwd']);
$msg = $this -> attr_html -> attribute -> ldapObject -> getFData($this -> sendMail['msg']);
if (sendMail( if (sendMail(
$mail, $mail,
$this -> sendMail['subject'], $this -> sendMail['subject'],
$this -> sendMail['msg'] $msg
)) { )) {
LSsession :: addInfo(_('Notice mail sent.')); LSsession :: addInfo(_('Notice mail sent.'));
} }