]> git.mxchange.org Git - friendica.git/blobdiff - include/bbcode.php
Merge pull request #1433 from tugelbend/develop
[friendica.git] / include / bbcode.php
index 84969dab9ffb14703347d48a1c5aa9ad099bd6c6..63406689a160ba20da15a1c9c68b724c627ce43b 100644 (file)
@@ -3,19 +3,19 @@ require_once("include/oembed.php");
 require_once('include/event.php');
 
 function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
-       $Text = preg_replace_callback("/\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
+       $Text = preg_replace_callback("/(.*?)\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
                function ($match) use ($plaintext){
 
-                       $attributes = $match[1];
+                       $attributes = $match[2];
 
                        $type = "";
                        preg_match("/type='(.*?)'/ism", $attributes, $matches);
                        if ($matches[1] != "")
-                               $type = $matches[1];
+                               $type = strtolower($matches[1]);
 
                        preg_match('/type="(.*?)"/ism', $attributes, $matches);
                        if ($matches[1] != "")
-                               $type = $matches[1];
+                               $type = strtolower($matches[1]);
 
                        if ($type == "")
                                return($match[0]);
@@ -41,78 +41,122 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
                        if ($matches[1] != "")
                                $title = $matches[1];
 
-                       $image = "";
-                       preg_match("/image='(.*?)'/ism", $attributes, $matches);
-                       if ($matches[1] != "")
-                               $image = $matches[1];
+                       //$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
+                       $title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true);
+                       $title = str_replace(array("[", "]"), array("[", "]"), $title);
 
-                       preg_match('/image="(.*?)"/ism', $attributes, $matches);
-                       if ($matches[1] != "")
-                               $image = $matches[1];
+                       $image = "";
+                       if ($type != "video") {
+                               preg_match("/image='(.*?)'/ism", $attributes, $matches);
+                               if ($matches[1] != "")
+                                       $image = $matches[1];
+
+                               preg_match('/image="(.*?)"/ism', $attributes, $matches);
+                               if ($matches[1] != "")
+                                       $image = $matches[1];
+                       }
 
                        $preview = "";
-                       preg_match("/preview='(.*?)'/ism", $attributes, $matches);
-                       if ($matches[1] != "")
-                               $preview = $matches[1];
+                       if ($type != "video") {
+                               preg_match("/preview='(.*?)'/ism", $attributes, $matches);
+                               if ($matches[1] != "")
+                                       $preview = $matches[1];
+
+                               preg_match('/preview="(.*?)"/ism', $attributes, $matches);
+                               if ($matches[1] != "")
+                                       $preview = $matches[1];
+                       }
 
-                       preg_match('/preview="(.*?)"/ism', $attributes, $matches);
-                       if ($matches[1] != "")
-                               $preview = $matches[1];
+                       if (((strpos($match[1], "[img=") !== false) OR (strpos($match[1], "[img]") !== false)) AND ($image != "")) {
+                               $preview = $image;
+                               $image = "";
+                       }
 
                        if ($plaintext)
-                               $text = sprintf('<a href="%s" target="_blank">%s</a>', $url, $title);
+                               $text = sprintf('<a href="%s" target="_blank">%s</a><br>', $url, $title);
                        else {
                                $text = sprintf('<span class="type-%s">', $type);
 
-                               $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $url, $title), $title, $url);
+                               $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $url, $title), $url, $title);
                                if ($tryoembed)
                                        $oembed = tryoembed($bookmark);
                                else
                                        $oembed = $bookmark[0];
 
                                if (($image != "") AND !strstr(strtolower($oembed), "<img "))
-                                       $text .= sprintf('<img src="%s" alt="%s" class="attachment-image" />', $image, $title); // To-Do: Anführungszeichen in "alt"
+                                       $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $url, $image, $title);
                                elseif (($preview != "") AND !strstr(strtolower($oembed), "<img "))
-                                       $text .= sprintf('<img src="%s" alt="%s" class="attachment-preview" />', $preview, $title); // To-Do: Anführungszeichen in "alt"
+                                       $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $url, $preview, $title);
 
                                $text .= $oembed;
 
-                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[2]));
+                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[3]));
                        }
 
-                       return($text);
+                       return($match[1].$text);
                },$Text);
 
        return($Text);
 }
 
