Merge pull request #743 from nupplaphil/rename_App_Methods

[friendica-addons.git] / js_upload / js_upload.php

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 2b15720b4fa5eeb0c72ae00fcbb82499346756e1..adeba838c9ac8328d7420d6e13f2ab9ea532bbf7 100644 (file)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -38,10 +38,10 @@ function js_upload_form(&$a,&$b) {
 
        $b['default_upload'] = false;
 
-       $b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
-       $b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
+       $b['addon_text'] .= '<link href="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
+       $b['addon_text'] .= '<script src="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
 
-       $upload_msg = L10n::t('Upload a file');
+       $upload_msg = L10n::t('Select files for upload');
        $drop_msg = L10n::t('Drop files here to upload');
        $cancel = L10n::t('Cancel');
        $failed = L10n::t('Failed');
@@ -96,25 +96,31 @@ function createUploader() {
                debug: true,
                sizeLimit: $maximagesize,
                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( {
-                                       newalbum                :       document.getElementById('photos-upload-newalbum').value,
-                                       album                   :       document.getElementById('photos-upload-album-select').value,
-                                       not_visible     :   document.getElementById('photos-upload-noshare').checked,
-                                       group_allow             :       acl.allow_gid.join(','),
-                                       contact_allow   :       acl.allow_cid.join(','),
-                                       group_deny              :       acl.deny_gid.join(','),
-                                       contact_deny    :       acl.deny_cid.join(',')
+                                       newalbum      : newalbum,
+                                       album         : album,
+                                       not_visible   : document.getElementById('photos-upload-noshare').checked,
+                                       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,
-                                       not_visible     :   document.getElementById('photos-upload-noshare').checked,
-                                       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(',')
+                                       newalbum      : newalbum,
+                                       album         : album,
+                                       not_visible   : document.getElementById('photos-upload-noshare').checked,
+                                       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(',')
                                });
                        }
                }