.

[friendica.git/.git] / addon / js_upload / js_upload.php

diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php
index 06a9076..1996b85 100644 (file)
--- 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(',')
+                               });
+                       }
                }
        });           
 }
@@ -288,10 +298,10 @@ class qqFileUploader {
             return array('error' => t('Uploaded file is empty'));
         }
         
-        if ($size > $this->sizeLimit) {
+//        if ($size > $this->sizeLimit) {
 
-            return array('error' => t('Uploaded file is too large'));
-        }
+//            return array('error' => t('Uploaded file is too large'));
+//        }
         
 
                $maximagesize = get_config('system','maximagesize');