]> git.mxchange.org Git - friendica.git/blobdiff - include/bbcode.php
bbcode: mask "[" and "]" for attachments.
[friendica.git] / include / bbcode.php
index 62759d192e00249cab054cbbf35fe220e8d9b3db..017673423b50aaa7080cfb1a75a3da890207f070 100644 (file)
@@ -1,8 +1,240 @@
 <?php
-
 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",
+               function ($match) use ($plaintext){
+
+                       $attributes = $match[1];
+
+                       $type = "";
+                       preg_match("/type='(.*?)'/ism", $attributes, $matches);
+                       if ($matches[1] != "")
+                               $type = strtolower($matches[1]);
+
+                       preg_match('/type="(.*?)"/ism', $attributes, $matches);
+                       if ($matches[1] != "")
+                               $type = strtolower($matches[1]);
+
+                       if ($type == "")
+                               return($match[0]);
+
+                       if (!in_array($type, array("link", "audio", "video")))
+                               return($match[0]);
+
+                       $url = "";
+                       preg_match("/url='(.*?)'/ism", $attributes, $matches);
+                       if ($matches[1] != "")
+                               $url = $matches[1];
+
+                       preg_match('/url="(.*?)"/ism', $attributes, $matches);
+                       if ($matches[1] != "")
+                               $url = $matches[1];
+
+                       $title = "";
+                       preg_match("/title='(.*?)'/ism", $attributes, $matches);
+                       if ($matches[1] != "")
+                               $title = $matches[1];
+
+                       preg_match('/title="(.*?)"/ism', $attributes, $matches);
+                       if ($matches[1] != "")
+                               $title = $matches[1];
+
+                       $title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
+
+                       $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 = "";
+                       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];
+                       }
+
+                       if ($plaintext)
+                               $text = sprintf('<a href="%s" target="_blank">%s</a>', $url, $title);
+                       else {
+                               $text = sprintf('<span class="type-%s">', $type);
+
+                               $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('<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('<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]));
+                       }
+
+                       return($text);
+               },$Text);
+
+       return($Text);
+}
+
+/* function bb_rearrange_link($shared) {
+       if ($shared[1] != "type-link")
+               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);
+
+       preg_match("/\[img\](.*?)\[\/img\]/ism", $newshare, $matches);
+
+       if ($matches) {
+               $newshare = str_replace($matches[0], '', $newshare);
+               $newshare = "[img]".$matches[1]."[/img]\n".$newshare;
+       }
+
+       $search = array("\n\n", "\n ", " \n");
+       $replace = array("\n", "\n", "\n");
+       do {
+               $oldtext = $newshare;
+               $newshare = str_replace($search, $replace, $newshare);
+       } while ($oldtext != $newshare);
+
+       $newshare = "[class=type-link]".$newshare."[/class]";
+
+       return($newshare);
+} */
+
+function bb_rearrange_share($shared) {
+       if (!in_array(strtolower($shared[2]), array("type-link", "type-audio", "type-video")))
+               return($shared[0]);
+
+       if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+               return($shared[0]);
+
+       $type = substr(trim(strtolower($shared[2])), 5);
+
+       $title = "";
+       $url = "";
+       $preview = "";
+       $description = "";
+
+       if (isset($bookmark[2][0]))
+               $title = $bookmark[2][0];
+
+       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($Text);
+}
+
+function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
+       $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism",
+               function ($match) use ($plaintext, $nolink){
+                       return(bb_cleanup_share($match, $plaintext, $nolink));
+               },$Text);
+       return($Text);
+}
+
+function bb_cleanup_share($shared, $plaintext, $nolink) {
+       if (!in_array($shared[2], array("type-link", "type-video")))
+               return($shared[0]);
+
+       if ($plaintext)
+               $shared[3] = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism","[bookmark=$1]$1[/bookmark]", $shared[3]);
+
+       if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+               return($shared[0]);
+
+       if ($nolink)
+               return(trim($shared[1]));
+
+       $title = "";
+       $link = "";
+
+       if (isset($bookmark[2][0]))
+               $title = $bookmark[2][0];
+
+       if (isset($bookmark[1][0]))
+               $link = $bookmark[1][0];
+
+       if (($title != "") AND (strpos($shared[1],$title) !== false))
+               $title = "";
+
+//        if (strpos($shared[1],$link) !== false)
+//                $link = "";
+
+       $text = trim($shared[1]);
+
+       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 != ""))
+               $text .= "\n".trim($link);
+
+       return(trim($text));
+}
+
+
 function bb_cleanstyle($st) {
   return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>";
 }
