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/remoteaccess/inc/remoteaccess.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules-available/remoteaccess')

diff --git a/modules-available/remoteaccess/inc/remoteaccess.inc.php b/modules-available/remoteaccess/inc/remoteaccess.inc.php
index 9b6dea6a..a45915e8 100644
--- a/modules-available/remoteaccess/inc/remoteaccess.inc.php
+++ b/modules-available/remoteaccess/inc/remoteaccess.inc.php
@@ -35,7 +35,7 @@ class RemoteAccess
 
 		// Consider machines we tried to wake in the past 90 seconds as online
 		$wolDeadline = time() - 90;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($row['wolcount'] <= 0)
 				continue;
 			// This can't really be anything but a CSV list, but better be safe
@@ -62,7 +62,7 @@ class RemoteAccess
 		$NOW = time();
 		while ($num > 0) {
 			$list = [];
-			for ($i = 0; $i < $num && $row = $res->fetch(PDO::FETCH_ASSOC); ++$i) {
+			for ($i = 0; $i < $num && $row = $res->fetch(); ++$i) {
 				$list[] = $row;
 				Database::exec("INSERT INTO remoteaccess_machine (machineuuid, password, woltime)
 						VALUES (:uuid, NULL, :now)
-- 
cgit v1.2.3-55-g7522