X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=2ae7a99157a2c72f43111020f9369f8bb22536ad;hb=461e01bd337aa8ae689d7a990f42b194c409bd14;hp=0e91ca7da1146770c0dad7b8245a616af63f1c1c;hpb=951b7179af35dd5a0a1544b76b9e04c66c9bae44;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 0e91ca7da1..2ae7a99157 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file include/enotify.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\Content\Text\BBCode;
@@ -31,7 +47,7 @@ use Friendica\Protocol\Activity;
 function notification($params)
 {
 	/** @var string the common prefix of a notification subject */
-	$SUBJECT_PREFIX = DI::l10n()->t('[Friendica:Notify]');
+	$subjectPrefix = DI::l10n()->t('[Friendica:Notify]');
 
 	// Temporary logging for finding the origin
 	if (!isset($params['uid'])) {
@@ -109,7 +125,7 @@ function notification($params)
 		$itemlink = $siteurl.'/message/'.$params['item']['id'];
 		$params["link"] = $itemlink;
 
-		$subject = $l10n->t( '%s New mail received at %s', $SUBJECT_PREFIX, $sitename);
+		$subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $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]');
@@ -158,39 +174,39 @@ function notification($params)
 
 		// "George Bull's post"
 		if ($params['activity']['origin_comment']) {
-			$message = '%1$s replied to you on %2$s\'s %3$s %4$s';
+			$message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
 		} elseif ($params['activity']['explicit_tagged']) {
-			$message = '%1$s tagged you on %2$s\'s %3$s %4$s';
+			$message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
 		} else {
-			$message = '%1$s commented on %2$s\'s %3$s %4$s';
+			$message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
 		}
 
-		$dest_str = $l10n->t($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
+		$dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
 
 		// Then look for the special cases
 
 		// "your post"
 		if ($params['activity']['origin_thread']) {
 			if ($params['activity']['origin_comment']) {
-				$message = '%1$s replied to you on your %2$s %3$s';
+				$message = $l10n->t('%1$s replied to you on your %2$s %3$s');
 			} elseif ($params['activity']['explicit_tagged']) {
-				$message = '%1$s tagged you on your %2$s %3$s';
+				$message = $l10n->t('%1$s tagged you on your %2$s %3$s');
 			} else {
-				$message = '%1$s commented on your %2$s %3$s';
+				$message = $l10n->t('%1$s commented on your %2$s %3$s');
 			}
 
-			$dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+			$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
 		// "their post"
 		} elseif ($item['author-link'] == $params['source_link']) {
 			if ($params['activity']['origin_comment']) {
-				$message = '%1$s replied to you on their %2$s %3$s';
+				$message = $l10n->t('%1$s replied to you on their %2$s %3$s');
 			} elseif ($params['activity']['explicit_tagged']) {
-				$message = '%1$s tagged you on their %2$s %3$s';
+				$message = $l10n->t('%1$s tagged you on their %2$s %3$s');
 			} else {
-				$message = '%1$s commented on their %2$s %3$s';
+				$message = $l10n->t('%1$s commented on their %2$s %3$s');
 			}
 
-			$dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+			$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
 		}
 
 		// Some mail software relies on subject field for threading.
@@ -198,11 +214,11 @@ function notification($params)
 		// Before this we have the name of the replier on the subject rendering
 		// different subjects for messages on the same thread.
 		if ($params['activity']['explicit_tagged']) {
-			$subject = $l10n->t('%s %s tagged you', $SUBJECT_PREFIX, $params['source_name']);
+			$subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']);
 
 			$preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
 		} else {
-			$subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $SUBJECT_PREFIX, $parent_id, $params['source_name']);
+			$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $parent_id, $params['source_name']);
 
 			$preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']);
 		}
@@ -216,7 +232,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == Notify\Type::WALL) {
-		$subject = $l10n->t('%s %s posted to your profile wall', $SUBJECT_PREFIX, $params['source_name']);
+		$subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $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]',
@@ -231,7 +247,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == Notify\Type::SHARE) {
-		$subject = $l10n->t('%s Friendica:Notify] %s shared a new post', $SUBJECT_PREFIX, $params['source_name']);
+		$subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $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].',
@@ -246,7 +262,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == Notify\Type::POKE) {
-		$subject = $l10n->t('%s %1$s poked you', $SUBJECT_PREFIX, $params['source_name']);
+		$subject = $l10n->t('%1$s %2$s poked you', $subjectPrefix, $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].',
@@ -266,7 +282,7 @@ function notification($params)
 
 	if ($params['type'] == Notify\Type::TAG_SHARE) {
 		$itemlink =  $params['link'];
-		$subject = $l10n->t('%s %s tagged your post', $SUBJECT_PREFIX, $params['source_name']);
+		$subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $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]',
@@ -281,7 +297,7 @@ function notification($params)
 
 	if ($params['type'] == Notify\Type::INTRO) {
 		$itemlink = $params['link'];
-		$subject = $l10n->t('%s Introduction received', $SUBJECT_PREFIX);
+		$subject = $l10n->t('%s Introduction received', $subjectPrefix);
 
 		$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.',
@@ -298,7 +314,7 @@ function notification($params)
 		switch ($params['verb']) {
 			case Activity::FRIEND:
 				// someone started to share with user (mostly OStatus)
-				$subject = $l10n->t('%s A new person is sharing with you', $SUBJECT_PREFIX);
+				$subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix);
 
 				$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',
@@ -308,7 +324,7 @@ function notification($params)
 				break;
 			case Activity::FOLLOW:
 				// someone started to follow the user (mostly OStatus)
-				$subject = $l10n->t('%s You have a new follower', $SUBJECT_PREFIX);
+				$subject = $l10n->t('%s You have a new follower', $subjectPrefix);
 
 				$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',
@@ -324,7 +340,7 @@ function notification($params)
 
 	if ($params['type'] == Notify\Type::SUGGEST) {
 		$itemlink =  $params['link'];
-		$subject = $l10n->t('%s Friend suggestion received', $SUBJECT_PREFIX);
+		$subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
 
 		$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.',
@@ -345,7 +361,7 @@ function notification($params)
 	if ($params['type'] == Notify\Type::CONFIRM) {
 		if ($params['verb'] == Activity::FRIEND) { // mutual connection
 			$itemlink =  $params['link'];
-			$subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX);
+			$subject = $l10n->t('%s Connection accepted', $subjectPrefix);
 
 			$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].',
@@ -360,7 +376,7 @@ function notification($params)
 			$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
 		} else { // ACTIVITY_FOLLOW
 			$itemlink =  $params['link'];
-			$subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX);
+			$subject = $l10n->t('%s Connection accepted', $subjectPrefix);
 
 			$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].',
@@ -437,7 +453,7 @@ function notification($params)
 	if ($show_in_notification_page) {
 		$notification = DI::notify()->insert([
 			'name'       => $params['source_name'] ?? '',
-			'name_cache' => strip_tags(BBCode::convert($params['source_name'] ?? '')),
+			'name_cache' => substr(strip_tags(BBCode::convert($params['source_name'] ?? '')), 0, 255),
 			'url'        => $params['source_link'] ?? '',
 			'photo'      => $params['source_photo'] ?? '',
 			'link'       => $itemlink ?? '',