Merge branch 'fabrixxm-master'

[friendica.git] / addon / oembed / oembed.php

diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index 82183f3cce8c87da81a2d8da16411ae18321da02..4bbd75387a8d386984edad3ae4309e60c2e3e85f 100644 (file)
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -10,13 +10,11 @@
 function oembed_install() {
   register_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool');
   register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header');
-  register_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode');
 }
 
 function oembed_uninstall() {
   unregister_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool');
   unregister_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header');
-  unregister_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode');
 }
 
 function oembed_hook_page_header($a, &$b){
@@ -53,49 +51,7 @@ function oembed_hook_jot_tool($a, &$b) {
   ';
 }
 
-function oembed_replacecb($matches){
-  $embedurl=$matches[1];
-  $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
-  $txt = fetch_url($ourl);
-  $j = json_decode($txt);
-  $ret="<!-- oembed $embedurl -->";
-  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='#' 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'>$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 -->";
-  return $ret;
-}
 
-function oembed_hook_bbcode($a, &$text){
-  $text = preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
-}
 
 
 ?>
\ No newline at end of file