From d1612e28047001e3a649f2b404b22531b17afb80 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 24 Aug 2018 13:53:18 +0200
Subject: [PATCH] Fix utf8 and JSON issues resulting from MYSQL being weird

---
 src/pvv/side/doors.php |  2 +-
 www/door/index.php     | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pvv/side/doors.php b/src/pvv/side/doors.php
index 38e027f..ab511ce 100644
--- a/src/pvv/side/doors.php
+++ b/src/pvv/side/doors.php
@@ -28,7 +28,7 @@ class Doors{
 	}
 
 	public function getByName($name){
-		$query = 'SELECT * FROM doors WHERE name=:name';
+		$query = 'SELECT name, open, description FROM doors WHERE name=:name';
 		$statement = $this->pdo->prepare($query);
 		$statement->bindParam(':name', $name, PDO::PARAM_STR);
 		$statement->execute();
diff --git a/www/door/index.php b/www/door/index.php
index 2052a8d..4dfb883 100644
--- a/www/door/index.php
+++ b/www/door/index.php
@@ -35,4 +35,15 @@ elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
     }
 }
 
-echo json_encode($out);
+function utf8ize($d) {
+    if (is_array($d)) {
+        foreach ($d as $k => $v) {
+            $d[$k] = utf8ize($v);
+        }
+    } else if (is_string ($d)) {
+        return utf8_encode($d);
+    }
+    return $d;
+}
+
+echo json_encode(utf8ize($out));