X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js_upload%2Fjs_upload.php;h=d7c2575e00de6de81ec5d0d841a1a852601c1054;hb=cb790ab4b80e1f77cb77c2da791f95bf1be54de8;hp=d0f92127d1686d9b8a68dbbaacc27b1c9e64babc;hpb=271b2d4b1c238e623272838df7b2b6cd8b07e3a0;p=friendica-addons.git

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index d0f92127..d7c2575e 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -1,18 +1,17 @@
 <?php
 /**
  * Name: JS Uploader
- * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
+ * Description: JavaScript photo/image uploader. Helpful for uploading multiple files at once. Uses Valum 'qq' Uploader.
  * Version: 1.1
  * Author: Chris Case <http://friendika.openmindspace.org/profile/chris_case>
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function js_upload_install()
 {
@@ -26,17 +25,17 @@ function js_upload_form(App $a, array &$b)
 {
 	$b['default_upload'] = false;
 
-	$a->page->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css');
-	$a->page->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js');
+	DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css');
+	DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js');
 
 	$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
 	$b['addon_text'] .= Renderer::replaceMacros($tpl, [
-		'$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'),
+		'$upload_msg' => DI::l10n()->t('Select files for upload'),
+		'$drop_msg' => DI::l10n()->t('Drop files here to upload'),
+		'$cancel' => DI::l10n()->t('Cancel'),
+		'$failed' => DI::l10n()->t('Failed'),
 		'$post_url' => $b['post_url'],
-		'$maximagesize' => intval(Config::get('system', 'maximagesize')),
+		'$maximagesize' => intval(DI::config()->get('system', 'maximagesize')),
 	]);
 }
 
@@ -46,7 +45,7 @@ function js_upload_post_init(App $a, &$b)
 	$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
 
 	// max file size in bytes
-	$sizeLimit = Config::get('system', 'maximagesize');
+	$sizeLimit = DI::config()->get('system', 'maximagesize');
 
 	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
@@ -99,7 +98,7 @@ class qqUploadedFileXhr
 	{
 		$input = fopen('php://input', 'r');
 
-		$upload_dir = Config::get('system', 'tempdir');
+		$upload_dir = DI::config()->get('system', 'tempdir');
 		if (!$upload_dir)
 			$upload_dir = sys_get_temp_dir();
 
@@ -212,25 +211,25 @@ class qqFileUploader
 	function handleUpload()
 	{
 		if (!$this->file) {
-			return ['error' => L10n::t('No files were uploaded.')];
+			return ['error' => DI::l10n()->t('No files were uploaded.')];
 		}
 
 		$size = $this->file->getSize();
 
 		if ($size == 0) {
-			return ['error' => L10n::t('Uploaded file is empty')];
+			return ['error' => DI::l10n()->t('Uploaded file is empty')];
 		}
 
 //		if ($size > $this->sizeLimit) {
 
-//			return array('error' => L10n::t('Uploaded file is too large'));
+//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
 //		}
 
 
-		$maximagesize = Config::get('system', 'maximagesize');
+		$maximagesize = DI::config()->get('system', 'maximagesize');
 
 		if (($maximagesize) && ($size > $maximagesize)) {
-			return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize];
+			return ['error' => DI::l10n()->t('Image exceeds size limit of ') . $maximagesize];
 
 		}
 
@@ -244,7 +243,7 @@ class qqFileUploader
 
 		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 . '.'];
+			return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of ') . $these . '.'];
 		}
 
 		if ($this->file->save()) {
@@ -255,7 +254,7 @@ class qqFileUploader
 			];
 		} else {
 			return [
-				'error' => L10n::t('Upload was cancelled, or server error encountered'),
+				'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'),
 				'path' => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];