Corrected variable name

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 0777a72f4f0d3feb0a4b31bc015aac163936246f..2ae7a99157a2c72f43111020f9369f8bb22536ad 100644 (file)
--- 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;
@@ -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', $subjectPrefix, $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.
@@ -202,7 +218,7 @@ function notification($params)
 
                        $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', $subjectPrefix, $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']);
                }
@@ -246,7 +262,7 @@ function notification($params)
        }
 
        if ($params['type'] == Notify\Type::POKE) {
-               $subject = $l10n->t('%s %1$s poked you', $subjectPrefix, $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].',
@@ -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 ?? '',