From 464712ec77f602a949230e19d3f2f76239b63716 Mon Sep 17 00:00:00 2001
From: thepurpleblob <thepurpleblob>
Date: Tue, 22 Jul 2003 10:11:12 +0000
Subject: [PATCH] Yet more minor problems fixed for hyperlink/mailto:
 conversion difficulties

---
 lib/wiki.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/wiki.php b/lib/wiki.php
index 44b1fe9a7b..076034a83f 100644
--- a/lib/wiki.php
+++ b/lib/wiki.php
@@ -245,7 +245,7 @@ class Wiki {
       "\\1<A HREF=\"http://www.\\2\\3\" TARGET=\"newpage\">www.\\2\\3</A>", $line);
 
     // make email addresses into mailtos....
-    $line = eregi_replace("([[:space:]]|^)([a-zA-Z0-9@.]+)\(([^)]+)\)",
+    $line = eregi_replace("([[:space:]]|^)([[:alnum:]._-]+@[[:alnum:]._-]+)\(([^)]+)\)",
       "\\1<a href=\"mailto:\\2\">\\3</a>", $line);
 
     // !# at the beginning of any lines means a heading
@@ -271,6 +271,15 @@ class Wiki {
           "<img src=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\\2\" alt=\"\\3\" />", $line );
       }
 
+      // Replace everything else resource link
+      if ($CFG->slasharguments) {
+        $line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
+          "<a href=\"$CFG->wwwroot/file.php/$course->id/\\1\" >\\2</a>", $line );
+      } else {
+        $line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
+          "<a href=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\" >\\2</a>", $line );
+      }
+
       replace_smilies( $line );
 
     }
-- 
2.39.5