Add not null/default value for ACL in fields

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 9b790a440ef08692371a062d8c2d109ae2e7afea..0324a5581ca9a674d48ac08381edd6289e392964 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,11 +6,10 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Mimetype;
+use Friendica\Model\Attach;
+use Friendica\Model\User;
 use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {
@@ -40,43 +39,26 @@ function wall_attach_post(App $a) {
        }
 
        $can_post  = false;
-       $visitor   = 0;
 
        $page_owner_uid   = $r[0]['uid'];
        $page_owner_cid   = $r[0]['id'];
-       $page_owner_nick  = $r[0]['nickname'];
-       $community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
+       $community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
-       if ((local_user()) && (local_user() == $page_owner_uid)) {
+       if (local_user() && (local_user() == $page_owner_uid)) {
                $can_post = true;
-       } else {
-               if ($community_page && remote_user()) {
-                       $contact_id = 0;
-
-                       if (is_array($_SESSION['remote'])) {
-                               foreach ($_SESSION['remote'] as $v) {
-                                       if ($v['uid'] == $page_owner_uid) {
-                                               $contact_id = $v['cid'];
-                                               break;
-                                       }
-                               }
-                       }
-
-                       if ($contact_id > 0) {
-                               $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)
-                               );
+       } 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)
+               );
 
-                               if (DBA::isResult($r)) {
-                                       $can_post = true;
-                                       $visitor = $contact_id;
-                               }
-                       }
+               if (DBA::isResult($r)) {
+                       $can_post = true;
                }
        }
 
-       if (! $can_post) {
+       if (!$can_post) {
                if ($r_json) {
                        echo json_encode(['error' => L10n::t('Permission denied.')]);
                        exit();
@@ -126,20 +108,11 @@ function wall_attach_post(App $a) {
                exit();
        }
 
-       $filedata = @file_get_contents($src);
-       $mimetype = Mimetype::getContentType($filename);
-       $hash = System::createGUID(64);
-       $created = DateTimeFormat::utcNow();
-
-       $fields = ['uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
-               'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
-               'allow_cid' => '<' . $page_owner_cid . '>', 'allow_gid' => '','deny_cid' => '', 'deny_gid' => ''];
-
-       $r = DBA::insert('attach', $fields);
+       $newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>');
 
        @unlink($src);
 
-       if (! $r) {
+       if ($newid === false) {
                $msg =  L10n::t('File upload failed.');
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
@@ -149,30 +122,14 @@ function wall_attach_post(App $a) {
                exit();
        }
 
-       $r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `created` = '%s' AND `hash` = '%s' LIMIT 1",
-               intval($page_owner_uid),
-               DBA::escape($created),
-               DBA::escape($hash)
-       );
-
-       if (! DBA::isResult($r)) {
-               $msg = L10n::t('File upload failed.');
-               if ($r_json) {
-                       echo json_encode(['error' => $msg]);
-               } else {
-                       echo $msg . EOL;
-               }
-               exit();
-       }
-
        if ($r_json) {
-               echo json_encode(['ok' => true]);
+               echo json_encode(['ok' => true, 'id' => $newid]);
                exit();
        }
 
        $lf = "\n";
 
-       echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+       echo  $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf;
 
        exit();
        // NOTREACHED