X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fenotify.php;h=1ddc9372ab39a349f610ae647cc7c2af70ddf0b5;hb=b9dba631aadf6c25a97b679808c684276b3dd76a;hp=5665f485f457f7754fee59570f82a689abac87d1;hpb=614a549d288814fe38ff7134ce65fff44055d637;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index 5665f485f4..1ddc9372ab 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -4,32 +4,40 @@ */ 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\DI; use Friendica\Model\Item; +use Friendica\Model\User; +use Friendica\Protocol\Activity; 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 @@ -37,31 +45,31 @@ function notification($params) $user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]); if (!DBA::isResult($user)) { - logger('Unknown user ' . $params['uid']); - return; + 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']); + $params['notify_flags'] = ($params['notify_flags'] ?? '') ?: $user['notify-flags']; + $params['language'] = ($params['language'] ?? '') ?: $user['language']; + $params['to_name'] = ($params['to_name'] ?? '') ?: $user['username']; + $params['to_email'] = ($params['to_email'] ?? '') ?: $user['email']; // from here on everything is in the recipients language - L10n::pushLang($params['language']); + $l10n = L10n::withLang($params['language']); - $banner = L10n::t('Friendica Notification'); + $banner = $l10n->t('Friendica Notification'); $product = FRIENDICA_PLATFORM; - $siteurl = System::baseUrl(true); - $thanks = L10n::t('Thank You,'); + $siteurl = DI::baseUrl()->get(true); + $thanks = $l10n->t('Thank You,'); $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); + $site_admin = $l10n->t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename); } else { - $site_admin = L10n::t('%s Administrator', $sitename); + $site_admin = $l10n->t('%s Administrator', $sitename); } $sender_name = $sitename; - $hostname = $a->getHostName(); + $hostname = DI::baseUrl()->getHostname(); if (strpos($hostname, ':')) { $hostname = substr($hostname, 0, strpos($hostname, ':')); } @@ -73,8 +81,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 { @@ -93,7 +101,7 @@ function notification($params) $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".System::baseUrl()."/notifications/system>\n"; + $additional_mail_header .= "List-Archive: <".DI::baseUrl()."/notifications/system>\n"; if (array_key_exists('item', $params)) { $title = $params['item']['title']; @@ -115,27 +123,32 @@ function notification($params) } $epreamble = ''; + $preamble = ''; + $subject = ''; + $sitelink = ''; + $tsitelink = ''; + $hsitelink = ''; + $itemlink = ''; 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); + $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]'); + $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]'); - $sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.'); + $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); - L10n::popLang(); - return; + if ($params['type'] == NOTIFY_COMMENT || $params['type'] == NOTIFY_TAGSELF) { + $thread = Item::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]); + if (DBA::isResult($thread) && $thread['ignored']) { + Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG); + return false; } // Check to see if there was already a tag notify or comment notify for this post. @@ -143,122 +156,152 @@ function notification($params) $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 = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]); } - $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.'); + $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']; } if ($params['type'] == NOTIFY_WALL) { - $subject = L10n::t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']); - - $preamble = L10n::t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%1$s posted to [url=%2$s]your wall[/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']; - } + $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']); - 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].', + $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/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.'); + $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']); + $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']); - $preamble = L10n::t('%1$s shared a new post at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%1$s [url=%2$s]shared a post[/url].', + $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/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.'); + $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_POKE) { - $subject = L10n::t('[Friendica:Notify] %1$s poked you', $params['source_name']); + $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']); - $preamble = L10n::t('%1$s poked you at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%1$s [url=%2$s]poked you[/url].', + $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $params['link'] ); - $subject = str_replace('poked', L10n::t($params['activity']), $subject); - $preamble = str_replace('poked', L10n::t($params['activity']), $preamble); - $epreamble = str_replace('poked', L10n::t($params['activity']), $epreamble); + $subject = str_replace('poked', $l10n->t($params['activity']), $subject); + $preamble = str_replace('poked', $l10n->t($params['activity']), $preamble); + $epreamble = str_replace('poked', $l10n->t($params['activity']), $epreamble); - $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.'); + $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']; @@ -266,52 +309,52 @@ function notification($params) if ($params['type'] == NOTIFY_TAGSHARE) { $itemlink = $params['link']; - $subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']); + $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); - $epreamble = L10n::t('%1$s tagged [url=%2$s]your post[/url]', + $preamble = $l10n->t('%1$s tagged your post at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%1$s tagged [url=%2$s]your post[/url]', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $itemlink ); - $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.'); + $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); } if ($params['type'] == NOTIFY_INTRO) { $itemlink = $params['link']; - $subject = L10n::t('[Friendica:Notify] Introduction received'); + $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); - $epreamble = L10n::t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.', + $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.', $itemlink, '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t('You may visit their profile at %s', $params['source_link']); + $body = $l10n->t('You may visit their profile at %s', $params['source_link']); - $sitelink = L10n::t('Please visit %s to approve or reject the introduction.'); + $sitelink = $l10n->t('Please visit %s to approve or reject the introduction.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); switch ($params['verb']) { - case ACTIVITY_FRIEND: + case Activity::FRIEND: // someone started to share with user (mostly OStatus) - $subject = L10n::t('[Friendica:Notify] A new person is sharing with you'); + $subject = $l10n->t('[Friendica:Notify] A new person is sharing with you'); - $preamble = L10n::t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%1$s is sharing with you at %2$s', + $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%1$s is sharing with you at %2$s', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $sitename ); break; - case ACTIVITY_FOLLOW: + case Activity::FOLLOW: // someone started to follow the user (mostly OStatus) - $subject = L10n::t('[Friendica:Notify] You have a new follower'); + $subject = $l10n->t('[Friendica:Notify] You have a new follower'); - $preamble = L10n::t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename); - $epreamble = L10n::t('You have a new follower at %2$s : %1$s', + $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('You have a new follower at %2$s : %1$s', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $sitename ); @@ -324,55 +367,55 @@ function notification($params) if ($params['type'] == NOTIFY_SUGGEST) { $itemlink = $params['link']; - $subject = L10n::t('[Friendica:Notify] Friend suggestion received'); + $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); - $epreamble = L10n::t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.', + $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.', $itemlink, '[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t('Name:').' '.$params['item']['name']."\n"; - $body .= L10n::t('Photo:').' '.$params['item']['photo']."\n"; - $body .= L10n::t('You may visit their profile at %s', $params['item']['url']); + $body = $l10n->t('Name:').' '.$params['item']['name']."\n"; + $body .= $l10n->t('Photo:').' '.$params['item']['photo']."\n"; + $body .= $l10n->t('You may visit their profile at %s', $params['item']['url']); - $sitelink = L10n::t('Please visit %s to approve or reject the suggestion.'); + $sitelink = $l10n->t('Please visit %s to approve or reject the suggestion.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); } if ($params['type'] == NOTIFY_CONFIRM) { - if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection + if ($params['verb'] == Activity::FRIEND) { // mutual connection $itemlink = $params['link']; - $subject = L10n::t('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('[Friendica:Notify] Connection accepted'); - $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].', + $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', $itemlink, '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t('You are now mutual friends and may exchange status updates, photos, and email without restriction.'); + $body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.'); - $sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.'); + $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); } else { // ACTIVITY_FOLLOW $itemlink = $params['link']; - $subject = L10n::t('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('[Friendica:Notify] Connection accepted'); - $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); - $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].', + $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', $itemlink, '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']); + $body = $l10n->t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']); $body .= "\n\n"; - $body .= L10n::t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']); + $body .= $l10n->t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']); - $sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.'); + $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.'); $tsitelink = sprintf($sitelink, $siteurl); $hsitelink = sprintf($sitelink, ''.$sitename.''); } @@ -382,21 +425,21 @@ function notification($params) switch($params['event']) { case "SYSTEM_REGISTER_REQUEST": $itemlink = $params['link']; - $subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request'); + $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); - $epreamble = L10n::t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.', + $preamble = $l10n->t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename); + $epreamble = $l10n->t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.', $itemlink, '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = L10n::t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)", + $body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)", $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick'] ); - $sitelink = L10n::t('Please visit %s to approve or reject the request.'); + $sitelink = $l10n->t('Please visit %s to approve or reject the request.'); $tsitelink = sprintf($sitelink, $params['link']); $hsitelink = sprintf($sitelink, ''.$sitename.'

