X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=addon%2Fjs_upload%2Fjs_upload.php;h=331548f8803258d2a221397a2be7165a754d0838;hb=abc01cad20f599a205e5c2534936092f6820e702;hp=9f3fa960096ee04ba2204dcad5077b118998478c;hpb=46c37fc7796ea80a3613d927e471cf8ebba0f2ba;p=friendica.git

diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php
index 9f3fa96009..331548f880 100644
--- a/addon/js_upload/js_upload.php
+++ b/addon/js_upload/js_upload.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Name: JS Uploader
+ * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
+ * Version: 1.0
+ * Author: Chris Case <http://friendika.openmindspace.org/profile/chris_case>
+ */
+
 /**
  *
  * JavaScript Photo/Image Uploader
@@ -7,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.
- *
  */
 
 
@@ -88,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(',')
+				});
+			}
 		}
 	});           
 }
@@ -122,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);
 
@@ -134,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();
 	}
 
@@ -246,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'])) {
@@ -258,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);