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/minilinux/inc/minilinux.inc.php | 6 +++---
 modules-available/minilinux/page.inc.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php
index d64ef080..89a5035a 100644
--- a/modules-available/minilinux/inc/minilinux.inc.php
+++ b/modules-available/minilinux/inc/minilinux.inc.php
@@ -359,7 +359,7 @@ class MiniLinux
 		$list = [];
 		$res = Database::simpleQuery('SELECT branchid, versionid, title, dateline, orphan, taskid, installed
 			FROM minilinux_version ORDER BY branchid, dateline, versionid');
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$list[$row['branchid']][$row['versionid']] = $row;
 		}
 		return $list;
@@ -473,7 +473,7 @@ class MiniLinux
 			GROUP BY be.data");
 		$return = [];
 		$usedMenuIds = [];
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$data = json_decode($row['data'], true);
 			if (!isset($data['id']))
 				continue;
@@ -496,7 +496,7 @@ class MiniLinux
 		$res = Database::simpleQuery("SELECT menuid, title FROM serversetup_menu m
 				WHERE menuid IN (:menuid)", ['menuid' => array_unique($usedMenuIds)]);
 		$menus = [];
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$menus[$row['menuid']] = $row['title'];
 		}
 		// Build output array
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 03ec121e..33a7ab28 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -57,7 +57,7 @@ class Page_MiniLinux extends Page
 			$data = ['list' => [], 'show_refresh' => true];
 			$tooOld = strtotime('-7 days');
 			$showRefresh = strtotime('-5 minutes');
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				$row['lastupdate_s'] = Util::prettyTime($row['lastupdate']);
 				if ($row['lastupdate'] != 0 && $row['lastupdate'] < $tooOld) {
 					$row['update_class'] = 'text-danger';
-- 
cgit v1.2.3-55-g7522