Merge pull request #4195 from zeroadam/ContactSelector-#3878

[friendica.git] / include / plaintext.php

diff --git a/include/plaintext.php b/include/plaintext.php
index 9e583dbe50914fc516a9c356b4e4775c9d1a071b..86acad6cfe730209cce2c3070ac4bb02c526ac69 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -1,16 +1,15 @@
 <?php
-
 /**
  * @file include/plaintext.php
  */
-
 use Friendica\App;
-use Friendica\ParseUrl;
+use Friendica\Core\PConfig;
+use Friendica\Object\Image;
+use Friendica\Util\ParseUrl;
 
-require_once("include/Photo.php");
-require_once("include/bbcode.php");
-require_once("include/html2plain.php");
-require_once("include/network.php");
+require_once "include/bbcode.php";
+require_once "include/html2plain.php";
+require_once "include/network.php";
 
 /**
  * @brief Fetches attachment data that were generated the old way
@@ -52,7 +51,7 @@ function get_old_attachment_data($body) {
 
                        if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
 
-                               $picturedata = get_photo_info($matches[1]);
+                               $picturedata = Image::getInfoFromURL($matches[1]);
 
                                if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
                                        $post["image"] = $matches[1];
@@ -75,7 +74,6 @@ function get_old_attachment_data($body) {
 
                }
        }
-
        return $post;
 }
 
@@ -223,7 +221,7 @@ function get_attached_data($body, $item = array()) {
                                        $post["preview"] = $pictures[0][2];
                                        $post["text"] = str_replace($pictures[0][0], "", $body);
                                } else {
-                                       $imgdata = get_photo_info($pictures[0][1]);
+                                       $imgdata = Image::getInfoFromURL($pictures[0][1]);
                                        if (substr($imgdata["mime"], 0, 6) == "image/") {
                                                $post["type"] = "photo";
                                                $post["image"] = $pictures[0][1];
@@ -277,12 +275,12 @@ function get_attached_data($body, $item = array()) {
                if (count($links) > 1) {
                        // The post will be the type "text", which means a blog post
                        unset($post["type"]);
+                       $post["url"] = $plink;
                }
 
                if (!isset($post["type"])) {
                        $post["type"] = "text";
                        $post["text"] = trim($body);
-                       $post["url"] = $plink;
                }
        } elseif (isset($post["url"]) && ($post["type"] == "video")) {
                $data = ParseUrl::getSiteinfoCached($post["url"], true);
@@ -294,30 +292,38 @@ function get_attached_data($body, $item = array()) {
        return $post;
 }
 
-function shortenmsg($msg, $limit, $twitter = false) {
-       /// @TODO
-       /// For Twitter URLs aren't shortened, but they have to be calculated as if.
-
+/**
+ * Shortens message
+ *
+ * @param type $msg
+ * @param type $limit
+ * @return type
+ *
+ * @todo For Twitter URLs aren't shortened, but they have to be calculated as if.
+ */
+function shortenmsg($msg, $limit)
+{
        $lines = explode("\n", $msg);
        $msg = "";
        $recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
        $ellipsis = html_entity_decode("&#x2026;", ENT_QUOTES, 'UTF-8');
-       foreach ($lines AS $row=>$line) {
-               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 == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle)))
-                       $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
-               else
+       foreach ($lines AS $row => $line) {
+               if (iconv_strlen(trim($msg . "\n" . $line), "UTF-8") <= $limit) {
+                       $msg = trim($msg . "\n" . $line);
+               } elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle))) {
+                       // Is the new message empty by now or is it a reshared message?
+                       $msg = iconv_substr(iconv_substr(trim($msg . "\n" . $line), 0, $limit, "UTF-8"), 0, -3, "UTF-8") . $ellipsis;
+               } else {
                        break;
+               }
        }
-       return($msg);
+
+       return $msg;
 }
 
 /**
  * @brief Convert a message into plaintext for connectors to other networks
  *
- * @param App $a The application class
  * @param array $b The message array that is about to be posted
  * @param int $limit The maximum number of characters when posting to that network
  * @param bool $includedlinks Has an attached link to be included into the message?
@@ -326,7 +332,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
  *
  * @return string The converted message
  */
-function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
+function plaintext($b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
 
        // Remove the hash tags
        $URLSearchString = "^\[\]";
@@ -450,7 +456,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2
                        // Which purpose has this line? It is now uncommented, but left as a reminder
                        //} elseif (strpos($b["body"], "[share") !== false) {
                        //      $post["url"] = $b["plink"];
-                       } elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening")) {
+                       } elseif (PConfig::get($b["uid"], "system", "no_intelligent_shortening")) {
                                $post["url"] = $b["plink"];
                        }
                        $msg = shortenmsg($msg, $limit);