summaryrefslogtreecommitdiffstats
path: root/modules-available/roomplanner/page.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-01 19:27:55 +0200
committerSimon Rettberg2016-09-01 19:27:55 +0200
commit94faa60de009df7d0d93fc729736ec7c7b0deef7 (patch)
treec5c1f779b61757353871d897fae493ff2425125a /modules-available/roomplanner/page.inc.php
parent[statistics] Fix toggle between list and stats (diff)
downloadslx-admin-94faa60de009df7d0d93fc729736ec7c7b0deef7.tar.gz
slx-admin-94faa60de009df7d0d93fc729736ec7c7b0deef7.tar.xz
slx-admin-94faa60de009df7d0d93fc729736ec7c7b0deef7.zip
[roomplanner] Don't pretty print json
Diffstat (limited to 'modules-available/roomplanner/page.inc.php')
-rw-r--r--modules-available/roomplanner/page.inc.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index b1869443..7152f015 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -34,7 +34,7 @@ class Page_Roomplanner extends Page
Render::addTemplate('page', [
'subnetMachines' => json_encode($subnetMachines),
'locationid' => $locationid,
- 'roomConfiguration' => json_encode($roomConfig, JSON_PRETTY_PRINT)]);
+ 'roomConfiguration' => json_encode($roomConfig)]);
} else if ($action === 'save') {
/* save */
$config = Request::post('serializedRoom', null, 'string');
@@ -74,7 +74,7 @@ class Page_Roomplanner extends Page
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$returnObject['machines'][] = $row;
}
- echo json_encode($returnObject, JSON_PRETTY_PRINT);
+ echo json_encode($returnObject);
}
}
@@ -92,7 +92,7 @@ class Page_Roomplanner extends Page
$position = json_encode(['gridRow' => $computer['gridRow'],
'gridCol' => $computer['gridCol'],
- 'itemlook' => $computer['itemlook']], JSON_PRETTY_PRINT);
+ 'itemlook' => $computer['itemlook']]);
Database::exec('UPDATE machine SET position = :position, locationid = :locationid WHERE machineuuid = :muuid',
['locationid' => $locationid, 'muuid' => $computer['muuid'], 'position' => $position]);
@@ -105,7 +105,7 @@ class Page_Roomplanner extends Page
}
}
protected function saveRoomConfig($locationid, $furniture) {
- $obj = json_encode(['furniture' => $furniture], JSON_PRETTY_PRINT);
+ $obj = json_encode(['furniture' => $furniture]);
Database::exec('INSERT INTO location_roomplan (locationid, roomplan) VALUES (:locationid, :roomplan) ON DUPLICATE KEY UPDATE roomplan=:roomplan',
['locationid' => $locationid,
'roomplan' => $obj]);
@@ -124,6 +124,7 @@ class Page_Roomplanner extends Page
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$machine = [];
$pos = json_decode($row['position'], true);
+ // TODO: Check if pos is valid (has required keys)
$machine['muuid'] = $row['machineuuid'];
$machine['ip'] = $row['clientip'];