Merge pull request #9829 from Extarys/9827-broken-navbar

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 0324a5581ca9a674d48ac08381edd6289e392964..8cb19ab1a09e4953e1a2653c667553358260fb23 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,13 +1,28 @@
 <?php
 /**
- * @file mod/wall_attach.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Attach;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
@@ -24,14 +39,14 @@ function wall_attach_post(App $a) {
 
                if (! DBA::isResult($r)) {
                        if ($r_json) {
-                               echo json_encode(['error' => L10n::t('Invalid request.')]);
+                               echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                                exit();
                        }
                        return;
                }
        } else {
                if ($r_json) {
-                       echo json_encode(['error' => L10n::t('Invalid request.')]);
+                       echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                        exit();
                }
 
@@ -60,16 +75,16 @@ function wall_attach_post(App $a) {
 
        if (!$can_post) {
                if ($r_json) {
-                       echo json_encode(['error' => L10n::t('Permission denied.')]);
+                       echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
                        exit();
                }
-               notice(L10n::t('Permission denied.') . EOL );
+               notice(DI::l10n()->t('Permission denied.') . EOL );
                exit();
        }
 
        if (empty($_FILES['userfile'])) {
                if ($r_json) {
-                       echo json_encode(['error' => L10n::t('Invalid request.')]);
+                       echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                }
                exit();
        }
@@ -78,7 +93,7 @@ function wall_attach_post(App $a) {
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
 
-       $maxfilesize = Config::get('system','maxfilesize');
+       $maxfilesize = DI::config()->get('system','maxfilesize');
 
        /* Found html code written in text field of form,
         * when trying to upload a file with filesize
@@ -87,18 +102,18 @@ function wall_attach_post(App $a) {
         */
 
        if ($filesize <= 0) {
-               $msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
+               $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(DI::l10n()->t('Or - did you try to upload an empty file?'));
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
-                       notice($msg . EOL);
+                       notice($msg);
                }
                @unlink($src);
                exit();
        }
 
        if ($maxfilesize && $filesize > $maxfilesize) {
-               $msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
+               $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
@@ -113,7 +128,7 @@ function wall_attach_post(App $a) {
        @unlink($src);
 
        if ($newid === false) {
-               $msg =  L10n::t('File upload failed.');
+               $msg =  DI::l10n()->t('File upload failed.');
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {