use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify

diff --git a/include/text.php b/include/text.php
index a47e352bae7fecdcee91fbcb58622ead3a2b15bf..7b4d7e191481de1e99f55c2d3347eaea10506747 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -218,14 +218,16 @@ function xmlify($str) {
                                break;
                }       
        }*/
-
+       /*
        $buffer = mb_ereg_replace("&", "&", $str);
        $buffer = mb_ereg_replace("'", "'", $buffer);
-       $buffer = mb_ereg_replace("\"", """, $buffer);
+       $buffer = mb_ereg_replace('"', """, $buffer);
        $buffer = mb_ereg_replace("<", "&lt;", $buffer);
        $buffer = mb_ereg_replace(">", "&gt;", $buffer);
-
+       */
+       $buffer = htmlspecialchars($str);
        $buffer = trim($buffer);
+       
        return($buffer);
 }}
 
@@ -238,11 +240,13 @@ if(! function_exists('unxmlify')) {
 function unxmlify($s) {
 //     $ret = str_replace('&amp;','&', $s);
 //     $ret = str_replace(array('&lt;','&gt;','&quot;','&apos;'),array('<','>','"',"'"),$ret);
-       $ret = mb_ereg_replace('&amp;', '&', $s);
+       /*$ret = mb_ereg_replace('&amp;', '&', $s);
        $ret = mb_ereg_replace('&apos;', "'", $ret);
        $ret = mb_ereg_replace('&quot;', '"', $ret);
        $ret = mb_ereg_replace('&lt;', "<", $ret);
        $ret = mb_ereg_replace('&gt;', ">", $ret);
+       */
+       $ret = htmlspecialchars_decode($s);
        return $ret;    
 }}