--- /home/anders/Desktop/drupal47/urlfilter/urlfilter.module 2006-06-08 19:01:56.000000000 +0200 +++ urlfilter.module 2006-10-18 20:43:30.000000000 +0200 @@ -51,7 +51,7 @@ $text = ' ' . $text . ' '; $text = preg_replace_callback("!(

|

  • ||[ \n\r\t\(])((http://|https://|ftp://|mailto:|smb://|afp://|file://|gopher://|news://|ssl://|sslv2://|sslv3://|tls://|tcp://|udp://)([a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+*~#&=/;-]))([.,?]?)(?=(

    |
  • ||[ \n\r\t\)]))!i", 'urlfilter_replace1', $text); - $text = preg_replace("!(

    |

  • ||[ \n\r\t\(])([A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,4})([.,?]?)(?=(

    |
  • ||[ \n\r\t\)]))!i", '\1\2\3', $text); + $text = preg_replace("!(

    |

  • ||[ \n\r\t\(])([A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,4})([.,?]?)(?=(

    |
  • ||[ \n\r\t\)]))!i", '\1\2\3', $text); $text = preg_replace_callback("!(

    |

  • |[ \n\r\t\(])(www\.[a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+~#\&=/;-])([.,?]?)(?=(

    |
  • ||[ \n\r\t\)]))!i", 'urlfilter_replace2', $text); $text = substr($text, 1, -1); unset($urlfilter_length); @@ -66,14 +66,18 @@ $match[2] = decode_entities($match[2]); $caption = check_plain(urlfilter_trim($match[2])); $match[2] = check_url($match[2]); - return $match[1] . ''. $caption .''. $match[5]; + global $urlfilter_length; + $class_postfix = strlen($match[2]) > $urlfilter_length ? 'truncated' : 'ok'; + return $match[1] . ''. $caption .''. $match[5]; } function urlfilter_replace2($match) { $match[2] = decode_entities($match[2]); $caption = check_plain(urlfilter_trim($match[2])); $match[2] = check_plain($match[2]); - return $match[1] . ''. $caption .''. $match[3]; + global $urlfilter_length; + $class_postfix = strlen($match[2]) > $urlfilter_length ? 'truncated' : 'ok'; + return $match[1] . ''. $caption .''. $match[3]; } function urlfilter_trim($text) {