X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js_upload%2Fjs_upload.php;h=adeba838c9ac8328d7420d6e13f2ab9ea532bbf7;hb=ce2af45897ea3263c1973802b9bf592ccb7f73e9;hp=cc3778cd85cc954890dd82bef81d646047f1f9c4;hpb=461b3db9f449fdb1ce780a337cf2f1bb7aa35ac5;p=friendica-addons.git

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index cc3778cd..adeba838 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: JS Uploader
  * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
@@ -15,23 +14,23 @@
  * Module Author: Chris Case
  *
  */
-
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
-
+use Friendica\Core\L10n;
 
 function js_upload_install() {
-	register_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
-	register_hook('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
-	register_hook('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
-	register_hook('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
+	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');
 }
 
 
 function js_upload_uninstall() {
-	unregister_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
-	unregister_hook('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
-	unregister_hook('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
-	unregister_hook('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
+	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');
 }
 
 
@@ -39,13 +38,13 @@ 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 = t('Upload a file');
-	$drop_msg = t('Drop files here to upload');
-	$cancel = t('Cancel');
-	$failed = t('Failed');
+	$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(Config::get('system','maximagesize'));
 
@@ -97,25 +96,31 @@ function createUploader() {
 		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(',')
 				});
 			}
 		}
@@ -302,25 +307,25 @@ class qqFileUploader {
     function handleUpload(){
 
         if (!$this->file){
-            return ['error' => t('No files were uploaded.')];
+            return ['error' => L10n::t('No files were uploaded.')];
         }
 
         $size = $this->file->getSize();
 
         if ($size == 0) {
-            return ['error' => t('Uploaded file is empty')];
+            return ['error' => L10n::t('Uploaded file is empty')];
         }
 
 //        if ($size > $this->sizeLimit) {
 
-//            return array('error' => t('Uploaded file is too large'));
+//            return array('error' => L10n::t('Uploaded file is too large'));
 //        }
 
 
 		$maximagesize = Config::get('system','maximagesize');
 
 		if(($maximagesize) && ($size > $maximagesize)) {
-			return ['error' => t('Image exceeds size limit of ') . $maximagesize ];
+			return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize ];
 
 		}
 
@@ -331,7 +336,7 @@ class qqFileUploader {
 
         if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
             $these = implode(', ', $this->allowedExtensions);
-            return ['error' => t('File has an invalid extension, it should be one of ') . $these . '.'];
+            return ['error' => L10n::t('File has an invalid extension, it should be one of ') . $these . '.'];
         }
 
         if ($this->file->save()){
@@ -342,7 +347,7 @@ class qqFileUploader {
 			];
         } else {
             return [
-				'error'=> t('Upload was cancelled, or server error encountered'),
+				'error'=> L10n::t('Upload was cancelled, or server error encountered'),
 				'path' => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];