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

5 files changed, 10 insertions, 10 deletions

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
index 8aef52e7..08b65ed6 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
@@ -121,7 +121,7 @@ abstract class BootEntry
 	{
 		$res = Database::simpleQuery("SELECT entryid, data FROM serversetup_bootentry");
 		$ret = [];
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$tmp = self::fromJson($row['module'], $row['data']);
 			if ($tmp === null)
 				continue;
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
index e2e90c2a..8731bb7a 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
@@ -18,7 +18,7 @@ class IPxe
 	{
 		$res = Database::simpleQuery('SELECT menuid, entryid FROM serversetup_menuentry ORDER BY sortval ASC');
 		$menus = [];
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (!isset($menus[$row['menuid']])) {
 				$menus[(int)$row['menuid']] = [];
 			}
@@ -40,7 +40,7 @@ class IPxe
 				WHERE startaddr >= :start AND endaddr <= :end", compact('start', 'end'));
 			$locations = [];
 			// Iterate over result, eliminate those that are dominated by others
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				foreach ($locations as &$loc) {
 					if ($row['startaddr'] <= $loc['startaddr'] && $row['endaddr'] >= $loc['endaddr']) {
 						$loc = false;
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
index b1e13e87..587d9200 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
@@ -43,7 +43,7 @@ class IPxeMenu
 			LEFT JOIN serversetup_bootentry b USING (entryid)
 			WHERE e.menuid = :menuid
 			ORDER BY e.sortval ASC, e.title ASC", ['menuid' => $menu['menuid']]);
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$this->items[] = new MenuEntry($row);
 		}
 		// Make sure we have a default entry if the menu isn't empty
@@ -109,7 +109,7 @@ class IPxeMenu
 			if ($res->rowCount() > 0) {
 				// Make the location id key, preserving order (closest location is first)
 				$chain = array_flip($chain);
-				while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				foreach ($res as $row) {
 					// Overwrite the value (numeric ascending values, useless) with menu array of according location
 					$chain[(int)$row['locationid']] = $row;
 				}
diff --git a/modules-available/serversetup-bwlp-ipxe/install.inc.php b/modules-available/serversetup-bwlp-ipxe/install.inc.php
index 983988bb..a8f1cccc 100644
--- a/modules-available/serversetup-bwlp-ipxe/install.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/install.inc.php
@@ -117,7 +117,7 @@ if (!tableHasColumn('serversetup_bootentry', 'module')) {
 	ADD COLUMN `module` varchar(30) CHARACTER SET ascii DEFAULT NULL AFTER `builtin`") !== false) {
 		$result[] = UPDATE_DONE;
 		$res = Database::simpleQuery('SELECT entryid, data FROM serversetup_bootentry WHERE module IS NULL');
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$json = json_decode($row['data'], true);
 			if (isset($json['script'])) {
 				Database::exec("UPDATE serversetup_bootentry SET module = '.script' WHERE entryid = :id", ['id' => $row['entryid']]);
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 8fd6fd49..4e104e78 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -294,7 +294,7 @@ class Page_ServerSetup extends Page
 			) m
 			LEFT JOIN serversetup_localboot sl USING (systemmodel)
 			ORDER BY systemmodel');
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['modelesc'] = urlencode($row['systemmodel']);
 			$row['options'] = $this->makeSelectArray(Localboot::BOOT_METHODS, $row);
 			$models[] = $row;
@@ -361,7 +361,7 @@ class Page_ServerSetup extends Page
 				GROUP BY menuid, title
 				ORDER BY title");
 		$menuTable = [];
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (empty($row['locations'])) {
 				$locations = [];
 				$row['allowEdit'] = in_array(0, $allowedEdit);
@@ -433,7 +433,7 @@ class Page_ServerSetup extends Page
 			LEFT JOIN serversetup_bootentry be USING (entryid)
 			WHERE menuid = :id
 			ORDER BY sortval ASC", compact('id'));
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($row['entryid'] === null && $row['refmenuid'] !== null) {
 				$row['entryid'] = 'menu:' . $row['refmenuid'];
 			}
@@ -975,7 +975,7 @@ class Page_ServerSetup extends Page
 				ORDER BY m.title ASC', ['locationid' => $locationId]);
 		$menus = [];
 		$hasDefault = false;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$eids = explode(',', $row['entries']);
 			$row['default_entry_title'] = $menuEntries[$row['menu_default']] ?? '';
 			$row['entries'] = [];