Merge pull request #3769 from annando/show-forum-posts

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 4c564533505c9c933a1da4f6e495a50853e846db..95467a584f68df4c600d010aae76847c535fd7b3 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -5,14 +5,17 @@
  * @brief The notifications module
  */
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once("include/NotificationsManager.php");
 require_once("include/contact_selectors.php");
 require_once("include/network.php");
 
-function notifications_post(&$a) {
+function notifications_post(App $a) {
 
        if (! local_user()) {
-               goaway(z_root());
+               goaway(System::baseUrl());
        }
 
        $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -65,7 +68,7 @@ function notifications_post(&$a) {
        }
 }
 
-function notifications_content(&$a) {
+function notifications_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -194,10 +197,14 @@ function notifications_content(&$a) {
                                                if($it['network'] === NETWORK_DFRN) {
                                                        $lbl_knowyou = t('Claims to be known to you: ');
                                                        $knowyou = (($it['knowyou']) ? t('yes') : t('no'));
-                                                       $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: ');
+                                                       $helptext = t('Shall your connection be bidirectional or not?');
+                                                       $helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
+                                                       $helptext3 = sprintf(t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
                                                } else {
                                                        $knowyou = '';
-                                                       $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: ');
+                                                       $helptext = t('Shall your connection be bidirectional or not?');
+                                                       $helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
+                                                       $helptext3 = sprintf(t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
                                                }
                                        }
 
@@ -205,9 +212,11 @@ function notifications_content(&$a) {
                                                '$intro_id' => $it['intro_id'],
                                                '$friend_selected' => $friend_selected,
                                                '$fan_selected' => $fan_selected,
-                                               '$approve_as' => $helptext,
+                                               '$approve_as1' => $helptext,
+                                               '$approve_as2' => $helptext2,
+                                               '$approve_as3' => $helptext3,
                                                '$as_friend' => t('Friend'),
-                                               '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
+                                               '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
                                        ));
 
                                        $header = $it["name"];
@@ -217,6 +226,12 @@ function notifications_content(&$a) {
 
                                        $header .= " (".network_to_name($it['network'], $it['url']).")";
 
+                                       if ($it['network'] != NETWORK_DIASPORA) {
+                                               $discard = t('Discard');
+                                       } else {
+                                               $discard = '';
+                                       }
+
                                        $notif_content[] = replace_macros($tpl, array(
                                                '$header' => htmlentities($header),
                                                '$str_notifytype' => t('Notification type: '),
@@ -249,7 +264,7 @@ function notifications_content(&$a) {
                                                '$approve' => t('Approve'),
                                                '$note' => $it['note'],
                                                '$ignore' => t('Ignore'),
-                                               '$discard' => t('Discard'),
+                                               '$discard' => $discard,
 
                                        ));
                                        break;
@@ -285,8 +300,10 @@ function notifications_content(&$a) {
                                '$item_label' => $it['label'],
                                '$item_link' => $it['link'],
                                '$item_image' => $it['image'],
-                               '$item_text' => htmlentities($it['text']),
+                               '$item_url' => $it['url'],
+                               '$item_text' => $it['text'],
                                '$item_when' => $it['when'],
+                               '$item_ago' => $it['ago'],
                                '$item_seen' => $it['seen'],
                        ));
                }