X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhtml2bbcode.php;h=d4e8cce6661cf84ebba4bac9ea9c819dba62c292;hb=d28d2ff440efba47ad65cf28eab4be96e0ea05b2;hp=bde761f2fc6bb2db1f7b6540c5eecba876454b9c;hpb=5899ae9017c351b9987868871605f3f2324c62c0;p=friendica.git

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index bde761f2fc..d4e8cce666 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -7,10 +7,15 @@
 
 function html2bbcode($s) {
 
+
+	// only keep newlines from source that are within pre tags
+
+	$s = stripnl_exceptinpre($s);
+
+
 	// Tags to Find
 
 	$htmltags = array(
-		'/\n/is',
 		'/\<pre\>(.*?)\<\/pre\>/is',
 		'/\<p(.*?)\>/is',
 		'/\<\/p\>/is',
@@ -30,13 +35,13 @@ function html2bbcode($s) {
 		'/\<blockquote\>(.*?)\<\/blockquote\>/is',
 		'/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/video\>/is',
 		'/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/audio\>/is',
+		'/\<iframe(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/iframe\>/is',
 
 	);
 
 	// Replace with
 
 	$bbtags = array(
-		'',
 		'[code]$1[/code]',
 		'',
 		"\n",
@@ -56,6 +61,7 @@ function html2bbcode($s) {
 		'[quote]$1[/quote]',
 		'[video]$1[/video]',
 		'[audio]$1[/audio]',
+		'[iframe]$1[/iframe]',
 	);
 
 	// Replace $htmltags in $text with $bbtags
@@ -66,5 +72,48 @@ function html2bbcode($s) {
 	// Strip all other HTML tags
 	$text = strip_tags($text);
 	return $text;
+
+}
+
+function stripnl_exceptinpre($string)
+{
+    // First, check for <pre> tag
+    if(strpos($string, '<pre>') === false)
+    {
+        return str_replace("\n","", $string);
+    }
+
+    // If there is a <pre>, we have to split by line
+    // and manually replace the linebreaks
+
+    $strArr=explode("\n", $string);
+
+    $output="";
+    $preFound=false;
+
+    // Loop over each line
+    foreach($strArr as $line)
+    {    // See if the line has a <pre>. If it does, set $preFound to true
+        if(strpos($line, "<pre>") !== false)
+        {
+            $preFound=true;
+        }
+        elseif(strpos($line, "</pre>") !== false)
+        {
+            $preFound=false;
+        }
+       
+        // If we are in a pre tag, add line and also add \n, else add the line without \n
+        if($preFound)
+        {
+            $output .= $line . "\n";
+        }
+        else
+        {
+            $output .= $line ;
+        }
+    }
+
+    return $output;
 }