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/locations/pages/locations.inc.php | |
| 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/locations/pages/locations.inc.php')
| -rw-r--r-- | modules-available/locations/pages/locations.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/locations/pages/locations.inc.php b/modules-available/locations/pages/locations.inc.php index 8afb454a..ce08e597 100644 --- a/modules-available/locations/pages/locations.inc.php +++ b/modules-available/locations/pages/locations.inc.php @@ -121,7 +121,7 @@ class SubPage $res = Database::simpleQuery("SELECT m.locationid, Count(*) AS cnt, Sum(If(m.state = 'OCCUPIED', 1, 0)) AS used, Sum(If(m.state = 'IDLE', 1, 0)) AS idle FROM machine m WHERE (locationid IN (:allowedLocationIds) $extra) GROUP BY locationid", compact('allowedLocationIds')); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $locId = (int)$row['locationid']; if (isset($locationList[$locId])) { $locationList[$locId]['clientCount'] = $row['cnt']; @@ -135,7 +135,7 @@ class SubPage } $res = Database::simpleQuery("SELECT m.locationid, Count(DISTINCT sm.machineuuid) AS cnt FROM setting_machine sm INNER JOIN machine m USING (machineuuid) GROUP BY m.locationid"); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $locId = (int)$row['locationid']; if (isset($locationList[$locId])) { $locationList[$locId]['machineVarsOverrideCount'] = $row['cnt']; @@ -188,7 +188,7 @@ class SubPage if (Module::get('baseconfig') !== false) { $res = Database::simpleQuery("SELECT locationid, Count(*) AS cnt FROM `setting_location` WHERE locationid IN (:allowedLocationIds) GROUP BY locationid", compact('allowedLocationIds')); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $lid = (int)$row['locationid']; if (isset($locationList[$lid])) { $locationList[$lid]['overriddenVars'] = $row['cnt']; @@ -202,7 +202,7 @@ class SubPage $res = Database::simpleQuery("SELECT ml.locationid, m.title, ml.defaultentryid FROM serversetup_menu m INNER JOIN serversetup_menu_location ml USING (menuid) WHERE locationid IN (:allowedLocationIds) GROUP BY locationid", compact('allowedLocationIds')); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + foreach ($res as $row) { $lid = (int)$row['locationid']; if (isset($locationList[$lid])) { if ($row['defaultentryid'] !== null) { |