Changeset 23272

Timestamp:

Jun 16, 2013, 9:52:51 PM (11 years ago)

Author:

flop25

Message:

bug:2855
new otpion "inherit" for create_virtual_category(), and $confinheritance_by_default = false;
ToDo: album registred from Ftp

Location:

trunk

Files:

• admin/include/functions.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -1304 +1304 @@
   update_global_rank();
 
-  if ('private' == $insert['status'])
+  if ('private' == $insert['status'] and ((isset($options['inherit']) and $options['inherit']) or $conf['inheritance_by_default']) )
+  {
+    $query = '
+      SELECT group_id
+      FROM '.GROUP_ACCESS_TABLE.'
+      WHERE cat_id = '.$insert['id_uppercat'].'
+    ;';
+    $granted_grps =  array_from_query($query, 'group_id');
+    $inserts = array();
+    foreach ($granted_grps as $granted_grp)
+    {
+      array_push(
+        $inserts,
+        array(
+          'group_id' => $granted_grp,
+          'cat_id' => $inserted_id
+          )
+        );
+    }
+    mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $inserts);
+
+    $query = '
+      SELECT user_id
+      FROM '.USER_ACCESS_TABLE.'
+      WHERE cat_id = '.$insert['id_uppercat'].'
+    ;';
+    $granted_users =  array_from_query($query, 'user_id');
+    add_permission_on_category($inserted_id, array_unique(array_merge(get_admins(), array($user['id']), $granted_users)));
+  }
+  else if ('private' == $insert['status'])
   {
     add_permission_on_category($inserted_id, array_unique(array_merge(get_admins(), array($user['id']))));

trunk/include/config_default.inc.php

@@ -787 +787 @@
 //TODO: Put this in admin and also manage .htaccess in #sites and upload folders
 $conf['original_url_protection'] = '';
+
+
+// Default behaviour when a new album is created: should the new album inherit the group/user
+// permissions from its parent? Note that config is only used for Ftp synchro,
+// and if that option is not explicitly transmit when the album is created.
+$conf['inheritance_by_default'] = false;
+
 ?>