From 229ed3b57c5efe13287d21043e6c4ad4c0643228 Mon Sep 17 00:00:00 2001 From: willcast Date: Thu, 20 Nov 2003 23:37:33 +0000 Subject: [PATCH] - Adding slashes to [,] and other characters to allow autolinking. --- mod/glossary/dynalink.php | 18 +++++++++++------- mod/glossary/tabs.html | 3 --- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mod/glossary/dynalink.php b/mod/glossary/dynalink.php index 40eb8944b4..c6aa521be6 100644 --- a/mod/glossary/dynalink.php +++ b/mod/glossary/dynalink.php @@ -70,17 +70,13 @@ $href_tag_begin = "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 bcfd94f722..32010b969a 100644 --- 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"; -- 2.39.5