diff options
| author | Friendika <info@friendika.com> | 2011-07-20 03:54:10 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-07-20 03:54:10 -0700 |
| commit | 40092c83a5568a9896c05f7ccdd8da4649f5271a (patch) | |
| tree | 4a3750df636bf641fd0de2f92287c305b2ae151d /addon | |
| parent | b27d68633be6219c3f65d830178e3dc96c1c91e9 (diff) | |
| parent | 19c93adf846647a61e407e8172ea7153cb7f2c41 (diff) | |
| download | volse-hubzilla-40092c83a5568a9896c05f7ccdd8da4649f5271a.tar.gz volse-hubzilla-40092c83a5568a9896c05f7ccdd8da4649f5271a.tar.bz2 volse-hubzilla-40092c83a5568a9896c05f7ccdd8da4649f5271a.zip | |
Merge pull request #142 from fabrixxm/newacl
More on ACL and editor
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/js_upload/js_upload.php | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php index 06a907603..331548f88 100644 --- a/addon/js_upload/js_upload.php +++ b/addon/js_upload/js_upload.php @@ -92,15 +92,25 @@ function createUploader() { debug: true, onSubmit: function(id,filename) { - - uploader.setParams( { - newalbum : document.getElementById('photos-upload-newalbum').value, - album : document.getElementById('photos-upload-album-select').value, - group_allow : getSelected(document.getElementById('group_allow')).join(','), - contact_allow : getSelected(document.getElementById('contact_allow')).join(','), - group_deny : getSelected(document.getElementById('group_deny')).join(','), - contact_deny : getSelected(document.getElementById('contact_deny')).join(',') - }); + if (typeof acl!="undefined"){ + uploader.setParams( { + newalbum : document.getElementById('photos-upload-newalbum').value, + album : document.getElementById('photos-upload-album-select').value, + group_allow : acl.allow_gid.join(','), + contact_allow : acl.allow_cid.join(','), + group_deny : acl.deny_gid.join(','), + contact_deny : acl.deny_cid.join(',') + }); + } else { + uploader.setParams( { + newalbum : document.getElementById('photos-upload-newalbum').value, + album : document.getElementById('photos-upload-album-select').value, + group_allow : getSelected(document.getElementById('group_allow')).join(','), + contact_allow : getSelected(document.getElementById('contact_allow')).join(','), + group_deny : getSelected(document.getElementById('group_deny')).join(','), + contact_deny : getSelected(document.getElementById('contact_deny')).join(',') + }); + } } }); } |