X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=50bbdd46e46e8c7c1ec46999b86730efb532124d;hb=3ca3157e53d9a37f5fee6ef6c459d61b453cca72;hp=f2dd7f4dfa327571aadc516152e1577030c612df;hpb=fa778e0040df784c9eec5392731473e58fbfa0be;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index f2dd7f4dfa..50bbdd46e4 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'] .= '<meta name="friendika.community" content="true" />';
 	}
 	if(x($a->profile,'openidserver'))				
@@ -31,10 +30,12 @@ function profile_init(&$a) {
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 
-	$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-	$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
-	if(strlen($keywords))
-		$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\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'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+	}
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
@@ -69,8 +70,9 @@ function profile_content(&$a, $update = 0) {
 		$a->profile['profile_uid'] = $update;
 	}
 	else {
-		if($a->profile['profile_uid'] == local_user())		
-			$o .= '<script>	$(document).ready(function() { $(\'#nav-home-link\').addClass(\'nav-selected\'); });</script>';
+		if($a->profile['profile_uid'] == local_user()) {
+			nav_set_selected('home');
+		}
 	}
 
 	$contact = null;
@@ -160,52 +162,23 @@ function profile_content(&$a, $update = 0) {
 		if($tab === 'posts') {
 			$o .= '<div id="live-profile"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] 
-				. "; var netargs = ''; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+				. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\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`
@@ -265,9 +238,7 @@ function profile_content(&$a, $update = 0) {
 	$o .= conversation($a,$r,'profile',$update);
 
 	if(! $update) {
-		
 		$o .= paginate($a);
-		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
 	}
 
 	return $o;