X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=becf672b2aaa4cddae79f208d963f9901c099990;hb=39a4a3cd5f7d61f5fa05a52f73ba06071a177801;hp=a1ac2e94947f1d2783a64023c1368c53bec5e133;hpb=faefafd4f8ac1874a23fbb54589471b7b59bf431;p=friendica.git
diff --git a/include/enotify.php b/include/enotify.php
index a1ac2e9494..becf672b2a 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -4,34 +4,53 @@
*/
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Model\Contact;
use Friendica\Model\Item;
+use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer;
+use Friendica\Util\Strings;
/**
* @brief Creates a notification entry and possibly sends a mail
*
* @param array $params Array with the elements:
- * uid, item, parent, type, otype, verb, event,
- * link, subject, body, to_name, to_email, source_name,
- * source_link, activity, preamble, notify_flags,
- * language, show_in_notification_page
+ * uid, item, parent, type, otype, verb, event,
+ * link, subject, body, to_name, to_email, source_name,
+ * source_link, activity, preamble, notify_flags,
+ * language, show_in_notification_page
+ * @return bool
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function notification($params)
{
- $a = get_app();
+ $a = \get_app();
// Temporary logging for finding the origin
- if (!isset($params['language']) || !isset($params['uid'])) {
- logger('Missing parameters.' . System::callstack());
+ if (!isset($params['uid'])) {
+ Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => 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::error('Unknown user', ['uid' => $params['uid']]);
+ return false;
+ }
+
+ $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']);
@@ -47,7 +66,7 @@ function notification($params)
}
$sender_name = $sitename;
- $hostname = $a->get_hostname();
+ $hostname = $a->getHostName();
if (strpos($hostname, ':')) {
$hostname = substr($hostname, 0, strpos($hostname, ':'));
}
@@ -59,8 +78,8 @@ function notification($params)
['uid' => $params['uid']]);
// There is no need to create notifications for forum accounts
- if (!DBA::isResult($user) || in_array($user["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
- return;
+ if (!DBA::isResult($user) || in_array($user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
+ return false;
}
$nickname = $user["nickname"];
} else {
@@ -70,7 +89,7 @@ function notification($params)
// with $params['show_in_notification_page'] == false, the notification isn't inserted into
// the database, and an email is sent if applicable.
// default, if not specified: true
- $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:true);
+ $show_in_notification_page = isset($params['show_in_notification_page']) ? $params['show_in_notification_page'] : true;
$additional_mail_header = "";
$additional_mail_header .= "Precedence: list\n";
@@ -101,6 +120,12 @@ function notification($params)
}
$epreamble = '';
+ $preamble = '';
+ $subject = '';
+ $sitelink = '';
+ $tsitelink = '';
+ $hsitelink = '';
+ $itemlink = '';
if ($params['type'] == NOTIFY_MAIL) {
$itemlink = $siteurl.'/message/'.$params['item']['id'];
@@ -109,84 +134,126 @@ function notification($params)
$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
$preamble = L10n::t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
- $epreamble = L10n::t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.L10n::t('a private message').'[/url]');
+ $epreamble = L10n::t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']'.L10n::t('a private message').'[/url]');
$sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.');
$tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
}
- if ($params['type'] == NOTIFY_COMMENT) {
- $thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
- if (DBA::isResult($thread) && $thread["ignored"]) {
- logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
- return;
+ if ($params['type'] == NOTIFY_COMMENT || $params['type'] == NOTIFY_TAGSELF) {
+ $thread = Item::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id]);
+ if (DBA::isResult($thread) && $thread['ignored']) {
+ Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG);
+ L10n::popLang();
+ return false;
}
// Check to see if there was already a tag notify or comment notify for this post.
// If so don't create a second notification
- $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d, %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
- intval(NOTIFY_TAGSELF),
- intval(NOTIFY_COMMENT),
- intval(NOTIFY_SHARE),
- DBA::escape($params['link']),
- intval($params['uid'])
- );
- if ($p && count($p)) {
+ $condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
+ 'link' => $params['link'], 'uid' => $params['uid']];
+ if (DBA::exists('notify', $condition)) {
L10n::popLang();
- return;
+ return false;
}
// if it's a post figure out who's post it is.
-
$item = null;
-
if ($params['otype'] === 'item' && $parent_id) {
$item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]);
}
- $item_post_type = item_post_type($item);
+ $item_post_type = Item::postType($item);
$itemlink = $item['plink'];
// "a post"
- $dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $itemlink,
- $item_post_type
- );
-
- // "George Bull's post"
- if ($item) {
- $dest_str = L10n::t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+ if ($params['type'] == NOTIFY_TAGSELF) {
+ $dest_str = L10n::t('%1$s tagged you on [url=%2$s]a %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item_post_type
+ );
+ } else {
+ $dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
$itemlink,
- $item['author-name'],
$item_post_type
);
}
+ // "George Bull's post"
+ if (DBA::isResult($item)) {
+ if ($params['type'] == NOTIFY_TAGSELF) {
+ $dest_str = L10n::t('%1$s tagged you on [url=%2$s]%3$s\'s %4$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item['author-name'],
+ $item_post_type
+ );
+ } else {
+ $dest_str = L10n::t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item['author-name'],
+ $item_post_type
+ );
+ }
+ }
+
// "your post"
if (DBA::isResult($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
- $dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $itemlink,
- $item_post_type
- );
+ if ($params['type'] == NOTIFY_TAGSELF) {
+ $dest_str = L10n::t('%1$s tagged you on [url=%2$s]your %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item_post_type
+ );
+ } else {
+ $dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item_post_type
+ );
+ }
}
- // Some mail softwares relies on subject field for threading.
+ // "their post"
+ if (DBA::isResult($item) && $item['author-link'] == $params['source_link']) {
+ if ($params['type'] == NOTIFY_TAGSELF) {
+ $dest_str = L10n::t('%1$s tagged you on [url=%2$s]their %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item_post_type
+ );
+ } else {
+ $dest_str = L10n::t('%1$s commented on [url=%2$s]their %3$s[/url]',
+ '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+ $itemlink,
+ $item_post_type
+ );
+ }
+ }
+
+ // Some mail software relies on subject field for threading.
// So, we cannot have different subjects for notifications of the same thread.
// Before this we have the name of the replier on the subject rendering
- // differents subjects for messages on the same thread.
+ // different subjects for messages on the same thread.
+ if ($params['type'] == NOTIFY_TAGSELF) {
+ $subject = L10n::t('[Friendica:Notify] %s tagged you', $params['source_name']);
- $subject = L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
+ $preamble = L10n::t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
+ } else {
+ $subject = L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
+
+ $preamble = L10n::t('%s commented on an item/conversation you have been following.', $params['source_name']);
+ }
- $preamble = L10n::t('%s commented on an item/conversation you have been following.', $params['source_name']);
$epreamble = $dest_str;
$sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
+ $hsitelink = sprintf($sitelink, '' . $sitename . '');
$itemlink = $params['link'];
}
@@ -205,21 +272,6 @@ function notification($params)
$itemlink = $params['link'];
}
- if ($params['type'] == NOTIFY_TAGSELF) {
- $subject = L10n::t('[Friendica:Notify] %s tagged you', $params['source_name']);
-
- $preamble = L10n::t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
- $epreamble = L10n::t('%1$s [url=%2$s]tagged you[/url].',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']
- );
-
- $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- $itemlink = $params['link'];
- }
-
if ($params['type'] == NOTIFY_SHARE) {
$subject = L10n::t('[Friendica:Notify] %s shared a new post', $params['source_name']);
@@ -401,16 +453,21 @@ function notification($params)
// It will be used by the system to send emails to users (like
// password reset, invitations and so) using one look (but without
// add a notification to the user, with could be inexistent)
- $subject = $params['subject'];
+ if (!isset($params['subject'])) {
+ Logger::warning('subject isn\'t set.', ['type' => $params['type']]);
+ }
+ $subject = defaults($params, 'subject', '');
- $preamble = $params['preamble'];
+ if (!isset($params['preamble'])) {
+ Logger::warning('preamble isn\'t set.', ['type' => $params['type'], 'subject' => $subject]);
+ }
+ $preamble = defaults($params, 'preamble', '');
- $body = $params['body'];
+ if (!isset($params['body'])) {
+ Logger::warning('body isn\'t set.', ['type' => $params['type'], 'subject' => $subject, 'preamble' => $preamble]);
+ }
+ $body = defaults($params, 'body', '');
- $sitelink = "";
- $tsitelink = "";
- $hsitelink = "";
- $itemlink = "";
$show_in_notification_page = false;
}
@@ -428,7 +485,7 @@ function notification($params)
'itemlink' => $itemlink
];
- Addon::callHooks('enotify', $h);
+ Hook::callAll('enotify', $h);
$subject = $h['subject'];
@@ -441,14 +498,14 @@ function notification($params)
$hsitelink = $h['hsitelink'];
$itemlink = $h['itemlink'];
+ $notify_id = 0;
+
if ($show_in_notification_page) {
- logger("adding notification entry", LOGGER_DEBUG);
+ Logger::log("adding notification entry", Logger::DEBUG);
do {
$dups = false;
- $hash = random_string();
- $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
- DBA::escape($hash));
- if (DBA::isResult($r)) {
+ $hash = Strings::getRandomHex();
+ if (DBA::exists('notify', ['hash' => $hash])) {
$dups = true;
}
} while ($dups == true);
@@ -470,41 +527,22 @@ function notification($params)
$datarray['otype'] = $params['otype'];
$datarray['abort'] = false;
- Addon::callHooks('enotify_store', $datarray);
+ Hook::callAll('enotify_store', $datarray);
if ($datarray['abort']) {
L10n::popLang();
- return False;
+ return false;
}
// create notification entry in DB
- q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
- values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
- DBA::escape($datarray['hash']),
- DBA::escape($datarray['name']),
- DBA::escape($datarray['url']),
- DBA::escape($datarray['photo']),
- DBA::escape($datarray['date']),
- intval($datarray['uid']),
- DBA::escape($datarray['link']),
- intval($datarray['iid']),
- intval($datarray['parent']),
- intval($datarray['type']),
- DBA::escape($datarray['verb']),
- DBA::escape($datarray['otype']),
- DBA::escape($datarray["name_cache"])
- );
+ $fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'],
+ 'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'],
+ 'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'],
+ 'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'],
+ 'name_cache' => $datarray["name_cache"]];
+ DBA::insert('notify', $fields);
- $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($hash),
- intval($params['uid'])
- );
- if ($r) {
- $notify_id = $r[0]['id'];
- } else {
- L10n::popLang();
- return False;
- }
+ $notify_id = DBA::lastInsertId();
// we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums
// After we've stored everything, look again to see if there are any duplicates and if so remove them
@@ -527,51 +565,40 @@ function notification($params)
}
$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
- $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
+ $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]);
$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
- q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
- DBA::escape($msg),
- DBA::escape($msg_cache),
- intval($notify_id),
- intval($params['uid'])
- );
+
+ $fields = ['msg' => $msg, 'msg_cache' => $msg_cache];
+ $condition = ['id' => $notify_id, 'uid' => $params['uid']];
+ DBA::update('notify', $fields, $condition);
}
// 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) {
- logger('sending notification email');
+ Logger::log('sending notification email');
if (isset($params['parent']) && (intval($params['parent']) != 0)) {
$id_for_parent = $params['parent']."@".$hostname;
// Is this the first email notification for this parent item and user?
+ if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
+ Logger::log("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), Logger::DEBUG);
- $r = q("SELECT `id` FROM `notify-threads` WHERE `master-parent-item` = %d AND `receiver-uid` = %d LIMIT 1",
- intval($params['parent']),
- intval($params['uid']));
-
- // If so, create the record of it and use a message-id smtp header.
-
- if (!$r) {
- logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);
- q("INSERT INTO `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
- values(%d, %d, %d, %d)",
- intval($notify_id),
- intval($params['parent']),
- intval($params['uid']),
- 0);
+ $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
+ 'receiver-uid' => $params['uid'], 'parent-item' => 0];
+ DBA::insert('notify-threads', $fields);
$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
$log_msg = "include/enotify: No previous notification found for this parent:\n".
" parent: ${params['parent']}\n"." uid : ${params['uid']}\n";
- logger($log_msg, LOGGER_DEBUG);
+ Logger::log($log_msg, Logger::DEBUG);
} else {
// If not, just "follow" the thread.
$additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n";
- logger("There's already a notification for this parent:\n".print_r($r, true), LOGGER_DEBUG);
+ Logger::log("There's already a notification for this parent.", Logger::DEBUG);
}
}
@@ -603,15 +630,15 @@ function notification($params)
$datarray['subject'] = $subject;
$datarray['headers'] = $additional_mail_header;
- Addon::callHooks('enotify_mail', $datarray);
+ Hook::callAll('enotify_mail', $datarray);
// check whether sending post content in email notifications is allowed
// always true for SYSTEM_EMAIL
$content_allowed = ((!Config::get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL));
// load the template for private message notifications
- $tpl = get_markup_template('email_notify_html.tpl');
- $email_html_body = replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('email_notify_html.tpl');
+ $email_html_body = Renderer::replaceMacros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => str_replace("\n", "
\n", $datarray['preamble']),
@@ -631,8 +658,8 @@ function notification($params)
]);
// load the template for private message notifications
- $tpl = get_markup_template('email_notify_text.tpl');
- $email_text_body = replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('email_notify_text.tpl');
+ $email_text_body = Renderer::replaceMacros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => $datarray['preamble'],
@@ -651,9 +678,9 @@ function notification($params)
'$content_allowed' => $content_allowed,
]);
+ L10n::popLang();
// use the Emailer class to send the message
- return Emailer::send(
- [
+ return Emailer::send([
'uid' => $params['uid'],
'fromName' => $sender_name,
'fromEmail' => $sender_email,
@@ -662,10 +689,11 @@ function notification($params)
'messageSubject' => $datarray['subject'],
'htmlVersion' => $email_html_body,
'textVersion' => $email_text_body,
- 'additionalMailHeader' => $datarray['headers']]
- );
+ 'additionalMailHeader' => $datarray['headers']
+ ]);
}
+ L10n::popLang();
return false;
}
@@ -673,6 +701,7 @@ function notification($params)
* @brief Checks for users who should be notified
*
* @param int $itemid ID of the item for which the check should be done
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function check_user_notification($itemid) {
// fetch all users in the thread
@@ -688,17 +717,19 @@ function check_user_notification($itemid) {
/**
* @brief Checks for item related notifications and sends them
*
- * @param int $itemid ID of the item for which the check should be done
- * @param int $uid User ID
+ * @param int $itemid ID of the item for which the check should be done
+ * @param int $uid User ID
* @param string $defaulttype (Optional) Forces a notification with this type.
+ * @return bool
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function check_item_notification($itemid, $uid, $defaulttype = "") {
$notification_data = ["uid" => $uid, "profiles" => []];
- Addon::callHooks('check_item_notification', $notification_data);
+ Hook::callAll('check_item_notification', $notification_data);
$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;
@@ -721,11 +752,11 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
// Check for invalid profile urls. 13 should be the shortest possible profile length:
// http://a.bc/d
// Additionally check for invalid urls that would return the normalised value "http:"
- if ((strlen($profile) >= 13) && (normalise_link($profile) != "http:")) {
+ if ((strlen($profile) >= 13) && (Strings::normaliseLink($profile) != "http:")) {
if (!in_array($profile, $profiles2))
$profiles2[] = $profile;
- $profile = normalise_link($profile);
+ $profile = Strings::normaliseLink($profile);
if (!in_array($profile, $profiles2))
$profiles2[] = $profile;
@@ -753,18 +784,14 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
'author-link', 'author-name', 'author-avatar', 'author-id',
'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
- $item = Item::selectFirst($fields, $condition);
+ $item = Item::selectFirstForUser($uid, $fields, $condition);
if (!DBA::isResult($item) || in_array($item['author-id'], $contacts)) {
- return;
+ return false;
}
// 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"]);
@@ -783,7 +810,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
if (DBA::isResult($tags)) {
foreach ($tags AS $tag) {
- $condition = ['nurl' => normalise_link($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true];
+ $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true];
$r = DBA::exists('contact', $condition);
if ($r) {
$send_notification = true;