aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-10 23:27:17 -0800
committerfriendica <info@friendica.com>2013-12-10 23:27:17 -0800
commit652959678f47b84830123df4fac8add31657b4c9 (patch)
tree8ed5be3886d3d2eac5765094ca89d9ee587bfd4b
parent5279f3bf6f0a61ed925e91016e27cd345e0c8b75 (diff)
downloadvolse-hubzilla-652959678f47b84830123df4fac8add31657b4c9.tar.gz
volse-hubzilla-652959678f47b84830123df4fac8add31657b4c9.tar.bz2
volse-hubzilla-652959678f47b84830123df4fac8add31657b4c9.zip
cleanup and Comanchification of mod_profile
-rw-r--r--include/identity.php3
-rw-r--r--mod/profile.php50
-rw-r--r--view/pdl/mod_profile.pdl3
3 files changed, 11 insertions, 45 deletions
diff --git a/include/identity.php b/include/identity.php
index e22bb8645..b25594c87 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -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>';
diff --git a/mod/profile.php b/mod/profile.php
index a307905e6..fca7c8f9f 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -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_load($a,$which,$profile);
- 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($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(! (perm_is_allowed($a->profile['profile_uid'],get_observer_hash(), 'view_profile'))) {
+ notice( t('Access to this profile has been restricted.') . EOL);
+ return;
}
- 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;
}
diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_profile.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]