-function bb_rearrange_link($shared) {
-       if ($shared[1] != "type-link")
+function bb_rearrange_share($shared) {
+       if (!in_array(strtolower($shared[2]), array("type-link", "type-audio", "type-video")))
                return($shared[0]);
 
-       $newshare = trim($shared[2]);
-       $newshare = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $newshare);
-
-       if (!strpos($shared[0], "[bookmark"))
-               $newshare = preg_replace("/\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $newshare, 1);
+       if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+               return($shared[0]);
 
-       preg_match("/\[img\](.*?)\[\/img\]/ism", $newshare, $matches);
+       $type = substr(trim(strtolower($shared[2])), 5);
 
-       if ($matches) {
-               $newshare = str_replace($matches[0], '', $newshare);
-               $newshare = "[img]".$matches[1]."[/img]\n".$newshare;
-       }
+       $title = "";
+       $url = "";
+       $preview = "";
+       $description = "";
 
-       $search = array("\n\n", "\n ", " \n");
-       $replace = array("\n", "\n", "\n");
-       do {
-               $oldtext = $newshare;
-               $newshare = str_replace($search, $replace, $newshare);
-       } while ($oldtext != $newshare);
+       if (isset($bookmark[2][0]))
+               $title = $bookmark[2][0];
 
-       $newshare = "[class=type-link]".$newshare."[/class]";
+       if (isset($bookmark[1][0]))
+               $url = $bookmark[1][0];
+
+       $cleanedshare = trim($shared[3]);
+       $cleanedshare = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $cleanedshare);
+       preg_match("/\[img\](.*?)\[\/img\]/ism", $cleanedshare, $matches);
+
+       if ($matches)
+               $preview = trim($matches[1]);
+
+       preg_match("/\[quote\](.*?)\[\/quote\]/ism", $cleanedshare, $matches);
+       if ($matches)
+               $description = trim($matches[1]);
+
+       $url = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($url, ENT_QUOTES, 'UTF-8', false));
+       $title = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($title, ENT_QUOTES, 'UTF-8', false));
+       $preview = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($preview, ENT_QUOTES, 'UTF-8', false));
+
+       $Text = trim($shared[1])."\n[attachment type='".$type."'";
+
+       if ($url != "")
+               $Text .= " url='".$url."'";
+       if ($title != "")
+               $Text .= " title='".$title."'";
+       if ($preview != "") {
+               require_once("include/Photo.php");
+               $picturedata = get_photo_info($preview);
+
+               if (count($picturedata) > 0) {
+                       // if the preview picture is larger than 500 pixels then show it in a larger mode
+                       // But only, if the picture isn't higher than large (To prevent huge posts)
+                       if (($picturedata[0] >= 500) AND ($picturedata[0] >= $picturedata[1]))
+                               $Text .= " image='".$preview."'";
+                       else
+                               $Text .= " preview='".$preview."'";
+               } else
+                       $Text .= " preview='".$preview."'";
+       }
+       $Text .= "]".$description."[/attachment]";
 
-       return($newshare);
+       return($Text);
 }
 
 function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
