X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=95467a584f68df4c600d010aae76847c535fd7b3;hb=d0dfcc71a82ac423db68a12fd2eaf6d13cb18e1f;hp=e9c04a0c9354bd41649a6a9783da567b41420c22;hpb=7442ce3d6d9f09156b75fdfdb626f3f228ee01ee;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index e9c04a0c93..95467a584f 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -5,6 +5,9 @@
  * @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");
@@ -12,7 +15,7 @@ require_once("include/network.php");
 function notifications_post(App $a) {
 
 	if (! local_user()) {
-		goaway(z_root());
+		goaway(System::baseUrl());
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -195,11 +198,13 @@ function notifications_content(App $a) {
 							$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?');
-							$helptext2 = t('"Friend" implies that you allow to read and you subscribe to their posts. "Subscriber" means that you allow to read but you do not want to read theirs. Approve as: ');
+							$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?');
-							$helptext2 = t('"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: ');
+							$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']);
 						}
 					}
 
@@ -209,6 +214,7 @@ function notifications_content(App $a) {
 						'$fan_selected' => $fan_selected,
 						'$approve_as1' => $helptext,
 						'$approve_as2' => $helptext2,
+						'$approve_as3' => $helptext3,
 						'$as_friend' => t('Friend'),
 						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
 					));
@@ -220,6 +226,12 @@ function notifications_content(App $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: '),
@@ -252,7 +264,7 @@ function notifications_content(App $a) {
 						'$approve' => t('Approve'),
 						'$note' => $it['note'],
 						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard'),
+						'$discard' => $discard,
 
 					));
 					break;
@@ -289,7 +301,7 @@ function notifications_content(App $a) {
 				'$item_link' => $it['link'],
 				'$item_image' => $it['image'],
 				'$item_url' => $it['url'],
-				'$item_text' => htmlentities($it['text']),
+				'$item_text' => $it['text'],
 				'$item_when' => $it['when'],
 				'$item_ago' => $it['ago'],
 				'$item_seen' => $it['seen'],