@@ -23,7 +255,7 @@ function cleancss($input) {
                if (($char >= "a") and ($char <= "z"))
                        $cleaned .= $char;
 
-               if (!(strpos(" #;:0123456789", $char) === false))
+               if (!(strpos(" #;:0123456789-_", $char) === false))
                        $cleaned .= $char;
        }
 
@@ -35,12 +267,19 @@ function stripcode_br_cb($s) {
 }
 
 function tryoembed($match){
-       $url = ((count($match)==2)?$match[1]:$match[2]);
-//     logger("tryoembed: $url");
+       //$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/"),
+                               array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
+
+       //logger("tryoembed: $url");
 
        $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];
 
@@ -124,7 +363,7 @@ function get_bb_tag_pos($s, $name, $occurance = 1) {
                return false;
 
        $res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
-                     'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
+                     'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
        if( $start_equal !== false)
                $res['start']['equal'] = $start_equal + 1;
 
@@ -214,135 +453,188 @@ function bb_replace_images($body, $images) {
        return $newbody;
 }}
 
-function bb_ShareAttributes($match) {
-
-        $attributes = $match[1];
-
-        $author = "";
-        preg_match("/author='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-
-        preg_match('/author="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $author = $matches[1];
-
-        $link = "";
-        preg_match("/link='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $link = $matches[1];
-
-        preg_match('/link="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $link = $matches[1];
+function bb_ShareAttributes($share, $simplehtml) {
+       $attributes = $share[2];
 
-        $avatar = "";
-        preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $avatar = $matches[1];
+       $author = "";
+       preg_match("/author='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 
-        preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $avatar = $matches[1];
+       preg_match('/author="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $author = $matches[1];
 
-        $profile = "";
-        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
+       $profile = "";
+       preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $profile = $matches[1];
 
-        preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
+       preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $profile = $matches[1];
 
-        $posted = "";
-        preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $posted = $matches[1];
+       $avatar = "";
+       preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $avatar = $matches[1];
 
-        preg_match('/posted="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $posted = $matches[1];
-               $reldate = (($posted) ? " " . relative_date($posted) : '');
-
-        $headline = '<br /><div class="shared_header">';
-
-       if ($avatar != "")
-               $headline .= '<img src="'.$avatar.'" height="32" width="32" >';
-
-       $headline .= sprintf(t('<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>'.$reldate.':</span>'), $profile, $author, $link);
-
-        $headline .= "</div>";
-
-        $text = $headline.'<blockquote class="shared_content">'.trim($match[2])."</blockquote>";
-
-        return($text);
-}
+       preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $avatar = $matches[1];
 
-function bb_ShareAttributesSimple($match) {
+       $link = "";
+       preg_match("/link='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
 
-        $attributes = $match[1];
+       preg_match('/link="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
 
-        $author = "";
-        preg_match("/author='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+       $posted = "";
 
-        preg_match('/author="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $author = $matches[1];
+       $itemcache = get_itemcachepath();
 
-        $profile = "";
-        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
+       // relative dates only make sense when they aren't cached
+       if ($itemcache == "") {
+               preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+               if ($matches[1] != "")
+                       $posted = $matches[1];
 
-        preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
+               preg_match('/posted="(.*?)"/ism', $attributes, $matches);
+               if ($matches[1] != "")
+                       $posted = $matches[1];
 
-       $userid = GetProfileUsername($profile,$author);
-
-        $text = "<br />".html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$userid."</a>: <br />»".$match[2]."«";
+               $reldate = (($posted) ? " " . relative_date($posted) : '');
+       }
 
-        return($text);
+       $userid = GetProfileUsername($profile,$author, false);
+       $userid_compact = GetProfileUsername($profile,$author, true);
+
+       $preshare = trim($share[1]);
+
+       if ($preshare != "")
+               $preshare .= "<br /><br />";
+
+       switch ($simplehtml) {
+               case 1:
+                       $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$userid."</a>: <br />»".$share[3]."«";
+                       break;
+               case 2:
+                       $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+                       break;
+               case 3: // Diaspora
+                       $headline = '<div class="shared_header">';
+                       $headline .= '<span><b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').$userid.':</b></span>';
+                       $headline .= "</div>";
+
+                       $text = trim($share[1]);
+
+                       if ($text != "")
+                               $text .= "<hr />";
+
+                       $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+
+                       if ($link != "")
+                               $text .= '<br /><a href="'.$link.'">[l]</a>';
+                       break;
+               case 4:
+                       $headline = '<div class="shared_header">';
+                       $headline .= '<span><b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
+                       $headline .= sprintf(t('<a href="%1$s" target="_blank">%2$s</a> %3$s'), $link, $userid, $posted);
+                       $headline .= ":</b></span></div>";
+
+                       $text = trim($share[1]);
+
+                       if ($text != "")
+                               $text .= "<hr />";
+
+                       $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+
+                       break;
+               case 5:
+                       $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+                       break;
+               case 6: // app.net
+                       $text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3];
+                       break;
+               case 7: // statusnet/GNU Social
+                       $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
+                       break;
+               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 != "")
+                               $headline .= '<img src="'.$avatar.'" height="32" width="32" >';
+
+                       $headline .= sprintf(t('<span><a href="%s" target="_blank">%s</a> wrote the following <a href="%s" target="_blank">post</a>'.$reldate.':</span>'), $profile, $author, $link);
+                       $headline .= "</div>";
+                       $text = $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote>";
+                       break;
+       }
+       return($text);
 }
-function bb_ShareAttributesSimple2($match) {
-
-        $attributes = $match[1];
-
-        $author = "";
-        preg_match("/author='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-
-        preg_match('/author="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $author = $matches[1];
-
-        $profile = "";
-        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
 
-        preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $profile = $matches[1];
+function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) {
 
-       $userid = GetProfileUsername($profile,$author);
+       $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile);
+       if ($twitter != $profile) {
+               if ($getnetwork)
+                       return(NETWORK_TWITTER);
+               elseif ($compact)
+                       return($twitter);
+               else
+                       return($username." (".$twitter.")");
+       }
 
-        $text = "<br />".html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$userid."</a>: <br />".$match[2];
+       $appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile);
+       if ($appnet != $profile) {
+               if ($getnetwork)
+                       return(NETWORK_APPNET);
+               elseif ($compact)
+                       return($appnet);
+               else
+                       return($username." (".$appnet.")");
+       }
 
-        return($text);
-}
+       $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
+       if ($gplus != $profile) {
+               if ($getnetwork)
+                       return(NETWORK_GPLUS);
+               elseif ($compact)
+                       return($gplususername." (".$username.")");
+               else
+                       return($username." (".$gplus.")");
+       }
 
-function GetProfileUsername($profile, $username) {
        $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
-       if ($friendica != $profile)
-               return($friendica);
+       if ($friendica != $profile) {
+               if ($getnetwork)
+                       return(NETWORK_DFRN);
+               elseif ($compact)
+                       return($friendica);
+               else
+                       return($username." (".$friendica.")");
+       }
 
        $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
-       if ($diaspora != $profile)
-               return($diaspora);
+       if ($diaspora != $profile) {
+               if ($getnetwork)
+                       return(NETWORK_DIASPORA);
+               elseif ($compact)
+                       return($diaspora);
+               else
+                       return($username." (".$diaspora.")");
+       }
 
        $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
        if ($StatusnetHost != $profile) {
@@ -350,18 +642,133 @@ function GetProfileUsername($profile, $username) {
                if ($StatusnetUser != $profile) {
                        $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
                        $user = json_decode($UserData);
-                       if ($user)
-                               return($user->screen_name."@".$StatusnetHost);
+                       if ($user) {
+                               if ($getnetwork)
+                                       return(NETWORK_STATUSNET);
+                               elseif ($compact)
+                                       return($user->screen_name."@".$StatusnetHost);
+                               else
+                                       return($username." (".$user->screen_name."@".$StatusnetHost.")");
+                       }
+               }
+       }
+
+       // pumpio (http://host.name/user)
+       $rest = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$3", $profile);
+       if ($rest == "") {
+               $pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile);
+               if ($pumpio != $profile) {
+                       if ($getnetwork)
+                               return(NETWORK_PUMPIO);
+                       elseif ($compact)
+                               return($pumpio);
+                       else
+                               return($username." (".$pumpio.")");
                }
        }
 
        return($username);
 }
 
+function bb_RemovePictureLinks($match) {
+       $text = Cache::get($match[1]);
+
+       if(is_null($text)){
+               $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_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION.")");
+               @curl_exec($ch);
+               $curl_info = @curl_getinfo($ch);
+
+               if (substr($curl_info["content_type"], 0, 6) == "image/")
+                       $text = "[url=".$match[1]."]".$match[1]."[/url]";
+               else {
+                       $text = "[url=".$match[2]."]".$match[2]."[/url]";
+
+                       // if its not a picture then look if its a page that contains a picture link
+                       require_once("include/network.php");
+
+                       $body = fetch_url($match[1]);
+
+                       $doc = new DOMDocument();
+                       @$doc->loadHTML($body);
+                       $xpath = new DomXPath($doc);
+                       $list = $xpath->query("//meta[@name]");
+                       foreach ($list as $node) {
+                               $attr = array();
+
+                               if ($node->attributes->length)
+                                       foreach ($node->attributes as $attribute)
+                                               $attr[$attribute->name] = $attribute->value;
+
+                               if (strtolower($attr["name"]) == "twitter:image")
+                                       $text = "[url=".$attr["content"]."]".$attr["content"]."[/url]";
+                       }
+               }
+               Cache::set($match[1],$text);
+       }
+       return($text);
+}
+
+function bb_expand_links($match) {
+       if (stristr($match[2], $match[3]) OR ($match[2] == $match[3]))
+               return ($match[1]."[url]".$match[2]."[/url]");
+       else
+               return ($match[1].$match[3]." [url]".$match[2]."[/url]");
+}
+
+function bb_CleanPictureLinksSub($match) {
+       $text = Cache::get($match[1]);
+
+       if(is_null($text)){
+               $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_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION.")");
+               @curl_exec($ch);
+               $curl_info = @curl_getinfo($ch);
+
+               // 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]";
+               else {
+                       $text = "[img]".$match[2]."[/img]";
+
+                       // if its not a picture then look if its a page that contains a picture link
+                       require_once("include/network.php");
+
+                       $body = fetch_url($match[1]);
+
+                       $doc = new DOMDocument();
+                       @$doc->loadHTML($body);
+                       $xpath = new DomXPath($doc);
+                       $list = $xpath->query("//meta[@name]");
+                       foreach ($list as $node) {
+                               $attr = array();
+
+                               if ($node->attributes->length)
+                                       foreach ($node->attributes as $attribute)
+                                               $attr[$attribute->name] = $attribute->value;
+
+                               if (strtolower($attr["name"]) == "twitter:image")
+                                       $text = "[img]".$attr["content"]."[/img]";
+                       }
+               }
+               Cache::set($match[1],$text);
+       }
+       return($text);
+}
+
+function bb_CleanPictureLinks($text) {
+       $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text);
+       return ($text);
+}
+
        // BBcode 2 HTML was written by WAY2WEB.net
        // extended to work with Mistpark/Friendica - Mike Macgirvin
 
-function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false) {
+function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
 
        $stamp1 = microtime(true);
 
@@ -379,7 +786,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
        $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
 
-       // Extract the private images which use data url's since preg has issues with
+       // Extract the private images which use data urls since preg has issues with
        // large data sizes. Stash them away while we do bbcode conversion, and then put them back
        // in after we've done all the regex matching. We cannot use any preg functions to do this.
 
@@ -407,6 +814,16 @@ 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);
 
+       // Rearrange shares to attachments
+       $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism", "bb_rearrange_share",$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);
+
        // 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)
                $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
@@ -423,8 +840,8 @@ 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]");
-               $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
+               $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 ");
                do {
                        $oldtext = $Text;
                        $Text = str_replace($search, $replace, $Text);
@@ -443,25 +860,51 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        // Set up the parameters for a MAIL search string
        $MAILSearchString = $URLSearchString;
 
+       // Remove all hashtag addresses
+       if (!$tryoembed OR $simplehtml)
+               $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+
+       // Bookmarks in red - will be converted to bookmarks in friendica
+       $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text);
+       $Text = preg_replace("/#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $Text);
+       $Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
+                               "[bookmark=$1]$2[/bookmark]", $Text);
+
+       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);
+       }
 
-       // Perform URL Search
-
-       $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
+       if ($simplehtml == 5)
+               $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
 
+       // Perform URL Search
        if ($tryoembed)
-               $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
+               $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'tryoembed',$Text);
 
-       $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$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);
+
+       // 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);
+       else {
+               $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
+               $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+       }
 
        if ($tryoembed)
                $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
 
