harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lots of stuff that was needed for successful photo import from red

Browse Source
This commit is contained in:
redmatrix
2015-08-24 20:58:12 -07:00
parent 0edac8810b
commit 5fa2aa6d48
2 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/photos.php
View File

@@ -52,12 +52,21 @@ function photo_upload($channel, $observer, $args) {
// Set to default channel permissions. If the parent directory (album) has permissions set,
// use those instead. If we have specific permissions supplied, they take precedence over
// all other settings.
// all other settings. 'allow_cid' being passed from an external source takes priority over channel settings.
// ...messy... needs re-factoring once the photos/files integration stabilises
$str_group_allow = $channel['channel_allow_gid'];
$str_contact_allow = $channel['channel_allow_cid'];
$str_group_deny = $channel['channel_deny_gid'];
$str_contact_deny = $channel['channel_deny_cid'];
if(array_key_exists('allow_cid',$args)) {
$str_group_allow = $args['allow_gid'];
$str_contact_allow = $args['allow_cid'];
$str_group_deny = $args['deny_gid'];
$str_contact_deny = $args['deny_cid'];
}
else {
$str_group_allow = $channel['channel_allow_gid'];
$str_contact_allow = $channel['channel_allow_cid'];
$str_group_deny = $channel['channel_deny_gid'];
$str_contact_deny = $channel['channel_deny_cid'];
}
if($args['directory']) {
$str_group_allow = $args['directory']['allow_gid'];