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, 10 insertions, 10 deletions

diff --git a/modules-available/dozmod/pages/actionlog.inc.php b/modules-available/dozmod/pages/actionlog.inc.php
index eaa5218c..51fccb4f 100644
--- a/modules-available/dozmod/pages/actionlog.inc.php
+++ b/modules-available/dozmod/pages/actionlog.inc.php
@@ -144,7 +144,7 @@ class SubPage
 		// query action log
 		$res = Database::simpleQuery($query, $params);
 		$events = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['dateline_s'] = date('d.m.Y H:i', $row['dateline']);
 			if (isset($row['imgname'])) {
 				$row['targeturl'] = '?do=dozmod&section=actionlog&action=showtarget&uuid=' . $row['targetid'];
diff --git a/modules-available/dozmod/pages/expiredimages.inc.php b/modules-available/dozmod/pages/expiredimages.inc.php
index 0ecdaa77..b61b863b 100644
--- a/modules-available/dozmod/pages/expiredimages.inc.php
+++ b/modules-available/dozmod/pages/expiredimages.inc.php
@@ -22,7 +22,7 @@ class SubPage
 			ORDER BY b.displayname ASC, v.createtime ASC");
 		$NOW = time();
 		$rows = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			if ($row['latexptime'] > $NOW && $row['latdelstate'] === 'KEEP') {
 				$row['hasNewerClass'] = 'glyphicon-ok green';
 				$row['checked'] = 'checked';
diff --git a/modules-available/dozmod/pages/networkrules.inc.php b/modules-available/dozmod/pages/networkrules.inc.php
index 710e90a9..218b7b06 100644
--- a/modules-available/dozmod/pages/networkrules.inc.php
+++ b/modules-available/dozmod/pages/networkrules.inc.php
@@ -74,7 +74,7 @@ class SubPage
 			$res = Database::simpleQuery('SELECT ruleid, rulename, ruledata
 					FROM sat.presetnetworkrule ORDER BY rulename ASC');
 			$rows = array();
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				$rows[] = $row;
 			}
 			Render::addTemplate('networkrules', [
diff --git a/modules-available/dozmod/pages/networkshares.inc.php b/modules-available/dozmod/pages/networkshares.inc.php
index 659321b4..852a8c67 100644
--- a/modules-available/dozmod/pages/networkshares.inc.php
+++ b/modules-available/dozmod/pages/networkshares.inc.php
@@ -66,7 +66,7 @@ class SubPage
 			$res = Database::simpleQuery('SELECT shareid, sharename, sharedata, active
 					FROM sat.presetnetworkshare ORDER BY sharename ASC');
 			$rows = array();
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				$dec = json_decode($row['sharedata'], true);
 				if (!is_array($dec)) {
 					$dec = [];
diff --git a/modules-available/dozmod/pages/runscripts.inc.php b/modules-available/dozmod/pages/runscripts.inc.php
index 9e6062d4..5665ba83 100644
--- a/modules-available/dozmod/pages/runscripts.inc.php
+++ b/modules-available/dozmod/pages/runscripts.inc.php
@@ -98,7 +98,7 @@ class SubPage
 					FROM sat.presetrunscript
 					ORDER BY scriptname ASC');
 			$rows = [];
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $row) {
 				if ($row['visibility'] == 0) {
 					$row['visibility'] = 'eye-close';
 				} elseif ($row['visibility'] == 1) {
@@ -139,7 +139,7 @@ class SubPage
 			$res = Database::simpleQuery('SELECT o.osid, o.displayname, pxo.osid AS isvalid FROM sat.operatingsystem o
 					LEFT JOIN sat.presetrunscript_x_operatingsystem pxo ON (o.osid = pxo.osid AND pxo.runscriptid = :runscriptid)
 					ORDER BY o.displayname ASC', ['runscriptid' => $id]);
-			while ($osrow = $res->fetch(PDO::FETCH_ASSOC)) {
+			foreach ($res as $osrow) {
 				$row['oslist'][] = [
 					'osid' => $osrow['osid'],
 					'displayname' => $osrow['displayname'],
diff --git a/modules-available/dozmod/pages/special.inc.php b/modules-available/dozmod/pages/special.inc.php
index 5a532b51..d6ac53d6 100644
--- a/modules-available/dozmod/pages/special.inc.php
+++ b/modules-available/dozmod/pages/special.inc.php
@@ -15,7 +15,7 @@ class SubPage
 			. " GROUP BY blocksha1, blocksize HAVING blockcount > 1 ORDER BY blockcount DESC, blocksha1 ASC");
 		$data = array('hashes' => array());
 		$spaceWasted = 0;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['hash_hex'] = bin2hex($row['blocksha1']);
 			$row['blocksize_s'] = Util::readableFileSize($row['blocksize']);
 			$data['hashes'][] = $row;
@@ -57,7 +57,7 @@ class SubPage
 			die('Database error: ' . Database::lastError());
 		}
 		$data = array('rows' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['createtime_s'] = date('d.m.Y H:i', $row['createtime']);
 			$row['filesize_s'] = Util::readableFileSize($row['filesize']);
 			$data['rows'][] = $row;
diff --git a/modules-available/dozmod/pages/users.inc.php b/modules-available/dozmod/pages/users.inc.php
index 50f0f763..cdf22b9d 100644
--- a/modules-available/dozmod/pages/users.inc.php
+++ b/modules-available/dozmod/pages/users.inc.php
@@ -42,7 +42,7 @@ class SubPage
 			. ' LEFT JOIN sat.organization USING (organizationid)'
 			. ' ORDER BY lastname ASC, firstname ASC');
 		$rows = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			settype($row['lastlogin'], 'int');
 			$row['canlogin'] = self::checked($row['canlogin']);
 			$row['issuperuser'] = self::checked($row['issuperuser']);
@@ -63,7 +63,7 @@ class SubPage
 		$res = Database::simpleQuery('SELECT organizationid, displayname, canlogin FROM sat.organization'
 			. ' ORDER BY displayname ASC');
 		$rows = array();
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+		foreach ($res as $row) {
 			$row['canlogin'] = self::checked($row['canlogin']);
 			$rows[] = $row;
 		}