bug:2855

check "Apply to sub" checkbox if $conf inheritance_by_default is true
add admins to the users granted
optimizations

git-svn-id: http://piwigo.org/svn/trunk@23430 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 41 insertions, 39 deletions

diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index ad9ff1a05..b7b32ac2e 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -319,7 +319,7 @@ SELECT user_id, group_id
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
-$template->assign(array('PWG_TOKEN' => get_pwg_token()));
+$template->assign(array('PWG_TOKEN' => get_pwg_token(), 'INHERIT' => $conf['inheritance_by_default']));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'cat_perm');
 ?>
diff --git a/admin/site_update.php b/admin/site_update.php
index feb517371..30cef3bc7 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -322,7 +322,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
           $granted_grps = array();
           while ($row = pwg_db_fetch_assoc($result))
           {
-            if (!is_array ($granted_grps[$row['cat_id']]))
+            if (!isset($granted_grps[$row['cat_id']]))
             {
               $granted_grps[$row['cat_id']]=array();
             }
@@ -333,33 +333,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
               )
             );
           }
-          $insert_granted_grps=array();
-          foreach ($category_ids as $ids)
-          {
-            $parent_id=$db_categories[$ids]['parent'];
-            while (in_array($parent_id, $category_ids))
-            {
-              $parent_id= $db_categories[$parent_id]['parent'];
-            }
-            if ($db_categories[$ids]['status']=='private' and !is_null($parent_id))
-            {
-              foreach ($granted_grps[$parent_id] as $granted_grp)
-              {
-                array_push(
-                  $insert_granted_grps,
-                  array(
-                    'group_id' => $granted_grp,
-                    'cat_id' => $ids
-                  )
-                );
-               
-              }
-            }
-          }
-  
-          mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $insert_granted_grps);
         }
-
         $query = '
           SELECT *
           FROM '.USER_ACCESS_TABLE.'
@@ -368,11 +342,10 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
         $result = pwg_query($query);
         if (!empty($result))
         {
-
           $granted_users = array();
           while ($row = pwg_db_fetch_assoc($result))
           {
-            if (!is_array ($granted_users[$row['cat_id']]))
+            if (!isset($granted_users[$row['cat_id']]))
             {
               $granted_users[$row['cat_id']]=array();
             }
@@ -383,15 +356,32 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
               )
             );
           }
-          $insert_granted_users=array();
-          foreach ($category_ids as $ids)
+        }
+        $insert_granted_users=array();
+        $insert_granted_grps=array();
+        foreach ($category_ids as $ids)
+        {
+          $parent_id=$db_categories[$ids]['parent'];
+          while (in_array($parent_id, $category_ids))
           {
-            $parent_id=$db_categories[$ids]['parent'];
-             while (in_array($parent_id, $category_ids))
+            $parent_id= $db_categories[$parent_id]['parent'];
+          }
+          if ($db_categories[$ids]['status']=='private' and !is_null($parent_id))
+          {
+            if (isset($granted_grps[$parent_id]))
             {
-              $parent_id= $db_categories[$parent_id]['parent'];
+              foreach ($granted_grps[$parent_id] as $granted_grp)
+              {
+                array_push(
+                  $insert_granted_grps,
+                  array(
+                    'group_id' => $granted_grp,
+                    'cat_id' => $ids
+                  )
+                );
+              }
             }
-            if ($db_categories[$ids]['status']=='private' and !is_null($parent_id))
+            if (isset($granted_users[$parent_id]))
             {
               foreach ($granted_users[$parent_id] as $granted_user)
               {
@@ -404,10 +394,22 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
                 );
               }
             }
+            foreach (get_admins() as $granted_user)
+            {
+              array_push(
+                $insert_granted_users,
+                array(
+                  'user_id' => $granted_user,
+                  'cat_id' => $ids
+                )
+              );
+            }
           }
-          mass_inserts(USER_ACCESS_TABLE, array('user_id','cat_id'), $insert_granted_users);
         }
-      }     
+        mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $insert_granted_grps);
+        $insert_granted_users=array_unique($insert_granted_users, SORT_REGULAR);
+        mass_inserts(USER_ACCESS_TABLE, array('user_id','cat_id'), $insert_granted_users);
+      }
       else
       {
         add_permission_on_category($category_ids, get_admins());
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index 718c7ba47..471736569 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -150,7 +150,7 @@ jQuery(document).ready(function() {
 
   <p style="margin:12px;text-align:left;">
     <input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit">
-    <label id="applytoSubAction" style="display:none;"><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
+    <label id="applytoSubAction" style="display:none;"><input type="checkbox" name="apply_on_sub" {if $INHERIT}checked="checked"{/if}>{'Apply to sub-albums'|@translate}</label>
   </p>
 
 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">