From 570a22de7425e2a486b02e3b43a4b4b1ece552af Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 22 May 2011 21:56:47 +0200 Subject: update oembed plugin. embed preview in editor --- addon/oembed/oembed.js | 12 ++++------- addon/oembed/oembed.php | 55 +++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 35 deletions(-) (limited to 'addon') diff --git a/addon/oembed/oembed.js b/addon/oembed/oembed.js index 54547a86e..f8e957413 100644 --- a/addon/oembed/oembed.js +++ b/addon/oembed/oembed.js @@ -1,10 +1,6 @@ function oembed(){ - $("#oembed").toggleClass('hide'); -} - -function oembed_do(){ - embed = "[embed]"+$('#oembed_url').attr('value')+"[/embed]"; - - tinyMCE.execCommand('mceInsertRawHTML',false,embed); - oembed(); + var reply = prompt("$oembed_message:"); + if(reply && reply.length) { + tinyMCE.execCommand('mceInsertRawHTML',false, "[embed]"+reply+"[/embed]" ); + } } diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index d9b205a3a..45f533cc5 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -6,7 +6,9 @@ * http://www.oembed.com/ * */ - + +require_once('include/oembed.php'); + 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'); @@ -18,32 +20,7 @@ function oembed_uninstall() { } function oembed_hook_page_header($a, &$b){ - - if(($a->module !== 'network') && ($a->module !== 'profile')) - return; - - $b .= ' - '; - - $b .= ' -
  - - -
Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, - Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video, - Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada, - Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status, - Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube
-
- '; + $a->page['htmlhead'] .= sprintf('', $a->get_baseurl()); } @@ -56,6 +33,30 @@ function oembed_hook_jot_tool($a, &$b) { } +function oembed_module() { + return; +} +function oembed_init(&$a) { + if ($a->argv[1]=='oembed.js'){ + $tpl = file_get_contents('addon/oembed/oembed.js'); + echo replace_macros($tpl, array( + '$oembed_message' => t('URL to embed:'), + )); + } + + if ($a->argv[1]=='b2h'){ + $url = array( "", trim(hex2bin($_GET['url']))); + echo "".oembed_replacecb($url).""; + } + + if ($a->argv[1]=='h2b'){ + $text = trim(hex2bin($_GET['text'])); + echo oembed_html2bbcode($text); + } + + killme(); + +} ?> \ No newline at end of file -- cgit v1.2.3 From 072e4146369ae8ec10af961b7e1b25dc491e8f07 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 22 May 2011 23:03:34 +0200 Subject: Fix missing wrapping span on bbcode to html, split embed data fetch and rappresentation in two functions. Prettier video embed. --- addon/oembed/oembed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addon') diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index 45f533cc5..caf4f5837 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -47,7 +47,7 @@ function oembed_init(&$a) { if ($a->argv[1]=='b2h'){ $url = array( "", trim(hex2bin($_GET['url']))); - echo "".oembed_replacecb($url).""; + echo oembed_replacecb($url); } if ($a->argv[1]=='h2b'){ -- cgit v1.2.3 From 7c5a7a94d4d224d23f7c922b86a60a6ffe53fc9f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 23 May 2011 10:37:09 +0200 Subject: Add oembed user option for use oembed instead of standard yotube embedding. Remove global option and parse_url use of oembed. --- addon/oembed/oembed.php | 54 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-) (limited to 'addon') diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index caf4f5837..f1fb27986 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -10,26 +10,58 @@ require_once('include/oembed.php'); 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('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); + register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); + register_hook('plugin_settings', 'addon/oembed/oembed.php', 'oembed_settings'); + register_hook('plugin_settings_post', 'addon/oembed/oembed.php', 'oembed_settings_post'); } 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('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); + unregister_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); } +function oembed_settings_post(){ + if(! local_user()) + return; + if (isset($_POST['oembed-submit'])){ + set_pconfig(local_user(), 'oembed', 'use_for_youtube', (isset($_POST['oembed_use_for_youtube'])?1:0)); + notice( t('OEmbed settings updated') . EOL); + } +} + +function oembed_settings(&$a,&$o) { + if(! local_user()) + return; + $uofy = get_pconfig(local_user(), 'oembed', 'use_for_youtube' ); + + $o .='

OEmbed

'; + $o.=' +
+ +
+
+
+ +
'; +} + + function oembed_hook_page_header($a, &$b){ - $a->page['htmlhead'] .= sprintf('', $a->get_baseurl()); + $a->page['htmlhead'] .= sprintf('', $a->get_baseurl()); } function oembed_hook_jot_tool($a, &$b) { - $b .= ' -
- Embed -
- '; + $b .= ' +
+ Embed +
+ '; } @@ -59,4 +91,4 @@ function oembed_init(&$a) { } -?> \ No newline at end of file +?> -- cgit v1.2.3 From f93106de3ae5ee525a9fdce6dcc4a1897f07a105 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 23 May 2011 10:50:22 +0200 Subject: Add missing widgets_uninstall function to widgets plugin --- addon/widgets/widgets.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'addon') diff --git a/addon/widgets/widgets.php b/addon/widgets/widgets.php index 6bd7a73d1..af17d9e9a 100644 --- a/addon/widgets/widgets.php +++ b/addon/widgets/widgets.php @@ -7,12 +7,15 @@ function widgets_install() { - // we need some hooks, for the configuration and for sending tweets register_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); register_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); - logger("installed widgets"); } +function widgets_uninstall() { + unregister_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); + unregister_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); +} + function widgets_settings_post(){ -- cgit v1.2.3