X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=js_upload%2Fjs_upload.php;h=cc3778cd85cc954890dd82bef81d646047f1f9c4;hb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;hp=c529be36602de6f0821a8e443ac369288dc63f4e;hpb=d7bd2246c18f5880fc3c083bf3d698fe4f29fcb6;p=friendica-addons.git

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
old mode 100755
new mode 100644
index c529be36..cc3778cd
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -11,11 +11,13 @@
  *
  * JavaScript Photo/Image Uploader
  *
- * Uses Valum 'qq' Uploader. 
+ * Uses Valum 'qq' Uploader.
  * Module Author: Chris Case
  *
  */
 
+use Friendica\Core\Config;
+
 
 function js_upload_install() {
 	register_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
@@ -39,23 +41,25 @@ function js_upload_form(&$a,&$b) {
 
 	$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>';
-   
+
 	$upload_msg = t('Upload a file');
 	$drop_msg = t('Drop files here to upload');
 	$cancel = t('Cancel');
 	$failed = t('Failed');
 
+	$maximagesize = intval(Config::get('system','maximagesize'));
+
 	$b['addon_text'] .= <<< EOT
-	
- <div id="file-uploader-demo1">		
-  <noscript>			
+
+ <div id="file-uploader-demo1">
+  <noscript>
    <p>Please enable JavaScript to use file uploader.</p>
    <!-- or put a simple form for upload here -->
-  </noscript> 
+  </noscript>
  </div>
 
 <script type="text/javascript">
-var uploader = null;       
+var uploader = null;
 function getSelected(opt) {
             var selected = new Array();
             var index = 0;
@@ -69,16 +73,16 @@ function getSelected(opt) {
                }
             }
             return selected;
-         } 
+         }
 function createUploader() {
 	uploader = new qq.FileUploader({
 		element: document.getElementById('file-uploader-demo1'),
 		action: '{$b['post_url']}',
 
-        template: '<div class="qq-uploader">' + 
+        template: '<div class="qq-uploader">' +
                 '<div class="qq-upload-drop-area"><span>$drop_msg</span></div>' +
                 '<div class="qq-upload-button">$upload_msg</div>' +
-                '<ul class="qq-upload-list"></ul>' + 
+                '<ul class="qq-upload-list"></ul>' +
              '</div>',
 
         // template for one item in file list
@@ -88,9 +92,10 @@ function createUploader() {
                 '<span class="qq-upload-size"></span>' +
                 '<a class="qq-upload-cancel" href="#">$cancel</a>' +
                 '<span class="qq-upload-failed-text">$failed</span>' +
-            '</li>',        
+            '</li>',
 
 		debug: true,
+		sizeLimit: $maximagesize,
 		onSubmit: function(id,filename) {
 			if (typeof acl!="undefined"){
 				uploader.setParams( {
@@ -114,17 +119,17 @@ function createUploader() {
 				});
 			}
 		}
-	});           
+	});
 }
 
 
 // in your app create uploader as soon as the DOM is ready
-// don't wait for the window to load  
-window.onload = createUploader;     
+// don't wait for the window to load
+window.onload = createUploader;
 
 
 </script>
- 
+
 EOT;
 
 
