diff -urp sites/all/modules/footnotes-d6/footnotes.info sites/all/modules/footnotes/footnotes.info --- sites/all/modules/footnotes-d6/footnotes.info 2010-10-03 21:41:04.000000000 +0100 +++ sites/all/modules/footnotes/footnotes.info 2010-12-05 05:32:00.000000000 +0000 @@ -1,11 +1,7 @@ -; $Id: footnotes.info,v 1.5.2.2 2008/08/12 20:17:53 hingo Exp $ +; $Id$ name = Footnotes -description = "Add automatically numbered footnotes to your posts. (Includes Better URL filter.)" -core = 6.x +description = "Add automatically numbered footnotes to your posts." +core = 7.x + -; Information added by drupal.org packaging script on 2010-10-03 -version = "6.x-2.4" -core = "6.x" -project = "footnotes" -datestamp = "1286138464" diff -urp sites/all/modules/footnotes-d6/footnotes.module sites/all/modules/footnotes/footnotes.module --- sites/all/modules/footnotes-d6/footnotes.module 2010-12-05 11:11:47.000000000 +0000 +++ sites/all/modules/footnotes/footnotes.module 2010-12-05 06:46:00.000000000 +0000 @@ -5,16 +5,6 @@ * @file * The Footnotes module is a filter that can be used to insert * automatically numbered footnotes into Drupal texts. - * - * Currently there are two filters. One is suitable for use primarily with html markup, - * but can be used with any input format. The second filter outputs footnotes in - * Textile format. This means you should run this filter together and before the - * Textile filter. - * Note: The Textile filter is no longer maintained. - * - * The Better URL filter is a fork of the URL filter in Drupal core filter.module. The - * original filter in core is too simple when parsing and does not make links in footnotes clickable - * (in addition to many other bugs). */ /** @@ -29,44 +19,41 @@ function footnotes_help($section) { switch ($section) { case 'admin/modules#description': // This description is shown in the listing at admin/modules. - return t('Insert automatically numbered footnotes into Drupal texts. (Also includes Better URL filter.)'); + return t('Insert automatically numbered footnotes into Drupal texts.'); } } /** - * Implementation of hook_filter_tips(). - * - * This hook allows filters to provide help text to users during the content - * editing process. Short tips are provided on the content editing screen, while - * long tips are provided on a separate linked page. Short tips are optional, - * but long tips are highly recommended. + * Implementation of hook_filter_info(). */ -function footnotes_filter_tips($delta, $format, $long = FALSE) { - - switch ($delta) { - case 0: - if ($long) { - return t('You can insert footnotes directly into texts with [fn]This text becomes a footnote.[/fn]. This will be replaced with a running number (the footnote reference) and the text within the [fn] tags will be moved to the bottom of the page (the footnote).'); - } - else { - return t('Use [fn]...[/fn] (or <fn>...</fn>) to insert automatically numbered footnotes.'); - } - break; - case 1: - if ($long) { - return t('You can insert footnotes directly into texts with [# ...]. This will be replaced with a running number (the footnote reference) and the text within the [# ...] tags will be moved to the bottom of the page (the footnote). This filter outputs footnotes in Textile format. You should use it together and before the Textile filter.'); - } - else { - return t('Use [# ...] to insert automatically numbered footnotes. Textile variant.'); - } - break; +function footnotes_filter_info() { + $filters['filter_footnotes'] = array( + 'title' => t('Convert footnotes'), + 'description' => t('Converts objects wrapped in or [fn] tags to footnotes.'), + 'process callback' => '_footnotes_filter', + 'settings callback' => '_footnotes_settings', + 'default settings' => array( + 'footnotes_collapse' => 0, + ), + 'tips callback' => '_footnotes_filter_tips', + ); + return $filters; +} - case 99: - return t('Web page addresses and e-mail addresses turn into links automatically. (Better URL filter.)'); - break; +/** + * Short tips are provided on the content editing screen, while + * long tips are provided on a separate linked page. Short tips are optional, + * but long tips are highly recommended. + */ +function _footnotes_filter_tips($filter, $format, $long = FALSE) { - } + if ($long) { + return t('You can insert footnotes directly into texts with [fn]This text becomes a footnote.[/fn]. This will be replaced with a running number (the footnote reference) and the text within the [fn] tags will be moved to the bottom of the page (the footnote).'); + } + else { + return t('Use [fn]...[/fn] (or <fn>...</fn>) to insert automatically numbered footnotes.'); + } } @@ -76,19 +63,16 @@ function footnotes_filter_tips($delta, $ * This has currently 1 setting, the feature to collapse together footnotes * with identical content is an option. */ -function _footnotes_settings($format) { - $form['footnotes'] = array( - '#type' => 'fieldset', - '#title' => t('Footnotes'), - '#collapsible' => TRUE, - ); - $form['footnotes']['footnotes_collapse_' . $format] = array( - '#type' => 'checkbox', - '#title' => t('Collapse footnotes with same content'), - '#default_value' => variable_get('footnotes_collapse_' . $format, 0), - '#description' => t('If two footnotes have the exact same content, they will be collapsed into one as if using the same value="" attribute.'), - ); - return $form; +function _footnotes_settings($form, &$form_state, $filter, $format, $defaults, $filters) { + + $settings['footnotes_collapse'] = array( + '#type' => 'checkbox', + '#title' => t('Collapse footnotes with identical content'), + '#default_value' => isset($filter->settings['footnotes_collapse']) ? $filter->settings['footnotes_collapse'] : $defaults['footnotes_collapse'], + '#description' => t('If two footnotes have the exact same content, they will be collapsed into one as if using the same value="" attribute.') + ); + return $settings; + } /** @@ -97,142 +81,50 @@ function _footnotes_settings($format) { * The bulk of filtering work is done here. This hook is quite complicated, so * we'll discuss each operation it defines. */ -function footnotes_filter($op, $delta = 0, $format = -1, $text = '') { - // The "list" operation provides the module an opportunity to declare both how - // many filters it defines and a human-readable name for each filter. Note that - // the returned name should be passed through t() for translation. - if ($op == 'list') { - return array( - 0 => t('Footnotes [fn]...[/fn]'), - 1 => t('Footnotes Textile style'), - 99 => t('Better URL filter (DEPRECATED, use Drupal 7 core)') - ); +function _footnotes_filter($text = '', $filter, $format) { + + $text = preg_replace( '|\[fn([^\]]*)\]|', '', $text); + $text = preg_replace( '|\[/fn\]|', '', $text); + $text = preg_replace( '|\[footnotes([^\]]*)\]|', '', $text); + + + // Check that there are an even number of open and closing tags. + // If there is one closing tag missing, append this to the end. + // If there is more disparity, throw a warning and continue. + // A closing tag may sometimes be missing when we are processing a teaser + // and it has been cut in the middle of the footnote. + // See http://drupal.org/node/253326 + $foo = array(); + $open_tags = preg_match_all("|]*)>|", $text, $foo); + $close_tags = preg_match_all("||", $text, $foo); + + if ($open_tags == $close_tags + 1) { + $text = $text . ''; + } + elseif ($open_tags > $close_tags + 1) { + trigger_error(t("You have unclosed fn tags. This is invalid and will produce unpredictable results.")); + } + + // Before doing the replacement, the callback function needs to know which options to use. + _footnotes_replace_callback($filter->settings['footnotes_collapse']); + + $pattern = '|]*)>(.*?)|s'; + $text = preg_replace_callback($pattern , '_footnotes_replace_callback', $text); + + // Replace tag with the list of footnotes. + // If tag is not present, by default add the footnotes at the end. + // Thanks to acp on drupal.org for this idea. see http://drupal.org/node/87226 + $footer = ''; + $footer = _footnotes_replace_callback(NULL, 'output footer'); + $pattern = '|()|'; + if (preg_match($pattern, $text) > 0) { + $text = preg_replace($pattern, $footer, $text, 1); + return $text; } - - // All operations besides "list" provide a $delta argument so we know which - // filter they refer to. We'll switch on that argument now so that we can - // discuss each filter in turn. - switch ($delta) { - - // First is the html footnotes filter - case 0: - - switch ($op) { - // This description is shown in the administrative interface, unlike the - // filter tips which are shown in the content editing interface. - case 'description': - return t('Use [fn]...[/fn] (or <fn>...</fn>) to insert automatically numbered footnotes.'); - - // We don't need the "prepare" operation for this filter, but it's required - // to at least return the input text as-is. - case 'prepare': - return $text; - - case 'settings': - return _footnotes_settings($format); - - // The actual filtering is performed here. The supplied text should be - // returned, once any necessary substitutions have taken place. - case 'process': - // Supporting both [fn] and now. Thanks to fletchgqc http://drupal.org/node/268026 - // Convert all square brackets to angle brackets. This way all further code just - // manipulates angle brackets. (Angle brackets are preferred here for the simple reason - // that square brackets are more tedious to use in regexps.) - $text = preg_replace( '|\[fn([^\]]*)\]|', '', $text); - $text = preg_replace( '|\[/fn\]|', '', $text); - $text = preg_replace( '|\[footnotes([^\]]*)\]|', '', $text); - - - // Check that there are an even number of open and closing tags. - // If there is one closing tag missing, append this to the end. - // If there is more disparity, throw a warning and continue. - // A closing tag may sometimes be missing when we are processing a teaser - // and it has been cut in the middle of the footnote. http://drupal.org/node/253326 - $foo = array(); - $open_tags = preg_match_all("|]*)>|", $text, $foo); - $close_tags = preg_match_all("||", $text, $foo); - if($open_tags == $close_tags + 1) { - $text = $text . ''; - } - elseif( $open_tags > $close_tags + 1) { - trigger_error(t("You have unclosed fn tags. This is invalid and will produce unpredictable results.")); - } - - // Before doing the replacement, the callback function needs to know which options to use. - _footnotes_replace_callback(variable_get('footnotes_collapse_' . $format, 0), 'prepare'); - - $pattern = '|]*)>(.*?)|s'; - $text = preg_replace_callback($pattern , '_footnotes_replace_callback', $text); - - // Replace tag with the list of footnotes. - // If tag is not present, by default add the footnotes at the end. - // Thanks to acp on drupal.org for this idea. see http://drupal.org/node/87226 - $footer = ''; - $footer = _footnotes_replace_callback(NULL, 'output footer'); - $pattern = '|()|'; - if(preg_match($pattern, $text) > 0) { - $text = preg_replace($pattern, $footer, $text, 1); - return $text; - } - else { - return $text . "\n\n" . $footer; - } - } - break; - - // Textile version. - case 1: - - switch ($op) { - // This description is shown in the administrative interface, unlike the - // filter tips which are shown in the content editing interface. - case 'description': - return t('Use [# ...] to insert automatically numbered footnotes in Textile markup.'); - - // We don't need the "prepare" operation for this filter, but it's required - // to at least return the input text as-is. - case 'prepare': - return $text; - - // The actual filtering is performed here. The supplied text should be - // returned, once any necessary substitutions have taken place. - case 'process': - $text = preg_replace_callback('|\[# (.*?)\]|s', '_footnotes_replace_callback_textile', $text); - - //Replace Textile tag "footnotes." with the list of footnotes. - //If tag is not present, by default add the footnotes at the end. - //Thanks to acp on drupal.org for this idea. see http://drupal.org/node/87226 - $footer = ''; - $footer = _footnotes_replace_callback_textile(NULL, 'output footer'); - if( preg_match( '/\n *footnotes\. *(\n|$)/', $text ) > 0 ) { - $text = preg_replace('/\n *footnotes\. *(\n|$)/', "\n$footer\n", $text, 1); - return $text; - } - else { - return $text . "\n\n" . $footer; - } - } - break; - - case 99: - switch ($op) { - case 'description': - return t('Better URL filter: Turns web and e-mail addresses into clickable links. DEPRECATED: This code is in Drupal 7 core and will be removed from the Footnotes module in Drupal 7. #161217'); - - // We don't need the "prepare" operation for this filter, but it's required - // to at least return the input text as-is. - case 'prepare': - return $text; - - case 'process': - return _footnotes_filter_url($text, $format); - - case 'settings': - return _footnotes_filter_url_settings($format); - } - break; - + else { + return $text . "\n\n" . $footer; } + } @@ -288,7 +180,7 @@ function _footnotes_replace_callback( $m if (count($store_matches) > 0) { // Only if there are stored fn matches, pass the array of fns to be themed // as a list - $str = theme('footnote_list',$store_matches); + $str = theme('footnote_list', $store_matches); } // Reset the static variables so they can be used again next time $n = 0; @@ -347,76 +239,45 @@ function _footnotes_replace_callback( $m $text_clean = str_replace("\n", " ", $text_clean); $text_clean = str_replace("\r", "", $text_clean); - // Create a footnote item as an array. - $fn = array( - 'value' => $value, - 'text' => $matches[2], - 'text_clean' => $text_clean, - 'fn_id' => 'footnote' . $value_id . '_' . $randstr, - 'ref_id' => 'footnoteref' . $value_id . '_' . $randstr - ); - - // We now allow to repeat the footnote value label, in which case the link to the previously - // existing footnote is returned. Content of the current footnote is ignored. - // See http://drupal.org/node/636808 - if( ! in_array( $value, $used_values ) ) - { - // This is the normal case, add the footnote to $store_matches - - // Store the footnote item. - array_push( $store_matches, $fn ); - array_push( $used_values, $value ); - } - else - { - // A footnote with the same label already exists - - // Use the text and id from the first footnote with this value. - // Any text in this footnote is discarded. - $i = array_search( $value, $used_values ); - $fn['text'] = $store_matches[$i]['text']; - $fn['text_clean'] = $store_matches[$i]['text_clean']; - $fn['fn_id'] = $store_matches[$i]['fn_id']; - // Push the new ref_id into the first occurence of this footnote label - // The stored footnote thus holds a list of ref_id's rather than just one id - $ref_array = is_array($store_matches[$i]['ref_id']) ? $store_matches[$i]['ref_id'] : array( $store_matches[$i]['ref_id'] ); - array_push( $ref_array, $fn['ref_id'] ); - $store_matches[$i]['ref_id'] = $ref_array; - } - - // Return the item themed into a footnote link. - return theme('footnote_link',$fn); -} - + if ($value > 0) { + $fn = array( + 'value' => $value, + 'text' => $matches[2], + 'text_clean' => $text_clean, + 'fn_id' => 'footnote' . $value_id . '_' . $randstr, + 'ref_id' => 'footnoteref' . $value_id . '_' . $randstr + ); + + // We now allow to repeat the footnote value label, in which case the link to the previously + // existing footnote is returned. Content of the current footnote is ignored. + // See http://drupal.org/node/636808 + if( ! in_array( $value, $used_values ) ) + { + // This is the normal case, add the footnote to $store_matches -/** - * Helper function called from preg_replace_callback() above - * - * Uses static vars to temporarily store footnotes found. - * In my understanding, this is not threadsafe?! - */ -function _footnotes_replace_callback_textile( $matches, $op = '' ) { - static $n = 0; - static $store_matches = array(); - $str = ''; - - if( $op == 'output footer' ) { - if( $n > 0 ) { - $str = ''; - for( $m = 1; $m <= $n; $m++ ){ - $str .= "fn$m. " . $store_matches[ $m - 1 ] . "\n\n"; - } + // Store the footnote item. + array_push( $store_matches, $fn ); + array_push( $used_values, $value ); } - $n = 0; - $store_matches = array(); - return $str; - } + else + { + // A footnote with the same label already exists - //default op: act as called by preg_replace_callback() - array_push( $store_matches, $matches[1] ); - $n++; - return '[' . $n . ']'; + // Use the text and id from the first footnote with this value. + // Any text in this footnote is discarded. + $i = array_search( $value, $used_values ); + $fn['text'] = $store_matches[$i]['text']; + $fn['text_clean'] = $store_matches[$i]['text_clean']; + $fn['fn_id'] = $store_matches[$i]['fn_id']; + // Push the new ref_id into the first occurence of this footnote label + // The stored footnote thus holds a list of ref_id's rather than just one id + $ref_array = is_array($store_matches[$i]['ref_id']) ? $store_matches[$i]['ref_id'] : array( $store_matches[$i]['ref_id'] ); + array_push( $ref_array, $fn['ref_id'] ); + $store_matches[$i]['ref_id'] = $ref_array; + } + return theme('footnote_link', $fn); + } } /** @@ -430,8 +291,8 @@ function _footnotes_helper_randstr() { //seeding with srand() not neccessary in modern PHP versions for( $i = 0; $i < 7; $i++ ) { - $n = rand( 0, strlen( $chars ) - 1 ); - $str .= substr( $chars, $n, 1 ); + $rand_no = rand( 0, strlen( $chars ) - 1 ); + $str .= substr( $chars, $rand_no, 1 ); } return $str; } @@ -441,13 +302,13 @@ function _footnotes_helper_randstr() { * * Thanks to emfabric for this implementation. http://drupal.org/node/221156 */ -function footnotes_theme( ) { +function footnotes_theme() { return array( 'footnote_link' => array( - 'arguments' => array('fn' => NULL) + 'render element' => 'fn' ), 'footnote_list' => array( - 'arguments' => array('footnotes' => NULL) + 'render element' => 'footnotes' ) ); } @@ -487,35 +348,29 @@ function theme_footnote_list($footnotes) $str = '
    '; // loop through the footnotes foreach ($footnotes as $fn) { - if( ! is_array( $fn['ref_id'] ) ) - { + if (!is_array( $fn['ref_id'])) { // Output normal footnote $str .= '
  • ' . $fn['value'] . '. '; $str .= $fn['text'] . "
    • \n"; } - else - { + else { // Output footnote that has more than one reference to it in the body. // The only difference is to insert backlinks to all references. // Helper: we need to enumerate a, b, c... $abc = str_split("abcdefghijklmnopqrstuvwxyz"); $i = 0; $str .= '
  • ' . $fn['value'] . '. '; - foreach ( $fn['ref_id'] as $ref ) - { + foreach ($fn['ref_id'] as $ref) { $str .= '' . $abc[$i] . '. '; $i++; } $str .= $fn['text'] . "
    • \n"; } - - } $str .= "
\n"; return $str; } - /** * Implementation of hook_init() * @@ -525,7 +380,8 @@ function theme_footnote_list($footnotes) * for the question leading up to it. http://drupal.org/node/80538 */ function footnotes_init() { - drupal_add_css(drupal_get_path('module', 'footnotes') .'/footnotes.css'); + + drupal_add_css(drupal_get_path('module', 'footnotes') . '/footnotes.css', array('group' => CSS_DEFAULT, 'every_page' => TRUE)); } /** @@ -601,196 +457,3 @@ function footnotes_is_footnotes_later( $ //TODO: What is correct interpretation when weight is equal? } } - - - - - - -/********************************************************************************************************** - * The URL filter shipped in Drupal core filter.module is buggy (or rather, too simple). Footnotes users - * in particular are affected since URL's in footnotes don't get converted into links even if they should. - * - * I've submitted a patch for a better URL filter a year ago, but the core developers have not committed it. - * There are no bugs or anything, just that nobody is paying attention. - * http://drupal.org/node/161217 - * - * To end the misery, I'm publishing the good version of URL filter within the Footnotes module. The URL - * filter related code is below, plus a few snippets above in footnotes_filter and footnotes_filter_tips. - * - * This forked "Better URL filter" will be deprecated if the code is ever committed to Drupal core. - ********************************************************************************************************** - */ - - - - -/** - * Settings for URL filter. - */ -function _footnotes_filter_url_settings($format) { - $form['footnotes_filter_urlfilter'] = array( - '#type' => 'fieldset', - '#title' => t('Better URL filter'), - '#collapsible' => TRUE, - ); - $form['footnotes_filter_urlfilter']['footnotes_filter_url_length_' . $format] = array( - '#type' => 'textfield', - '#title' => t('Maximum link text length'), - '#default_value' => variable_get('footnotes_filter_url_length_' . $format, 72), - '#maxlength' => 4, - '#description' => t('URLs longer than this number of characters will be truncated to prevent long strings that break formatting. The link itself will be retained; just the text portion of the link will be truncated.'), - ); - return $form; -} - -/** - * URL filter. Automatically converts text web addresses (URLs, e-mail addresses, - * ftp links, etc.) into hyperlinks. - */ -function _footnotes_filter_url($text, $format) { - // List of tags - the content of which must be skipped. - $ignoretags = 'a|script|style|code'; - - // This filter identifies and makes clickable links of 3 types of "links". - // 1) URL's like http://www.example.com. - // 2) e-mail addresses like name@example.com. - // 3) Web addresses without the "http://" protocol defined, like www.example.com. - // Each type must be processed separately, as there is no one regular expression - // that could possibly match all of the cases in one pass. - // - // Create an array which contains the regexps for each type of link. - // The key to the regexp is the name of a function that is used as - // callback function to process matches of the regexp. The callback function - // is to return the replacement for the match. - // The array is used and matching/replacement done below inside some loops. - $tasks = NULL; - // Match absolute URLs. - $protocols = 'http://|https://|ftp://|mailto:|smb://|afp://|file://|gopher://|news://|ssl://|sslv2://|sslv3://|tls://|tcp://|udp://'; - $urlpattern = "(?:$protocols)(?:[a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+*~#&=/;-])"; - $re = "`($urlpattern)([\.\,\?\!]*?)`i"; - $tasks['_footnotes_filter_url_parse_full_links'] = $re; - // Match e-mail addresses. - // Note: The ICANN seems to be on track towards accepting more diverse top level domains, - // so this pattern has been "future-proofed" to allow for TLD's of length 2-64. - $urlpattern = '[A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,64}'; - $re = "`($urlpattern)`i"; - $tasks['_footnotes_filter_url_parse_email_links'] = $re; - // Match www domains/addresses. - $urlpattern = 'www\.[a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+~#\&=/;-]'; - $re = "`($urlpattern)([\.\,\?\!]*?)`i"; - $tasks['_footnotes_filter_url_parse_partial_links'] = $re; - - // Pass length to regexp callback. - _footnotes_filter_url_trim(NULL, variable_get('footnotes_filter_url_length_' . $format, 72)); - - // We need to process each case of replacement type separately. - // The text must be joined and split again after each - // replacement, since replacements create new HTML tags and the new - // tags must be correctly protected before the next replacement can be done. - foreach ($tasks as $task => $re) { - // Split at all tags. - // This ensures that nothing that is a tagname or attribute or html comment will be processed. - $chunks = preg_split('/(<.+?>)/i', $text, -1, PREG_SPLIT_DELIM_CAPTURE); - // Note: PHP ensures the array consists of alternating delimiters and literals - // and begins and ends with a literal (inserting NULL as required). - // Therefore, first chunk is always text: - $chunk_type = 'text'; - // Tags to ignore are defined in $ignoretags (see above). - // If an ignoretag is found, it is stored here and removed only when the - // closing tag is found. Until the closing tag is found, no replacements are made. - $opentag = ''; - - for ($i = 0; $i < count($chunks); $i++) { - if ($chunk_type == 'text') { - // Only do replacements when there are no unclosed ignoretags. - if ($opentag == '') { - // This is the high point of this function! If there is a match, - // a link is created in the callback function named by $task. - $chunks[$i] = preg_replace_callback($re, $task, $chunks[$i]); - } - // Done processing text chunk, so next chunk is a tag. - $chunk_type = 'tag'; - } - else { - if ($opentag == '') { - // No open ignoretags. Process this tag... - if (preg_match("`<($ignoretags)(?:\s|>)`i", $chunks[$i], $matches)) { - // This matches one of the $ignoretags. - // Catch and store the tag in question. - $opentag = $matches[1]; - } - } - else { - // There is an $ignoretag open. See if this is a matching closing tag. - // Nothing else is done until we find the closing tag. - if (preg_match("`<\/$opentag>`i", $chunks[$i], $matches)) { - $opentag = ''; - } - } - // Done processing tag chunk, so next chunk is text. - $chunk_type = 'text'; - } - } - $text = implode($chunks); - } - - return $text; -} -/** - * Callback function. Make links out of absolute URLs. - */ -function _footnotes_filter_url_parse_full_links($match) { - // The $i:th parenthesis in the regexp contains the URL. - $i = 1; - - $match[$i] = decode_entities($match[$i]); - $caption = check_plain(_footnotes_filter_url_trim($match[$i])); - $match[$i] = check_url($match[$i]); - return '' . $caption . '' . $match[$i+1]; -} - -/** - * Callback function. Make links out of e-mail addresses. - */ -function _footnotes_filter_url_parse_email_links($match) { - // The $i:th parenthesis in the regexp contains the URL. - $i = 0; - - $match[$i] = decode_entities($match[$i]); - $caption = check_plain(_footnotes_filter_url_trim($match[$i])); - $match[$i] = check_url($match[$i]); - return '' . $caption . ''; -} - -/** - * Callback function. Make links out of domain names starting with "www.". - */ -function _footnotes_filter_url_parse_partial_links($match) { - // The $i:th parenthesis in the regexp contains the URL. - $i = 1; - - $match[$i] = decode_entities($match[$i]); - $caption = check_plain(_footnotes_filter_url_trim($match[$i])); - $match[$i] = check_plain($match[$i]); - return '' . $caption . '' . $match[$i+1]; -} - -/** - * Shortens long URLs to http://www.example.com/long/url... - */ -function _footnotes_filter_url_trim($text, $length = NULL) { - static $_length; - if ($length !== NULL) { - $_length = $length; - } - - if (strlen($text) > $_length) { - $text = substr($text, 0, $_length) . '...'; - } - - return $text; -} - -/**** End of Better URL filter code. Now returning to our normally scheduled Footnotes programming. *****/ -/********************************************************************************************************/