Merge pull request #1028 from tugelbend/master

[friendica.git] / include / plaintext.php

diff --git a/include/plaintext.php b/include/plaintext.php
index d824f8759590d3068d3e048db0b12cf355687176..3d30a3299c9e5f18bedd7fd1dce0431d44ef3a97 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -46,6 +46,7 @@ function get_attached_data($body) {
        // if nothing is found, it maybe having an image.
        if (!isset($post["type"])) {
                require_once("mod/parse_url.php");
+               require_once("include/Photo.php");
 
                $URLSearchString = "^\[\]";
                if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures,  PREG_SET_ORDER)) {
@@ -64,12 +65,8 @@ function get_attached_data($body) {
                                        $post["text"] = str_replace($pictures[0][0], "", $body);
                                } else {
                                        $img_str = fetch_url($pictures[0][1]);
-
-                                       $tempfile = tempnam(get_config("system","temppath"), "cache");
-                                       file_put_contents($tempfile, $img_str);
-                                       $mime = image_type_to_mime_type(exif_imagetype($tempfile));
-                                       unlink($tempfile);
-                                       if (substr($mime, 0, 6) == "image/") {
+                                       $imgdata = get_photo_info($img_str);
+                                       if (substr($imgdata["mime"], 0, 6) == "image/") {
                                                $post["type"] = "photo";
                                                $post["image"] = $pictures[0][1];
                                                $post["preview"] = $pictures[0][2];
@@ -111,7 +108,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
        $msg = "";
        $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
        foreach ($lines AS $row=>$line) {
-               if (strlen(trim($msg."\n".$line)) <= $limit)
+               if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit)
                        $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)))
@@ -122,7 +119,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
        return($msg);
 }
 
-function plaintext($a, $b, $limit = 0, $includedlinks = false) {
+function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2) {
        require_once("include/bbcode.php");
        require_once("include/html2plain.php");
        require_once("include/network.php");
@@ -136,7 +133,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false) {
        elseif ($b["title"] != "")
                $post["text"] = trim($b["title"]);
 
-       $html = bbcode($post["text"], false, false, 2);
+       $html = bbcode($post["text"], false, false, $htmlmode);
        $msg = html2plain($html, 0, true);
        $msg = trim(html_entity_decode($msg,ENT_QUOTES,'UTF-8'));