Yet more minor problems fixed for hyperlink/mailto: conversion

difficulties

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