-       $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="external-link">$1</a>', $Text);
-       $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
+       $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $Text);
+       $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
        //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 
        // Red compatibility, though the link can't be authenticated on Friendica
-       $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
+       $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 
 
        // we may need to restrict this further if it picks up too many strays
@@ -493,9 +936,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","<span style=\"color: $1;\">$2</span>",$Text);
 
        // Check for sized text
-        // [size=50] --> font-size: 50px (with the unit).
-       $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px;\">$2</span>",$Text);
-       $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1;\">$2</span>",$Text);
+       // [size=50] --> font-size: 50px (with the unit).
+       $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px; line-height: initial;\">$2</span>",$Text);
+       $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1; line-height: initial;\">$2</span>",$Text);
 
        // Check for centered text
        $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);
@@ -509,7 +952,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        // Check for CSS classes
        $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text);
 
-       // handle nested lists
+       // handle nested lists
        $endlessloop = 0;
 
        while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) ||
@@ -570,8 +1013,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $endlessloop = 0;
        while ((strpos($Text, "[/spoiler]")!== false)  and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20))
                $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
-                                    "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
-                                    $Text);
+                                    "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
+                                    $Text);
 
        // Declare the format for [quote] layout
        $QuoteLayout = '<blockquote>$1</blockquote>';
@@ -590,8 +1033,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $endlessloop = 0;
        while ((strpos($Text, "[/quote]")!== false)  and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
                $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
-                                    "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
-                                    $Text);
+                                    "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
+                                    $Text);
 
        // [img=widthxheight]image source[/img]
        //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
