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

7 files changed, 16 insertions, 16 deletions

diff --git a/modules-available/sysconfig/addconfig.inc.php b/modules-available/sysconfig/addconfig.inc.php
index a22cdc46..af8aab37 100644
--- a/modules-available/sysconfig/addconfig.inc.php
+++ b/modules-available/sysconfig/addconfig.inc.php
@@ -122,7 +122,7 @@ class AddConfig_Start extends AddConfig_Base
 			$modGroups[$mod['group']] =& $mod;
 		}
 		unset($mod);
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (!isset($mods[$row['moduletype']])) {
 				$mods[$row['moduletype']] = array(
 					'unique' => false,
diff --git a/modules-available/sysconfig/api.inc.php b/modules-available/sysconfig/api.inc.php
index 983c6dcb..c81d37b5 100644
--- a/modules-available/sysconfig/api.inc.php
+++ b/modules-available/sysconfig/api.inc.php
@@ -46,7 +46,7 @@ $res = Database::simpleQuery("SELECT c.title, c.filepath, c.status, cl.locationi
 
 $best = 1000;
 $row = false;
-while ($r = $res->fetch(PDO::FETCH_ASSOC)) {
+foreach ($res as $r) {
 	settype($r['locationid'], 'int');
 	$index = array_search($r['locationid'], $locationChain);
 	if ($index === false || $index > $best)
diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php
index 580c15a0..fadc649a 100644
--- a/modules-available/sysconfig/inc/configmodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule.inc.php
@@ -153,7 +153,7 @@ abstract class ConfigModule
 		if ($ret === false)
 			return false;
 		$list = array();
-		while ($row = $ret->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($ret as $row) {
 			$instance = self::instanceFromDbRow($row);
 			if ($instance === false)
 				continue;
diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php
index 98f29753..015b5ccf 100644
--- a/modules-available/sysconfig/inc/configtgz.inc.php
+++ b/modules-available/sysconfig/inc/configtgz.inc.php
@@ -69,7 +69,7 @@ class ConfigTgz
 		// Delete old connections
 		Database::exec("DELETE FROM configtgz_x_module WHERE configid = :configid", array('configid' => $this->configId));
 		// Make connection
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			Database::exec("INSERT INTO configtgz_x_module (configid, moduleid) VALUES (:configid, :moduleid)", array(
 				'configid' => $this->configId,
 				'moduleid' => $row['moduleid']
@@ -170,7 +170,7 @@ class ConfigTgz
 				// Get mapping of moduleid to module name for prettier log display
 				$res = Database::simpleQuery('SELECT moduleid, title FROM configtgz_module');
 				$mods = [];
-				while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				foreach ($res as $row) {
 					$mods[$row['moduleid']] = $row['title'];
 				}
 				// Now extract module id from filename and if applicable, replace filename by module name
@@ -252,7 +252,7 @@ class ConfigTgz
 			'status' => 'OUTDATED'
 		));
 		$res = Database::simpleQuery("SELECT configid FROM configtgz");
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$configTgz = self::get($row['configid']);
 			if ($configTgz !== false) {
 				$configTgz->generate();
@@ -290,7 +290,7 @@ class ConfigTgz
 		}
 		$res = Database::simpleQuery("SELECT moduleid, moduletype, filepath, status FROM configtgz_module WHERE moduleid IN ($idstr)");
 		// Make connection
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			Database::exec("INSERT INTO configtgz_x_module (configid, moduleid) VALUES (:configid, :moduleid)", array(
 				'configid' => $instance->configId,
 				'moduleid' => $row['moduleid']
@@ -315,7 +315,7 @@ class ConfigTgz
 			. " INNER JOIN configtgz_module USING (moduleid) "
 			. " WHERE configid = :configid", array('configid' => $instance->configId));
 		$instance->modules = array();
-		while ($row = $ret->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($ret as $row) {
 			$instance->modules[] = $row;
 		}
 		return $instance;
@@ -335,7 +335,7 @@ class ConfigTgz
 		if ($res === false)
 			return false;
 		$list = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$instance = new ConfigTgz;
 			$instance->configId = $row['configid'];
 			$instance->configTitle = $row['title'];
@@ -344,7 +344,7 @@ class ConfigTgz
 				. " INNER JOIN configtgz_module USING (moduleid) "
 				. " WHERE configid = :configid", array('configid' => $instance->configId));
 			$instance->modules = array();
-			while ($innerRow = $innerRes->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($innerRes as $innerRow) {
 				$instance->modules[] = $innerRow;
 			}
 			$list[] = $instance;
diff --git a/modules-available/sysconfig/inc/sysconfig.inc.php b/modules-available/sysconfig/inc/sysconfig.inc.php
index 9ad3a36f..02131366 100644
--- a/modules-available/sysconfig/inc/sysconfig.inc.php
+++ b/modules-available/sysconfig/inc/sysconfig.inc.php
@@ -8,7 +8,7 @@ class SysConfig
 		$res = Database::simpleQuery("SELECT c.configid, c.title, c.filepath, c.status, Group_Concat(cl.locationid) AS locs FROM configtgz c"
 			. " LEFT JOIN configtgz_location cl USING (configid) GROUP BY c.configid");
 		$ret = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$ret[] = $row;
 		}
 		return $ret;
diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php
index e9eaaf50..6c9edba2 100644
--- a/modules-available/sysconfig/install.inc.php
+++ b/modules-available/sysconfig/install.inc.php
@@ -87,7 +87,7 @@ if (!tableHasColumn('configtgz_module', 'dateline')) {
 	$update[] = UPDATE_DONE;
 	// Infer from module's filemtime
 	$res = Database::simpleQuery('SELECT moduleid, filepath FROM configtgz_module');
-	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+	foreach ($res as $row) {
 		Database::exec('UPDATE configtgz_module SET dateline = :mtime WHERE moduleid = :moduleid',
 			['moduleid' => $row['moduleid'], 'mtime' => filemtime($row['filepath'])]);
 	}
@@ -102,7 +102,7 @@ if (!tableHasColumn('configtgz', 'dateline')) {
 			INNER JOIN configtgz_x_module cxm USING (configid)
 			INNER JOIN configtgz_module m USING (moduleid)
 			GROUP BY configid');
-	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+	foreach ($res as $row) {
 		Database::exec('UPDATE configtgz SET dateline = :mtime WHERE configid = :configid',
 			['configid' => $row['configid'], 'mtime' => $row['dateline']]);
 	}
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index ff3983c1..e868ec67 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -188,7 +188,7 @@ class Page_SysConfig extends Page
 			$locationName = false;
 		}
 		$hasDefault = false;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if (is_null($row['loclist'])) {
 				$locList = array();
 			} else {
@@ -291,7 +291,7 @@ class Page_SysConfig extends Page
 			. " ORDER BY module.title ASC", array('configid' => $configid));
 
 		$modules = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$modules[] = array(
 				'module' => $row['moduletitle'],
 				'moduleid' => $row['moduleid']
@@ -375,7 +375,7 @@ class Page_SysConfig extends Page
 			Message::addSuccess('module-deleted', $module['title']);
 		}
 		// Rebuild depending config.tgz
-		while ($crow = $existing->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($existing as $crow) {
 			$config = ConfigTgz::get($crow['configid']);
 			if ($config !== false) {
 				$config->generate();