The url detection in BBCode is too greedy

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 51e25572d3aa7560765236b44aa0ff85eecf0d38..ab4bbc6db249c1fb84ebd85fd16f8a8ae1212e85 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -3,6 +3,7 @@
  * @file include/enotify.php
  */
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -54,7 +55,7 @@ function notification($params)
                        ['uid' => $params['uid']]);
 
                // There is no need to create notifications for forum accounts
-               if (!DBM::is_result($user) || in_array($user["page-flags"], array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
+               if (!DBM::is_result($user) || in_array($user["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
                        return;
                }
        }
@@ -147,7 +148,7 @@ function notification($params)
                        $dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
                                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                                $itemlink,
-                                               $p['author-name'],
+                                               $item['author-name'],
                                                $item_post_type);
                }
 
@@ -386,7 +387,7 @@ function notification($params)
 
        $subject .= " (".$nickname."@".$hostname.")";
 
-       $h = array(
+       $h = [
                'params'    => $params,
                'subject'   => $subject,
                'preamble'  => $preamble,
@@ -396,9 +397,9 @@ function notification($params)
                'tsitelink' => $tsitelink,
                'hsitelink' => $hsitelink,
                'itemlink'  => $itemlink
-       );
+       ];
 
-       call_hooks('enotify', $h);
+       Addon::callHooks('enotify', $h);
 
        $subject   = $h['subject'];
 
@@ -424,7 +425,7 @@ function notification($params)
                } while ($dups == true);
 
                /// @TODO One statement is enough
-               $datarray = array();
+               $datarray = [];
                $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
                $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
@@ -440,7 +441,7 @@ function notification($params)
                $datarray['otype'] = $params['otype'];
                $datarray['abort'] = false;
 
-               call_hooks('enotify_store', $datarray);
+               Addon::callHooks('enotify_store', $datarray);
 
                if ($datarray['abort']) {
                        pop_lang();
@@ -486,7 +487,7 @@ function notification($params)
                );
                if ($p && (count($p) > 1)) {
                        for ($d = 1; $d < count($p); $d ++) {
-                               dba::delete('notify', array('id' => $p[$d]['id']));
+                               dba::delete('notify', ['id' => $p[$d]['id']]);
                        }
 
                        // only continue on if we stored the first one
@@ -497,7 +498,7 @@ function notification($params)
                }
 
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
-               $msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
+               $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
                $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
                q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc($msg),
@@ -546,12 +547,12 @@ function notification($params)
                }
 
                // textversion keeps linebreaks
-               $textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
+               $textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
                        $body))),ENT_QUOTES, 'UTF-8')));
-               $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n\\n", "\\n"),
+               $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
                        "<br />\n", $body))), ENT_QUOTES, 'UTF-8');
 
-               $datarray = array();
+               $datarray = [];
                $datarray['banner'] = $banner;
                $datarray['product'] = $product;
                $datarray['preamble'] = $preamble;
@@ -576,7 +577,7 @@ function notification($params)
                $datarray['subject'] = $subject;
                $datarray['headers'] = $additional_mail_header;
 
-               call_hooks('enotify_mail', $datarray);
+               Addon::callHooks('enotify_mail', $datarray);
 
                // check whether sending post content in email notifications is allowed
                // always true for SYSTEM_EMAIL
@@ -584,7 +585,7 @@ function notification($params)
 
                // load the template for private message notifications
                $tpl = get_markup_template('email_notify_html.tpl');
-               $email_html_body = replace_macros($tpl, array(
+               $email_html_body = replace_macros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => str_replace("\n", "<br>\n", $datarray['preamble']),
@@ -601,11 +602,11 @@ function notification($params)
                        '$title'        => $datarray['title'],
                        '$htmlversion'  => $datarray['htmlversion'],
                        '$content_allowed'      => $content_allowed,
-               ));
+               ]);
 
                // load the template for private message notifications
                $tpl = get_markup_template('email_notify_text.tpl');
-               $email_text_body = replace_macros($tpl, array(
+               $email_text_body = replace_macros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => $datarray['preamble'],
@@ -622,11 +623,11 @@ function notification($params)
                        '$title'        => $datarray['title'],
                        '$textversion'  => $datarray['textversion'],
                        '$content_allowed'      => $content_allowed,
-               ));
+               ]);
 
                // use the Emailer class to send the message
                return Emailer::send(
-                       array(
+                       [
                        'uid' => $params['uid'],
                        'fromName' => $sender_name,
                        'fromEmail' => $sender_email,
@@ -635,7 +636,7 @@ function notification($params)
                        'messageSubject' => $datarray['subject'],
                        'htmlVersion' => $email_html_body,
                        'textVersion' => $email_text_body,
-                       'additionalMailHeader' => $datarray['headers'])
+                       'additionalMailHeader' => $datarray['headers']]
                );
        }
 
@@ -666,8 +667,8 @@ function check_user_notification($itemid) {
  * @param str $defaulttype (Optional) Forces a notification with this type.
  */
 function check_item_notification($itemid, $uid, $defaulttype = "") {
-       $notification_data = array("uid" => $uid, "profiles" => array());
-       call_hooks('check_item_notification', $notification_data);
+       $notification_data = ["uid" => $uid, "profiles" => []];
+       Addon::callHooks('check_item_notification', $notification_data);
 
        $profiles = $notification_data["profiles"];
 
@@ -688,7 +689,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        // Notifications from Diaspora are often with an URL in the Diaspora format
        $profiles[] = System::baseUrl()."/u/".$user["nickname"];
 
-       $profiles2 = array();
+       $profiles2 = [];
 
        foreach ($profiles AS $profile) {
                // Check for invalid profile urls. 13 should be the shortest possible profile length:
@@ -732,7 +733,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
                return false;
 
        // Generate the notification array
-       $params = array();
+       $params = [];
        $params["uid"] = $uid;
        $params["notify_flags"] = $user["notify-flags"];
        $params["language"] = $user["language"];