X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=c2b4fe2489d6cde7195d3efe0e2ac5d994b010e6;hb=1cb694947f264da64390e6cc8a329de7d5b8b742;hp=d2864d838a3ea7eafe7a04a858e7a51411931e2c;hpb=199bba20d9daa99b368b56982e9a6b09fc19729d;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index d2864d838a..c2b4fe2489 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,9 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
 
-
 function profile_init(App $a) {
 
 	if(! x($a->page,'aside'))
@@ -14,7 +16,7 @@ function profile_init(App $a) {
 	else {
 		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
 		if (dbm::is_result($r)) {
-			goaway(App::get_baseurl() . '/profile/' . $r[0]['nickname']);
+			goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
 		}
 		else {
 			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
@@ -57,16 +59,16 @@ function profile_init(App $a) {
 	}
 
 	$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="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-	header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
 	foreach ($dfrn_pages as $dfrn) {
-		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}
-	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";
+	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".System::baseUrl()."/poco/{$which}\" />\r\n";
 
 }
 
@@ -149,6 +151,7 @@ function profile_content(App $a, $update = 0) {
 	}
 
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+	$last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
 	if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
 		notice( t('Access to this profile has been restricted.') . EOL);
@@ -177,8 +180,8 @@ function profile_content(App $a, $update = 0) {
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
-		$a->page['aside'] .= posted_date_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
-		$a->page['aside'] .= categories_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
+		$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
+		$a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
 		if (can_write_wall($a,$a->profile['profile_uid'])) {
 
@@ -195,9 +198,9 @@ function profile_content(App $a, $update = 0) {
 				'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
 				'profile_uid' => $a->profile['profile_uid'],
 				'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
-		);
+			);
 
-		$o .= status_editor($a,$x);
+			$o .= status_editor($a,$x);
 		}
 	}
 
@@ -209,21 +212,36 @@ function profile_content(App $a, $update = 0) {
 
 
 	if ($update) {
+		$last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
 
-		$r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`
+		// If the page user is the owner of the page we should query for unseen
+		// items. Otherwise use a timestamp of the last succesful update request.
+		if ($is_owner || !$last_updated) {
+			$sql_extra4 = " AND `item`.`unseen`";
+		} else {
+			$gmupdate = gmdate("Y-m-d H:i:s", $last_updated);
+			$sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
+		}
+
+		$r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created`
 			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
 			(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."'
 			OR item.verb = '" . ACTIVITY_DISLIKE . "' OR item.verb = '" . ACTIVITY_ATTEND . "'
 			OR item.verb = '" . ACTIVITY_ATTENDNO . "' OR item.verb = '" . ACTIVITY_ATTENDMAYBE . "')
-			AND `item`.`moderated` = 0 and `item`.`unseen` = 1
+			AND `item`.`moderated` = 0
 			AND `item`.`wall` = 1
+			$sql_extra4
 			$sql_extra
 			ORDER BY `item`.`created` DESC",
 			intval($a->profile['profile_uid'])
 		);
 
+		if (!dbm::is_result($r)) {
+			return '';
+		}
+
 	} else {
 		$sql_post_table = "";
 
@@ -251,23 +269,6 @@ function profile_content(App $a, $update = 0) {
 			$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
 		}
 
-		if(get_config('system', 'old_pager')) {
-		    $r = q("SELECT COUNT(*) AS `total`
-			    FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-			    $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			    AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			    WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
-			    and `thread`.`moderated` = 0
-			    AND `thread`.`wall` = 1
-			    $sql_extra3 $sql_extra $sql_extra2 ",
-			    intval($a->profile['profile_uid'])
-			);
-
-			if (dbm::is_result($r)) {
-				$a->set_pager_total($r[0]['total']);
-			}
-		}
-
 		//  check if we serve a mobile device and get the user settings
 		//  accordingly
 		if ($a->is_mobile) {
@@ -300,11 +301,16 @@ function profile_content(App $a, $update = 0) {
 			ORDER BY `thread`.`created` DESC $pager_sql",
 			intval($a->profile['profile_uid'])
 		);
+
 	}
 
 	$parents_arr = array();
 	$parents_str = '';
 
+	// Set a time stamp for this page. We will make use of it when we
+	// search for new items (update routine)
+	$_SESSION['last_updated'][$last_updated_key] = time();
+
 	if (dbm::is_result($r)) {
 		foreach($r as $rr)
 			$parents_arr[] = $rr['item_id'];
@@ -328,21 +334,18 @@ function profile_content(App $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())
-		);
+	if ($is_owner) {
+		$unseen = dba::exists('item', array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+		if ($unseen) {
+			$r = dba::update('item', array('unseen' => false),
+					array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+		}
 	}
 
-	$o .= conversation($a,$items,'profile',$update);
+	$o .= conversation($a, $items, 'profile', $update);
 
-	if(! $update) {
-		if(!get_config('system', 'old_pager')) {
-			$o .= alt_pager($a,count($items));
-		} else {
-			$o .= paginate($a);
-		}
+	if (!$update) {
+		$o .= alt_pager($a, count($items));
 	}
 
 	return $o;