diff --git a/INSTALL.txt b/INSTALL.txt index beedac9..0e6defd 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -2,7 +2,7 @@ Readme ------ This is a simple filter module. It automatically converts URLs of -Youtube and Google Videos into embedded. +Youtube and Vimeo Videos into embedded. Send comments to Keizo Gates . diff --git a/README.txt b/README.txt index fddefb5..0d86974 100644 --- a/README.txt +++ b/README.txt @@ -1,25 +1,18 @@ Readme ------ -This is a simple filter module. It automatically converts links to google videos and youtube videos into embedded code. +This is a simple filter module. It automatically converts links to youtube and vimeo videos into embedded code. -For example. If people input stuff like: +For example. If people input something like: ------ -http://video.google.com/videoplay?docid=1083482561197698956&sourceid=docidfeed&hl=en - http://youtube.com/watch?v=wWBmShJDMMM ------ It will turn into: ------ - - - + ------ - Send comments to Keizo Gates . - - diff --git a/googtube.info b/googtube.info index a6caf6e..1da6499 100644 --- a/googtube.info +++ b/googtube.info @@ -1,8 +1,3 @@ name = Googtube -description = "Youtube and Google Video links are automatically converted into embedded videos." +description = "Youtube and Vimeo Video links are automatically converted into embedded videos." core = 7.x -; Information added by drupal.org packaging script on 2007-07-06 -version = "7.x-1.x-dev" -project = "googtube" -datestamp = "1183680382" - diff --git a/googtube.module b/googtube.module index 687773f..d47f95b 100644 --- a/googtube.module +++ b/googtube.module @@ -4,7 +4,7 @@ function googtube_help($path, $arg) { switch ($path) { case 'admin/help#googtube': - $output = '

'. t('Googtube is a filter module that automatically converts youtube and google video urls into embedded code. Useful if users want to post videos easily.') .'

'; + $output = '

'. t('Googtube is a filter module that automatically converts youtube and vimeo video urls into embedded code. Useful if users want to post videos easily.') .'

'; $output .= t('

Use Input Formats to enable the googtube filter

  1. Select an existing Input Format or add a new one
    2. @@ -23,30 +23,62 @@ function googtube_help($path, $arg) { function googtube_filter_info() { $filters['googtube'] = array( 'title' => t('Googtube filter'), - 'description' => t('Googtube is a filter module that automatically converts youtube and google video urls into embedded code. Useful if users want to post videos easily.'), + 'description' => t('Googtube is a filter module that automatically converts youtube and vimeo video urls into embedded code. Useful if users want to post videos easily.'), 'process callback' => '_googtube_process', 'tips callback' => '_googtube_tips', + 'settings callback' => '_googtube_settings', + 'default settings' => array( + 'width' => 300, + 'height' => 255, + ), ); return $filters; } function _googtube_tips($format, $long = false) { - return t('Youtube and google video links are automatically converted into embedded videos.'); + return t('Youtube and vimeo video links are automatically converted into embedded videos.'); } -function _googtube_process($text = '', $format = -1) { +function _googtube_settings($form, &$form_state, $filter, $format, $defaults, $filters) { + $filter->settings += $defaults; + + $elements = array(); + + $elements['width'] = array( + '#type' => 'textfield', + '#title' => t('Width'), + '#description' => t('Width of embedded videos'), + '#default_value' => $filter->settings['width'], + ); + + $elements['height'] = array( + '#type' => 'textfield', + '#title' => t('Height'), + '#description' => t('Height of embedded videos'), + '#default_value' => $filter->settings['height'], + ); + + return $elements; +} + +function _googtube_process($text, $filter, $format, $langcode, $cache, $cache_id) { $text = ' ' . $text . ' '; //youtube regex $text = preg_replace_callback('#(((http://)?)|(^./))(((www.)?)|(^./))youtube\.com/watch[?]v=([^\[\]()<.,\s\n\t\r]+)(?![^<]*)#i', 'googtube_youtube', $text); - //google video regex - $text = preg_replace_callback('#(((http://)?)|(^./))(((www.)?)|(^./))video\.google\.(com|ca|co\.uk)(\.[a-z]+)?/videoplay[?]docid=([^\[\]()<.,\s\n\t\r]+)(?![^<]*)#i', 'googtube_google', $text); - //vimeo video regex $text = preg_replace_callback('#(((http://)?)|(^./))(((www.)?)|(^./))vimeo\.com/([0-9]+)(?![^<]*)#i', 'googtube_vimeo', $text); - $text = substr($text, 1, -1); + $text = substr($text, 1, -1); + + /** Update the width and height placeholders with values from settings + * + * Done this way because one can't pass parameters in preg_replace_callback + * above. + */ + $text = str_replace(array('[googtube:width]', '[googtube:height]'), array($filter->settings['width'], $filter->settings['height']), $text); + return $text; } @@ -54,24 +86,11 @@ function googtube_youtube($match) { $parsed_url = parse_url(check_url($match[0])); parse_str($parsed_url['query'], $parsed_query); $youtube_id = $parsed_query['v']; - return ''; - /* return ''; */ - } - -function googtube_google($match) { - $parsed_url = parse_url(check_url($match[0])); - parse_str($parsed_url['query'], $parsed_query); - $googlevideo_id = $parsed_query['docid']; - isset($parsed_query['hl']) ? $googlevideo_hl = '&hl=' . $parsed_query['hl'] : $googlevideo_hl = ''; - return ' '; + return ''; } function googtube_vimeo($match) { $parsed_url = parse_url(check_url($match[0])); $vimeo_id = ltrim($parsed_url[path],"/"); - return ''; + return ''; } - - - -?>