X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=2d4cbdadb5a09a5f1ac461576b6dd77f969bfe39;hb=6e1ed0b0d33ce3f893397eeb25909269402cf6bd;hp=7eb2c80ebc5964d5a89f70b8966c233f55874ba3;hpb=0134fa31d1ee3fb093d0979f01a300957e1b7871;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index 7eb2c80ebc..2d4cbdadb5 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -33,11 +33,11 @@ function notification($params) $product = FRIENDICA_PLATFORM; $siteurl = System::baseUrl(true); $thanks = L10n::t('Thank You,'); - $sitename = $a->config['sitename']; - if (!x($a->config['admin_name'])) { - $site_admin = L10n::t('%s Administrator', $sitename); + $sitename = Config::get('config', 'sitename'); + if (Config::get('config', 'admin_name')) { + $site_admin = L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename); } else { - $site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename); + $site_admin = L10n::t('%s Administrator', $sitename); } $sender_name = $sitename; @@ -93,6 +93,8 @@ function notification($params) } if ($params['type'] == NOTIFY_MAIL) { + $itemlink = $siteurl.'/message/'.$params['item']['id']; + $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); @@ -101,7 +103,6 @@ function notification($params) $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.''); - $itemlink = $siteurl.'/message/'.$params['item']['id']; } if ($params['type'] == NOTIFY_COMMENT) { @@ -130,10 +131,11 @@ function notification($params) $item = null; if ($params['otype'] === 'item' && $parent_id) { - $item = Item::selectFirst($params['uid'], [], ['id' => $parent_id]); + $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]); } $item_post_type = item_post_type($item); + $itemlink = $item['plink']; // "a post" $dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]', @@ -242,6 +244,7 @@ function notification($params) } if ($params['type'] == NOTIFY_TAGSHARE) { + $itemlink = $params['link']; $subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']); $preamble = L10n::t('%1$s tagged your post at %2$s', $params['source_name'], $sitename); @@ -253,10 +256,10 @@ function notification($params) $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_INTRO) { + $itemlink = $params['link']; $subject = L10n::t('[Friendica:Notify] Introduction received'); $preamble = L10n::t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename); @@ -270,7 +273,6 @@ function notification($params) $sitelink = L10n::t('Please visit %s to approve or reject the introduction.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); - $itemlink = $params['link']; switch ($params['verb']) { case ACTIVITY_FRIEND: @@ -300,6 +302,7 @@ function notification($params) } if ($params['type'] == NOTIFY_SUGGEST) { + $itemlink = $params['link']; $subject = L10n::t('[Friendica:Notify] Friend suggestion received'); $preamble = L10n::t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename); @@ -316,11 +319,11 @@ function notification($params) $sitelink = L10n::t('Please visit %s to approve or reject the suggestion.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); - $itemlink = $params['link']; } if ($params['type'] == NOTIFY_CONFIRM) { if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection + $itemlink = $params['link']; $subject = L10n::t('[Friendica:Notify] Connection accepted'); $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); @@ -334,8 +337,8 @@ function notification($params) $sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); - $itemlink = $params['link']; } else { // ACTIVITY_FOLLOW + $itemlink = $params['link']; $subject = L10n::t('[Friendica:Notify] Connection accepted'); $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); @@ -351,13 +354,13 @@ function notification($params) $sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); - $itemlink = $params['link']; } } if ($params['type'] == NOTIFY_SYSTEM) { switch($params['event']) { case "SYSTEM_REGISTER_REQUEST": + $itemlink = $params['link']; $subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request'); $preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename); @@ -366,7 +369,7 @@ function notification($params) '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s ' . "\x28" . '%4$s' . "\x29", + $body = L10n::t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)", $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick'] @@ -375,7 +378,6 @@ function notification($params) $sitelink = L10n::t('Please visit %s to approve or reject the request.'); $tsitelink = sprintf($sitelink, $params['link']); $hsitelink = sprintf($sitelink, ''.$sitename.'

