improve profile update for non logged in ussers and remote users

diff --git a/index.php b/index.php
index ebc65cdb018904f550ccda6c6e1cd21ff2c8bca1..efaf07c1a0b24a7957ba47acc81753f33245a8ac 100644 (file)
--- a/index.php
+++ b/index.php
@@ -174,6 +174,10 @@ if (! x($_SESSION,'sysmsg_info')) {
        $_SESSION['sysmsg_info'] = array();
 }
 
+// Array for informations about last received items
+if (! x($_SESSION,'last_updated')) {
+       $_SESSION['last_updated'] = array();
+}
 /*
  * check_config() is responsible for running update scripts. These automatically
  * update the DB schema whenever we push a new one out. It also checks to see if

diff --git a/mod/profile.php b/mod/profile.php
index a83cb076f26b883a04504be31e9a5974e95ed64d..259e0860825c1c11a0c33713b54fe61c5be07129 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -149,6 +149,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);
@@ -195,9 +196,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,6 +210,14 @@ function profile_content(App $a, $update = 0) {
 
 
        if ($update) {
+               // 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) {
+                       $sql_extra4 = " AND `item`.`unseen`";
+               } else {
+                       $last_updated = gmdate("Y-m-d H:i:s", $_SESSION['last_updated'][$last_updated_key]);
+                       $sql_extra4 = " AND `item`.`received` > '" . $last_updated . "'";
+               }
 
                $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`
@@ -217,13 +226,18 @@ function profile_content(App $a, $update = 0) {
                        (`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 = "";
 
@@ -283,11 +297,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 fornew items (update routine)
+       $_SESSION['last_updated'][$last_updated_key] = time();
+
        if (dbm::is_result($r)) {
                foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];