#8374: Not triggering post height limit when showing individual post under /display

[friendica-addons.git] / js_upload / js_upload.php

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index b92466a0f6de04910d6072d6130fbe7201ad7a51..20012a976729de5a2f23593d08316cd62b5811b0 100644 (file)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -8,9 +8,7 @@
  */
 
 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;
@@ -32,12 +30,12 @@ function js_upload_form(App $a, array &$b)
 
        $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')),
        ]);
 }
 
@@ -47,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);
 
@@ -100,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();
 
@@ -213,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];
 
                }
 
@@ -245,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()) {
@@ -256,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
                        ];