'); - $itemlink = $params['link']; break; case "SYSTEM_DB_UPDATE_FAIL": break; @@ -562,11 +564,8 @@ function notification($params) } } - // textversion keeps linebreaks - $textversion = strip_tags(str_replace("
", "\n", html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n", - $body))),ENT_QUOTES, 'UTF-8'))); - $htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"], - "
\n", $body))), ENT_QUOTES, 'UTF-8'); + $textversion = BBCode::toPlaintext($body); + $htmlversion = BBCode::convert($body); $datarray = []; $datarray['banner'] = $banner; @@ -575,7 +574,7 @@ function notification($params) $datarray['sitename'] = $sitename; $datarray['siteurl'] = $siteurl; $datarray['type'] = $params['type']; - $datarray['parent'] = $params['parent']; + $datarray['parent'] = $parent_id; $datarray['source_name'] = $params['source_name']; $datarray['source_link'] = $params['source_link']; $datarray['source_photo'] = $params['source_photo']; @@ -610,7 +609,7 @@ function notification($params) '$source_name' => $datarray['source_name'], '$source_link' => $datarray['source_link'], '$source_photo' => $datarray['source_photo'], - '$username' => $datarray['to_name'], + '$username' => $datarray['username'], '$hsitelink' => $datarray['hsitelink'], '$hitemlink' => $datarray['hitemlink'], '$thanks' => $datarray['thanks'], @@ -631,7 +630,7 @@ function notification($params) '$source_name' => $datarray['source_name'], '$source_link' => $datarray['source_link'], '$source_photo' => $datarray['source_photo'], - '$username' => $datarray['to_name'], + '$username' => $datarray['username'], '$tsitelink' => $datarray['tsitelink'], '$titemlink' => $datarray['titemlink'], '$thanks' => $datarray['thanks'], @@ -727,28 +726,28 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $profiles = $profiles2; - $profile_list = ""; + $ret = dba::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]); - foreach ($profiles AS $profile) { - if ($profile_list != "") - $profile_list .= "', '"; + $contacts = []; - $profile_list .= dbesc($profile); + while ($contact = dba::fetch($ret)) { + $contacts[] = $contact['id']; } - $profile_list = "'".$profile_list."'"; + $contact_list = implode(',', $contacts); + + dba::close($ret); // Only act if it is a "real" post // We need the additional check for the "local_profile" because of mixed situations on connector networks - $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`, - `parent-uri`, `uri`, `contact-id` - FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND - NOT (`author-link` IN ($profile_list)) LIMIT 1", - intval($itemid), dbesc(ACTIVITY_POST)); - if (!$item) - return false; - - $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['author-id']]); + $fields = ['id', 'mention', 'tag', 'parent', 'title', 'body', + '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); + if (!DBM::is_result($item) || in_array($item['author-id'], $contacts)) { + return; + } // Generate the notification array $params = []; @@ -757,17 +756,17 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["language"] = $user["language"]; $params["to_name"] = $user["username"]; $params["to_email"] = $user["email"]; - $params["item"] = $item[0]; - $params["parent"] = $item[0]["parent"]; - $params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]); + $params["item"] = $item; + $params["parent"] = $item["parent"]; + $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]); $params["otype"] = 'item'; - $params["source_name"] = $author["name"]; - $params["source_link"] = $author["url"]; - $params["source_photo"] = $author["thumb"]; + $params["source_name"] = $item["author-name"]; + $params["source_link"] = $item["author-link"]; + $params["source_photo"] = $item["author-avatar"]; - if ($item[0]["parent-uri"] === $item[0]["uri"]) { + if ($item["parent-uri"] === $item["uri"]) { // Send a notification for every new post? - $send_notification = dba::exists('contact', ['id' => $item[0]['contact-id'], 'notify_new_posts' => true]); + $send_notification = dba::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]); if (!$send_notification) { $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", @@ -794,11 +793,11 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $tagged = false; foreach ($profiles AS $profile) { - if (strpos($item[0]["tag"], "=".$profile."]") || strpos($item[0]["body"], "=".$profile."]")) + if (strpos($item["tag"], "=".$profile."]") || strpos($item["body"], "=".$profile."]")) $tagged = true; } - if ($item[0]["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { + if ($item["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { $params["type"] = NOTIFY_TAGSELF; $params["verb"] = ACTIVITY_TAG; } @@ -806,9 +805,9 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { // 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-link` IN ($profile_list)) + (`thread`.`mention` OR `item`.`author-id` IN ($contact_list)) LIMIT 1", - intval($item[0]["parent"])); + intval($item["parent"])); if ($parent && !isset($params["type"])) { $params["type"] = NOTIFY_COMMENT;