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

4 files changed, 11 insertions, 11 deletions

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index d3ff9ebd..e1c35525 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -175,7 +175,7 @@ function getCalendar($idList)
 	$dbquery = Database::simpleQuery($query, array('idlist' => array_values($idList)));
 
 	$serverList = array();
-	while ($dbresult = $dbquery->fetch(PDO::FETCH_ASSOC)) {
+	foreach ($dbquery as $dbresult) {
 		if (!isset($serverList[$dbresult['serverid']])) {
 			$serverList[$dbresult['serverid']] = array(
 				'credentials' => json_decode($dbresult['credentials'], true),
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
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 9e7a704e..d4fa50ac 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -459,7 +459,7 @@ class Page_LocationInfo extends Page
 		// Build list of defined backends
 		$serverlist = array();
 		$dbquery2 = Database::simpleQuery("SELECT * FROM `locationinfo_coursebackend` ORDER BY servername ASC");
-		while ($row = $dbquery2->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($dbquery2 as $row) {
 			if (isset($servertypes[$row['servertype']])) {
 				$row['typename'] = $servertypes[$row['servertype']];
 			} else {
@@ -512,7 +512,7 @@ class Page_LocationInfo extends Page
 		$server['list'] = [];
 		$res = Database::simpleQuery('SELECT dateline, message FROM locationinfo_backendlog
 				WHERE serverid = :id ORDER BY logid DESC LIMIT 100', ['id' => $id]);
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['dateline_s'] = Util::prettyTime($row['dateline']);
 			$row['class'] = substr($row['message'], 0, 3) === '[F]' ? 'text-danger' : 'text-warning';
 			$row['message'] = Substr($row['message'], 3);
@@ -536,7 +536,7 @@ class Page_LocationInfo extends Page
 			LEFT JOIN `locationinfo_coursebackend` AS cb USING (serverid)
 			LEFT JOIN `location` AS loc USING (locationid)");
 
-		while ($row = $dbquery->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($dbquery as $row) {
 			$locid = (int)$row['locationid'];
 			if (!isset($locations[$locid]) || !in_array($locid, $allowedLocations))
 				continue;
@@ -593,7 +593,7 @@ class Page_LocationInfo extends Page
 		}
 		$panels = array();
 		$locations = Location::getLocationsAssoc();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($row['paneltype'] === 'URL') {
 				$url = json_decode($row['panelconfig'], true)['url'];
 				$row['locations'] = $row['locationurl'] = $url;
@@ -721,7 +721,7 @@ class Page_LocationInfo extends Page
 					WHERE locationid IN (:locations) AND serverid IS NOT NULL", array('locations' => $chain));
 				$chain = array_flip($chain);
 				$best = false;
-				while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				foreach ($res as $row) {
 					if ($best === false || $chain[$row['locationid']] < $chain[$best['locationid']]) {
 						$best = $row;
 					}
@@ -735,7 +735,7 @@ class Page_LocationInfo extends Page
 		// get Server / ID list
 		$res = Database::simpleQuery("SELECT serverid, servername FROM locationinfo_coursebackend ORDER BY servername ASC");
 		$serverList = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($row['serverid'] == $locConfig['serverid']) {
 				$row['selected'] = 'selected';
 			}