igb 5 өдөр өмнө
parent
commit
25ad63ec80
1 өөрчлөгдсөн 34 нэмэгдсэн , 15 устгасан
  1. 34 15
      system/conn.php

+ 34 - 15
system/conn.php

@@ -129,7 +129,7 @@ function txt2HTML($text) {
     if (empty($text) || is_null($text)) {
         return '';
     }
-    return htmlspecialchars($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+    return htmlspecialcharsFix($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
 }
 
 function html2Txt($text) {
@@ -155,20 +155,38 @@ function htmlEncode($text) {
     return strtr($text, $chars);
 }
 
-function htmlUncode($text) {
-    if (empty($text) || is_null($text)) {
-        return '';
+//function htmlUncode($text) {
+//    if (empty($text) || is_null($text)) {
+//        return '';
+//    }
+//
+//    $chars = array_flip([
+//        '&' => '&', "\t" => '	', "\n" => '
', "\r" => '
',
+//        ' ' => ' ', '"' => '"', '%' => '%', "'" => ''',
+//        '(' => '&#40;', ')' => '&#41;', '<' => '&#60;', '>' => '&#62;',
+//        '[' => '&#91;', ']' => '&#93;', '^' => '&#94;', '_' => '&#95;',
+//        '{' => '&#123;', '|' => '&#124;', '}' => '&#125;'
+//    ]);
+//
+//    return strtr($text, $chars);
+//}
+
+function htmlUnCode($t0) {
+    if (empty($t0) || is_array($t0)) {
+        return "";
     }
-    
-    $chars = array_flip([
-        '&' => '&#38;', "\t" => '&#9;', "\n" => '&#10;', "\r" => '&#13;',
-        ' ' => '&#32;', '"' => '&#34;', '%' => '&#37;', "'" => '&#39;',
-        '(' => '&#40;', ')' => '&#41;', '<' => '&#60;', '>' => '&#62;',
-        '[' => '&#91;', ']' => '&#93;', '^' => '&#94;', '_' => '&#95;',
-        '{' => '&#123;', '|' => '&#124;', '}' => '&#125;'
-    ]);
-    
-    return strtr($text, $chars);
+
+    $replacements = [
+        "&#9;" => chr(9), "&#11;" => chr(11), "&#10;" => chr(10),
+        "&#13;" => chr(13), "&#32;" => chr(32), "&#34;" => chr(34),
+        "&#37;" => chr(37), "&#39;" => chr(39), "&#40;" => chr(40),
+        "&#41;" => chr(41), "&#60;" => chr(60), "&#62;" => chr(62),
+        "&#91;" => chr(91), "&#93;" => chr(93), "&#94;" => chr(94),
+        "&#95;" => chr(95), "&#123;" => chr(123), "&#124;" => chr(124),
+        "&#125;" => chr(125), "&#38;" => chr(38)
+    ];
+
+    return strtr($t0, $replacements);
 }
 
 function textEncode($text) {
@@ -352,5 +370,6 @@ function isValidEmail($email) {
 //处理特殊字符
 function htmlspecialcharsFix($input_str)
 {
-    return $input_str;
+    return htmlUnCode($input_str);
+//    return $input_str;
 }