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

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 607d0fe7a394c237b5ff8b179191fcd5dcc001bc..7f12d15e64e4793cb2ce4d473f31b1b00e39017e 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -55,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);
@@ -66,15 +66,15 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        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) {
                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
-               exit();
+               System::exit();
        }
 
        $src      = $_FILES['userfile']['tmp_name'];
@@ -90,14 +90,14 @@ 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) {
                        System::jsonExit(['error' => $msg]);
                } else {
-                       notice($msg);
+                       DI::sysmsg()->addNotice($msg);
                }
-               exit();
+               System::exit();
        }
 
        if ($maxfilesize && $filesize > $maxfilesize) {
@@ -106,9 +106,9 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        System::jsonExit(['error' => $msg]);
                } else {
-                       echo $msg . EOL;
+                       echo $msg . '<br />';
                }
-               exit();
+               System::exit();
        }
 
        $newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>');
@@ -120,9 +120,9 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        System::jsonExit(['error' => $msg]);
                } else {
-                       echo $msg . EOL;
+                       echo $msg . '<br />';
                }
-               exit();
+               System::exit();
        }
 
        if ($r_json) {
@@ -132,7 +132,6 @@ function wall_attach_post(App $a) {
        $lf = "\n";
 
        echo  $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf;
-
-       exit();
+       System::exit();
        // NOTREACHED
 }