Merge pull request #8456 from annando/fix-ap

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index a9f1ef808baad0daf07f45f6504851967bb25db1..bc6050646077f5967c1dff3ce35ff94f494392c6 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -128,7 +128,7 @@ function item_post(App $a) {
                        $thread_parent_contact = Contact::getDetailsByURL($toplevel_item["author-link"]);
 
                        if ($toplevel_item['id'] != $toplevel_item['parent']) {
-                               $toplevel_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $toplevel_item['parent']]);
+                               $toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]);
                        }
                }
 
@@ -261,32 +261,18 @@ function item_post(App $a) {
                $network           = $orig_post['network'];
                $guid              = $orig_post['guid'];
                $extid             = $orig_post['extid'];
-
        } else {
+               $str_contact_allow = '';
+               $str_group_allow   = '';
+               $str_contact_deny  = '';
+               $str_group_deny    = '';
 
-               /*
-                * if coming from the API and no privacy settings are set,
-                * use the user default permissions - as they won't have
-                * been supplied via a form.
-                */
-               if ($api_source
-                       && !array_key_exists('contact_allow', $_REQUEST)
-                       && !array_key_exists('group_allow', $_REQUEST)
-                       && !array_key_exists('contact_deny', $_REQUEST)
-                       && !array_key_exists('group_deny', $_REQUEST)) {
-                       $str_group_allow   = $user['allow_gid'];
-                       $str_contact_allow = $user['allow_cid'];
-                       $str_group_deny    = $user['deny_gid'];
-                       $str_contact_deny  = $user['deny_cid'];
-               } else {
-                       // use the posted permissions
-
+               if (($_REQUEST['visibility'] ?? '') !== 'public') {
                        $aclFormatter = DI::aclFormatter();
-
-                       $str_group_allow   = $aclFormatter->toString($_REQUEST['group_allow'] ?? '');
-                       $str_contact_allow = $aclFormatter->toString($_REQUEST['contact_allow'] ?? '');
-                       $str_group_deny    = $aclFormatter->toString($_REQUEST['group_deny'] ?? '');
-                       $str_contact_deny  = $aclFormatter->toString($_REQUEST['contact_deny'] ?? '');
+                       $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
+                       $str_group_allow   = isset($_REQUEST['group_allow'])   ? $aclFormatter->toString($_REQUEST['group_allow'])   : $user['allow_gid'] ?? '';
+                       $str_contact_deny  = isset($_REQUEST['contact_deny'])  ? $aclFormatter->toString($_REQUEST['contact_deny'])  : $user['deny_cid']  ?? '';
+                       $str_group_deny    = isset($_REQUEST['group_deny'])    ? $aclFormatter->toString($_REQUEST['group_deny'])    : $user['deny_gid']  ?? '';
                }
 
                $title             = Strings::escapeTags(trim($_REQUEST['title']    ?? ''));
@@ -318,10 +304,10 @@ function item_post(App $a) {
                                $network = $toplevel_item['network'];
                        }
 
-                       $str_contact_allow = $toplevel_item['allow_cid'];
-                       $str_group_allow   = $toplevel_item['allow_gid'];
-                       $str_contact_deny  = $toplevel_item['deny_cid'];
-                       $str_group_deny    = $toplevel_item['deny_gid'];
+                       $str_contact_allow = $toplevel_item['allow_cid'] ?? '';
+                       $str_group_allow   = $toplevel_item['allow_gid'] ?? '';
+                       $str_contact_deny  = $toplevel_item['deny_cid'] ?? '';
+                       $str_group_deny    = $toplevel_item['deny_gid'] ?? '';
                        $private           = $toplevel_item['private'];
 
                        $wall              = $toplevel_item['wall'];
@@ -481,7 +467,7 @@ function item_post(App $a) {
 
        $match = null;
 
-       if (!$preview && Photo::setPermissionFromBody($body, $profile_uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
+       if (!$preview && Photo::setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
                $objecttype = Activity\ObjectType::IMAGE;
        }