@@ -134,11 +139,11 @@ function js_upload_post_init(&$a,&$b) {
 
 	// list of valid extensions, ex. array("jpeg", "xml", "bmp")
 
-	$allowedExtensions = array("jpeg","gif","png","jpg");
+	$allowedExtensions = ["jpeg","gif","png","jpg"];
 
 	// max file size in bytes
 
-	$sizeLimit = get_config('system','maximagesize'); //6 * 1024 * 1024;
+	$sizeLimit = Config::get('system','maximagesize'); //6 * 1024 * 1024;
 
 	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
@@ -191,16 +196,22 @@ class qqUploadedFileXhr {
      * Save the file in the temp dir.
      * @return boolean TRUE on success
      */
-    function save() {    
+    function save() {
         $input = fopen("php://input", "r");
-        $this->pathnm = tempnam(sys_get_temp_dir(),'frn');
+
+		$upload_dir = Config::get('system','tempdir');
+		if(! $upload_dir)
+			$upload_dir = sys_get_temp_dir();
+
+        $this->pathnm = tempnam($upload_dir,'frn');
+
 		$temp = fopen($this->pathnm,"w");
         $realSize = stream_copy_to_stream($input, $temp);
 
         fclose($input);
 		fclose($temp);
-        
-        if ($realSize != $this->getSize()){            
+
+        if ($realSize != $this->getSize()){
             return false;
         }
         return true;
@@ -216,18 +227,18 @@ class qqUploadedFileXhr {
 
     function getSize() {
         if (isset($_SERVER["CONTENT_LENGTH"])){
-            return (int)$_SERVER["CONTENT_LENGTH"];            
+            return (int)$_SERVER["CONTENT_LENGTH"];
         } else {
             throw new Exception('Getting content length is not supported.');
-        }      
-    }   
+        }
+    }
 }
 
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
 
-class qqUploadedFileForm {  
+class qqUploadedFileForm {
 
 
     /**
@@ -253,63 +264,63 @@ class qqUploadedFileForm {
 }
 
 class qqFileUploader {
-    private $allowedExtensions = array();
+    private $allowedExtensions = [];
     private $sizeLimit = 10485760;
     private $file;
 
-    function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){        
+    function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){
         $allowedExtensions = array_map("strtolower", $allowedExtensions);
-            
-        $this->allowedExtensions = $allowedExtensions;        
+
+        $this->allowedExtensions = $allowedExtensions;
         $this->sizeLimit = $sizeLimit;
-        
+
         if (isset($_GET['qqfile'])) {
             $this->file = new qqUploadedFileXhr();
         } elseif (isset($_FILES['qqfile'])) {
             $this->file = new qqUploadedFileForm();
         } else {
-            $this->file = false; 
+            $this->file = false;
         }
 
     }
-    
-    
+
+
     private function toBytes($str){
         $val = trim($str);
         $last = strtolower($str[strlen($str)-1]);
         switch($last) {
             case 'g': $val *= 1024;
             case 'm': $val *= 1024;
-            case 'k': $val *= 1024;        
+            case 'k': $val *= 1024;
         }
         return $val;
     }
-    
+
     /**
      * Returns array('success'=>true) or array('error'=>'error message')
      */
     function handleUpload(){
-        
+
         if (!$this->file){
-            return array('error' => t('No files were uploaded.'));
+            return ['error' => t('No files were uploaded.')];
         }
-        
+
         $size = $this->file->getSize();
-        
+
         if ($size == 0) {
-            return array('error' => t('Uploaded file is empty'));
+            return ['error' => t('Uploaded file is empty')];
         }
-        
+
 //        if ($size > $this->sizeLimit) {
 
 //            return array('error' => t('Uploaded file is too large'));
 //        }
-        
 
-		$maximagesize = get_config('system','maximagesize');
+
+		$maximagesize = Config::get('system','maximagesize');
 
 		if(($maximagesize) && ($size > $maximagesize)) {
-			return array('error' => t('Image exceeds size limit of ') . $maximagesize );
+			return ['error' => t('Image exceeds size limit of ') . $maximagesize ];
 
 		}
 
@@ -320,22 +331,22 @@ class qqFileUploader {
 
         if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
             $these = implode(', ', $this->allowedExtensions);
-            return array('error' => t('File has an invalid extension, it should be one of ') . $these . '.');
+            return ['error' => t('File has an invalid extension, it should be one of ') . $these . '.'];
         }
-        
+
         if ($this->file->save()){
-            return array(
+            return [
 				'success'=>true,
-				'path' => $this->file->getPath(), 
+				'path' => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
-			);
+			];
         } else {
-            return array(
+            return [
 				'error'=> t('Upload was cancelled, or server error encountered'),
-				'path' => $this->file->getPath(), 
+				'path' => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
-			);
+			];
         }
-        
-    }    
+
+    }
 }