--- inc/global.php	2001/09/07 15:07:17	1.10
+++ inc/global.php	2001/10/02 16:18:09	1.15
@@ -1,4 +1,5 @@
 <?php
+
 	function MyUpper($str) {
 		return strtr(strtoupper($str), "¹ðèæ¾", "©ÐÈÆ®");
 	}
@@ -11,7 +12,8 @@
 
 	function Slova($alpha_only = false) {
 		$sl = preg_split('//', Letters());
-		array_pop($sl);	// The final element is empty.
+		array_shift($sl);	// First element is empty.
+		array_pop($sl);		// Last element is empty.
 		if (!$alpha_only) array_unshift($sl, "@");
 		return $sl;
 	}
@@ -23,20 +25,48 @@
 			strtr(MyUpper($b), $slova, $weights));
 	}
 
-	function MyEscape($str) {
-		$allowed = array("", "A", "B", "I", "U", "UL", "OL", "LI");
-		$str = preg_replace("/(^\\s+|\\s+$)/", "", $str);
-		$str = preg_replace("/(\\<\\/?\\s*(\\w+)\\b[^\\>]*\\>)/e", "array_search(MyUpper('\\2'),".
-			"\$allowed,false)?'\\1':HTMLSpecialChars('\\1')", $str);
-		$str = preg_replace("/(\\<\\s*[aA]\\b)/", '\\1 target=_blank class=more', $str);
-		$str = ereg_replace("\"", "&quot;", $str);
+	function my_replace($str, $start, $end, $pat = "", $rep = "") {
+		if (!$pat) $pat = '\s*(\r\n?|\n\r?)';
+		$idx1 = $idx2 = -1;
+		while (true) {
+			$str2 = strtoupper($str);
+			$idx1 = strpos($str2, $start, $idx1 + 1);
+			if ($idx1 === false) break;
+			$idx2 = strpos($str2, $end, $idx2 + 1);
+			if ($idx2 === false) break;
+			if ($idx1 > $idx2) break;
+			$idx2 += strlen($end);
+			$str1 = substr($str, 0, $idx1);
+			$str2 = preg_replace('/'.$pat.'/m', $rep,
+				substr($str, $idx1, $idx2 - $idx1));
+			$str3 = substr($str, $idx2, strlen($str) - $idx2);
+			$str = $str1.$str2.$str3;
+		}
+		return $str;
+	}
+
+	function MyEscape($str, $full = true) {
+		$allowed = array("", "A", "B", "I", "U", "UL", "OL", "LI", "TABLE", "TR", "TH", "TD", "HR", "SUP", "SUB");
+		$str = preg_replace('/(^[ 	]+|[ 	]+$)/m', '', $str);
+		$str = preg_replace('/(\<\/?\s*(\w+)\\b[^\>]*\>)/e', 'array_search(MyUpper("\2"),'.
+			'\$allowed,false)?"\1":HTMLSpecialChars("\1")', $str);
+		$str = preg_replace('/(\<\s*A\b)/i', '\\1 target=_blank class=more', $str);
+		$str = preg_replace('/(\<\s*TABLE\b)/i', '\\1 class=normal', $str);
+		$str = preg_replace('/(class=[^ 	]+)( class=[^ 	]+)+/', '\\1', $str);
+		$str = my_replace($str, "<TABLE", "/TABLE>");
+		$str = my_replace($str, "<UL", "/UL>", true);
+		$str = my_replace($str, "<OL", "/OL>");
+		if (!$full) $str = my_replace($str, "<", ">", '"', "'|'");
+		$str = str_replace('"', "&quot;", $str);
+		if (!$full) $str = str_replace("'|'", '"', $str);
 		return $str;
 	}
 
 	function ParseNewline($str, $paragraphs = false) {
 		if (!$str) return $str;
-		if ($paragraphs) $str = preg_replace('/\s*(\r\n\r\n|\n\r\n\r|\n\n|\r\r)/m', ' </p><p class="ptext">', $str);
-		$str = ereg_replace("[ \t]*(\r\n?|\n\r?)", '<br>', $str);
+		$str = str_replace("\r\n", "\n", $str);
+		if ($paragraphs) $str = preg_replace('/[ 	]*\n\n/s', ' </p><p class="ptext">', $str);
+		$str = preg_replace('/[ 	]*\n/s', '<br>'."\n", $str);
 		return $str;
 	}
 
@@ -55,46 +85,63 @@
 			"Scaron" => "©", "#352" => "©",
 			"scaron" => "¹", "#353" => "¹",
 			"Ccaron" => "È", "#268" => "È", "#268" => "È",
-			"ccaron" => "è", "#232" => "è", "#269" => "è",
+			"ccaron" => "è", "egrave" => "è", "#232" => "è", "#269" => "è",
 			"Cgrave" => "Æ", "#262" => "Æ", "#" => "Æ",
-			"cgrave" => "æ", "#230" => "æ", "#263" => "æ",
-			"???" => "Ð", "#272" => "Ð", "#" => "Ð",
-			"???" => "ð", "#273" => "ð",
+			"cgrave" => "æ", "aelig" => "æ", "#230" => "æ", "#263" => "æ",
+			"<?>" => "Ð", "#272" => "Ð", "#" => "Ð",
+			"<?>" => "ð", "eth" => "ð", "#273" => "ð",
 			"Zcaron" => "®", "#381" => "®",
 			"zcaron" => "¾", "#382" => "¾",
 		);
