Move groups queries to GroupRepository and GroupAccessRepository

classes. Cope with #20
nikrou · Oct 10, 2018 · 2bd3e87 · 2bd3e87
1 parent 23ff674
commit 2bd3e87
Show file tree

Hide file tree

Showing 25 changed files with 600 additions and 352 deletions.
diff --git a/admin/album_notification.php b/admin/album_notification.php
@@ -14,6 +14,8 @@
 }
 
 use App\Repository\ImageRepository;
+use App\Repository\GroupRepository;
+use App\Repository\GroupAccessRepository;
 
 // +-----------------------------------------------------------------------+
 // |                       variable initialization                         |
@@ -79,10 +81,10 @@
 
     \Phyxo\Functions\URL::unset_make_full_url();
 
-    $query = 'SELECT name FROM ' . GROUPS_TABLE . ' WHERE id = ' . $conn->db_real_escape_string($_POST['group']);
-    list($group_name) = $conn->db_fetch_row($conn->db_query($query));
+    $result = (new GroupRepository($conn))->findById($_POST['group']);
+    $row = $conn->db_fetch_assoc($result);
 
-    $page['infos'][] = \Phyxo\Functions\Language::l10n('An information email was sent to group "%s"', $group_name);
+    $page['infos'][] = \Phyxo\Functions\Language::l10n('An information email was sent to group "%s"', $row['name']);
 }
 
 // +-----------------------------------------------------------------------+
@@ -104,15 +106,15 @@
 // |                          form construction                            |
 // +-----------------------------------------------------------------------+
 
-$query = 'SELECT id AS group_id FROM ' . GROUPS_TABLE;
-$all_group_ids = $conn->query2array($query, null, 'group_id');
+$result = (new GroupRepository($conn))->findAll();
+$all_group_ids = $conn->result2array($result, null, 'group_id');
 
 if (count($all_group_ids) == 0) {
     $template->assign('no_group_in_gallery', true);
 } else {
     if ('private' == $category['status']) {
-        $query = 'SELECT group_id FROM ' . GROUP_ACCESS_TABLE . ' WHERE cat_id = ' . $category['id'];
-        $group_ids = $conn->query2array($query, null, 'group_id');
+        $result = (new GroupAccessRepository($conn))->findByCatId($category['id']);
+        $group_ids = $conn->result2array($result, null, 'group_id');
 
         if (count($group_ids) == 0) {
             $template->assign('permission_url', ALBUM_BASE_URL . '&amp;section=permissions');
@@ -122,11 +124,10 @@
     }
 
     if (count($group_ids) > 0) {
-        $query = 'SELECT id,name FROM ' . GROUPS_TABLE;
-        $query .= ' WHERE id ' . $conn->in($group_ids) . ' ORDER BY name ASC';
+        $result = (new GroupRepository($conn))->findByIds($group_ids, 'ORDER BY name ASC');
         $template->assign(
             'group_mail_options',
-            $conn->query2array($query, 'id', 'name')
+            $conn->result2array($result, 'id', 'name')
         );
     }
 }
diff --git a/admin/album_permissions.php b/admin/album_permissions.php
@@ -10,6 +10,8 @@
  */
 
 use App\Repository\CategoryRepository;
+use App\Repository\GroupAccessRepository;
+use App\Repository\GroupRepository;
 
 if (!defined('ALBUM_BASE_URL')) {
     die("Hacking attempt!");
@@ -37,8 +39,8 @@
         //
         // manage groups
         //
-        $query = 'SELECT group_id FROM ' . GROUP_ACCESS_TABLE . ' WHERE cat_id = ' . $conn->db_real_escape_string($page['cat']);
-        $groups_granted = $conn->query2array($query, null, 'group_id');
+        $result = (new GroupAccessRepository($conn))->findByCatId($page['cat']);
+        $groups_granted = $conn->result2array($result, null, 'group_id');
 
         if (!isset($_POST['groups'])) {
             $_POST['groups'] = [];
@@ -51,10 +53,7 @@
         if (count($deny_groups) > 0) {
             // if you forbid access to an album, all sub-albums become
             // automatically forbidden
-            $query = 'DELETE FROM ' . GROUP_ACCESS_TABLE;
-            $query .= ' WHERE group_id ' . $conn->in($deny_groups);
-            $query .= ' AND cat_id ' . $conn->in((new CategoryRepository($conn))->getSubcatIds([$page['cat']]));
-            $conn->db_query($query);
+            (new GroupAccessRepository($conn))->deleteByGroupIdsAndCatIds($deny_groups, (new CategoryRepository($conn))->getSubcatIds([$page['cat']]));
         }
 
         //
@@ -80,12 +79,7 @@
                 }
             }
 
-            $conn->mass_inserts(
-                GROUP_ACCESS_TABLE,
-                ['group_id', 'cat_id'],
-                $inserts,
-                ['ignore' => true]
-            );
+            (new GroupAccessRepository($conn))->massInserts(['group_id', 'cat_id'], $inserts, ['ignore' => true]);
         }
 
         //
@@ -149,13 +143,13 @@
 
 $groups = [];
 
-$query = 'SELECT id, name FROM ' . GROUPS_TABLE . ' ORDER BY name ASC;';
-$groups = $conn->query2array($query, 'id', 'name');
+$result = (new GroupRepository($conn))->findAll('ORDER BY name ASC');
+$groups = $conn->result2array($result, 'id', 'name');
 $template->assign('groups', $groups);
 
 // groups granted to access the category
-$query = 'SELECT group_id FROM ' . GROUP_ACCESS_TABLE . ' WHERE cat_id = ' . $conn->db_real_escape_string($page['cat']);
-$group_granted_ids = $conn->query2array($query, null, 'group_id');
+$result = (new GroupAccessRepository($conn))->findByCatId($page['cat']);
+$group_granted_ids = $conn->result2array($result, null, 'group_id');
 $template->assign('groups_selected', $group_granted_ids);
 
 // users...