@@ -124,6 +168,8 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
 }
 
 function bb_cleanup_share($shared, $plaintext, $nolink) {
+       $shared[1] = trim($shared[1]);
+
        if (!in_array($shared[2], array("type-link", "type-video")))
                return($shared[0]);
 
@@ -134,7 +180,7 @@ function bb_cleanup_share($shared, $plaintext, $nolink) {
                return($shared[0]);
 
        if ($nolink)
-               return(trim($shared[1]));
+               return($shared[1]);
 
        $title = "";
        $link = "";
@@ -145,7 +191,11 @@ function bb_cleanup_share($shared, $plaintext, $nolink) {
        if (isset($bookmark[1][0]))
                $link = $bookmark[1][0];
 
-       if (strpos($shared[1],$title) !== false)
+       if (($shared[1] != "") AND (strpos($title, $shared[1]) !== false))
+               $shared[1] = $title;
+
+       if (($title != "") AND ((strpos($shared[1],$title) !== false) OR
+               (similar_text($shared[1],$title) / strlen($title)) > 0.9))
                $title = "";
 
 //        if (strpos($shared[1],$link) !== false)
@@ -156,6 +206,10 @@ function bb_cleanup_share($shared, $plaintext, $nolink) {
        if (($text == "") AND ($title != "") AND ($link == ""))
                $text .= "\n\n".trim($title);
 
+       // If the link already is included in the post, don't add it again
+       if (($link != "") AND strpos($text, $link))
+               return(trim($text));
+
        if (($link != "") AND ($title != ""))
                $text .= "\n[url=".trim($link)."]".trim($title)."[/url]";
        elseif (($link != ""))
@@ -197,7 +251,8 @@ function stripcode_br_cb($s) {
 }
 
 function tryoembed($match){
-       $url = ((count($match)==2)?$match[1]:$match[2]);
+       //$url = ((count($match)==2)?$match[1]:$match[2]);
+       $url = $match[1];
 
        // Always embed the SSL version
        $url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
@@ -207,7 +262,8 @@ function tryoembed($match){
 
        $o = oembed_fetch_url($url);
 
-       //echo "<pre>"; var_dump($match, $url, $o); killme();
+       if (isset($match[2]))
+               $o->title = $match[2];
 
        if ($o->type=="error") return $match[0];
 
@@ -452,7 +508,7 @@ function bb_ShareAttributes($share, $simplehtml) {
                case 2:
                        $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
                        break;
-               case 3:
+               case 3: // Diaspora
                        $headline = '<div class="shared_header">';
                        $headline .= '<span><b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').$userid.':</b></span>';
                        $headline .= "</div>";
@@ -462,10 +518,14 @@ function bb_ShareAttributes($share, $simplehtml) {
                        if ($text != "")
                                $text .= "<hr />";
 
-                       $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+                       if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") {
+                               $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+
+                               if ($link != "")
+                                       $text .= '<br /><a href="'.$link.'">[l]</a>';
+                       } else
+                               $text .= '<br /><a href="'.$link.'">'.$link.'</a>';
 
-                       if ($link != "")
-                               $text .= '<br /><a href="'.$link.'">[l]</a>';
                        break;
                case 4:
                        $headline = '<div class="shared_header">';
@@ -484,15 +544,21 @@ function bb_ShareAttributes($share, $simplehtml) {
                case 5:
                        $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
                        break;
-               case 6:
+               case 6: // app.net
                        $text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3];
                        break;
-               case 7:
+               case 7: // statusnet/GNU Social
                        $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
                        break;
-               case 8:
+               case 8: // twitter
                        $text = $preshare."RT @".$userid_compact.": ".$share[3];
                        break;
+               case 9: // Google+/Facebook
+                       $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+
+                       if ($link != "")
+                               $text .= "<br /><br />".$link;
+                       break;
                default:
                        $headline = trim($share[1]).'<div class="shared_header">';
                        if ($avatar != "")
@@ -506,11 +572,13 @@ function bb_ShareAttributes($share, $simplehtml) {
        return($text);
 }
 
-function GetProfileUsername($profile, $username, $compact = false) {
+function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) {
 
        $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile);
        if ($twitter != $profile) {
-               if ($compact)
+               if ($getnetwork)
+                       return(NETWORK_TWITTER);
+               elseif ($compact)
                        return($twitter);
                else
                        return($username." (".$twitter.")");
@@ -518,7 +586,9 @@ function GetProfileUsername($profile, $username, $compact = false) {
 
        $appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile);
        if ($appnet != $profile) {
-               if ($compact)
+               if ($getnetwork)
+                       return(NETWORK_APPNET);
+               elseif ($compact)
                        return($appnet);
                else
                        return($username." (".$appnet.")");
@@ -526,7 +596,9 @@ function GetProfileUsername($profile, $username, $compact = false) {
 
        $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
        if ($gplus != $profile) {
-               if ($compact)
+               if ($getnetwork)
+                       return(NETWORK_GPLUS);
+               elseif ($compact)
                        return($gplususername." (".$username.")");
                else
                        return($username." (".$gplus.")");
@@ -534,7 +606,9 @@ function GetProfileUsername($profile, $username, $compact = false) {
 
        $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
        if ($friendica != $profile) {
-               if ($compact)
+               if ($getnetwork)
+                       return(NETWORK_DFRN);
+               elseif ($compact)
                        return($friendica);
                else
                        return($username." (".$friendica.")");
@@ -542,12 +616,25 @@ function GetProfileUsername($profile, $username, $compact = false) {
 
        $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
        if ($diaspora != $profile) {
-               if ($compact)
+               if ($getnetwork)
+                       return(NETWORK_DIASPORA);
+               elseif ($compact)
                        return($diaspora);
                else
                        return($username." (".$diaspora.")");
        }
 
+       $red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile);
+       if ($red != $profile) {
+               if ($getnetwork)
+                       // red is identified as Diaspora - friendica can't connect directly to it
+                       return(NETWORK_DIASPORA);
+               elseif ($compact)
+                       return($red);
+               else
+                       return($username." (".$red.")");
+       }
+
        $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
        if ($StatusnetHost != $profile) {
                $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
@@ -555,7 +642,9 @@ function GetProfileUsername($profile, $username, $compact = false) {
                        $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
                        $user = json_decode($UserData);
                        if ($user) {
-                               if ($compact)
+                               if ($getnetwork)
+                                       return(NETWORK_STATUSNET);
+                               elseif ($compact)
                                        return($user->screen_name."@".$StatusnetHost);
                                else
                                        return($username." (".$user->screen_name."@".$StatusnetHost.")");
@@ -568,7 +657,9 @@ function GetProfileUsername($profile, $username, $compact = false) {
        if ($rest == "") {
                $pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile);
                if ($pumpio != $profile) {
-                       if ($compact)
+                       if ($getnetwork)
+                               return(NETWORK_PUMPIO);
+                       elseif ($compact)
                                return($pumpio);
                        else
                                return($username." (".$pumpio.")");
@@ -578,17 +669,29 @@ function GetProfileUsername($profile, $username, $compact = false) {
        return($username);
 }
 
+function bb_DiasporaLinks($match) {
+       $a = get_app();
+
+       return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
+}
+
 function bb_RemovePictureLinks($match) {
        $text = Cache::get($match[1]);
 
        if(is_null($text)){
+               $a = get_app();
+
+               $stamp1 = microtime(true);
+
                $ch = @curl_init($match[1]);
                @curl_setopt($ch, CURLOPT_NOBODY, true);
                @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-               @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)");
+               @curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
                @curl_exec($ch);
                $curl_info = @curl_getinfo($ch);
 
+               $a->save_timestamp($stamp1, "network");
+
                if (substr($curl_info["content_type"], 0, 6) == "image/")
                        $text = "[url=".$match[1]."]".$match[1]."[/url]";
                else {
@@ -620,7 +723,7 @@ function bb_RemovePictureLinks($match) {
 }
 
 function bb_expand_links($match) {
-       if (stristr($match[2], $match[3]) OR ($match[2] == $match[3]))
+       if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3]))
                return ($match[1]."[url]".$match[2]."[/url]");
        else
                return ($match[1].$match[3]." [url]".$match[2]."[/url]");
@@ -630,13 +733,19 @@ function bb_CleanPictureLinksSub($match) {
        $text = Cache::get($match[1]);
 
        if(is_null($text)){
+               $a = get_app();
+
+               $stamp1 = microtime(true);
+
                $ch = @curl_init($match[1]);
                @curl_setopt($ch, CURLOPT_NOBODY, true);
                @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-               @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)");
+               @curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
                @curl_exec($ch);
                $curl_info = @curl_getinfo($ch);
 
+               $a->save_timestamp($stamp1, "network");
+
                // if its a link to a picture then embed this picture
                if (substr($curl_info["content_type"], 0, 6) == "image/")
                        $text = "[img]".$match[1]."[/img]";
@@ -678,8 +787,6 @@ function bb_CleanPictureLinks($text) {
 
 function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
 
-       $stamp1 = microtime(true);
-
        $a = get_app();
 
        // Hide all [noparse] contained bbtags by spacefying them
@@ -722,12 +829,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text);
        $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text);
 
-       // Handle attached links or videos
-       $Text = bb_attachment($Text, ($simplehtml != 4) AND ($simplehtml != 0), $tryoembed);
-
-       // Rearrange shared links
-       if (get_config("system", "rearrange_shared_links") AND (!$simplehtml OR $tryoembed))
-               $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_rearrange_link",$Text);
+       // Rearrange shares to attachments
+       $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism", "bb_rearrange_share",$Text);
 
        // when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
        if (!$tryoembed)
@@ -745,21 +848,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
        // removing multiplicated newlines
        if (get_config("system", "remove_multiplicated_lines")) {
-               $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ");
-               $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ");
+               $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
+                               "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
+               $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
+                               "[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]");
                do {
                        $oldtext = $Text;
                        $Text = str_replace($search, $replace, $Text);
                } while ($oldtext != $Text);
        }
 
+       // Handle attached links or videos
+       $Text = bb_attachment($Text, ($simplehtml != 4) AND ($simplehtml != 0), $tryoembed);
+
        $Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
 
        if($preserve_nl)
                $Text = str_replace(array("\n","\r"), array('',''),$Text);
 
-
-
        // Set up the parameters for a URL search string
        $URLSearchString = "^\[\]";
        // Set up the parameters for a MAIL search string
@@ -775,7 +881,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
                                "[bookmark=$1]$2[/bookmark]", $Text);
 
-       if (in_array($simplehtml, array(2, 6, 7, 8))) {
+       if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
                $Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism","bb_expand_links",$Text);
                //$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism",' $2 [url]$1[/url]',$Text);
                $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$Text);
@@ -786,13 +892,16 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
        // Perform URL Search
        if ($tryoembed)
-               $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
+               $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'tryoembed',$Text);
 
        if ($simplehtml == 5)
                $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url]$1[/url]',$Text);
        else
                $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text);
 
+       // Handle Diaspora posts
+       $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
+
        // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
        if (!$forplaintext)
                $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text);
@@ -822,6 +931,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
        $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
 
+       // Check for headers
+       $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text);
+       $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text);
+       $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text);
+       $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text);
+       $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
+       $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
+
        // Check for bold text
        $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text);
 
@@ -1002,8 +1119,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                                        '<a href="https://www.youtube.com/watch?v=$1" target="_blank">https://www.youtube.com/watch?v=$1</a>', $Text);
 
        if ($tryoembed) {
-               $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
-               $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
+               $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text);
+               $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text);
        }
 
        $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); 
@@ -1017,7 +1134,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
 //     $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
-
        // oembed tag
        $Text = oembed_bbcode2html($Text);
 
@@ -1059,25 +1175,26 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        if($saved_image)
                $Text = bb_replace_images($Text, $saved_image);
 
-       // Clean up the HTML by loading and saving the HTML with the DOM
-       // Only do it when it has to be done - for performance reasons
-       // Update: Now it is done every time - since bad structured html can break a whole page
-       //if (!$tryoembed) {
-       //      $doc = new DOMDocument();
-       //      $doc->preserveWhiteSpace = false;
+       // Clean up the HTML by loading and saving the HTML with the DOM.
+       // Bad structured html can break a whole page.
+       // For performance reasons do it only with ativated item cache or at export.
+       if (!$tryoembed OR (get_itemcachepath() != "")) {
+               $doc = new DOMDocument();
+               $doc->preserveWhiteSpace = false;
 
-       //      $Text = mb_convert_encoding($Text, 'HTML-ENTITIES', "UTF-8");
+               $Text = mb_convert_encoding($Text, 'HTML-ENTITIES', "UTF-8");
 
-       //      $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">';
-       //      @$doc->loadHTML($doctype."<html><body>".$Text."</body></html>");
+               $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">';
+               $encoding = '<?xml encoding="UTF-8">';
+               @$doc->loadHTML($encoding.$doctype."<html><body>".$Text."</body></html>");
+               $doc->encoding = 'UTF-8';
+               $Text = $doc->saveHTML();
+               $Text = str_replace(array("<html><body>", "</body></html>", $doctype, $encoding), array("", "", "", ""), $Text);
 
-       //      $Text = $doc->saveHTML();
-       //      $Text = str_replace(array("<html><body>", "</body></html>", $doctype), array("", "", ""), $Text);
+               $Text = str_replace('<br></li>','</li>', $Text);
 
-       //      $Text = str_replace('<br></li>','</li>', $Text);
-
-       //      $Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
-       //}
+               //$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
+       }
 
        // Clean up some useless linebreaks in lists
        //$Text = str_replace('<br /><ul','<ul ', $Text);
@@ -1086,16 +1203,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        //$Text = str_replace('<br /><li>','<li>', $Text);
        //      $Text = str_replace('<br /><ul','<ul ', $Text);
 
-       // Remove all hashtag addresses
-/*     if (!$tryoembed AND get_config("system", "remove_hashtags_on_export")) {
-               $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
-               $Text = preg_replace($pattern, '#$2', $Text);
-       }
-*/
        call_hooks('bbcode',$Text);
 
-       $a->save_timestamp($stamp1, "parser");
-
-       return $Text;
+       return trim($Text);
 }
 ?>