WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

send password mail only if all LDAP updates were ok

This commit is contained in:
Roland Gruber 2013-02-10 17:16:43 +00:00
parent 987e75b4a0
commit c44af12d69
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lam/lib/modules.inc
View File

@ -746,6 +746,8 @@ class accountContainer {
private $titleBarTitle = null; private $titleBarTitle = null;
/** subtitle in title bar */ /** subtitle in title bar */
private $titleBarSubtitle = null; private $titleBarSubtitle = null;
/** send password via mail */
private $sendPasswordViaMail = null;
/** /**
* Returns the account module with the given class name * Returns the account module with the given class name
@ -1131,20 +1133,7 @@ class accountContainer {
} }
} }
if (isLAMProVersion() && $sendMail) { if (isLAMProVersion() && $sendMail) {
$mailMessages = sendPasswordMail($password1, $this->attributes_orig); $this->sendPasswordViaMail = $password1;
if (sizeof($mailMessages) > 0) {
for ($i = 0; $i < sizeof($mailMessages); $i++) {
if ($mailMessages[$i][0] == 'ERROR') {
$return['errorsOccured'] = 'true';
}
if (sizeof($mailMessages[$i]) == 2) {
$return['messages'] .= StatusMessage($mailMessages[$i][0], $mailMessages[$i][1], '', array(), true);
}
elseif (sizeof($mailMessages[$i]) == 3) {
$return['messages'] .= StatusMessage($mailMessages[$i][0], $mailMessages[$i][1], $mailMessages[$i][2], array(), true);
}
}
}
} }
if ($return['errorsOccured'] == 'false') { if ($return['errorsOccured'] == 'false') {
$return['messages'] .= StatusMessage('INFO', _('The new password will be stored in the directory after you save this account.'), '', array(), true); $return['messages'] .= StatusMessage('INFO', _('The new password will be stored in the directory after you save this account.'), '', array(), true);
@ -1830,7 +1819,14 @@ class accountContainer {
} }
} }
} }
// send password mail
if (!$stopprocessing && isLAMProVersion() && ($this->sendPasswordViaMail != null)) {
$mailMessages = sendPasswordMail($this->sendPasswordViaMail, $prePostModifyAttributes);
if (sizeof($mailMessages) > 0) {
$errors = array_merge($errors, $mailMessages);
}
$this->sendPasswordViaMail = null;
}
if (!$stopprocessing) { if (!$stopprocessing) {
// post modify actions // post modify actions
foreach ($module as $singlemodule) { foreach ($module as $singlemodule) {