Remove album name bin2hex conversion in file browser

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index c18941471096561c901791da954bcb133c896de2..bc6050646077f5967c1dff3ce35ff94f494392c6 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -244,10 +244,10 @@ function item_post(App $a) {
        $body = preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $body);
 
        if (!empty($orig_post)) {
-               $str_group_allow   = $orig_post['allow_gid'] ?? '';
-               $str_contact_allow = $orig_post['allow_cid'] ?? '';
-               $str_group_deny    = $orig_post['deny_gid']  ?? '';
-               $str_contact_deny  = $orig_post['deny_cid']  ?? '';
+               $str_group_allow   = $orig_post['allow_gid'];
+               $str_contact_allow = $orig_post['allow_cid'];
+               $str_group_deny    = $orig_post['deny_gid'];
+               $str_contact_deny  = $orig_post['deny_cid'];
                $location          = $orig_post['location'];
                $coord             = $orig_post['coord'];
                $verb              = $orig_post['verb'];
@@ -262,12 +262,18 @@ function item_post(App $a) {
                $guid              = $orig_post['guid'];
                $extid             = $orig_post['extid'];
        } else {
-               $aclFormatter = DI::aclFormatter();
-
-               $str_group_allow   = isset($_REQUEST['group_allow'])   ? $aclFormatter->toString($_REQUEST['group_allow'])    : $user['allow_gid'] ?? '';
-               $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact__allow']) : $user['allow_cid'] ?? '';
-               $str_group_deny    = isset($_REQUEST['group_deny'])    ? $aclFormatter->toString($_REQUEST['group_deny'])     : $user['deny_gid']  ?? '';
-               $str_contact_deny  = isset($_REQUEST['contact_deny'])  ? $aclFormatter->toString($_REQUEST['contact_deny'])   : $user['deny_cid']  ?? '';
+               $str_contact_allow = '';
+               $str_group_allow   = '';
+               $str_contact_deny  = '';
+               $str_group_deny    = '';
+
+               if (($_REQUEST['visibility'] ?? '') !== 'public') {
+                       $aclFormatter = DI::aclFormatter();
+                       $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']    ?? ''));
                $location          = Strings::escapeTags(trim($_REQUEST['location'] ?? ''));
@@ -461,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;
        }