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

3 files changed, 4 insertions, 4 deletions

diff --git a/modules-available/locations/inc/autolocation.inc.php b/modules-available/locations/inc/autolocation.inc.php
index 82c61251..f77cf714 100644
--- a/modules-available/locations/inc/autolocation.inc.php
+++ b/modules-available/locations/inc/autolocation.inc.php
@@ -22,7 +22,7 @@ class AutoLocation
 		}
 		$updates = array();
 		$nulls = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$loc = Location::mapIpToLocation($row['clientip']);
 			if ($loc === false) {
 				$nulls[] = $row['machineuuid'];
diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php
index 700edaf8..e4bce313 100644
--- a/modules-available/locations/inc/location.inc.php
+++ b/modules-available/locations/inc/location.inc.php
@@ -21,7 +21,7 @@ class Location
 	{
 		$res = Database::simpleQuery("SELECT locationid, parentlocationid, locationname FROM location");
 		$rows = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$rows[] = $row;
 		}
 		return $rows;
@@ -390,7 +390,7 @@ class Location
 	{
 		$res = Database::simpleQuery("SELECT startaddr, endaddr, locationid FROM subnet");
 		$subnets = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			settype($row['locationid'], 'int');
 			$subnets[] = $row;
 		}
diff --git a/modules-available/locations/inc/locationutil.inc.php b/modules-available/locations/inc/locationutil.inc.php
index 708cc8a2..960eefa8 100644
--- a/modules-available/locations/inc/locationutil.inc.php
+++ b/modules-available/locations/inc/locationutil.inc.php
@@ -124,7 +124,7 @@ class LocationUtil
 		$res = Database::simpleQuery($query, $params);
 		$return = [];
 		$locs = false;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (Location::isFixedLocationValid($row['fixedlocationid'], $row['subnetlocationid']))
 				continue;
 			$lid = (int)$row['fixedlocationid'];