From 8dc2b92d667f1401ab9f1315a36add61658f899c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 6 May 2021 10:26:09 +0200
Subject: Moderize Database handling

* Auto-convert to utf8mb4_unicode_520_ci
* Use foreach instead of while to loop over results
* Drop useless statement caching
* Keep emulated prepares, as we sometimes loop over nested queries
---
 modules-available/roomplanner/inc/room.inc.php       | 2 +-
 modules-available/roomplanner/inc/simpleroom.inc.php | 2 +-
 modules-available/roomplanner/install.inc.php        | 2 +-
 modules-available/roomplanner/page.inc.php           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules-available/roomplanner')

diff --git a/modules-available/roomplanner/inc/room.inc.php b/modules-available/roomplanner/inc/room.inc.php
index 855bdbcf..1a7a80ae 100644
--- a/modules-available/roomplanner/inc/room.inc.php
+++ b/modules-available/roomplanner/inc/room.inc.php
@@ -28,7 +28,7 @@ abstract class Room
 			'SELECT lr.locationid, lr.managerip, lr.tutoruuid, lr.roomplan, m.clientip as tutorip
 					FROM location_roomplan lr
 					LEFT JOIN machine m ON (lr.tutoruuid = m.machineuuid)');
-		while ($row = $ret->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($ret as $row) {
 			$row = self::loadSingleRoom($row);
 			if ($row === false)
 				continue;
diff --git a/modules-available/roomplanner/inc/simpleroom.inc.php b/modules-available/roomplanner/inc/simpleroom.inc.php
index 78db6c4a..43ae43ca 100644
--- a/modules-available/roomplanner/inc/simpleroom.inc.php
+++ b/modules-available/roomplanner/inc/simpleroom.inc.php
@@ -21,7 +21,7 @@ class SimpleRoom extends Room
 			'SELECT machineuuid, clientip, position FROM machine WHERE fixedlocationid = :locationid',
 			['locationid' => $locationId]);
 
-		while ($clientRow = $ret->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($ret as $clientRow) {
 			$position = json_decode($clientRow['position'], true);
 
 			if ($position === false || !isset($position['gridRow']) || !isset($position['gridCol']))
diff --git a/modules-available/roomplanner/install.inc.php b/modules-available/roomplanner/install.inc.php
index 13365fe1..05fd7589 100644
--- a/modules-available/roomplanner/install.inc.php
+++ b/modules-available/roomplanner/install.inc.php
@@ -47,7 +47,7 @@ if (tableHasColumn('location_roomplan', 'dedicatedmgr')) {
 		if ($ret === false) {
 			$res[] = UPDATE_FAILED;
 		} else {
-			while ($row = $ret->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($ret as $row) {
 				$dedi = $row['dedicatedmgr'] != 0;
 				$data = json_encode(array('dedicatedmgr' => $dedi));
 				Database::exec("INSERT IGNORE INTO runmode (machineuuid, module, modeid, modedata, isclient)
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 8c3beace..a591014b 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -195,7 +195,7 @@ class Page_Roomplanner extends Page
 
 			$returnObject = ['machines' => []];
 
-			while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($result as $row) {
 				if (!Location::isFixedLocationValid($roomLocationId, $row['subnetlocationid']))
 					continue;
 				if (empty($row['hostname'])) {
@@ -393,7 +393,7 @@ class Page_Roomplanner extends Page
 				WHERE fixedlocationid = :locationid',
 			['locationid' => $this->locationid]);
 		$machines = [];
-		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($result as $row) {
 			$machine = [];
 			$pos = json_decode($row['position'], true);
 			if ($pos === false || !isset($pos['gridRow']) || !isset($pos['gridCol'])) {
@@ -429,7 +429,7 @@ class Page_Roomplanner extends Page
 
 		$machines = [];
 
-		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($result as $row) {
 			if (empty($row['hostname'])) {
 				$row['hostname'] = $row['clientip'];
 			}
-- 
cgit v1.2.3-55-g7522