iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-18 07:16:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug:2855

Browse Source 
new otpion "inherit" for create_virtual_category(), and $conf['inheritance_by_default'] = false;
ToDo: album registred from Ftp

git-svn-id: http://piwigo.org/svn/trunk@23272 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
flop25
2013-06-16 19:52:51 +00:00
parent 272a55d377
commit c17bc66aeb
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions.php
+30 -1
View File
@@ -1303,7 +1303,36 @@ SELECT id, uppercats, global_rank, visible, status
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']))));
}