From 89e1ce04748f3c0f13a058abfa3c192ef4667c73 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 9 Mar 2005 01:13:53 +0000
Subject: [PATCH] More fixes for linking. Bug 2693. (SE)

---
 lib/filterlib.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/filterlib.php b/lib/filterlib.php
index f3bf63f2539..eb49af22bac 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -53,7 +53,8 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
 /// Add the user defined ignore tags to the default list
 /// Unless specified otherwise, we will not replace within <a></a> tags
     if ( $ignoretagsopen === NULL ) {
-        $ignoretagsopen  = array('<a(.+?)>');
+        //$ignoretagsopen  = array('<a(.+?)>');
+        $ignoretagsopen  = array('<a[^>]+?>');
         $ignoretagsclose = array('</a>');
     }
     
@@ -65,8 +66,8 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
 
 /// Remove everything enclosed by the ignore tags from $text
     $ignoretags = array();
-    foreach ($filterignoretagsopen as $key=>$opentag) {
-        $closetag = $filterignoretagsclose[$key];
+    foreach ($filterignoretagsopen as $ikey=>$opentag) {
+        $closetag = $filterignoretagsclose[$ikey];
     /// form regular expression
         $opentag  = str_replace('/','\/',$opentag); // delimit forward slashes
         $closetag = str_replace('/','\/',$closetag); // delimit forward slashes
@@ -74,7 +75,7 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
         
         preg_match_all($pregexp, $text, $list_of_ignores);
         foreach (array_unique($list_of_ignores[0]) as $key=>$value) {
-            $ignoretags['<~'.$key.'~>'] = $value;
+            $ignoretags['<#'.$ikey.'.'.$key.'#>'] = $value;
         }
         if (!empty($ignoretags)) {
             $text = str_replace($ignoretags,array_keys($ignoretags),$text);
@@ -82,10 +83,9 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
     }
 
 
-
 /// Remove tags from $text
     $tags = array();
-    preg_match_all('/<(.+?)>/is',$text,$list_of_tags);
+    preg_match_all('/<[^\#](.+?)[^\#]>/is',$text,$list_of_tags);
     foreach (array_unique($list_of_tags[0]) as $key=>$value) {
         $tags['<|'.$key.'|>'] = $value;
     }
@@ -94,7 +94,6 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
     }
 
 
-
 /// Time to cycle through each phrase to be linked
     foreach ($link_array as $linkobject) {
     
@@ -149,7 +148,6 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
             }
         }
 
-
     /// Finally we do our highlighting
         $text = preg_replace('/('.$linkobject->phrase.')/'.$modifiers, $linkobject->hreftagbegin.'$1'.$linkobject->hreftagend, $text);
 
@@ -168,15 +166,15 @@ function filter_phrases ($text, $link_array, $ignoretagsopen=NULL, $ignoretagscl
         $newtagsprefix = (string)(count($newtagsarray) + 1);
         $newtags = array();
         preg_match_all('/<(.+?)>/is',$text,$list_of_newtags);
-        foreach (array_unique($list_of_newtags[0]) as $key=>$value) {
-            $newtags['<|'.$newtagsprefix.'.'.$key.'|>'] = $value;
+        foreach (array_unique($list_of_newtags[0]) as $ntkey=>$value) {
+            $newtags['<%'.$newtagsprefix.'.'.$ntkey.'%>'] = $value;
         }
         if (!empty($newtags)) {
             $text = str_replace($newtags,array_keys($newtags),$text);
             $newtagsarray[] = $newtags;
         }
+        unset($newtags);
 
-    
     }