X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=3703fe7f26c6f49d09dda271295d67fc5edf9a08;hb=6d7b0182376d6ce0cfa2c4e01500ff321b9e9b51;hp=7b54340a91e66e0481d44361c33bafb13fb7177e;hpb=2a17c20fb8e910aeb814ab999cf9131478dd2b03;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index 7b54340a91..3703fe7f26 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,11 +1,7 @@
 <?php
 
 if(! function_exists('profile_load')) {
-function profile_load(&$a,$uid,$profile = 0) {
-
-	$sql_extra = (($uid) && (intval($uid)) 
-		? " WHERE `user`.`uid` = " . intval($uid) 
-		: " WHERE `user`.`nickname` = '" . dbesc($uid) . "' " ); 
+function profile_load(&$a, $username, $profile = 0) {
 
 	if(remote_user()) {
 		$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
@@ -23,7 +19,8 @@ function profile_load(&$a,$uid,$profile = 0) {
 
 	$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` 
 		LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-		$sql_extra $sql_which LIMIT 1"
+		WHERE `user`.`nickname` = '%s' $sql_which LIMIT 1",
+		dbesc($username)
 	);
 
 	if(($r === false) || (! count($r))) {
@@ -70,7 +67,7 @@ function profile_init(&$a) {
 }
 
 
-function profile_content(&$a) {
+function profile_content(&$a, $update = false) {
 
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
@@ -79,14 +76,8 @@ function profile_content(&$a) {
 
 	$tab = 'posts';
 
-	if(x($_GET,'tab'))
-		$tab = notags(trim($_GET['tab']));
 
-	$tpl = file_get_contents('view/profile_tabs.tpl');
 
-	$o .= replace_macros($tpl,array(
-		'$url' => $a->get_baseurl() . '/' . $a->cmd
-	));
 
 
 	if(remote_user()) {
@@ -97,30 +88,64 @@ function profile_content(&$a) {
 		$contact_id = $_SESSION['cid'];
 	}
 
-	if($tab == 'profile') {
-		require_once('view/profile_advanced.php');
-		return $o;
+	if($update) {
+		// Ensure we've got a profile owner if updating.
+		if(remote_user()) {
+			$r = q("SELECT `uid` FROM `contact` WHERE `id` = %d LIMIT 1",
+				intval($_SESSION['visitor_id'])
+			);
+			if(count($r))
+				$a->profile['uid'] = $r[0]['uid'];
+			else
+				killme();
+		}
+		elseif(local_user()) {
+			$a->profile['uid'] = $_SESSION['uid'];
+		}
+		else {
+			killme();
+			return; // NOTREACHED
+		}
 	}
 
-	if(can_write_wall($a,$a->profile['profile_uid'])) {
-		$tpl = file_get_contents('view/jot-header.tpl');
-	
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
-		require_once('view/acl_selectors.php');
+	else {
+		if(x($_GET,'tab'))
+			$tab = notags(trim($_GET['tab']));
 
-		$tpl = file_get_contents("view/jot.tpl");
+		$tpl = file_get_contents('view/profile_tabs.tpl');
 
 		$o .= replace_macros($tpl,array(
-			'$baseurl' => $a->get_baseurl(),
-			'$return_path' => $a->cmd,
-			'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
-			'$lockstate' => 'unlock',
-			'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
-			'$profile_uid' => $a->profile['profile_uid']
+			'$url' => $a->get_baseurl() . '/' . $a->cmd
 		));
-	}
 
 
+		if($tab == 'profile') {
+			require_once('view/profile_advanced.php');
+			return $o;
+		}
+
+		if(can_write_wall($a,$a->profile['profile_uid'])) {
+			$tpl = file_get_contents('view/jot-header.tpl');
+	
+			$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+			require_once('view/acl_selectors.php');
+
+			$tpl = file_get_contents("view/jot.tpl");
+
+			$o .= replace_macros($tpl,array(
+				'$baseurl' => $a->get_baseurl(),
+				'$return_path' => $a->cmd,
+				'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
+				'$lockstate' => 'unlock',
+				'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
+				'$profile_uid' => $a->profile['profile_uid']
+			));
+		}
+
+		if($tab == 'posts' && (! $a->pager['start']))
+			$o .= '<div id="live-profile"></div>' . "\r\n";
+	}
+
 	// TODO alter registration and settings and profile to update contact table when names and  photos change.  
 
 	// default permissions - anonymous user
@@ -129,8 +154,17 @@ function profile_content(&$a) {
 
 	// Profile owner - everything is visible
 
-	if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid']))
+	if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
 		$sql_extra = ''; 
+		
+		// Oh - while we're here... reset the Unseen messages
+
+		$r = q("UPDATE `item` SET `unseen` = 0 
+			WHERE `type` != 'remote' AND `unseen` = 1 AND `uid` = %d",
+			intval($_SESSION['uid'])
+		);
+
+	}
 
 	// authenticated visitor - here lie dragons
 	elseif(remote_user()) {
@@ -141,9 +175,9 @@ function profile_content(&$a) {
 		} 
 		$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') ",
+			  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']),
@@ -155,7 +189,7 @@ function profile_content(&$a) {
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `item`.`type` != 'remote' AND `contact`.`blocked` = 0 
+		AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
 		$sql_extra ",
 		intval($a->profile['uid'])
 
@@ -171,7 +205,7 @@ function profile_content(&$a) {
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `item`.`type` != 'remote' AND `contact`.`blocked` = 0 
+		AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		$sql_extra
 		ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
 		intval($a->profile['uid']),
@@ -185,6 +219,10 @@ function profile_content(&$a) {
 
 	$tpl = file_get_contents('view/wall_item.tpl');
 
+	if($update)
+		$return_url = $_SESSION['return_url'];
+	else
+		$return_url = $_SESSION['return_url'] = $a->cmd;
 
 	if(count($r)) {
 		foreach($r as $item) {
@@ -193,12 +231,16 @@ function profile_content(&$a) {
 			
 			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 			
-			if(can_write_wall($a,$a->profile['profile_uid'])) {
+
+
+			if(can_write_wall($a,$a->profile['uid'])) {
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
+						'$return_path' => $_SESSION['return_url'],
+						'$type' => 'wall-comment',
 						'$id' => $item['item_id'],
 						'$parent' => $item['parent'],
-						'$profile_uid' =>  $a->profile['profile_uid'],
+						'$profile_uid' =>  $a->profile['uid'],
 						'$ww' => ''
 					));
 				}
@@ -223,10 +265,18 @@ function profile_content(&$a) {
 			// known to us and is reflected in the contact-id for this item. We can use the contact url or redirect rather than 
 			// use the link in the feed. This is different than on the network page where we may not know the author.
  
-			$profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
-			$profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $item['thumb']);
+			$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
+			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 			$profile_link = $profile_url;
 
+			$drop = '';
+
+			if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
+				$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+
+
+
+
 			$o .= replace_macros($template,array(
 				'$id' => $item['item_id'],
 				'$profile_url' => $profile_link,
@@ -234,12 +284,17 @@ function profile_content(&$a) {
 				'$thumb' => $profile_avatar,
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
-				'$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
+				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+				'$drop' => $drop,
 				'$comment' => $comment
 			));
 		}
 	}
 
+	if($update) {
+		return $o;
+	}
+		
 	$o .= paginate($a);
 
 	return $o;