X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fhtml2plain.php;h=dfb577abe18018714b4518dd4319ec457addc18e;hb=d1a0206cdd1a65b08feb16197fe2236c8e1a8037;hp=21261327db82aefc2ce9dda46c8d930155fb390d;hpb=fe257a20324fe68838e5829e19d18777045a41b4;p=friendica.git

diff --git a/include/html2plain.php b/include/html2plain.php
index 21261327db..dfb577abe1 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -1,5 +1,5 @@
 <?php
-require_once "html2bbcode.php";
+require_once("include/html2bbcode.php");
 
 function breaklines($line, $level, $wraplength = 75)
 {
@@ -82,16 +82,25 @@ 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=", "mailto:", "/u/", "/node/",
-				"//facebook.com/profile.php?id=", "//plus.google.com/");
+		$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
+				"//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;
 
+		if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/photos") !== false))
+				$ignore = false;
+
 		if (!$ignore)
 			$urls[$treffer[1]] = $treffer[1];
 	}
@@ -104,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;
 
@@ -206,11 +221,14 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	if (!$compact) {
 		$counter = 1;
 		foreach ($urls as $id=>$url)
-			if (strpos($message, $url) == false)
+			if (strpos($message, $url) === false)
 				$message .= "\n".$url." ";
 				//$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);
@@ -220,4 +238,4 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
 	return(trim($message));
 }
-?>
+