Changeset 1442 for g-map/files/lib/page/MapAjaxPage.class.php

Timestamp:

05/29/11 11:08:27 (2 years ago)

Author:

Torben Brodt

Message:

try to fix problems with umlauts and iso encoding, see #539

Files:

• g-map/files/lib/page/MapAjaxPage.class.php (modified) (2 diffs)

g-map/files/lib/page/MapAjaxPage.class.php

@@ -147 +147 @@
                         
                         $username = $user->username;
+                        
+                        // json encode can only use utf-8
                         if(CHARSET != 'UTF-8') {
-                                $username = StringUtil::encodeHTML($username);
+                                $username = StringUtil::convertEncoding(CHARSET, 'UTF-8', $username);
                         }
                                         
@@ -167 +169 @@
                 parent::show();
                 
-                // send header for corrent charset
+                // json encode can only use utf-8, thats why we converted all data before
+                $str = json_encode($this->datapoints);
+
                 @header('Content-Type: application/json; charset='.CHARSET);
-                echo json_encode($this->datapoints);
+                if(CHARSET != 'UTF-8') {
+                        echo StringUtil::convertEncoding('UTF-8', CHARSET, $str);
+                } else {
+                        echo $str;
+                }
         }
 }