- Adding slashes to [,] and other characters to allow autolinking.

diff --git a/mod/glossary/dynalink.php b/mod/glossary/dynalink.php
index 40eb8944b44e6f6e501088d6231f3bffa6877cd2..c6aa521be6ccd05991ebc775fda130c78d35fd58 100644 (file)
--- a/mod/glossary/dynalink.php
+++ b/mod/glossary/dynalink.php
@@ -70,17 +70,13 @@
                         $href_tag_begin = "<a target=\"entry\" class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/glossary/showentry.php?courseid=$courseid&concept=$concepttitle\" ".
                              "onClick=\"return openpopup('/mod/glossary/showentry.php?courseid=$courseid\&concept=$concepttitle', 'entry', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">";
                     }
-
-                    $currentconcept = str_replace("|", "\|", $concept->concept);
-                    $currentconcept = str_replace("'", "\'", $currentconcept);
-                    $currentconcept = str_replace("*", "\*", $currentconcept);
+                    $replace = "\\[]'\"*()";
+                    $currentconcept = glossary_addslashes($replace,$concept->concept);                    
                     if ( $currentconcept = trim(strip_tags($currentconcept)) ) {
                         if ( !$concept->category ) {
                             if ( $aliases = get_records("glossary_alias","entryid",$concept->id, "alias") ) {
                                 foreach ($aliases as $alias) {
-                                    $currentalias = str_replace("|", "\|", $alias->alias);
-                                    $currentalias = str_replace("'", "\'", $currentalias);
-                                    $currentalias = str_replace("*", "\*", $currentalias);
+                                    $currentalias = glossary_addslashes($replace,$alias->alias);
                                     $currentconcept .= "|" . trim($currentalias);
                                 }
                             }
@@ -188,4 +184,12 @@
         }
     }
 
+    function glossary_addslashes ( $chars, $text ) {
+        if ( $chars ) {
+            for ($i = 0; $i < strlen($chars); $i++) {
+                $text = str_replace($chars[$i], "\\" . $chars[$i], $text);
+            }
+        }
+        return $text;
+    }
 ?>

diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html
index bcfd94f722f600aa805a3833396e6b3983d37ff4..32010b969aae20e5e08a40c0658ae080e165f3bc 100644 (file)
--- a/mod/glossary/tabs.html
+++ b/mod/glossary/tabs.html
@@ -24,9 +24,6 @@
         $data[GLOSSARY_IMPORT_VIEW]->caption = get_string("importentries", "glossary");
         $data[GLOSSARY_EXPORT_VIEW]->caption = get_string("exportentries", "glossary");
 
-        $data[GLOSSARY_IMPORT_VIEW]->link = "import.php?id=$cm->id";
-        $data[GLOSSARY_EXPORT_VIEW]->link = "export.php?id=$cm->id&tab=".GLOSSARY_CATEGORY_VIEW;
-
         $data[GLOSSARY_IMPORT_VIEW]->link = "import.php?id=$cm->id";
         $data[GLOSSARY_EXPORT_VIEW]->link = "export.php?id=$cm->id&mode=$mode&hook=$hook";