-		$t = intval($str);
 		# Skip if not a scalar
-		if (!is_scalar($str)) return $str;
+		if (!is_string($str)) return $str;
 		# If a number, don't touch it
-		if (strcmp(intval($str), $str) == 0) return $str;
-		# Replace "<BR>" with "\n"
-		$str = preg_replace("/\<BR\>/m", "\n", $str);
-		# Replace "<...>\n" with "<...>"
-		$str = preg_replace("/(\<[^\/][^\>]*\>)\s*(\r\n?|\n\r?)\s*/m", '$1', $str);
-		# Replace "\n</...>" with "</...>\n"
-		$str = preg_replace("/\s*(\r\n?|\n\r?)\s*(\<\/[^\>]+\>)/m", '$2$1', $str);
-		# Remove "<HEAD>"/"</HEAD>", and anything in between.
-		$str = preg_replace("/\<\s*HEAD[^\>]*\>.*\<\/\s*HEAD\s*\>(\r\n?|\n\r?)*/ims", '', $str);
-		# Remove all "<HTML>", "<HEAD>", "<BODY>", "<FONT>", "<P>" and "BR" tags, along with their pairs
-		$str = preg_replace("/\<\/?\s*(HTML|HEAD|BODY|FONT|P|BR)[^\>]*\>/im", '', $str);
-		# Replace "\n<LI>" or "<LI>\n" with "<LI>"
-		$str = preg_replace("/(\s*(\r\n?|\n\r?))*(\<\/\s*LI\s*\>)(\s*(\r\n?|\n\r?))*/m", '$3', $str);
-		# Replace "<UL>\n" or "<OL>\n" with "<UL>" or "<OL>", respectively
-		$str = preg_replace("/(\<\s*(UL|OL)\s*\>)(\s*(\r\n?|\n\r?))+/m", '$1', $str);
-		# Replace "\n</UL>" or "\n</OL>" with "</UL>" or "</OL>", respectively
-		$str = preg_replace("/(\s*(\r\n?|\n\r?))+(\<\/\s*(UL|OL)\s*\>)/m", '$3', $str);
-		# Replace "``" and "''" with """ (a single double quote)
+		if (strcmp(intval($str)."", $str."") == 0) return $str;
+
+		# Replace "``" and "''" with """ (normal ASCII double quote)
 		$str = str_replace("“", '"', $str);
 		$str = str_replace("”", '"', $str);
 		# Replace "-" with "-" 
 		$str = str_replace("—", '-', $str);
 		# Replace character references ("&...;" and "&#...;") with its value
