Merge remote-tracking branch 'upstream/develop' into share-rework

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 607d0fe7a394c237b5ff8b179191fcd5dcc001bc..83d5338da1ad67921ac134278e208814689110cf 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -55,10 +54,10 @@ 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 (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $page_owner_uid)) {
                $can_post = true;
-       } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
-               $contact_id = Session::getRemoteContactID($page_owner_uid);
+       } elseif ($community_page && !empty(DI::userSession()->getRemoteContactID($page_owner_uid))) {
+               $contact_id = DI::userSession()->getRemoteContactID($page_owner_uid);
                $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]);
        }
 
@@ -66,15 +65,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 +89,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 +105,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 +119,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 +131,6 @@ function wall_attach_post(App $a) {
        $lf = "\n";
 
        echo  $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf;
-
-       exit();
+       System::exit();
        // NOTREACHED
 }