Changeset 12019

Timestamp:

Aug 31, 2011, 5:12:14 PM (13 years ago)

Author:

flop25

Message:

feature:2418
adding an option to apply permission of users to sub-albums
changing the name of vars $private_uppercats->$private_cats

Location:

trunk/admin

Files:

• cat_perm.php (modified) (3 diffs)
• include/functions.php (modified) (4 diffs)
• themes/default/template/cat_perm.tpl (modified) (1 diff)

trunk/admin/cat_perm.php

@@ -97 +97 @@
   AND status = \'private\'
 ;';
-  $private_uppercats = array_from_query($query, 'id');
+  $private_cats = array_from_query($query, 'id');
 
   // We must not reinsert already existing lines in group_access table
   $granteds = array();
-  foreach ($private_uppercats as $cat_id)
+  foreach ($private_cats as $cat_id)
   {
     $granteds[$cat_id] = array();
@@ -109 +109 @@
 SELECT group_id, cat_id
   FROM '.GROUP_ACCESS_TABLE.'
-  WHERE cat_id IN ('.implode(',', $private_uppercats).')
+  WHERE cat_id IN ('.implode(',', $private_cats).')
     AND group_id IN ('.implode(',', $_POST['grant_groups']).')
 ;';
@@ -120 +120 @@
   $inserts = array();
   
-  foreach ($private_uppercats as $cat_id)
+  foreach ($private_cats as $cat_id)
   {
     $group_ids = array_diff($_POST['grant_groups'], $granteds[$cat_id]);

trunk/admin/include/functions.php

@@ -2144 +2144 @@
   }
   
-  // make sure categories are private and select uppercats
+  // 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
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN ('.implode(',', get_uppercat_ids($category_ids)).')
+  WHERE id IN ('.$cat_ids.')
     AND status = \'private\'
 ;';
-  $private_uppercats = array_from_query($query, 'id');
-
-  if (count($private_uppercats) == 0)
+  $private_cats = array_from_query($query, 'id');
+
+  if (count($private_cats) == 0)
   {
     return;
@@ -2161 +2162 @@
   // We must not reinsert already existing lines in user_access table
   $granteds = array();
-  foreach ($private_uppercats as $cat_id)
+  foreach ($private_cats as $cat_id)
   {
     $granteds[$cat_id] = array();
@@ -2171 +2172 @@
     cat_id
   FROM '.USER_ACCESS_TABLE.'
-  WHERE cat_id IN ('.implode(',', $private_uppercats).')
+  WHERE cat_id IN ('.implode(',', $private_cats).')
     AND user_id IN ('.implode(',', $user_ids).')
 ;';
@@ -2182 +2183 @@
   $inserts = array();
   
-  foreach ($private_uppercats as $cat_id)
+  foreach ($private_cats as $cat_id)
   {
     $grant_to_users = array_diff($user_ids, $granteds[$cat_id]);

trunk/admin/themes/default/template/cat_perm.tpl

@@ -60 +60 @@
       {/foreach}
     </ul>
+    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
     <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
   </fieldset>