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

(limited to 'modules-available/dnbd3/inc')

diff --git a/modules-available/dnbd3/inc/dnbd3util.inc.php b/modules-available/dnbd3/inc/dnbd3util.inc.php
index 8e355370..d9bfaeee 100644
--- a/modules-available/dnbd3/inc/dnbd3util.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3util.inc.php
@@ -12,7 +12,7 @@ class Dnbd3Util {
 		$res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastup, s.lastdown, m.clientip
 			FROM dnbd3_server s
 			LEFT JOIN machine m USING (machineuuid)');
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (!empty($row['machineuuid'])) {
 				$allUuids[$row['machineuuid']] = true;
 			}
@@ -121,7 +121,7 @@ class Dnbd3Util {
 				WHERE machineuuid = :uuid',
 			array('uuid' => $machineUuid));
 		$assignedLocs = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$assignedLocs[] = $row['locationid'];
 		}
 		$modeData = (array)json_decode($modeData, true) + self::defaultRunmodeConfig();
@@ -142,7 +142,7 @@ class Dnbd3Util {
 				$floatIp = (float)sprintf('%u', $floatIp); // Float for 32bit php :/
 			}
 			$ranges = [['startaddr' => $floatIp, 'endaddr' => $floatIp]];
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				settype($row['startaddr'], PHP_INT_SIZE === 4 ? 'float' : 'int');
 				settype($row['endaddr'], PHP_INT_SIZE === 4 ? 'float' : 'int');
 				self::mergeRanges($ranges, $row);
@@ -164,7 +164,7 @@ class Dnbd3Util {
 		$public = array();
 		$private = array();
 		$public[$self] = $self;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$ip = $row['fixedip'] ? $row['fixedip'] : $row['clientip'];
 			if ($ip === '<self>') {
 				continue;
-- 
cgit v1.2.3-55-g7522