@@ -604,15 +1047,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
        // Shared content
-       if (!$simplehtml)
-               $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
-       elseif ($simplehtml == 1)
-               $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributesSimple",$Text);
-       elseif ($simplehtml == 2)
-               $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributesSimple2",$Text);
+       $Text = preg_replace_callback("/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism",
+               function ($match) use ($simplehtml){
+                       return(bb_ShareAttributes($match, $simplehtml));
+               },$Text);
 
        $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
-       $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+       $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+       //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
 
 
        // Try to Oembed
@@ -623,8 +1065,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
                $Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", 'tryoembed', $Text);
        } else {
-               $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text);
-               $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text);
+               $Text = preg_replace("/\[video\](.*?)\[\/video\]/",
+                                       '<a href="$1" target="_blank">$1</a>', $Text);
+               $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/",
+                                       '<a href="$1" target="_blank">$1</a>', $Text);
        }
 
        // html5 video and audio
@@ -637,20 +1081,20 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
        // Youtube extensions
        if ($tryoembed) {
-               $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);        
-               $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);        
-               $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
+               $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
+               $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
+               $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text);
        }
 
-       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
+       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
        $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
 
        if ($tryoembed)
-               $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
+               $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="https://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
        else
-               $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
-
+               $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
+                                       '<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); 
@@ -661,9 +1105,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
 
        if ($tryoembed)
-               $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
+               $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="https://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
        else
-               $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
+               $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
+                                       '<a href="https://vimeo.com/$1" target="_blank">https://vimeo.com/$1</a>', $Text);
 
 //     $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);
 
@@ -709,35 +1154,44 @@ 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);
+       //$Text = str_replace('</ul><br />','</ul>', $Text);
+       //$Text = str_replace('</li><br />','</li>', $Text);
+       //$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")) {
+/*     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;
 }
+?>