From bdedda7c6b4bf85b5fae151e6d93efe3f01dffa3 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 15 Jun 2015 20:43:49 -0700 Subject: fix attachment permissions when they also contain an image. --- mod/item.php | 15 +++++++++++++++ mod/wall_attach.php | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/item.php b/mod/item.php index db0218136..659afef68 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1086,6 +1086,21 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body, intval($uid) ); } + $r = q("select id from attach where hash = '%s' and uid = %d limit 1", + dbesc($image_uri), + intval($uid) + ); + if($r) { + q("update attach SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' + WHERE id = %d AND uid = %d", + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), + intval($r[0]['id']), + intval($uid) + ); + } } } } diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 04ab59146..9ce16d190 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -38,7 +38,7 @@ function wall_attach_post(&$a) { // } // } - $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),array('source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']))); + $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']))); if(! $r['success']) { notice( $r['message'] . EOL); -- cgit v1.2.3