Merge branch 'fabrixxm-oembed'

4 files changed, 108 insertions, 1 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index 8382cc804..eb0806dc5 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once("include/oembed.php");
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendika - Mike Macgirvin
 
@@ -93,6 +93,9 @@ function bbcode($Text) {
         $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$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_bbcode2html($Text);
+
 	call_hooks('bbcode',$Text);
 
 	return $Text;
diff --git a/include/items.php b/include/items.php
index a5991d663..f204745bb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -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);
 
diff --git a/include/oembed.php b/include/oembed.php
new file mode 100644
index 000000000..a130357ab
--- /dev/null
+++ b/include/oembed.php
@@ -0,0 +1,97 @@
+<?php
+function oembed_replacecb($matches){
+  $embedurl=$matches[1];
+  
+  $r = q("SELECT v FROM `cache` WHERE k='%s'",
+  		dbesc($embedurl));
+  if(count($r)){
+  	$txt = $r[0]['v'];
+  } else {
+	  $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+	  $txt = fetch_url($ourl);
+	  //save in cache
+	  q("INSERT INTO `cache` VALUES ('%s','%s','%s')",
+	  	dbesc($embedurl),
+		dbesc($txt),
+		dbesc(datetime_convert()));
+  }
+  $j = json_decode($txt);
+  $ret="<span class='oembed'>";
+  switch ($j->type) {
+    case "video": {
+       if (isset($j->thumbnail_url)) {
+         $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+         $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
+         $ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
+         $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
+         $ret.= "</a>";
+       } else {
+         $ret=$j->html;
+       }
+       $ret.="<br>";
+    }; break;
+    case "photo": {
+      $ret = "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
+      $ret.="<br>";
+    }; break;  
+    case "link": {
+      //$ret = "<a href='".$embedurl."'>".$j->title."</a>";
+    }; break;  
+    case "rich": {
+      // not so safe.. 
+      $ret = "<blockquote>".$j->html."</blockquote>";
+    }; break;
+  }
+  
+  $embedlink = (isset($j->title))?$j->title:$embedurl;
+  $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.="</span>";
+  return $ret;
+}
+
+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) ); 
+}
+
+?>
\ No newline at end of file
diff --git a/include/poller.php b/include/poller.php
index 4567a5cfc..2ba285b7b 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,6 +30,10 @@ function poller_run($argv, $argc){
 	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 	//proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
 	proc_run($php_path,"include/queue.php");
+	
+	// clear old cache
+	q("DELETE FROM `cache` WHERE `updated`<'%s'",
+		dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
 
 
 	$hub_update = false;