diff options
author | Simon Rettberg | 2021-05-06 10:26:09 +0200 |
---|---|---|
committer | Simon Rettberg | 2021-05-11 14:51:13 +0200 |
commit | 8dc2b92d667f1401ab9f1315a36add61658f899c (patch) | |
tree | 452c5fe040055884cf9d9ee834415db84999a9a1 /modules-available/minilinux | |
parent | [session] Add simple session overview table (diff) | |
download | slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.tar.gz slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.tar.xz slx-admin-8dc2b92d667f1401ab9f1315a36add61658f899c.zip |
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
Diffstat (limited to 'modules-available/minilinux')
-rw-r--r-- | modules-available/minilinux/inc/minilinux.inc.php | 6 | ||||
-rw-r--r-- | modules-available/minilinux/page.inc.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php index d64ef080..89a5035a 100644 --- a/modules-available/minilinux/inc/minilinux.inc.php +++ b/modules-available/minilinux/inc/minilinux.inc.php @@ -359,7 +359,7 @@ class MiniLinux $list = []; $res = Database::simpleQuery('SELECT branchid, versionid, title, dateline, orphan, taskid, installed FROM minilinux_version ORDER BY branchid, dateline, versionid'); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $list[$row['branchid']][$row['versionid']] = $row; } return $list; @@ -473,7 +473,7 @@ class MiniLinux GROUP BY be.data"); $return = []; $usedMenuIds = []; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $data = json_decode($row['data'], true); if (!isset($data['id'])) continue; @@ -496,7 +496,7 @@ class MiniLinux $res = Database::simpleQuery("SELECT menuid, title FROM serversetup_menu m WHERE menuid IN (:menuid)", ['menuid' => array_unique($usedMenuIds)]); $menus = []; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $menus[$row['menuid']] = $row['title']; } // Build output array diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php index 03ec121e..33a7ab28 100644 --- a/modules-available/minilinux/page.inc.php +++ b/modules-available/minilinux/page.inc.php @@ -57,7 +57,7 @@ class Page_MiniLinux extends Page $data = ['list' => [], 'show_refresh' => true]; $tooOld = strtotime('-7 days'); $showRefresh = strtotime('-5 minutes'); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $row['lastupdate_s'] = Util::prettyTime($row['lastupdate']); if ($row['lastupdate'] != 0 && $row['lastupdate'] < $tooOld) { $row['update_class'] = 'text-danger'; |