diff options
| -rw-r--r-- | addon/oembed/oembed.php | 44 | ||||
| -rw-r--r-- | include/bbcode.php | 5 | ||||
| -rw-r--r-- | include/oembed.php | 48 |
3 files changed, 52 insertions, 45 deletions
diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index 82183f3cc..4bbd75387 100644 --- 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 diff --git a/include/bbcode.php b/include/bbcode.php index 8382cc804..c17e5dded 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_bbcode($Text); + call_hooks('bbcode',$Text); return $Text; diff --git a/include/oembed.php b/include/oembed.php new file mode 100644 index 000000000..d9bf9f67c --- /dev/null +++ b/include/oembed.php @@ -0,0 +1,48 @@ +<?php +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_bbcode($text){ + $stopoembed = get_config("system","no_oembed"); + if ($stopoembed == True): + return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", "$1" ,$text); + return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text); +} +?>
\ No newline at end of file |