Revert "Revert "fix utf8 encoding""

This reverts commit f8b56ce.
hedii · Jul 6, 2015 · 08db893 · 08db893
1 parent f8b56ce
commit 08db893
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ColissimoApi/ColissimoApi.php b/ColissimoApi/ColissimoApi.php
@@ -81,9 +81,12 @@ private function getPage($id)
     private function storeTable($data)
     {
         $table = '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title></title></head><body><table>' . $this->get_string_between($data, '<table class="dataArray" summary="Suivi de votre colis" width="100%">', '</table>') . '</table></body></html>';
+        //$table = mb_convert_encoding($table, 'UTF-8', 'OLD-ENCODING');
+        $table = utf8_encode($table);
+        //var_dump($table); die;
         $unique_id = uniqid();
         $filePath = 'temp/' . $unique_id . '.html';
-        $file = file_put_contents('temp/' . $unique_id . '.html', $table);
+        $file = file_put_contents($filePath, $table);
 
         // if $file is under 600, there is something wrong, stop everything
         if ($file < 600) {
@@ -104,6 +107,8 @@ private function storeTable($data)
     private function parse($filePath)
     {
 		$content = file_get_contents($filePath);
+        //var_dump($content);
+        //die();
         $dom = new DOMDocument();
         @$html = $dom->loadHTML(mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8'));
         $dom->preserveWhiteSpace = false;

diff --git a/index.php b/index.php
@@ -1,7 +1,7 @@
 <?php
 use ColissimoApi\ColissimoApi;
 
-header('Content-Type: application/json');
+header('Content-Type: application/json; charset=utf-8');
 require 'ColissimoApi/ColissimoApi.php';
 $colissimoApi = new ColissimoApi();
 $colissimoApi->run();