mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #1915 from rabuzarus/hide_profilepics

Browse source 
don't show profile photos in albums to others than owner or remote
This commit is contained in:
fabrixxm 2015-09-30 08:57:31 +02:00
parent 67638118e7 3d7602a5a3
commit 2e8caf7f27
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mod/photos.php
View file

@ -30,6 +30,7 @@ function photos_init(&$a) {
$a->data['user'] = $r[0]; $a->data['user'] = $r[0];
$a->profile_uid = $r[0]['uid']; $a->profile_uid = $r[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_uid));
$profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg'); $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
@ -62,6 +63,9 @@ function photos_init(&$a) {
$ret['albums'] = array(); $ret['albums'] = array();
foreach($albums as $k => $album) { foreach($albums as $k => $album) {
//hide profile photos to others
if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
continue;
$entry = array( $entry = array(
'text' => $album['album'], 'text' => $album['album'],
'total' => $album['total'], 'total' => $album['total'],
@ -1059,8 +1063,8 @@ function photos_content(&$a) {
$o = ""; $o = "";
// tabs // tabs
$_is_owner = (local_user() && (local_user() == $owner_uid)); $is_owner = (local_user() && (local_user() == $owner_uid));
$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']); $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
// //
// dispatch request // dispatch request
@ -1799,6 +1803,10 @@ function photos_content(&$a) {
if(count($r)) { if(count($r)) {
$twist = 'rotright'; $twist = 'rotright';
foreach($r as $rr) { foreach($r as $rr) {
//hide profile photos to others
if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
continue;
if($twist == 'rotright') if($twist == 'rotright')
$twist = 'rotleft'; $twist = 'rotleft';
else else