X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fenotify.php;h=68208ec5ac612f2d59ac743dbab082d446abb5e7;hb=edcf1466a749d59bc3bba8e5d1dc48508e10521a;hp=60c5b0ca77c04d07179ae63326ff5f613c4a8916;hpb=6f1b1aee4b18cabe24253b7550fc5a72789a5852;p=friendica.git
diff --git a/include/enotify.php b/include/enotify.php
index 60c5b0ca77..68208ec5ac 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -2,40 +2,41 @@
/**
* @file include/enotify.php
*/
-use Friendica\App;
+
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer;
-require_once 'include/bbcode.php';
-require_once 'include/html2bbcode.php';
-
/**
* @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
*/
function notification($params)
{
$a = get_app();
// from here on everything is in the recipients language
- push_lang($params['language']);
+ L10n::pushLang($params['language']);
- $banner = t('Friendica Notification');
+ $banner = L10n::t('Friendica Notification');
$product = FRIENDICA_PLATFORM;
$siteurl = System::baseUrl(true);
- $thanks = t('Thank You,');
+ $thanks = L10n::t('Thank You,');
$sitename = $a->config['sitename'];
if (!x($a->config['admin_name'])) {
- $site_admin = sprintf(t('%s Administrator'), $sitename);
+ $site_admin = L10n::t('%s Administrator', $sitename);
} else {
- $site_admin = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
+ $site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
}
$sender_name = $sitename;
@@ -44,17 +45,14 @@ function notification($params)
$hostname = substr($hostname, 0, strpos($hostname, ':'));
}
- $sender_email = $a->config['sender_email'];
- if (empty($sender_email)) {
- $sender_email = t('noreply').'@'.$hostname;
- }
+ $sender_email = $a->getSenderEmailAddress();
if ($params['type'] != SYSTEM_EMAIL) {
$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))) {
+ if (!DBM::is_result($user) || in_array($user["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
return;
}
}
@@ -94,12 +92,12 @@ function notification($params)
}
if ($params['type'] == NOTIFY_MAIL) {
- $subject = sprintf(t('[Friendica:Notify] New mail received at %s'), $sitename);
+ $subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
- $preamble = sprintf(t('%1$s sent you a new private message at %2$s.'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s sent you %2$s.'), '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.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 = 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.'');
$itemlink = $siteurl.'/message/'.$params['item']['id'];
@@ -122,7 +120,7 @@ function notification($params)
intval($params['uid'])
);
if ($p && count($p)) {
- pop_lang();
+ L10n::popLang();
return;
}
@@ -137,26 +135,29 @@ function notification($params)
$item_post_type = item_post_type($item);
// "a post"
- $dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $itemlink,
- $item_post_type);
+ $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 = sprintf(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);
+ $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 (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,
- $item_post_type);
+ $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.
@@ -164,102 +165,108 @@ function notification($params)
// Before this we have the name of the replier on the subject rendering
// differents subjects for messages on the same thread.
- $subject = sprintf(t('[Friendica:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $params['source_name']);
+ $subject = L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
- $preamble = sprintf(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 = 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_WALL) {
- $subject = sprintf(t('[Friendica:Notify] %s posted to your profile wall'), $params['source_name']);
+ $subject = L10n::t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']);
- $preamble = sprintf(t('%1$s posted to your profile wall at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s posted to [url=%2$s]your wall[/url]'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']);
+ $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 = 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_TAGSELF) {
- $subject = sprintf(t('[Friendica:Notify] %s tagged you'), $params['source_name']);
+ $subject = L10n::t('[Friendica:Notify] %s tagged you', $params['source_name']);
- $preamble = sprintf(t('%1$s tagged you at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s [url=%2$s]tagged you[/url].'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']);
+ $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 = 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 = sprintf(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 = sprintf(t('%1$s shared a new post at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s [url=%2$s]shared a post[/url].'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']);
+ $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 = 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 = sprintf(t('[Friendica:Notify] %1$s poked you'), $params['source_name']);
+ $subject = L10n::t('[Friendica:Notify] %1$s poked you', $params['source_name']);
- $preamble = sprintf(t('%1$s poked you at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s [url=%2$s]poked you[/url].'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']);
+ $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', t($params['activity']), $subject);
- $preamble = str_replace('poked', t($params['activity']), $preamble);
- $epreamble = str_replace('poked', 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 = 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_TAGSHARE) {
- $subject = sprintf(t('[Friendica:Notify] %s tagged your post'), $params['source_name']);
+ $subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']);
- $preamble = sprintf(t('%1$s tagged your post at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s tagged [url=%2$s]your post[/url]'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $itemlink);
+ $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 = 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_INTRO) {
- $subject = sprintf(t('[Friendica:Notify] Introduction received'));
+ $subject = L10n::t('[Friendica:Notify] Introduction received');
- $preamble = sprintf(t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
- $itemlink,
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+ $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 = sprintf(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 = 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.'');
$itemlink = $params['link'];
@@ -267,21 +274,23 @@ function notification($params)
switch ($params['verb']) {
case ACTIVITY_FRIEND:
// someone started to share with user (mostly OStatus)
- $subject = sprintf(t('[Friendica:Notify] A new person is sharing with you'));
+ $subject = L10n::t('[Friendica:Notify] A new person is sharing with you');
- $preamble = sprintf(t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%1$s is sharing with you at %2$s'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $sitename);
+ $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:
// someone started to follow the user (mostly OStatus)
- $subject = sprintf(t('[Friendica:Notify] You have a new follower'));
+ $subject = L10n::t('[Friendica:Notify] You have a new follower');
- $preamble = sprintf(t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('You have a new follower at %2$s : %1$s'),
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $sitename);
+ $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
+ );
break;
default:
// ACTIVITY_REQ_FRIEND is default activity for notifications
@@ -290,19 +299,20 @@ function notification($params)
}
if ($params['type'] == NOTIFY_SUGGEST) {
- $subject = sprintf(t('[Friendica:Notify] Friend suggestion received'));
+ $subject = L10n::t('[Friendica:Notify] Friend suggestion received');
- $preamble = sprintf(t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(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]');
+ $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 = t('Name:').' '.$params['item']['name']."\n";
- $body .= t('Photo:').' '.$params['item']['photo']."\n";
- $body .= sprintf(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 = 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.'');
$itemlink = $params['link'];
@@ -310,32 +320,34 @@ function notification($params)
if ($params['type'] == NOTIFY_CONFIRM) {
if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
- $subject = sprintf(t('[Friendica:Notify] Connection accepted'));
+ $subject = L10n::t('[Friendica:Notify] Connection accepted');
- $preamble = sprintf(t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%2$s has accepted your [url=%1$s]connection request[/url].'),
- $itemlink,
- '[url='.$params['source_link'].']'.$params['source_name'].'[/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 = 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 = 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.'');
$itemlink = $params['link'];
} else { // ACTIVITY_FOLLOW
- $subject = sprintf(t('[Friendica:Notify] Connection accepted'));
+ $subject = L10n::t('[Friendica:Notify] Connection accepted');
- $preamble = sprintf(t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('%2$s has accepted your [url=%1$s]connection request[/url].'),
- $itemlink,
- '[url='.$params['source_link'].']'.$params['source_name'].'[/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 = sprintf(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 .= sprintf(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 = 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.'');
$itemlink = $params['link'];
@@ -345,17 +357,21 @@ function notification($params)
if ($params['type'] == NOTIFY_SYSTEM) {
switch($params['event']) {
case "SYSTEM_REGISTER_REQUEST":
- $subject = sprintf(t('[Friendica System:Notify] registration request'));
+ $subject = L10n::t('[Friendica System:Notify] registration request');
- $preamble = sprintf(t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
- $epreamble = sprintf(t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.'),
- $itemlink,
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+ $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 = sprintf(t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s (%4$s)'),
- $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']);
+ $body = L10n::t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s ' . "\x28" . '%4$s' . "\x29",
+ $params['source_name'],
+ $siteurl, $params['source_mail'],
+ $params['source_nick']
+ );
- $sitelink = 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.'
');
$itemlink = $params['link'];
@@ -386,7 +402,7 @@ function notification($params)
$subject .= " (".$nickname."@".$hostname.")";
- $h = array(
+ $h = [
'params' => $params,
'subject' => $subject,
'preamble' => $preamble,
@@ -396,9 +412,9 @@ function notification($params)
'tsitelink' => $tsitelink,
'hsitelink' => $hsitelink,
'itemlink' => $itemlink
- );
+ ];
- call_hooks('enotify', $h);
+ Addon::callHooks('enotify', $h);
$subject = $h['subject'];
@@ -424,13 +440,13 @@ function notification($params)
} while ($dups == true);
/// @TODO One statement is enough
- $datarray = array();
+ $datarray = [];
$datarray['hash'] = $hash;
$datarray['name'] = $params['source_name'];
- $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
+ $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
$datarray['url'] = $params['source_link'];
$datarray['photo'] = $params['source_photo'];
- $datarray['date'] = datetime_convert();
+ $datarray['date'] = DateTimeFormat::utcNow();
$datarray['uid'] = $params['uid'];
$datarray['link'] = $itemlink;
$datarray['iid'] = $item_id;
@@ -440,10 +456,10 @@ function notification($params)
$datarray['otype'] = $params['otype'];
$datarray['abort'] = false;
- call_hooks('enotify_store', $datarray);
+ Addon::callHooks('enotify_store', $datarray);
if ($datarray['abort']) {
- pop_lang();
+ L10n::popLang();
return False;
}
@@ -472,7 +488,7 @@ function notification($params)
if ($r) {
$notify_id = $r[0]['id'];
} else {
- pop_lang();
+ L10n::popLang();
return False;
}
@@ -486,19 +502,19 @@ function notification($params)
);
if ($p && (count($p) > 1)) {
for ($d = 1; $d < count($p); $d ++) {
- dba::delete('notify', array('id' => $p[$d]['id']));
+ dba::delete('notify', ['id' => $p[$d]['id']]);
}
// only continue on if we stored the first one
if ($notify_id != $p[0]['id']) {
- pop_lang();
- return False;
+ L10n::popLang();
+ return false;
}
}
$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
- $msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
- $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
+ $msg = replace_macros($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),
@@ -546,12 +562,12 @@ function notification($params)
}
// textversion keeps linebreaks
- $textversion = strip_tags(str_replace("
", "\n", html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
+ $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(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n\\n", "\\n"),
+ $htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
"
\n", $body))), ENT_QUOTES, 'UTF-8');
- $datarray = array();
+ $datarray = [];
$datarray['banner'] = $banner;
$datarray['product'] = $product;
$datarray['preamble'] = $preamble;
@@ -576,7 +592,7 @@ function notification($params)
$datarray['subject'] = $subject;
$datarray['headers'] = $additional_mail_header;
- call_hooks('enotify_mail', $datarray);
+ Addon::callHooks('enotify_mail', $datarray);
// check whether sending post content in email notifications is allowed
// always true for SYSTEM_EMAIL
@@ -584,7 +600,7 @@ function notification($params)
// load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl');
- $email_html_body = replace_macros($tpl, array(
+ $email_html_body = replace_macros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => str_replace("\n", "
\n", $datarray['preamble']),
@@ -601,11 +617,11 @@ function notification($params)
'$title' => $datarray['title'],
'$htmlversion' => $datarray['htmlversion'],
'$content_allowed' => $content_allowed,
- ));
+ ]);
// load the template for private message notifications
$tpl = get_markup_template('email_notify_text.tpl');
- $email_text_body = replace_macros($tpl, array(
+ $email_text_body = replace_macros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => $datarray['preamble'],
@@ -622,11 +638,11 @@ function notification($params)
'$title' => $datarray['title'],
'$textversion' => $datarray['textversion'],
'$content_allowed' => $content_allowed,
- ));
+ ]);
// use the Emailer class to send the message
return Emailer::send(
- array(
+ [
'uid' => $params['uid'],
'fromName' => $sender_name,
'fromEmail' => $sender_email,
@@ -635,7 +651,7 @@ function notification($params)
'messageSubject' => $datarray['subject'],
'htmlVersion' => $email_html_body,
'textVersion' => $email_text_body,
- 'additionalMailHeader' => $datarray['headers'])
+ 'additionalMailHeader' => $datarray['headers']]
);
}
@@ -666,8 +682,8 @@ function check_user_notification($itemid) {
* @param str $defaulttype (Optional) Forces a notification with this type.
*/
function check_item_notification($itemid, $uid, $defaulttype = "") {
- $notification_data = array("uid" => $uid, "profiles" => array());
- call_hooks('check_item_notification', $notification_data);
+ $notification_data = ["uid" => $uid, "profiles" => []];
+ Addon::callHooks('check_item_notification', $notification_data);
$profiles = $notification_data["profiles"];
@@ -688,7 +704,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
// Notifications from Diaspora are often with an URL in the Diaspora format
$profiles[] = System::baseUrl()."/u/".$user["nickname"];
- $profiles2 = array();
+ $profiles2 = [];
foreach ($profiles AS $profile) {
// Check for invalid profile urls. 13 should be the shortest possible profile length:
@@ -732,7 +748,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
return false;
// Generate the notification array
- $params = array();
+ $params = [];
$params["uid"] = $uid;
$params["notify_flags"] = $user["notify-flags"];
$params["language"] = $user["language"];