X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=9edfaaca82b8e2ea2a5b46365b94ad74c859fd61;hb=3f03f3b4b7e5bdaefe80d50ec9185e1bf668b927;hp=1990f2ef9c2242e2db20592b55f03f02c79d1ecd;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git
diff --git a/include/enotify.php b/include/enotify.php
index 1990f2ef9c..9edfaaca82 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -7,11 +7,15 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
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\Util\DateTimeFormat;
use Friendica\Util\Emailer;
+use Friendica\Util\Strings;
/**
* @brief Creates a notification entry and possibly sends a mail
@@ -24,7 +28,26 @@ use Friendica\Util\Emailer;
*/
function notification($params)
{
- $a = get_app();
+ $a = \get_app();
+
+ // Temporary logging for finding the origin
+ if (!isset($params['language']) || !isset($params['uid'])) {
+ Logger::log('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::log('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']);
@@ -41,7 +64,7 @@ function notification($params)
}
$sender_name = $sitename;
- $hostname = $a->get_hostname();
+ $hostname = $a->getHostName();
if (strpos($hostname, ':')) {
$hostname = substr($hostname, 0, strpos($hostname, ':'));
}
@@ -53,16 +76,18 @@ function notification($params)
['uid' => $params['uid']]);
// There is no need to create notifications for forum accounts
- if (!DBA::is_result($user) || in_array($user["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
+ if (!DBA::isResult($user) || in_array($user["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
return;
}
+ $nickname = $user["nickname"];
+ } else {
+ $nickname = '';
}
- $nickname = $user["nickname"];
// 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";
@@ -92,8 +117,11 @@ function notification($params)
$parent_id = 0;
}
+ $epreamble = '';
+
if ($params['type'] == NOTIFY_MAIL) {
$itemlink = $siteurl.'/message/'.$params['item']['id'];
+ $params["link"] = $itemlink;
$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
@@ -106,22 +134,18 @@ function notification($params)
}
if ($params['type'] == NOTIFY_COMMENT) {
- $thread = DBA::selectFirst('thread', ['ignored'], ['iid' => $parent_id]);
- if (DBA::is_result($thread) && $thread["ignored"]) {
- logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
+ $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;
}
// 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),
- dbesc($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;
}
@@ -134,7 +158,7 @@ function notification($params)
$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"
@@ -155,7 +179,7 @@ function notification($params)
}
// "your post"
- if (DBA::is_result($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
+ 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,
@@ -431,13 +455,11 @@ function notification($params)
$itemlink = $h['itemlink'];
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",
- dbesc($hash));
- if (DBA::is_result($r)) {
+ $hash = Strings::getRandomHex();
+ if (DBA::exists('notify', ['hash' => $hash])) {
$dups = true;
}
} while ($dups == true);
@@ -467,40 +489,21 @@ function notification($params)
}
// 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')",
- dbesc($datarray['hash']),
- dbesc($datarray['name']),
- dbesc($datarray['url']),
- dbesc($datarray['photo']),
- dbesc($datarray['date']),
- intval($datarray['uid']),
- dbesc($datarray['link']),
- intval($datarray['iid']),
- intval($datarray['parent']),
- intval($datarray['type']),
- dbesc($datarray['verb']),
- dbesc($datarray['otype']),
- dbesc($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",
- dbesc($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
$p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
intval(NOTIFY_TAGSELF),
intval(NOTIFY_COMMENT),
- dbesc($params['link']),
+ DBA::escape($params['link']),
intval($params['uid'])
);
if ($p && (count($p) > 1)) {
@@ -516,14 +519,12 @@ 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",
- dbesc($msg),
- dbesc($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
@@ -531,36 +532,27 @@ function notification($params)
|| $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);
}
}
@@ -575,11 +567,11 @@ function notification($params)
$datarray['siteurl'] = $siteurl;
$datarray['type'] = $params['type'];
$datarray['parent'] = $parent_id;
- $datarray['source_name'] = $params['source_name'];
- $datarray['source_link'] = $params['source_link'];
- $datarray['source_photo'] = $params['source_photo'];
+ $datarray['source_name'] = defaults($params, 'source_name', '');
+ $datarray['source_link'] = defaults($params, 'source_link', '');
+ $datarray['source_photo'] = defaults($params, 'source_photo', '');
$datarray['uid'] = $params['uid'];
- $datarray['username'] = $params['to_name'];
+ $datarray['username'] = defaults($params, 'to_name', '');
$datarray['hsitelink'] = $hsitelink;
$datarray['tsitelink'] = $tsitelink;
$datarray['hitemlink'] = ''.$itemlink.'';
@@ -599,8 +591,8 @@ function notification($params)
$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']),
@@ -620,8 +612,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'],
@@ -640,6 +632,7 @@ function notification($params)
'$content_allowed' => $content_allowed,
]);
+ L10n::popLang();
// use the Emailer class to send the message
return Emailer::send(
[
@@ -655,6 +648,7 @@ function notification($params)
);
}
+ L10n::popLang();
return false;
}
@@ -687,14 +681,14 @@ 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::is_result($user)) {
+ if (!DBA::isResult($user)) {
return false;
}
$owner = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
- if (!DBA::is_result($owner)) {
+ if (!DBA::isResult($owner)) {
return false;
}
@@ -710,11 +704,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;
@@ -734,8 +728,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$contacts[] = $contact['id'];
}
- $contact_list = implode(',', $contacts);
-
DBA::close($ret);
// Only act if it is a "real" post
@@ -745,17 +737,13 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
$item = Item::selectFirst($fields, $condition);
- if (!DBA::is_result($item) || in_array($item['author-id'], $contacts)) {
+ if (!DBA::isResult($item) || in_array($item['author-id'], $contacts)) {
return;
}
// 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"]);
@@ -772,9 +760,9 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid));
- if (DBA::is_result($tags)) {
+ 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;
@@ -802,20 +790,26 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$params["verb"] = ACTIVITY_TAG;
}
- // Is it a post that the user had started or where he interacted?
- $parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid`
- WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND
- (`thread`.`mention` OR `item`.`author-id` IN ($contact_list))
- LIMIT 1",
- intval($item["parent"]));
+ // Is it a post that the user had started?
+ $fields = ['ignored', 'mention'];
+ $thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]);
+
+ if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) {
+ $params["type"] = NOTIFY_COMMENT;
+ $params["verb"] = ACTIVITY_POST;
+ }
+
+ // And now we check for participation of one of our contacts in the thread
+ $condition = ['parent' => $item["parent"], 'author-id' => $contacts];
- if ($parent && !isset($params["type"])) {
+ if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) {
$params["type"] = NOTIFY_COMMENT;
$params["verb"] = ACTIVITY_POST;
}
- if (isset($params["type"]))
+ if (isset($params["type"])) {
notification($params);
+ }
}
/**