'); break; @@ -411,16 +454,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 = $params['subject'] ?? ''; - $preamble = $params['preamble']; + if (!isset($params['preamble'])) { + Logger::warning('preamble isn\'t set.', ['type' => $params['type'], 'subject' => $subject]); + } + $preamble = $params['preamble'] ?? ''; - $body = $params['body']; + if (!isset($params['body'])) { + Logger::warning('body isn\'t set.', ['type' => $params['type'], 'subject' => $subject, 'preamble' => $preamble]); + } + $body = $params['body'] ?? ''; - $sitelink = ""; - $tsitelink = ""; - $hsitelink = ""; - $itemlink = ""; $show_in_notification_page = false; } @@ -438,7 +486,7 @@ function notification($params) 'itemlink' => $itemlink ]; - Addon::callHooks('enotify', $h); + Hook::callAll('enotify', $h); $subject = $h['subject']; @@ -451,19 +499,13 @@ function notification($params) $hsitelink = $h['hsitelink']; $itemlink = $h['itemlink']; + $notify_id = 0; + if ($show_in_notification_page) { - logger("adding notification entry", LOGGER_DEBUG); - do { - $dups = false; - $hash = random_string(); - if (DBA::exists('notify', ['hash' => $hash])) { - $dups = true; - } - } while ($dups == true); + Logger::log("adding notification entry", Logger::DEBUG); /// @TODO One statement is enough $datarray = []; - $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name'])); $datarray['url'] = $params['source_link']; @@ -478,15 +520,14 @@ 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 - $fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'], + $fields = ['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'], @@ -495,28 +536,8 @@ function notification($params) $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), - DBA::escape($params['link']), - intval($params['uid']) - ); - if ($p && (count($p) > 1)) { - for ($d = 1; $d < count($p); $d ++) { - DBA::delete('notify', ['id' => $p[$d]['id']]); - } - - // only continue on if we stored the first one - if ($notify_id != $p[0]['id']) { - L10n::popLang(); - return false; - } - } - - $itemlink = System::baseUrl().'/notify/view/'.$notify_id; - $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]); + $itemlink = DI::baseUrl().'/notify/view/'.$notify_id; + $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]); $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg))); $fields = ['msg' => $msg, 'msg_cache' => $msg_cache]; @@ -529,14 +550,14 @@ 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("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG); + Logger::log("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), Logger::DEBUG); $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid'], 'parent-item' => 0]; @@ -545,11 +566,11 @@ function notification($params) $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.", LOGGER_DEBUG); + Logger::log("There's already a notification for this parent.", Logger::DEBUG); } } @@ -564,11 +585,11 @@ function notification($params) $datarray['siteurl'] = $siteurl; $datarray['type'] = $params['type']; $datarray['parent'] = $parent_id; - $datarray['source_name'] = defaults($params, 'source_name', ''); - $datarray['source_link'] = defaults($params, 'source_link', ''); - $datarray['source_photo'] = defaults($params, 'source_photo', ''); + $datarray['source_name'] = $params['source_name'] ?? ''; + $datarray['source_link'] = $params['source_link'] ?? ''; + $datarray['source_photo'] = $params['source_photo'] ?? ''; $datarray['uid'] = $params['uid']; - $datarray['username'] = defaults($params, 'to_name', ''); + $datarray['username'] = $params['to_name'] ?? ''; $datarray['hsitelink'] = $hsitelink; $datarray['tsitelink'] = $tsitelink; $datarray['hitemlink'] = ''.$itemlink.''; @@ -581,15 +602,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']), @@ -609,8 +630,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'], @@ -629,10 +650,8 @@ 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, @@ -641,11 +660,10 @@ function notification($params) 'messageSubject' => $datarray['subject'], 'htmlVersion' => $email_html_body, 'textVersion' => $email_text_body, - 'additionalMailHeader' => $datarray['headers']] - ); + 'additionalMailHeader' => $datarray['headers'] + ]); } - L10n::popLang(); return false; } @@ -653,6 +671,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 @@ -668,13 +687,15 @@ 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"]; @@ -693,7 +714,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $profiles[] = $owner["url"]; // Notifications from Diaspora are often with an URL in the Diaspora format - $profiles[] = System::baseUrl()."/u/".$user["nickname"]; + $profiles[] = DI::baseUrl()."/u/".$user["nickname"]; $profiles2 = []; @@ -701,11 +722,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; @@ -732,10 +753,10 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $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); + $condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'deleted' => false]; + $item = Item::selectFirstForUser($uid, $fields, $condition); if (!DBA::isResult($item) || in_array($item['author-id'], $contacts)) { - return; + return false; } // Generate the notification array @@ -743,7 +764,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["uid"] = $uid; $params["item"] = $item; $params["parent"] = $item["parent"]; - $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]); + $params["link"] = DI::baseUrl().'/display/'.urlencode($item["guid"]); $params["otype"] = 'item'; $params["source_name"] = $item["author-name"]; $params["source_link"] = $item["author-link"]; @@ -751,17 +772,18 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { if ($item["parent-uri"] === $item["uri"]) { // Send a notification for every new post? + // Either the contact had posted something directly $send_notification = DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]); + // Or the contact is a mentioned forum if (!$send_notification) { $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::isResult($tags)) { foreach ($tags AS $tag) { - $condition = ['nurl' => normalise_link($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true]; - $r = DBA::exists('contact', $condition); - if ($r) { + $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY]; + if (DBA::exists('contact', $condition)) { $send_notification = true; } } @@ -770,7 +792,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { if ($send_notification) { $params["type"] = NOTIFY_SHARE; - $params["verb"] = ACTIVITY_TAG; + $params["verb"] = Activity::TAG; } } @@ -784,24 +806,24 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { if ($item["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { $params["type"] = NOTIFY_TAGSELF; - $params["verb"] = ACTIVITY_TAG; + $params["verb"] = Activity::TAG; } // Is it a post that the user had started? $fields = ['ignored', 'mention']; - $thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]); + $thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"], 'deleted' => false]); if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) { $params["type"] = NOTIFY_COMMENT; - $params["verb"] = ACTIVITY_POST; + $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]; + $condition = ['parent' => $item["parent"], 'author-id' => $contacts, 'deleted' => false]; if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) { $params["type"] = NOTIFY_COMMENT; - $params["verb"] = ACTIVITY_POST; + $params["verb"] = Activity::POST; } if (isset($params["type"])) {