X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=f68006af54620bfd1bc4b5ca28abc31e9a95f98f;hb=a1a07e7287e9e764912bbd08383cf43503deb9e8;hp=ea84c3822cd51f7c7f98be32077a41e14db6e43f;hpb=32bebdfa7e6cf4b73eeabba0377e9fcb5afea27c;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index ea84c3822c..f68006af54 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,8 +2,7 @@
function profile_init(&$a) {
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user()))
- return;
+ $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
if($a->argc > 1)
$which = $a->argv[1];
@@ -21,7 +20,7 @@ function profile_init(&$a) {
profile_load($a,$which,$profile);
- if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] & PAGE_COMMUNITY)) {
+ if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
$a->page['htmlhead'] .= '';
}
if(x($a->profile,'openidserver'))
@@ -31,10 +30,12 @@ function profile_init(&$a) {
$a->page['htmlhead'] .= '' . "\r\n";
}
- $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
- $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
- if(strlen($keywords))
- $a->page['htmlhead'] .= '' . "\r\n" ;
+ if(! $blocked) {
+ $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+ $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+ if(strlen($keywords))
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+ }
$a->page['htmlhead'] .= '' . "\r\n" ;
$a->page['htmlhead'] .= '' . "\r\n" ;
@@ -45,6 +46,7 @@ function profile_init(&$a) {
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn)
$a->page['htmlhead'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+ $a->page['htmlhead'] .= "get_baseurl()."/poco/{$which}\" />\r\n";
}
@@ -69,8 +71,9 @@ function profile_content(&$a, $update = 0) {
$a->profile['profile_uid'] = $update;
}
else {
- if($a->profile['profile_uid'] == local_user())
- $o .= '';
+ if($a->profile['profile_uid'] == local_user()) {
+ nav_set_selected('home');
+ }
}
$contact = null;
@@ -108,15 +111,7 @@ function profile_content(&$a, $update = 0) {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
- $tpl = get_markup_template('profile_tabs.tpl');
-
- $o .= replace_macros($tpl,array(
- '$url' => $a->get_baseurl() . '/' . $a->cmd,
- '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
- '$status' => t('Status'),
- '$profile' => t('Profile'),
- '$photos' => t('Photos')
- ));
+ $o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
if($tab === 'profile') {
@@ -126,7 +121,9 @@ function profile_content(&$a, $update = 0) {
return $o;
}
- if(x($_SESSION,'new_member') && $_SESSION['new_member'])
+
+
+ if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
$o .= '' . t('Tips for New Members') . '' . EOL;
$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
@@ -157,52 +154,23 @@ function profile_content(&$a, $update = 0) {
if($tab === 'posts') {
$o .= '' . "\r\n";
$o .= "\r\n";
+ . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n";
}
}
- // Construct permissions
-
- // default permissions - anonymous user
-
- $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
-
- // Profile owner - everything is visible
-
if($is_owner) {
- $sql_extra = '';
-
- // Oh - while we're here... reset the Unseen messages
-
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
- intval($_SESSION['uid'])
+ intval(local_user())
);
-
}
- // authenticated visitor - here lie dragons
- // If $remotecontact is true, we know that not only is this a remotely authenticated
- // person, but that it is *our* contact, which is important in multi-user mode.
-
- elseif($remote_contact) {
- $gs = '<<>>'; // should be impossible to match
- if(count($groups)) {
- foreach($groups as $g)
- $gs .= '|<' . intval($g) . '>';
- }
- $sql_extra = sprintf(
- " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
- AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
- AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
- AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
-
- intval($_SESSION['visitor_id']),
- intval($_SESSION['visitor_id']),
- dbesc($gs),
- dbesc($gs)
- );
- }
+ /**
+ * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
+ */
+
+ $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -256,18 +224,15 @@ function profile_content(&$a, $update = 0) {
);
}
- if($is_owner && ! $update)
+ if($is_owner && ! $update) {
$o .= get_birthdays();
-
-
+ $o .= get_events();
+ }
$o .= conversation($a,$r,'profile',$update);
-
if(! $update) {
-
$o .= paginate($a);
- $o .= '';
}
return $o;