diff --git urlicon.info urlicon.info index 8c44821..9e96be4 100644 --- urlicon.info +++ urlicon.info @@ -1,4 +1,5 @@ ; $Id: urlicon.info,v 1.6 2008-07-28 21:07:54 sanduhrs Exp $ name = "URL Icon" description = "Filter all external links in nodes and comments." -core = 6.x \ No newline at end of file +core = 7.x +files[] = urlicon.module diff --git urlicon.module urlicon.module index 0b1776a..0de5f12 100644 --- urlicon.module +++ urlicon.module @@ -27,7 +27,7 @@ function urlicon_help($path, $arg) { $output = '

'. t('The URLIcon module automatically adds a CSS class to <a>-elements reflecting their target and fetches the favicon from the target site.') .'

'; $output .= '

'. t('Use Input Formats to enable the URL filter') .'

'; $output .= '

'. t('

  1. Select an existing Input Format or add a new one
  2. Configure the Input Format
  3. Enable URL class filter and Save configuration
  4. Rearrange the weight of the URL filter depending on what filters exist in the format
') .'

'; - $output .= '

'. t('You can enable the urlfilter for an input format from administer >> Site Configuration >> Input Filter.', array('%admin-filters' => url('admin/settings/filters'))) .'

'; + $output .= '

'. t('You can enable the urlfilter for an input format from administer >> Site Configuration >> Input Filter.', array('%admin-filter' => url('admin/config/content/formats'))) .'

'; return $output; case 'admin/modules#description': return t('Automatically fetch favicons for URLs.'); @@ -42,45 +42,43 @@ function urlicon_init() { } /** - * Implementation of hook_filter(). + * Implements of hook_filter_info(). */ -function urlicon_filter($op, $delta = 0, $format = -1, $text = '') { - switch ($op) { - case 'list': - return array(0 => t('URL Icon filter')); - - case 'description': - return t('Adds favicons to URLs.'); - break; - case 'process': - // check for directory - $dir = UI_FILE_PATH; - file_check_directory($dir, 1); - - $reg_exp = '/]*>(.+?)<\/a>/i'; - - $ui_format = variable_get("filter_urlicon_$format", UI_FORMAT_FAVICON); - switch ($ui_format) { - case UI_FORMAT_FAVICON: - $text = preg_replace_callback($reg_exp, '_urlicon_format_favicon', $text); - break; - case UI_FORMAT_ICON: - $text = preg_replace_callback($reg_exp, '_urlicon_format_icon', $text); - break; - case UI_FORMAT_CLASS: - $text = preg_replace_callback($reg_exp, '_urlicon_format_class', $text); - break; - } - - return $text; +function urlicon_filter_info() { + $filters['url_icon'] = array( + 'title' => t('URL Icon filter'), + 'description' => t('Adds favicons to URLs.'), + 'process callback' => 'urlicon_filter_icons', + 'settings callback' => 'urlicon_settings', + ); + + return $filters; +} + +/** + * Add url icons to a certain text. + */ +function urlicon_filter_icons($text, $format) { + // check for directory + $dir = UI_FILE_PATH; + file_prepare_directory($dir, FILE_CREATE_DIRECTORY); + + $reg_exp = '/]*>(.+?)<\/a>/i'; + + $ui_format = $format->settings['urlicon']; + switch ($ui_format) { + case UI_FORMAT_FAVICON: + $text = preg_replace_callback($reg_exp, '_urlicon_format_favicon', $text); break; - case 'settings': - return urlicon_settings($format); + case UI_FORMAT_ICON: + $text = preg_replace_callback($reg_exp, '_urlicon_format_icon', $text); break; - default: - return $text; + case UI_FORMAT_CLASS: + $text = preg_replace_callback($reg_exp, '_urlicon_format_class', $text); break; } + + return $text; } /** @@ -110,7 +108,12 @@ function _urlicon_format_icon($match) { // check for favicon availability $favicon = base_path() . drupal_get_path('module', 'urlicon') .'/Icon_External_Link.png'; - $link = theme('urlicon', $match[3], $favicon, $match[1], array('alt' => '', 'title' => t('favicon'), 'class' => 'urlicon urlicon-'. check_plain($domain))); + $link = theme('urlicon', array( + 'text' => $match[3], + 'favicon' => $favicon, + 'path' => $match[1], + 'attributes' => array('alt' => '', 'title' => t('favicon'), 'class' => array('urlicon', 'urlicon-'. check_plain($domain))), + )); return $link; } @@ -199,8 +202,13 @@ function _urlicon_format_favicon($match) { // check for favicon availability $favicon = file_exists($dir .'/'. $domain .'.ico') ? (file_create_url($dir .'/'. $domain .'.ico')) : (base_path().drupal_get_path('module', 'urlicon') .'/Icon_External_Link.png'); - - $link = theme('urlicon', $match[3], $favicon, $match[1], array('alt' => '', 'title' => t('favicon'), 'class' => 'urlicon urlicon-'. check_plain($domain))); + + $link = theme('urlicon', array( + 'text' => $match[3], + 'favicon' => $favicon, + 'path' => $match[1], + 'attributes' => array('alt' => '', 'title' => t('favicon'), 'class' => array('urlicon', 'urlicon-'. check_plain($domain))), + )); return $link; } @@ -223,27 +231,12 @@ function urlicon_file_download($filepath) { /** * Settings form */ -function urlicon_settings($format) { - $form['urlicon'] = array( - '#type' => 'fieldset', - '#title' => t('URL Icon'), - '#collapsible' => TRUE, - ); - $form['urlicon']["filter_urlicon_$format"] = array( - '#type' => 'radios', - '#title' => t('Filter URLs'), - '#default_value' => variable_get("filter_urlicon_$format", UI_FORMAT_FAVICON), - '#options' => array( - UI_FORMAT_FAVICON => t('Find all external URLs and append the according favicon (if available)'), - UI_FORMAT_ICON => t('Find all external URLs and append an external link icon'), - UI_FORMAT_CLASS => t('Find all external URLs and add a CSS class only (theme it as you like)'), - ), - '#description' => t('Choose what to add to a link in the markup.'), - ); - $form['urlicon']["filter_urlicon_$format"] = array( +function urlicon_settings($form, &$form_state, $filter, $format, $defaults) { + $format_id = $format->format; + $settings["urlicon"] = array( '#type' => 'radios', '#title' => t('Filter URLs'), - '#default_value' => variable_get("filter_urlicon_$format", UI_FORMAT_FAVICON), + '#default_value' => isset($filter->settings['urlicon']) ? $filter->settings['urlicon'] : $defaults['urlicon'], '#options' => array( UI_FORMAT_FAVICON => t('Find all external URLs and append the according favicon (if available)'), UI_FORMAT_ICON => t('Find all external URLs and append an external link icon'), @@ -251,8 +244,8 @@ function urlicon_settings($format) { ), '#description' => t('Choose what to add to a link in the markup.'), ); - - return $form; + + return $settings; } /** @@ -274,7 +267,12 @@ function urlicon_theme($existing, $type, $theme, $path) { /** * Return a themed link with a favicon. */ -function theme_urlicon($text, $favicon, $path, $attributes = array()) { +function theme_urlicon($variables) { + $hooks = theme_get_registry(); + foreach ($hooks['urlicon']['arguments'] as $key => $default) { + $$key = $variables[$key]; + } $favicon = ''; - return l($text .' '. $favicon, $path, array('absolute' => TRUE, 'html' => TRUE)); -} \ No newline at end of file + $output = l($text .' '. $favicon, $path, array('absolute' => TRUE, 'html' => TRUE)); + return $output; +}