The "share a post" notification is now sent based upon mentions as well.

[friendica.git] / include / plaintext.php

diff --git a/include/plaintext.php b/include/plaintext.php
index 4bbca636ce63397aa6340a3bb1b5142beb4ab38a..88febbfff858449fdec687cd35e6ac945e904eb0 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -53,7 +53,6 @@ function get_attached_data($body) {
                        if (count($pictures) == 1) {
                                // Checking, if the link goes to a picture
                                $data = parseurl_getsiteinfo($pictures[0][1], true);
-
                                if ($data["type"] == "photo") {
                                        $post["type"] = "photo";
                                        if (isset($data["images"][0]))
@@ -64,8 +63,7 @@ function get_attached_data($body) {
                                        $post["preview"] = $pictures[0][2];
                                        $post["text"] = str_replace($pictures[0][0], "", $body);
                                } else {
-                                       $img_str = fetch_url($pictures[0][1]);
-                                       $imgdata = get_photo_info($img_str);
+                                       $imgdata = get_photo_info($pictures[0][1]);
                                        if (substr($imgdata["mime"], 0, 6) == "image/") {
                                                $post["type"] = "photo";
                                                $post["image"] = $pictures[0][1];
@@ -118,7 +116,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
                        $msg = trim($msg."\n".$line);
                // Is the new message empty by now or is it a reshared message?
                elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
-                       $msg = substr(substr(trim($msg."\n".$line), 0, $limit), 0, -3)."...";
+                       $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8")."...";
                else
                        break;
        }
@@ -174,15 +172,16 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2) {
                        $msg = str_replace("  ", " ", $msg);
 
                // Twitter is using its own limiter, so we always assume that shortened links will have this length
-               if (strlen($link) > 0)
+               if (iconv_strlen($link, "UTF-8") > 0)
                        $limit = $limit - 23;
 
-               if (strlen($msg) > $limit) {
+               if (iconv_strlen($msg, "UTF-8") > $limit) {
 
                        if (!isset($post["url"])) {
                                $limit = $limit - 23;
                                $post["url"] = $b["plink"];
-                       }
+                       } elseif (strpos($b["body"], "[share") !== false)
+                               $post["url"] = $b["plink"];
 
                        $msg = shortenmsg($msg, $limit);
                }