strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2913 from rabuzarus/1411_fix_photo_permissions

Browse source 
fix photos page permissions
This commit is contained in:
Tobias Diekershoff 2016-11-14 20:22:48 +01:00 committed by GitHub
parent b7dbecd5e3 9878974e1f
commit 2ecf2723c8
5 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/items.php
View file

@ -1896,21 +1896,21 @@ function drop_item($id,$interactive = true) {
$owner = $item['uid']; $owner = $item['uid'];
$cid = 0; $contact_id = 0;
// check if logged in user is either the author or owner of this item // check if logged in user is either the author or owner of this item
if (is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $visitor) { foreach($_SESSION['remote'] as $visitor) {
if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
$cid = $visitor['cid']; $contact_id = $visitor['cid'];
break; break;
} }
} }
} }
if ((local_user() == $item['uid']) || ($cid) || (! $interactive)) { if ((local_user() == $item['uid']) || ($contact_id) || (! $interactive)) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if ($_REQUEST['confirm']) { if ($_REQUEST['confirm']) {

12
mod/photos.php
View file

@ -132,24 +132,24 @@ function photos_post(&$a) {
$can_post = true; $can_post = true;
else { else {
if ($community_page && remote_user()) { if ($community_page && remote_user()) {
$cid = 0; $contact_id = 0;
if (is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $page_owner_uid) { if ($v['uid'] == $page_owner_uid) {
$cid = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if ($cid) { if ($contact_id) {
$r = qu("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = qu("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($contact_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$can_post = true; $can_post = true;
$visitor = $cid; $visitor = $contact_id;
} }
} }
} }
@ -1012,7 +1012,7 @@ function photos_content(&$a) {
$can_post = true; $can_post = true;
$contact = $r[0]; $contact = $r[0];
$remote_contact = true; $remote_contact = true;
$visitor = $cid; $visitor = $contact_id;
} }
} }
} }

2
mod/videos.php
View file

@ -263,7 +263,7 @@ function videos_content(&$a) {
$can_post = true; $can_post = true;
$contact = $r[0]; $contact = $r[0];
$remote_contact = true; $remote_contact = true;
$visitor = $cid; $visitor = $contact_id;
} }
} }
} }

10
mod/wall_attach.php
View file

@ -40,24 +40,24 @@ function wall_attach_post(&$a) {
$can_post = true; $can_post = true;
else { else {
if($community_page && remote_user()) { if($community_page && remote_user()) {
$cid = 0; $contact_id = 0;
if(is_array($_SESSION['remote'])) { if(is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $page_owner_uid) { if($v['uid'] == $page_owner_uid) {
$cid = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if($cid) { if($contact_id) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($contact_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($r)) { if(count($r)) {
$can_post = true; $can_post = true;
$visitor = $cid; $visitor = $contact_id;
} }
} }
} }

10
mod/wall_upload.php
View file

@ -48,24 +48,24 @@ function wall_upload_post(&$a, $desktopmode = true) {
$can_post = true; $can_post = true;
else { else {
if($community_page && remote_user()) { if($community_page && remote_user()) {
$cid = 0; $contact_id = 0;
if(is_array($_SESSION['remote'])) { if(is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $page_owner_uid) { if($v['uid'] == $page_owner_uid) {
$cid = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if($cid) { if($contact_id) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($contact_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($r)) { if(count($r)) {
$can_post = true; $can_post = true;
$visitor = $cid; $visitor = $contact_id;
} }
} }
} }