Merge pull request #806 from maase2/patch-6

[friendica.git] / include / html2plain.php

diff --git a/include/html2plain.php b/include/html2plain.php
index 1e3f407af494a5e3ab1154c4c05332f296e4c21a..dfb577abe18018714b4518dd4319ec457addc18e 100644 (file)
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -82,13 +82,19 @@ function collecturls($message) {
 
        $urls = array();
        foreach ($result as $treffer) {
+
+               $ignore = false;
+
                // A list of some links that should be ignored
                $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
-                               "//facebook.com/profile.php?id=", "//plus.google.com/");
+                               "//facebook.com/profile.php?id=", "//plus.google.com/", "//twitter.com/");
                foreach ($list as $listitem)
                        if (strpos($treffer[1], $listitem) !== false)
                                $ignore = true;
 
+               if ((strpos($treffer[1], "//twitter.com/") !== false) and (strpos($treffer[1], "/status/") !== false))
+                               $ignore = false;
+
                if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
                                $ignore = false;
 
@@ -107,6 +113,12 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        $message = str_replace("\r", "", $html);
 
+       // replace all hashtag addresses
+       if (get_config("system", "remove_hashtags_on_export")) {
+               $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
+               $message = preg_replace($pattern, '#$2', $message);
+       }
+
        $doc = new DOMDocument();
        $doc->preserveWhiteSpace = false;
 
@@ -214,6 +226,9 @@ function html2plain($html, $wraplength = 75, $compact = false)
                                //$message .= "\n[".($counter++)."] ".$url;
        }
 
+       $message = str_replace("\n«", "«\n", $message);
+       $message = str_replace("»\n", "\n»", $message);
+
        do {
                $oldmessage = $message;
                $message = str_replace("\n\n\n", "\n\n", $message);