Changeset 1513

Timestamp:

07/01/06 11:08:52 (2 years ago)

Author:

mbonetti

Message:

Better url filtering (it actually works, now :)

Files:

• trunk/gregarius/plugins/urlfilter.php (modified) (3 diffs)

trunk/gregarius/plugins/urlfilter.php

@@ -31 +31 @@
 /// Author: Marco Bonetti
 /// Description: This plugin will try to make ugly URL links look better
-/// Version: 1.6
+/// Version: 1.7
 
 /**
@@ -38 +38 @@
  */
 function __urlfilter_filter($in) {
-    $match = '|<a[^>]+?href="(.*?)">\\1</a>|i';
-    return preg_replace_callback($match, '__filter_callback', $in);
+    $match = '#<a[^>]+?href="(.*?)">\\1</a>#im';
+    // matches non-linkified URLs
+    $match2 = '#[^>"\'](http[^\s$]+)[\s$]?#im';
+    $ret= preg_replace_callback($match, '__filter_callback', $in);
+    $ret2= preg_replace_callback($match2,'__filter_callback', $ret);
+    return $ret2;
 }
 
@@ -49 +53 @@
     $ret = preg_match("/^(http:\/\/)?([^\/]+)/i", $matches[1], $outmatches);
     if ($outmatches && isset ($outmatches[2])) {
-        return "<a href=\"". $matches[1]."\">[" . $outmatches[2] . "]</a>";
+        return " <a href=\"". $matches[1]."\">[" . $outmatches[2] . "]</a> ";
     }
-    return "<a href=\"". $matches[1]."\">[" . $matches[1] . "]</a>";
+    return " <a href=\"". $matches[1]."\">[" . $matches[1] . "]</a> ";
 }