X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=428679ffc53e02f85f8bf573e4adb371c0557fe7;hb=ed30635bee9a9c1876f83288f38dd0dfa31a43d4;hp=e7cac7959881bc38944cab835a691f5878015af2;hpb=a1c277ed1a7a604a3b0e9ab21695a45e29c1b249;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
old mode 100644
new mode 100755
index e7cac79598..428679ffc5
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -7,9 +7,15 @@ function profile_init(&$a) {
 	if($a->argc > 1)
 		$which = $a->argv[1];
 	else {
-		notice( t('No profile') . EOL );
-		$a->error = 404;
-		return;
+		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1");
+		if(count($r)) {
+			$which = $r[0]['nickname'];
+		}
+		else {
+			notice( t('Requested profile is not available.') . EOL );
+			$a->error = 404;
+			return;
+		}
 	}
 
 	$profile = 0;
@@ -21,7 +27,7 @@ function profile_init(&$a) {
 	profile_load($a,$which,$profile);
 
 	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
-		$a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
 	if(x($a->profile,'openidserver'))				
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
@@ -32,7 +38,7 @@ function profile_init(&$a) {
 
 	if(! $blocked) {
 		$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-		$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
 		if(strlen($keywords))
 			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
 	}
@@ -101,7 +107,7 @@ function profile_content(&$a, $update = 0) {
 
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-	if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+	if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
 		notice( t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
@@ -122,7 +128,7 @@ function profile_content(&$a, $update = 0) {
 		}
 
 		if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
-			$o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
+			$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;
 
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
@@ -148,47 +154,57 @@ function profile_content(&$a, $update = 0) {
 
 	}
 
-	if($is_owner) {
-		$r = q("UPDATE `item` SET `unseen` = 0 
-			WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
-			intval(local_user())
-		);
-	}
 
 	/**
 	 * 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);
+	$sql_extra = item_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`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
-		$sql_extra ",
-		intval($a->profile['profile_uid'])
+	if($update) {
 
-	);
+		$r = q("SELECT distinct(parent) AS `item_id`, `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`.`moderated` = 0 and `item`.`unseen` = 1
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			AND `item`.`wall` = 1
+			$sql_extra
+			ORDER BY `item`.`created` DESC",
+			intval($a->profile['profile_uid'])
+		);
 
-	if(count($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
 	}
+	else {
+
+		$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`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+			AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+			$sql_extra ",
+			intval($a->profile['profile_uid'])
+		);
+
+		if(count($r)) {
+			$a->set_pager_total($r[0]['total']);
+			$a->set_pager_itemspage(40);
+		}
 
-	$r = q("SELECT `item`.`id` AS `item_id`, `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 `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
-		$sql_extra
-		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		intval($a->profile['profile_uid']),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
+		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
-	);
+		$r = q("SELECT `item`.`id` AS `item_id`, `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`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+			$sql_extra
+			ORDER BY `item`.`created` DESC $pager_sql ",
+			intval($a->profile['profile_uid'])
+
+		);
+	}
 
 	$parents_arr = array();
 	$parents_str = '';
@@ -198,20 +214,24 @@ function profile_content(&$a, $update = 0) {
 			$parents_arr[] = $rr['item_id'];
 		$parents_str = implode(', ', $parents_arr);
  
-		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
 			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent` = `p`.`id`) AS `parentitem`, `contact`
+			FROM `item`, `contact`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			and `item`.`moderated` = 0
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
-			$sql_extra
-			ORDER BY `parentitem`.`created` DESC, `gravity` ASC, `item`.`created` ASC ",
+			AND `item`.`parent` IN ( %s )
+			$sql_extra ",
 			intval($a->profile['profile_uid']),
 			dbesc($parents_str)
 		);
+		
+		$items = conv_sort($items,'created');
+	} else {
+		$items = array();
 	}
 
 	if($is_owner && ! $update) {
@@ -226,10 +246,18 @@ function profile_content(&$a, $update = 0) {
 
 		$o .= '<div id="live-profile"></div>' . "\r\n";
 		$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] 
-			. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+			. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+	}
+
+
+	if($is_owner) {
+		$r = q("UPDATE `item` SET `unseen` = 0 
+			WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
+			intval(local_user())
+		);
 	}
 
-	$o .= conversation($a,$r,'profile',$update);
+	$o .= conversation($a,$items,'profile',$update);
 
 	if(! $update) {
 		$o .= paginate($a);