Burn notices, burn

[friendica.git/.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 0ef3c56..70abce5 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -32,6 +32,20 @@ function notification($params)
                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
        L10n::pushLang($params['language']);
 
@@ -510,7 +524,7 @@ function notification($params)
        }
 
        // 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'] == SYSTEM_EMAIL) {
 
@@ -661,7 +675,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
        $profiles = $notification_data["profiles"];
 
-       $fields = ['notify-flags', 'language', 'username', 'email', 'nickname'];
+       $fields = ['nickname'];
        $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
        if (!DBA::isResult($user)) {
                return false;
@@ -724,10 +738,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        // Generate the notification array
        $params = [];
        $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["parent"] = $item["parent"];
        $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]);