harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-01-14 14:26:41 -08:00
commit b429a9496a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
boot.php
View File

@ -1249,19 +1249,23 @@ function profile_load(&$a, $nickname, $profile = 0) {
return; return;
} }
if(remote_user() && count($_SESSION['remote'])) { // get the current observer
foreach($_SESSION['remote'] as $visitor) { $observer = $a->get_observer();
if($visitor['uid'] == $user[0]['channel_id']) {
$r = q("SELECT `profile_id` FROM `contact` WHERE `id` = %d LIMIT 1", // Can the observer see our profile?
intval($visitor['cid']) require_once('include/permissions.php');
); if(! perm_is_allowed($user[0]['channel_id'],$observer['xchan_hash'],'view_profile')) {
if(count($r)) // permission denied
$profile = $r[0]['profile_id']; //TODO: place error message
break; return;
}
}
} }
$r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' limit 1",
dbesc($observer['xchan_hash'])
);
if($r)
$profile = $r[0]['abook_profile'];
$r = null; $r = null;