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

2 files changed, 4 insertions, 4 deletions

diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php
index 6e4d77ac..045952ed 100644
--- a/modules-available/locationinfo/inc/coursebackend.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend.inc.php
@@ -195,7 +195,7 @@ abstract class CourseBackend
 				array('locations' => $requestedLocationIds));
 		$returnValue = [];
 		$remoteIds = [];
-		while ($row = $dbquery1->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($dbquery1 as $row) {
 			// Check if in cache - if lastUpdate is null then it is interpreted as 1970
 			if ($row['lastcalendarupdate'] + $this->getCacheTime() < $NOW) {
 				$remoteIds[$row['locationid']] = $row['serverlocationid'];
@@ -222,7 +222,7 @@ abstract class CourseBackend
 						'lastuse' => $NOW - $this->getRefreshTime(),
 						'minage' => $NOW - $this->getCacheTime(),
 			));
-			while ($row = $dbquery4->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($dbquery4 as $row) {
 				$remoteIds[$row['locationid']] = $row['serverlocationid'];
 			}
 		}
diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php
index 6deb9db5..84a74e80 100644
--- a/modules-available/locationinfo/inc/infopanel.inc.php
+++ b/modules-available/locationinfo/inc/infopanel.inc.php
@@ -115,7 +115,7 @@ class InfoPanel
 		$dbquery = Database::simpleQuery($query, array('idlist' => $idList));
 
 		// Iterate over matching machines
-		while ($row = $dbquery->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($dbquery as $row) {
 			if (isset($ignoreList[$row['machineuuid']]))
 				continue;
 			settype($row['locationid'], 'int');
@@ -175,7 +175,7 @@ class InfoPanel
 		$res = Database::simpleQuery("SELECT locationid, openingtime FROM location
 		WHERE locationid IN (:lids)", array('lids' => $allIds));
 		$openingTimes = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$openingTimes[(int)$row['locationid']] = $row;
 		}
 		// Now we got all the calendars for locations and parents