X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fhtml2plain.php;h=1e3f407af494a5e3ab1154c4c05332f296e4c21a;hb=7f6a7af2b3407f345043bb58756be14c4e12d3ae;hp=fe0e3326e81a8ae35bcbc0791931e9dcc738e92a;hpb=792edfe9c834e3daeae598727e4cb15dc0ff8475;p=friendica.git

diff --git a/include/html2plain.php b/include/html2plain.php
index fe0e3326e8..1e3f407af4 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)
 {
@@ -83,12 +83,18 @@ function collecturls($message) {
 	$urls = array();
 	foreach ($result as $treffer) {
 		// A list of some links that should be ignored
-		$list = array("/user/", "/tag/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+		$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
 				"//facebook.com/profile.php?id=", "//plus.google.com/");
 		foreach ($list as $listitem)
 			if (strpos($treffer[1], $listitem) !== false)
 				$ignore = true;
 
+		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];
 	}
@@ -154,7 +160,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
 	node2bbcode($doc, 'li', array(), "\n* ", "\n");
 
-	node2bbcode($doc, 'hr', array(), str_repeat("-", 70), "");
+	node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
 
 	node2bbcode($doc, 'tr', array(), "\n", "");
 	node2bbcode($doc, 'td', array(), "\t", "");
@@ -203,7 +209,7 @@ 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;
 	}
@@ -217,4 +223,4 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
 	return(trim($message));
 }
-?>
+