Changeset 23430

Timestamp:

Jun 21, 2013, 4:48:43 PM (11 years ago)

Author:

flop25

Message:

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

Location:

trunk/admin

Files:

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

trunk/admin/cat_perm.php

@@ -320 +320 @@
 // |                           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');

trunk/admin/site_update.php

@@ -323 +323 @@
           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();
@@ -334 +334 @@
             );
           }
-          $insert_granted_grps=array();
-          foreach ($category_ids as $ids)
+        }
+        $query = '
+          SELECT *
+          FROM '.USER_ACCESS_TABLE.'
+          WHERE cat_id IN ('.$category_up.')
+        ;';
+        $result = pwg_query($query);
+        if (!empty($result))
+        {
+          $granted_users = array();
+          while ($row = pwg_db_fetch_assoc($result))
           {
-            $parent_id=$db_categories[$ids]['parent'];
-            while (in_array($parent_id, $category_ids))
+            if (!isset($granted_users[$row['cat_id']]))
             {
-              $parent_id= $db_categories[$parent_id]['parent'];
+              $granted_users[$row['cat_id']]=array();
             }
-            if ($db_categories[$ids]['status']=='private' and !is_null($parent_id))
+            array_push(
+              $granted_users,
+              array(
+                $row['cat_id'] => array_push($granted_users[$row['cat_id']],$row['user_id'])
+              )
+            );
+          }
+        }
+        $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[$parent_id]['parent'];
+          }
+          if ($db_categories[$ids]['status']=='private' and !is_null($parent_id))
+          {
+            if (isset($granted_grps[$parent_id]))
             {
               foreach ($granted_grps[$parent_id] as $granted_grp)
@@ -353 +380 @@
                   )
                 );
-               
               }
             }
-          }
-  
-          mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $insert_granted_grps);
-        }
-
-        $query = '
-          SELECT *
-          FROM '.USER_ACCESS_TABLE.'
-          WHERE cat_id IN ('.$category_up.')
-        ;';
-        $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']]))
-            {
-              $granted_users[$row['cat_id']]=array();
-            }
-            array_push(
-              $granted_users,
-              array(
-                $row['cat_id'] => array_push($granted_users[$row['cat_id']],$row['user_id'])
-              )
-            );
-          }
-          $insert_granted_users=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))
+            if (isset($granted_users[$parent_id]))
             {
               foreach ($granted_users[$parent_id] as $granted_user)
@@ -405 +395 @@
               }
             }
+            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
       {

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

@@ -151 +151 @@
   <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>