Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 096439fa74ef335f199cfc5752f1bbce1906e8f9..bb5128137f5d6be5f5ce11741b94de337d90a20b 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -4,9 +4,9 @@
  */
 
 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;
@@ -23,14 +23,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();
                }
 
@@ -45,8 +45,8 @@ function wall_attach_post(App $a) {
 
        if (local_user() && (local_user() == $page_owner_uid)) {
                $can_post = true;
-       } elseif ($community_page && !empty(remote_user($page_owner_uid))) {
-               $contact_id = remote_user($page_owner_uid);
+       } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
+               $contact_id = Session::getRemoteContactID($page_owner_uid);
                $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact_id),
                        intval($page_owner_uid)
@@ -59,16 +59,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();
        }
@@ -77,7 +77,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
@@ -86,7 +86,7 @@ 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 {
@@ -97,7 +97,7 @@ function wall_attach_post(App $a) {
        }
 
        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 {
@@ -112,7 +112,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 {