Merge pull request #12025 from annando/no-boot-src-module

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 98dc3e1cba548458405bcfed3bd29b7f0890cd8b..7f12d15e64e4793cb2ce4d473f31b1b00e39017e 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -21,6 +21,7 @@
 
 use Friendica\App;
 use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Attach;
@@ -36,15 +37,13 @@ function wall_attach_post(App $a) {
                $owner = User::getOwnerDataByNick($nick);
                if (!DBA::isResult($owner)) {
                        if ($r_json) {
-                               echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
-                               exit();
+                               System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                        }
                        return;
                }
        } else {
                if ($r_json) {
-                       echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
-                       exit();
+                       System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
 
                return;
@@ -56,7 +55,7 @@ function wall_attach_post(App $a) {
        $page_owner_cid = $owner['id'];
        $community_page = $owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
 
-       if (local_user() && (local_user() == $page_owner_uid)) {
+       if (Session::getLocalUser() && (Session::getLocalUser() == $page_owner_uid)) {
                $can_post = true;
        } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
                $contact_id = Session::getRemoteContactID($page_owner_uid);
@@ -65,18 +64,17 @@ function wall_attach_post(App $a) {
 
        if (!$can_post) {
                if ($r_json) {
-                       echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
-                       exit();
+                       System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]);
                }
-               notice(DI::l10n()->t('Permission denied.') . EOL );
-               exit();
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
+               System::exit();
        }
 
        if (empty($_FILES['userfile'])) {
                if ($r_json) {
-                       echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
+                       System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
-               exit();
+               System::exit();
        }
 
        $src      = $_FILES['userfile']['tmp_name'];
@@ -92,25 +90,25 @@ function wall_attach_post(App $a) {
         */
 
        if ($filesize <= 0) {
-               $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?'));
+               $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . '<br />' . (DI::l10n()->t('Or - did you try to upload an empty file?'));
+               @unlink($src);
                if ($r_json) {
-                       echo json_encode(['error' => $msg]);
+                       System::jsonExit(['error' => $msg]);
                } else {
-                       notice($msg);
+                       DI::sysmsg()->addNotice($msg);
                }
-               @unlink($src);
-               exit();
+               System::exit();
        }
 
        if ($maxfilesize && $filesize > $maxfilesize) {
                $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
+               @unlink($src);
                if ($r_json) {
-                       echo json_encode(['error' => $msg]);
+                       System::jsonExit(['error' => $msg]);
                } else {
-                       echo $msg . EOL;
+                       echo $msg . '<br />';
                }
-               @unlink($src);
-               exit();
+               System::exit();
        }
 
        $newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>');
@@ -120,22 +118,20 @@ function wall_attach_post(App $a) {
        if ($newid === false) {
                $msg =  DI::l10n()->t('File upload failed.');
                if ($r_json) {
-                       echo json_encode(['error' => $msg]);
+                       System::jsonExit(['error' => $msg]);
                } else {
-                       echo $msg . EOL;
+                       echo $msg . '<br />';
                }
-               exit();
+               System::exit();
        }
 
        if ($r_json) {
-               echo json_encode(['ok' => true, 'id' => $newid]);
-               exit();
+               System::jsonExit(['ok' => true, 'id' => $newid]);
        }
 
        $lf = "\n";
 
        echo  $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf;
-
-       exit();
+       System::exit();
        // NOTREACHED
 }