friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

js_upload: use empty string if no newalbum or album input element is found (#712)

Browse source
This commit is contained in:
rabuzarus 2018-08-20 06:25:35 +02:00 committed by Hypolite Petovan
parent 77b7b73288
commit 6e4abdb875
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
js_upload/js_upload.php
View file

@ -96,25 +96,31 @@ function createUploader() {
debug: true, debug: true,
sizeLimit: $maximagesize, sizeLimit: $maximagesize,
onSubmit: function(id,filename) { onSubmit: function(id,filename) {
if (typeof acl!="undefined"){ var newalbumElm = document.getElementById('photos-upload-newalbum');
var albumElm = document.getElementById('photos-upload-album-select');
var newalbum = newalbumElm ? newalbumElm.value : "";
var album = albumElm ? albumElm.value : "";
if (typeof acl != "undefined"){
uploader.setParams( { uploader.setParams( {
newalbum : document.getElementById('photos-upload-newalbum').value, newalbum : newalbum,
album : document.getElementById('photos-upload-album-select').value, album : album,
not_visible : document.getElementById('photos-upload-noshare').checked, not_visible : document.getElementById('photos-upload-noshare').checked,
group_allow : acl.allow_gid.join(','), group_allow : acl.allow_gid.join(','),
contact_allow : acl.allow_cid.join(','), contact_allow : acl.allow_cid.join(','),
group_deny : acl.deny_gid.join(','), group_deny : acl.deny_gid.join(','),
contact_deny : acl.deny_cid.join(',') contact_deny : acl.deny_cid.join(',')
}); });
} else { } else {
uploader.setParams( { uploader.setParams( {
newalbum : document.getElementById('photos-upload-newalbum').value, newalbum : newalbum,
album : document.getElementById('photos-upload-album-select').value, album : album,
not_visible : document.getElementById('photos-upload-noshare').checked, not_visible : document.getElementById('photos-upload-noshare').checked,
group_allow : getSelected(document.getElementById('group_allow')).join(','), group_allow : getSelected(document.getElementById('group_allow')).join(','),
contact_allow : getSelected(document.getElementById('contact_allow')).join(','), contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
group_deny : getSelected(document.getElementById('group_deny')).join(','), group_deny : getSelected(document.getElementById('group_deny')).join(','),
contact_deny : getSelected(document.getElementById('contact_deny')).join(',') contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
}); });
} }
} }