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

cleanup and Comanchification of mod_profile

Browse Source
This commit is contained in:
friendica 2013-12-10 23:27:17 -08:00
parent 5279f3bf6f
commit 652959678f
3 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/identity.php
View File

@ -868,6 +868,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
function advanced_profile(&$a) {
if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_profile'))
return '';
$o = '';
$o .= '<h2>' . t('Profile') . '</h2>';

50
mod/profile.php
View File

@ -43,72 +43,32 @@ function profile_init(&$a) {
$a->profile = $x[0];
}
}
// $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
// if(! $channel_display)
profile_load($a,$which,$profile);
}
function profile_aside(&$a) {
profile_create_sidebar($a);
}
function profile_content(&$a, $update = 0) {
if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
return login();
}
$groups = array();
$tab = 'profile';
$o = '';
$contact = null;
$remote_contact = false;
$contact_id = 0;
if(is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $a->profile['profile_uid']) {
$contact_id = $v['cid'];
break;
}
}
if(! (perm_is_allowed($a->profile['profile_uid'],get_observer_hash(), 'view_profile'))) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}
if($contact_id) {
$groups = init_groups_visitor($contact_id);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($a->profile['profile_uid'])
);
if(count($r)) {
$contact = $r[0];
$remote_contact = true;
}
}
if(! $remote_contact) {
if(local_user()) {
$contact_id = $_SESSION['cid'];
$contact = $a->contact;
}
}
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}

3
view/pdl/mod_profile.pdl Normal file
View File

@ -0,0 +1,3 @@
[region=aside]
[widget=fullprofile][/widget]
[/region]