bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix: Mail notifications arrive again (#5654)

Browse source 
* Fix: Mail notifications arrive again

* Ensure that user data is always there
This commit is contained in:
Michael Vogel 2018-08-23 10:00:25 +02:00 committed by Tobias Diekershoff
parent 20127a77b3
commit d29cb1acaf
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/enotify.php
View file

@ -32,6 +32,20 @@ function notification($params)
logger('Missing parameters.' . System::callstack()); logger('Missing parameters.' . System::callstack());
} }
// Ensure that the important fields are set at any time
$fields = ['notify-flags', 'language', 'username', 'email'];
$user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
if (!DBA::isResult($user)) {
logger('Unknown user ' . $params['uid']);
return;
}
$params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']);
$params['language'] = defaults($params, 'language', $user['language']);
$params['to_name'] = defaults($params, 'to_name', $user['username']);
$params['to_email'] = defaults($params, 'to_email', $user['email']);
// from here on everything is in the recipients language // from here on everything is in the recipients language
L10n::pushLang($params['language']); L10n::pushLang($params['language']);
@ -510,7 +524,7 @@ function notification($params)
} }
// send email notification if notification preferences permit // send email notification if notification preferences permit
if ((!empty($params['notify_flags']) & intval($params['type'])) if ((intval($params['notify_flags']) & intval($params['type']))
|| $params['type'] == NOTIFY_SYSTEM || $params['type'] == NOTIFY_SYSTEM
|| $params['type'] == SYSTEM_EMAIL) { || $params['type'] == SYSTEM_EMAIL) {
@ -661,7 +675,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$profiles = $notification_data["profiles"]; $profiles = $notification_data["profiles"];
$fields = ['notify-flags', 'language', 'username', 'email', 'nickname']; $fields = ['nickname'];
$user = DBA::selectFirst('user', $fields, ['uid' => $uid]); $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
return false; return false;
@ -724,10 +738,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
// Generate the notification array // Generate the notification array
$params = []; $params = [];
$params["uid"] = $uid; $params["uid"] = $uid;
$params["notify_flags"] = $user["notify-flags"];
$params["language"] = $user["language"];
$params["to_name"] = $user["username"];
$params["to_email"] = $user["email"];
$params["item"] = $item; $params["item"] = $item;
$params["parent"] = $item["parent"]; $params["parent"] = $item["parent"];
$params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]); $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]);