use microformat to mark html from [embed] tag, convert html with oembed microformat to [embed] tag
This commit is contained in:
		| @@ -94,7 +94,7 @@ function bbcode($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); | ||||
|  | ||||
| 	// oembed tag | ||||
| 	$Text = oembed_bbcode($Text); | ||||
| 	$Text = oembed_bbcode2html($Text); | ||||
|  | ||||
| 	call_hooks('bbcode',$Text); | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| <?php | ||||
|  | ||||
| require_once('bbcode.php'); | ||||
| require_once('oembed.php'); | ||||
|  | ||||
| function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) { | ||||
|  | ||||
| @@ -395,6 +396,8 @@ function get_atom_elements($feed,$item) { | ||||
| 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s', | ||||
| 			'[youtube]$1[/youtube]', $res['body']); | ||||
|  | ||||
| 		$res['body'] = oembed_html2bbcode($res['body']); | ||||
| 	 | ||||
| 		$config = HTMLPurifier_Config::createDefault(); | ||||
| 		$config->set('Cache.DefinitionImpl', null); | ||||
|  | ||||
|   | ||||
| @@ -4,7 +4,7 @@ function oembed_replacecb($matches){ | ||||
|   $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);   | ||||
|   $txt = fetch_url($ourl); | ||||
|   $j = json_decode($txt); | ||||
|   $ret="<!-- oembed $embedurl -->"; | ||||
|   $ret="<span class='oembed'>"; | ||||
|   switch ($j->type) { | ||||
|     case "video": { | ||||
|        if (isset($j->thumbnail_url)) { | ||||
| @@ -32,18 +32,54 @@ function oembed_replacecb($matches){ | ||||
|   } | ||||
|    | ||||
|   $embedlink = (isset($j->title))?$j->title:$embedurl; | ||||
|   $ret .= "<a href='$embedurl'>$embedlink</a>"; | ||||
|   $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>"; | ||||
|   if (isset($j->author_name)) $ret.=" by ".$j->author_name; | ||||
|   if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; | ||||
|   $ret.="<!-- /oembed $embedurl -->"; | ||||
|   $ret.="</span>"; | ||||
|   return $ret; | ||||
| } | ||||
|  | ||||
| function oembed_bbcode($text){ | ||||
| function oembed_bbcode2html($text){ | ||||
| 	$stopoembed = get_config("system","no_oembed"); | ||||
| 	if ($stopoembed == true){ | ||||
| 		return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text); | ||||
| 	} | ||||
| 	return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text); | ||||
| } | ||||
|  | ||||
|  | ||||
| function oe_build_xpath($attr, $value){ | ||||
| 	// http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html | ||||
| 	return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'"; | ||||
| } | ||||
|  | ||||
| function oe_get_inner_html( $node ) { | ||||
|     $innerHTML= ''; | ||||
|     $children = $node->childNodes; | ||||
|     foreach ($children as $child) { | ||||
|         $innerHTML .= $child->ownerDocument->saveXML( $child ); | ||||
|     } | ||||
|     return $innerHTML; | ||||
| }  | ||||
|  | ||||
| /** | ||||
|  * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span> | ||||
|  * and replace it with [embed]url[/embed] | ||||
|  */ | ||||
| function oembed_html2bbcode($text) { | ||||
| 	$dom = DOMDocument::loadHTML($text); | ||||
| 	$xpath = new DOMXPath($dom); | ||||
| 	$attr = "oembed"; | ||||
| 	 | ||||
| 	$xattr = oe_build_xpath("class","oembed"); | ||||
| 	$entries = $xpath->query("//span[$xattr]"); | ||||
| 	 | ||||
| 	$xattr = oe_build_xpath("rel","oembed"); | ||||
| 	foreach($entries as $e) { | ||||
| 		$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; | ||||
| 		if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e); | ||||
| 	} | ||||
| 	return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );  | ||||
| } | ||||
|  | ||||
| ?> | ||||
		Reference in New Issue
	
	Block a user