sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backport #7659

remotes/origin/stable6
Thomas Müller 2014-03-11 14:28:53 +07:00
parent 37e19534f1
commit a3bc3bbf2d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/ajax/share.php
Unescape Escape View File

@ -231,12 +231,27 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
// send it out now
try {
OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName, 1, $alttext);
OCP\JSON::success();
} catch (Exception $exception) {
OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
$rs = explode(' ', $to_address);
$failed = array();
foreach ($rs as $r) {
try {
\OCP\Util::sendMail($r, $r, $subject, $text, $from_address, $displayName, 1, $alttext);
} catch (\Exception $e) {
\OCP\Util::writeLog('sharing', "Can't send mail with public link to $r: " . $e->getMessage(), \OCP\Util::ERROR);
$failed[] = $r;
}
}
if (empty($failed)) {
OCP\JSON::success();
} else {
OCP\JSON::error(array(
'data' => array(
'message' => $l->t("Couldn't send mail to following users: %s ",
implode(', ', $failed)
)
)
)); }
break;
}
} else if (isset($_GET['fetch'])) {