', $url, $image, $title); elseif (($preview != "") AND !strstr(strtolower($oembed), "
', $url, $preview, $title); $text .= $oembed; - $text .= sprintf('
%s
%s', trim($match[2])); + $text .= sprintf('
%s', 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("[", "]"), htmlentities($url, ENT_QUOTES, 'UTF-8', false)); + $title = str_replace(array("[", "]"), array("[", "]"), htmlentities($title, ENT_QUOTES, 'UTF-8', false)); + $preview = str_replace(array("[", "]"), array("[", "]"), 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) { @@ -145,7 +189,8 @@ function bb_cleanup_share($shared, $plaintext, $nolink) { if (isset($bookmark[1][0])) $link = $bookmark[1][0]; - if (($title != "") AND (strpos($shared[1],$title) !== false)) + 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 +201,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 != "")) @@ -211,8 +260,6 @@ function tryoembed($match){ if (isset($match[2])) $o->title = $match[2]; - //echo "
"; var_dump($match, $url, $o); killme();
-
if ($o->type=="error") return $match[0];
$html = oembed_format_object($o);
@@ -466,10 +513,14 @@ function bb_ShareAttributes($share, $simplehtml) {
if ($text != "")
$text .= "
";
- $text .= $headline.''.trim($share[3])."
";
+ if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") {
+ $text .= $headline.''.trim($share[3])."
";
+
+ if ($link != "")
+ $text .= '
[l]';
+ } else
+ $text .= '
'.$link.'';
- if ($link != "")
- $text .= '
[l]';
break;
case 4:
$headline = '