X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js_upload%2Fjs_upload.php;h=89f62ea4dac04ef38714fc4e8ab8bf374d2baba4;hb=da159e9d2c95e341a39bdc845291ea97be0ca61f;hp=d7c2575e00de6de81ec5d0d841a1a852601c1054;hpb=2365a9ae02f15bab90349cad0721cb068c47eb02;p=friendica-addons.git

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index d7c2575e..89f62ea4 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -12,6 +12,10 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Util\Strings;
+
+global $js_upload_jsonresponse;
+global $js_upload_result;
 
 function js_upload_install()
 {
@@ -41,6 +45,8 @@ function js_upload_form(App $a, array &$b)
 
 function js_upload_post_init(App $a, &$b)
 {
+	global $js_upload_result, $js_upload_jsonresponse;
+
 	// list of valid extensions
 	$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
 
@@ -52,7 +58,7 @@ function js_upload_post_init(App $a, &$b)
 	$result = $uploader->handleUpload();
 
 	// to pass data through iframe you will need to encode all html tags
-	$a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
+	$js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if (isset($result['error'])) {
 		Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'], Logger::DEBUG);
@@ -60,12 +66,14 @@ function js_upload_post_init(App $a, &$b)
 		exit();
 	}
 
-	$a->data['upload_result'] = $result;
+	$js_upload_result = $result;
 }
 
 function js_upload_post_file(App $a, &$b)
 {
-	$result = $a->data['upload_result'];
+	global $js_upload_result;
+
+	$result = $js_upload_result;
 
 	$b['src'] = $result['path'];
 	$b['filename'] = $result['filename'];
@@ -75,9 +83,11 @@ function js_upload_post_file(App $a, &$b)
 
 function js_upload_post_end(App $a, &$b)
 {
+	global $js_upload_jsonresponse;
+
 	Logger::log('upload_post_end');
-	if (!empty($a->data['upload_jsonresponse'])) {
-		echo $a->data['upload_jsonresponse'];
+	if (!empty($js_upload_jsonresponse)) {
+		echo $js_upload_jsonresponse;
 		exit();
 	}
 }
@@ -229,8 +239,7 @@ class qqFileUploader
 		$maximagesize = DI::config()->get('system', 'maximagesize');
 
 		if (($maximagesize) && ($size > $maximagesize)) {
-			return ['error' => DI::l10n()->t('Image exceeds size limit of ') . $maximagesize];
-
+			return ['error' => DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))];
 		}
 
 		$pathinfo = pathinfo($this->file->getName());
@@ -242,8 +251,7 @@ class qqFileUploader
 		$ext = $pathinfo['extension'] ?? '';
 
 		if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) {
-			$these = implode(', ', $this->allowedExtensions);
-			return ['error' => DI::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 %s.', implode(', ', $this->allowedExtensions))];
 		}
 
 		if ($this->file->save()) {