Fix tests (#5400)

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index f33b16f50ac94c7a19c8ef844b7e0ce6965e661b..2d4cbdadb5a09a5f1ac461576b6dd77f969bfe39 100644 (file)
--- 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, '<a href="'.$siteurl.'/message/'.$params['item']['id'].'">'.$sitename.'</a>');
-               $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::selectFirstForUser($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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-               $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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-               $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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-               $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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-                       $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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-                       $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);
@@ -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, '<a href="'.$params['link'].'">'.$sitename.'</a><br><br>');
-                               $itemlink =  $params['link'];
                                break;
                        case "SYSTEM_DB_UPDATE_FAIL":
                                break;
@@ -572,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'];
@@ -607,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'],
@@ -628,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'],