fixed the utf-8 problem in all lists

Author: redray

interface/lib/classes/listform.inc.php

@@ -276,14 +276,15 @@ public function getSortSQL()
 
     public function decode($record) 
     {
+        global $conf;
         if(is_array($record)) {
             foreach($this->listDef['item'] as $field){
                 $key = $field['field'];
 				if(isset($record[$key])) {
                 	switch ($field['datatype']){
                     case 'VARCHAR':
                     case 'TEXT':
-                        $record[$key] = htmlentities(stripslashes($record[$key]));
+                        $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
                          break;
 
                     case 'DATE':
@@ -295,15 +296,15 @@ public function decode($record)
                         break;
 
                     case 'DOUBLE':
-                        $record[$key] = htmlentities($record[$key]);
+                        $record[$key] = htmlentities($record[$key],ENT_QUOTES,$conf["html_content_encoding"]);
                         break;
 
                     case 'CURRENCY':
                         $record[$key] = number_format($record[$key], 2, ',', '');
                         break;
 
                     default:
-                        $record[$key] = htmlentities(stripslashes($record[$key]));
+                        $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
                 	}
 				}
             }
@@ -362,11 +363,12 @@ function lng($msg) {
 	}
 
 	function escapeArrayValues($search_values) {
+	    global $conf;
 
 		$out = array();
 		if(is_array($search_values)) {
 			foreach($search_values as $key => $val) {
-				$out[$key] = htmlentities($val,ENT_QUOTES);
+				$out[$key] = htmlentities($val,ENT_QUOTES,$conf["html_content_encoding"]);
 			}
 		}
 

interface/lib/classes/validate_dns.inc.php

@@ -139,8 +139,8 @@ function validate_srv_data(&$data, $zoneid){
   $weight = $fields[0];
   $port = $fields[1];
   $target = $fields[2];
-  if($weight < 0 || $weight > 65535) $error .= $app->tform->wordbook['weight_txt']." (\"<i>" . htmlentities($weight)."</i>\") ".$app->tform->wordbook['error_srv_out_of_range']."<br>\r\n";
-  if ($port < 0 || $port > 65535) $error .= $app->tform->wordbook['port_txt']." (\"<i>".htmlentities($port)."</i>\") ".$app->tform->wordbook['error_srv_out_of_range']."<br>\r\n";
+  if($weight < 0 || $weight > 65535) $error .= $app->tform->wordbook['weight_txt']." (\"<i>" . htmlentities($weight,ENT_QUOTES,$conf["html_content_encoding"])."</i>\") ".$app->tform->wordbook['error_srv_out_of_range']."<br>\r\n";
+  if($port < 0 || $port > 65535) $error .= $app->tform->wordbook['port_txt']." (\"<i>".htmlentities($port,ENT_QUOTES,$conf["html_content_encoding"])."</i>\") ".$app->tform->wordbook['error_srv_out_of_range']."<br>\r\n";
 
   $error .= $this->validate_field($target, "SRV target", $zoneid, 0);