extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Admin: fix bulk password reset to work on minimal install / no longer require old phpgwapi

Browse Source
This commit is contained in:
Ralf Becker 2018-05-25 15:09:38 +02:00
parent 82fccefcaa
commit 3d1ef4512c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/inc/class.admin_passwordreset.inc.php
View File

@ -220,19 +220,20 @@ class admin_passwordreset
$msg .= lang('Account "%1" has no email address --> not notified!',$account['account_lid']); $msg .= lang('Account "%1" has no email address --> not notified!',$account['account_lid']);
continue; continue;
} }
$send = new send(); $send = new Api\Mailer();
$send->AddAddress($account['account_email'],$account['account_fullname']); $send->AddAddress($account['account_email'],$account['account_fullname']);
$replacements = array(); $replacements = array();
foreach($this->replacements as $name => $label) foreach($this->replacements as $name => $label)
{ {
$replacements['$$'.$name.'$$'] = $account['account_'.$name]; $replacements['$$'.$name.'$$'] = $account['account_'.$name];
} }
$send->Subject = strtr($content['subject'],$replacements); $send->addHeader('Subject', strtr($content['subject'], $replacements));
$send->Body = strtr($content['body'],$replacements); $send->setBody(strtr($content['body'], $replacements));
if (!empty($GLOBALS['egw_info']['user']['account_email'])) if (!empty($GLOBALS['egw_info']['user']['account_email']))
{ {
$send->From = $GLOBALS['egw_info']['user']['account_email']; $send->addHeader('From', Api\Mailer::add_personal(
$send->FromName = $GLOBALS['egw_info']['user']['account_fullname']; $GLOBALS['egw_info']['user']['account_email'],
$GLOBALS['egw_info']['user']['account_fullname']));
} }
try try
{ {
@ -240,9 +241,8 @@ class admin_passwordreset
} }
catch (Exception $e) catch (Exception $e)
{ {
unset ($e);
$msg .= lang('Notifying account "%1" %2 failed!',$account['account_lid'],$account['account_email']). $msg .= lang('Notifying account "%1" %2 failed!',$account['account_lid'],$account['account_email']).
': '.strip_tags(str_replace('<p>',"\n",$send->ErrorInfo))."\n"; ': '.strip_tags(str_replace('<p>', "\n", $e->getMessage()))."\n";
} }
} }
} }