Changeset 25244

Timestamp:

Oct 30, 2013, 9:14:32 PM (10 years ago)

Author:

mistic100

Message:

mistakenly removed status check in previous commit + same thing for users

Location:

trunk/admin

Files:

• cat_perm.php (modified) (1 diff)
• include/functions.php (modified) (3 diffs)

trunk/admin/cat_perm.php

@@ -100 +100 @@
       }
       
+      $query = '
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id IN ('.implode(',', $cat_ids).')
+    AND status = \'private\'
+;';
+      $private_cats = array_from_query($query, 'id');
+      
       $inserts = array();
-      foreach ($cat_ids as $cat_id)
+      foreach ($private_cats as $cat_id)
       {
         foreach ($grant_groups as $group_id)

trunk/admin/include/functions.php

@@ -2256 +2256 @@
 
   // make sure categories are private and select uppercats or subcats
-  $cat_ids = (isset($_POST['apply_on_sub'])) ? implode(',', get_subcat_ids($category_ids)).",".implode(',', get_uppercat_ids($category_ids)) : implode(',', get_uppercat_ids($category_ids));
-  $query = '
-SELECT
-    id
+  $cat_ids = get_uppercat_ids($category_ids);
+  if (isset($_POST['apply_on_sub']))
+  {
+    $cat_ids = array_merge($cat_ids, get_subcat_ids($category_ids));
+  }
+
+  $query = '
+SELECT id
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN ('.$cat_ids.')
+  WHERE id IN ('.implode(',', $cat_ids).')
     AND status = \'private\'
 ;';
@@ -2270 +2274 @@
     return;
   }
-
-  // We must not reinsert already existing lines in user_access table
-  $granteds = array();
+  
+  $inserts = array();
   foreach ($private_cats as $cat_id)
   {
-    $granteds[$cat_id] = array();
-  }
-
-  $query = '
-SELECT
-    user_id,
-    cat_id
-  FROM '.USER_ACCESS_TABLE.'
-  WHERE cat_id IN ('.implode(',', $private_cats).')
-    AND user_id IN ('.implode(',', $user_ids).')
-;';
-  $result = pwg_query($query);
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    $granteds[ $row['cat_id'] ][] = $row['user_id'];
-  }
-
-  $inserts = array();
-
-  foreach ($private_cats as $cat_id)
-  {
-    $grant_to_users = array_diff($user_ids, $granteds[$cat_id]);
-
-    foreach ($grant_to_users as $user_id)
+    foreach ($user_ids as $user_id)
     {
       $inserts[] = array(
@@ -2306 +2286 @@
     }
   }
-
-  if (count($inserts) > 0)
-  {
-    mass_inserts(USER_ACCESS_TABLE, array_keys($inserts[0]), $inserts);
-  }
+  
+  mass_inserts(
+    USER_ACCESS_TABLE,
+    array('user_id','cat_id'),
+    $inserts,
+    array('ignore'=>true)
+    );
 }