X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js_upload%2Fjs_upload.php;h=83fb275a2a21b12257a16acbe03ea52977377549;hb=7c8c09836eac3ade1e886ceb402dc73849ddd753;hp=e16ee2d074bf655754cb78685ef7262cae16615d;hpb=39dd3dffe07efd69fa1ac6d0bd243c7fc0e3a66f;p=friendica-addons.git

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index e16ee2d0..83fb275a 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -10,27 +10,29 @@
  *
  * JavaScript Photo/Image Uploader
  *
- * Uses Valum 'qq' Uploader. 
+ * Uses Valum 'qq' Uploader.
  * Module Author: Chris Case
  *
  */
-use Friendica\Core\Addon;
+
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 
 function js_upload_install() {
-	Addon::registerHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
-	Addon::registerHook('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
-	Addon::registerHook('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
-	Addon::registerHook('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
+	Hook::register('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
+	Hook::register('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
+	Hook::register('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
+	Hook::register('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
 }
 
 
 function js_upload_uninstall() {
-	Addon::unregisterHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
-	Addon::unregisterHook('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
-	Addon::unregisterHook('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
-	Addon::unregisterHook('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
+	Hook::unregister('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
+	Hook::unregister('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
+	Hook::unregister('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
+	Hook::unregister('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
 }
 
 
@@ -38,97 +40,103 @@ 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');
 
-	$maximagesize = intval(get_config('system','maximagesize'));
+	$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;
-            for (var intLoop = 0; intLoop < opt.length; intLoop++) {
-               if ((opt[intLoop].selected) ||
-                   (opt[intLoop].checked)) {
-                  index = selected.length;
-                  //selected[index] = new Object;
-                  selected[index] = opt[intLoop].value;
-                  //selected[index] = intLoop;
-               }
-            }
-            return selected;
-         } 
+			var selected = new Array();
+			var index = 0;
+			for (var intLoop = 0; intLoop < opt.length; intLoop++) {
+				if ((opt[intLoop].selected) ||
+					(opt[intLoop].checked)) {
+					index = selected.length;
+					//selected[index] = new Object;
+					selected[index] = opt[intLoop].value;
+					//selected[index] = intLoop;
+				}
+			}
+			return selected;
+		 }
 function createUploader() {
 	uploader = new qq.FileUploader({
 		element: document.getElementById('file-uploader-demo1'),
 		action: '{$b['post_url']}',
 
-        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>' + 
-             '</div>',
-
-        // template for one item in file list
-        fileTemplate: '<li>' +
-                '<span class="qq-upload-file"></span>' +
-                '<span class="qq-upload-spinner"></span>' +
-                '<span class="qq-upload-size"></span>' +
-                '<a class="qq-upload-cancel" href="#">$cancel</a>' +
-                '<span class="qq-upload-failed-text">$failed</span>' +
-            '</li>',        
+		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>' +
+			 '</div>',
+
+		// template for one item in file list
+		fileTemplate: '<li>' +
+				'<span class="qq-upload-file"></span>' +
+				'<span class="qq-upload-spinner"></span>' +
+				'<span class="qq-upload-size"></span>' +
+				'<a class="qq-upload-cancel" href="#">$cancel</a>' +
+				'<span class="qq-upload-failed-text">$failed</span>' +
+			'</li>',
 
 		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(',')
 				});
 			}
 		}
-	});           
+	});
 }
 
 
 // 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;
 
 
@@ -138,11 +146,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);
 
@@ -153,9 +161,9 @@ function js_upload_post_init(&$a,&$b) {
 	$a->data['upload_jsonresponse'] =  htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if(isset($result['error'])) {
-		logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG');
+		Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG);
 		echo json_encode($result);
-		killme();
+		exit();
 	}
 
 	$a->data['upload_result'] = $result;
@@ -166,19 +174,19 @@ function js_upload_post_file(&$a,&$b) {
 
 	$result = $a->data['upload_result'];
 
-	$b['src']		= $result['path'];
-	$b['filename']	= $result['filename'];
-	$b['filesize']	= filesize($b['src']);
+	$b['src']       = $result['path'];
+	$b['filename']  = $result['filename'];
+	$b['filesize']  = filesize($b['src']);
 
 }
 
 
 function js_upload_post_end(&$a,&$b) {
 
-logger('upload_post_end');
-	if(x($a->data,'upload_jsonresponse')) {
+Logger::log('upload_post_end');
+	if(!empty($a->data['upload_jsonresponse'])) {
 		echo $a->data['upload_jsonresponse'];
-		killme();
+		exit();
 	}
 
 }
@@ -191,161 +199,164 @@ class qqUploadedFileXhr {
 
 	private $pathnm = '';
 
-    /**
-     * Save the file in the temp dir.
-     * @return boolean TRUE on success
-     */
-    function save() {    
-        $input = fopen("php://input", "r");
+	/**
+	 * Save the file in the temp dir.
+	 * @return boolean TRUE on success
+	 */
+	function save() {
+		$input = fopen("php://input", "r");
 
-		$upload_dir = get_config('system','tempdir');
+		$upload_dir = Config::get('system','tempdir');
 		if(! $upload_dir)
 			$upload_dir = sys_get_temp_dir();
 
-        $this->pathnm = tempnam($upload_dir,'frn');
+		$this->pathnm = tempnam($upload_dir,'frn');
 
 		$temp = fopen($this->pathnm,"w");
-        $realSize = stream_copy_to_stream($input, $temp);
+		$realSize = stream_copy_to_stream($input, $temp);
 
-        fclose($input);
+		fclose($input);
 		fclose($temp);
-        
-        if ($realSize != $this->getSize()){            
-            return false;
-        }
-        return true;
-    }
+
+		if ($realSize != $this->getSize()) {
+			return false;
+		}
+		return true;
+	}
 
 	function getPath() {
 		return $this->pathnm;
 	}
 
-    function getName() {
-        return $_GET['qqfile'];
-    }
-
-    function getSize() {
-        if (isset($_SERVER["CONTENT_LENGTH"])){
-            return (int)$_SERVER["CONTENT_LENGTH"];            
-        } else {
-            throw new Exception('Getting content length is not supported.');
-        }      
-    }   
+	function getName() {
+		return $_GET['qqfile'];
+	}
+
+	function getSize() {
+		if (isset($_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 {
 
 
-    /**
-     * Save the file to the specified path
-     * @return boolean TRUE on success
-     */
+	/**
+	 * Save the file to the specified path
+	 * @return boolean TRUE on success
+	 */
 
 
-    function save() {
-        return true;
-    }
+	function save() {
+		return true;
+	}
 
 	function getPath() {
 		return $_FILES['qqfile']['tmp_name'];
 	}
 
-    function getName() {
-        return $_FILES['qqfile']['name'];
-    }
-    function getSize() {
-        return $_FILES['qqfile']['size'];
-    }
+	function getName() {
+		return $_FILES['qqfile']['name'];
+	}
+	function getSize() {
+		return $_FILES['qqfile']['size'];
+	}
 }
 
 class qqFileUploader {
-    private $allowedExtensions = array();
-    private $sizeLimit = 10485760;
-    private $file;
-
-    function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){        
-        $allowedExtensions = array_map("strtolower", $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; 
-        }
-
-    }
-    
-    
-    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;        
-        }
-        return $val;
-    }
-    
-    /**
-     * Returns array('success'=>true) or array('error'=>'error message')
-     */
-    function handleUpload(){
-        
-        if (!$this->file){
-            return ['error' => L10n::t('No files were uploaded.')];
-        }
-        
-        $size = $this->file->getSize();
-        
-        if ($size == 0) {
-            return ['error' => L10n::t('Uploaded file is empty')];
-        }
-        
-//        if ($size > $this->sizeLimit) {
-
-//            return array('error' => L10n::t('Uploaded file is too large'));
-//        }
-        
-
-		$maximagesize = get_config('system','maximagesize');
+	private $allowedExtensions = [];
+	private $sizeLimit = 10485760;
+	private $file;
+
+	function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){
+		$allowedExtensions = array_map("strtolower", $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;
+		}
+
+	}
+
+
+	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;
+		}
+		return $val;
+	}
+
+	/**
+	 * Returns array('success'=>true) or array('error'=>'error message')
+	 */
+	function handleUpload(){
+
+		if (!$this->file) {
+			return ['error' => L10n::t('No files were uploaded.')];
+		}
+
+		$size = $this->file->getSize();
+
+		if ($size == 0) {
+			return ['error' => L10n::t('Uploaded file is empty')];
+		}
+
+//		if ($size > $this->sizeLimit) {
+
+//			return array('error' => L10n::t('Uploaded file is too large'));
+//		}
+
+
+		$maximagesize = Config::get('system','maximagesize');
 
 		if(($maximagesize) && ($size > $maximagesize)) {
 			return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize ];
 
 		}
 
-        $pathinfo = pathinfo($this->file->getName());
-        $filename = $pathinfo['filename'];
+		$pathinfo = pathinfo($this->file->getName());
+		$filename = $pathinfo['filename'];
 
-        $ext = $pathinfo['extension'];
+		if (!isset($pathinfo['extension'])) {
+			Logger::warning('extension isn\'t set.', ['filename' => $filename]);
+		}
+		$ext = defaults($pathinfo, 'extension', '');
 
-        if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
-            $these = implode(', ', $this->allowedExtensions);
-            return ['error' => L10n::t('File has an invalid extension, it should be one of ') . $these . '.'];
-        }
-        
-        if ($this->file->save()){
-            return array(
-				'success'=>true,
-				'path' => $this->file->getPath(), 
+		if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
+			$these = implode(', ', $this->allowedExtensions);
+			return ['error' => L10n::t('File has an invalid extension, it should be one of ') . $these . '.'];
+		}
+
+		if ($this->file->save()){
+			return [
+				'success'  => true,
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
-			);
-        } else {
-            return [
-				'error'=> L10n::t('Upload was cancelled, or server error encountered'),
-				'path' => $this->file->getPath(),
+			];
+		} else {
+			return [
+				'error'    => L10n::t('Upload was cancelled, or server error encountered'),
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
-			);
-        }
-        
-    }    
+			];
+		}
+
+	}
 }