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, 8 insertions, 6 deletions

diff --git a/modules-available/runmode/inc/runmode.inc.php b/modules-available/runmode/inc/runmode.inc.php
index 4d077f02..ccc432d2 100644
--- a/modules-available/runmode/inc/runmode.inc.php
+++ b/modules-available/runmode/inc/runmode.inc.php
@@ -139,7 +139,7 @@ class RunMode
 		$res = Database::simpleQuery('SELECT machineuuid, modeid, modedata FROM runmode WHERE module = :module',
 			compact('module'));
 		$ret = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($groupByModeId) {
 				if (!isset($ret[$row['modeid']])) {
 					$ret[$row['modeid']] = array();
@@ -177,7 +177,7 @@ class RunMode
 				WHERE module = :module AND modeid = :modeId",
 			compact('module', 'modeId'));
 		$ret = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($detailed && empty($row['hostname'])) {
 				$row['hostname'] = $row['clientip'];
 			}
@@ -204,7 +204,7 @@ class RunMode
 		}
 		$res = Database::simpleQuery("SELECT machineuuid, module, modeid, isclient $xtra FROM runmode");
 		$ret = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (!is_null($isClient) && ($row['isclient'] != 0) !== $isClient)
 				continue;
 			$ret[$row['machineuuid']] = $row;
diff --git a/modules-available/runmode/page.inc.php b/modules-available/runmode/page.inc.php
index 0b6dfa02..a551ddc5 100644
--- a/modules-available/runmode/page.inc.php
+++ b/modules-available/runmode/page.inc.php
@@ -198,15 +198,17 @@ class Page_RunMode extends Page
 	{
 		if ($onlyModule === false) {
 			$where = '';
+			$args = [];
 		} else {
 			$where = ' AND r.module = :moduleId ';
+			$args = ['moduleId' => $onlyModule];
 		}
 		$res = Database::simpleQuery("SELECT m.machineuuid, m.hostname, m.clientip, r.module, r.modeid, r.isclient"
 			. " FROM runmode r"
 			. " INNER JOIN machine m ON (m.machineuuid = r.machineuuid $where )"
-			. " ORDER BY m.hostname ASC, m.clientip ASC", array('moduleId' => $onlyModule));
+			. " ORDER BY m.hostname ASC, m.clientip ASC", $args);
 		$modules = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (!isset($modules[$row['module']])) {
 				if (!Module::isAvailable($row['module']))
 					continue;
@@ -332,7 +334,7 @@ class Page_RunMode extends Page
 					 LIMIT 100", $params);
 
 				$returnObject = [
-					'machines' => $result->fetchAll(PDO::FETCH_ASSOC)
+					'machines' => $result->fetchAll()
 				];
 			}
 		}