-		$str = preg_replace("/\&([^;]+);/em", '$entities["$1"]?$entities["$1"]:"?"', $str);
-		# Remove all whitespace at beginning or ending of a line
-		$str = preg_replace("/(^\s+|\s+$)/", '', $str);
+		$str = preg_replace('/\&([^;]+);/em', '$entities["$1"]?$entities["$1"]:"?"', $str);
+		# Remove all whitespace from line beginnings and endings
+		$str = preg_replace('/(^[ 	]+|[ 	]+$)/s', '', $str);
+		# Remove "<P>[whitespace]</P>"
+		$str = preg_replace('/\<\s*P[^\>]*\>\s*\<\/\s*P\s*\>/im', "", $str);
+		# Replace "<BR>\n" with "\n"
+		$str = preg_replace('/\<[ 	]*BR[^\>]*\>([\n\r]+)/im', '$1', $str);
+		# Replace "<P>" with "\n"
+		$str = preg_replace('/\<\s*P[^\>]*\>/im', "", $str);
+		# Replace "</P>" with "\n"
+		$str = preg_replace('/\<\/\s*P[^\>]*\>/im', "\n", $str);
+		# Replace "<BR>" with "\n"
+		$str = preg_replace('/\<BR\>/im', "\n", $str);
+		# Replace "<...>\n" with "\n<...>"
+		$str = preg_replace('/(\<[^\/][^\>]*\>)[ 	]*([\r\n]*)[ 	]*/m', '$2$1', $str);
+		# Replace "\n</...>" with "</...>\n"
+		$str = preg_replace('/[ 	]*([\n\r]*)[ 	]*(\<\/[^\>]+\>)/m', '$2$1', $str);
+		# Remove "<HEAD>" and "</HEAD>", and anything in between.
+		$str = preg_replace('/\<\s*HEAD[^\>]*\>.*\<\/\s*HEAD\s*\>(\r\n?|\n\r?)*/ims', '', $str);
+		# Remove all "<HTML>", "<HEAD>", "<BODY>" and "<FONT>" tags, along with their pairs
+		$str = preg_replace('/\<\/?\s*(HTML|HEAD|BODY|FONT|DIR)[^\>]*\>/im', '', $str);
+		# Remove all table elements "<TABLE>", "<TR>", "<TH>", "<TD>")
+		#$str = preg_replace('/\<\/?\s*(TABLE|TR|TH|TD)[^\>]*\>/im', '', $str);
+		# Replace "\n<LI>" or "<LI>\n" with "<LI>"
+		$str = preg_replace('/([ 	]*[\r\n]*)(\<\/?\s*(LI|UL|OL)[ 	]*\>)([ 	]*[\r\n]*)/m', '$2', $str);
+		# Replace "<UL>\n" or "<OL>\n" with "<UL>" or "<OL>", respectively
+		$str = preg_replace('/(\<\s*(UL|OL)\s*\>)([ 	]*(\r\n?|\n\r?))+/m', '$1', $str);
+		# Replace "\n</UL>" or "\n</OL>" with "</UL>" or "</OL>", respectively
+		$str = preg_replace('/([ 	]*(\r\n?|\n\r?))+(\<\/\s*(UL|OL)\s*\>)/m', '$3', $str);
+		# Replace "<[whitespace]/>" with "</"
+		$str = preg_replace('/\<\s*\//', '</', $str);
+		# Do some wild exchanges...
+		$str = preg_replace('/(\<[ 	]*(B|U|I)[^\>]*\>)[ 	]*(\<\/[ 	]*(UL|OL|LI)[^\>]*\>)/', '$3$1', $str);
+		$str = preg_replace('/(\<[ 	]*(UL|OL|LI)[^\>]*\>)[ 	]*(\<\/[ 	]*(B|U|I)[^\>]*\>)/', '$3$1', $str);
 		# Convert Win1250 to ISO8859-2
+		# (Actually, it should already be in ISO8859-2, but you never know.)
 		$str = strtr($str, "ŠÐÈÆŽšðèæž", "©ÐÈÆ®¹ðèæ¾");
 		return $str;
 	}
+
 ?>