Merge pull request #4246 from zeroadam/Widget-#3878

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index e128ae9bedf4213e7e8eb2359503e25b3611018d..60c5b0ca77c04d07179ae63326ff5f613c4a8916 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -50,8 +50,8 @@ function notification($params)
        }
 
        if ($params['type'] != SYSTEM_EMAIL) {
-               $user = dba::select('user', array('nickname', 'page-flags'),
-                       array('uid' => $params['uid']), array('limit' => 1));
+               $user = dba::selectFirst('user', ['nickname', 'page-flags'],
+                       ['uid' => $params['uid']]);
 
                // There is no need to create notifications for forum accounts
                if (!DBM::is_result($user) || in_array($user["page-flags"], array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
@@ -106,8 +106,8 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_COMMENT) {
-               $p = dba::selectFirst('thread', ['ignored'], ['iid' => $parent_id]);
-               if (DBM::is_result($p) && $p["ignored"]) {
+               $thread = dba::selectFirst('thread', ['ignored'], ['iid' => $parent_id]);
+               if (DBM::is_result($thread) && $thread["ignored"]) {
                        logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
                        return;
                }
@@ -128,13 +128,13 @@ function notification($params)
 
                // if it's a post figure out who's post it is.
 
-               $p = null;
+               $item = null;
 
                if ($params['otype'] === 'item' && $parent_id) {
-                       $p = dba::selectFirst('item', [], ['id' => $parent_id]);
+                       $item = dba::selectFirst('item', [], ['id' => $parent_id]);
                }
 
-               $item_post_type = item_post_type($p);
+               $item_post_type = item_post_type($item);
 
                // "a post"
                $dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
@@ -143,16 +143,16 @@ function notification($params)
                                                                $item_post_type);
 
                // "George Bull's post"
-               if ($p) {
+               if ($item) {
                        $dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
                                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                                $itemlink,
-                                               $p['author-name'],
+                                               $item['author-name'],
                                                $item_post_type);
                }
 
                // "your post"
-               if ($p['owner-name'] == $p['author-name'] && $p['wall']) {
+               if (DBM::is_result($item) && $item['owner-name'] == $item['author-name'] && $item['wall']) {
                        $dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
                                                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                                                $itemlink,