"; var_dump($match, $url, $o); killme(); + if (isset($match[2])) + $o->title = $match[2]; if ($o->type=="error") return $match[0]; @@ -452,7 +524,7 @@ function bb_ShareAttributes($share, $simplehtml) { case 2: $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; break; - case 3: + case 3: // Diaspora $headline = '

'; $headline .= ''.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$userid.':'; $headline .= "

"; @@ -484,14 +556,20 @@ function bb_ShareAttributes($share, $simplehtml) { case 5: $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; break; - case 6: + case 6: // app.net $text = $preshare.">> @".$userid_compact.":
".$share[3]; break; - case 7: - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact." ".$share[3]; + case 7: // statusnet/GNU Social + $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3]; break; - case 8: - $text = $preshare."RT @".$userid_compact." ".$share[3]; + case 8: // twitter + $text = $preshare."RT @".$userid_compact.": ".$share[3]; + break; + case 9: // Google+/Facebook + $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; + + if ($link != "") + $text .= "

".$link; break; default: $headline = trim($share[1]).'

'; @@ -506,11 +584,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,19 +598,29 @@ 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.")"); } $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile); - if ($gplus != $profile) - return($username." (".$gplus.")"); + if ($gplus != $profile) { + if ($getnetwork) + return(NETWORK_GPLUS); + elseif ($compact) + return($gplususername." (".$username.")"); + else + return($username." (".$gplus.")"); + } $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.")"); @@ -538,7 +628,9 @@ 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.")"); @@ -551,7 +643,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.")"); @@ -564,7 +658,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.")"); @@ -581,7 +677,7 @@ function bb_RemovePictureLinks($match) { $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, "Mozilla/5.0 (compatible; ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION.")"); @curl_exec($ch); $curl_info = @curl_getinfo($ch); @@ -629,7 +725,7 @@ function bb_CleanPictureLinksSub($match) { $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, "Mozilla/5.0 (compatible; ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION.")"); @curl_exec($ch); $curl_info = @curl_getinfo($ch); @@ -718,12 +814,15 @@ 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); +// 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) @@ -771,7 +870,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); @@ -782,7 +881,7 @@ 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); @@ -1055,25 +1154,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 = ''; - // @$doc->loadHTML($doctype."".$Text.""); + $doctype = ''; + $encoding = ''; + @$doc->loadHTML($encoding.$doctype."".$Text.""); + $doc->encoding = 'UTF-8'; + $Text = $doc->saveHTML(); + $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text); - // $Text = $doc->saveHTML(); - // $Text = str_replace(array("", "", $doctype), array("", "", ""), $Text); + $Text = str_replace('
','', $Text); - // $Text = str_replace('
','', $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('