.

[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 042e9a9..1996b85 100644 (file)
--- a/addon/js_upload/js_upload.php
+++ b/addon/js_upload/js_upload.php
@@ -14,9 +14,6 @@
  * Uses Valum 'qq' Uploader. 
  * Module Author: Chris Case
  *
- * Prior to enabling, ensure that you have a directory 'uploads'
- * which is writable by the web server.
- *
  */
 
 
@@ -95,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(',')
+                               });
+                       }
                }
        });           
 }
@@ -129,7 +136,7 @@ function js_upload_post_init(&$a,&$b) {
 
        // max file size in bytes
 
-       $sizeLimit = 6 * 1024 * 1024;
+       $sizeLimit = get_config('system','maximagesize'); //6 * 1024 * 1024;
 
        $uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
@@ -141,6 +148,7 @@ function js_upload_post_init(&$a,&$b) {
 
        if(isset($result['error'])) {
                logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG');
+               echo json_encode($result);
                killme();
        }
 
@@ -253,8 +261,6 @@ class qqFileUploader {
         $this->allowedExtensions = $allowedExtensions;        
         $this->sizeLimit = $sizeLimit;
         
-        $this->checkServerSettings();       
-
         if (isset($_GET['qqfile'])) {
             $this->file = new qqUploadedFileXhr();
         } elseif (isset($_FILES['qqfile'])) {
@@ -265,15 +271,6 @@ class qqFileUploader {
 
     }
     
-    private function checkServerSettings(){        
-        $postSize = $this->toBytes(ini_get('post_max_size'));
-        $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));        
-               logger('mod/photos.php: qqFileUploader(): upload_max_filesize=' . $uploadSize , 'LOGGER_DEBUG');
-        if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit){
-            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';             
-            die("{'error':'increase post_max_size and upload_max_filesize to $size'}");    
-        }        
-    }
     
     private function toBytes($str){
         $val = trim($str);
@@ -301,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');