added spaces + some curly braces + some usage of dbm::is_result()

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 15f49db53874a14f31b2055b0d9839f252e3e005..7a11e9bc6b1fe80a261b5328ac77400afecf8bc8 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,22 +1,23 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
 
-
 function profile_init(App $a) {
 
-       if (! x($a->page,'aside')) {
+       if(! x($a->page,'aside'))
                $a->page['aside'] = '';
-       }
 
-       if ($a->argc > 1) {
+       if($a->argc > 1)
                $which = htmlspecialchars($a->argv[1]);
-       }else {
+       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']);
-               } else {
+               }
+               else {
                        logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested profile is not available.') . EOL );
                        $a->error = 404;
@@ -25,10 +26,11 @@ function profile_init(App $a) {
        }
 
        $profile = 0;
-       if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+       if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
                $which = $a->user['nickname'];
                $profile = htmlspecialchars($a->argv[1]);
-       } else {
+       }
+       else {
                auto_redir($a, $which);
        }
 
@@ -37,7 +39,7 @@ function profile_init(App $a) {
        $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
        $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
 
-       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="friendica.community" content="true" />';
        }
        if (x($a->profile,'openidserver')) {
@@ -51,7 +53,7 @@ function profile_init(App $a) {
        if ((! $blocked) && (! $userblock)) {
                $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
                $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
-               if (strlen($keywords))
+               if(strlen($keywords))
                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
        }
 
@@ -148,6 +150,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);
@@ -194,9 +197,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);
                }
        }
 
@@ -208,21 +211,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 = "";
 
@@ -261,7 +279,7 @@ function profile_content(App $a, $update = 0) {
                }
                //  now that we have the user settings, see if the theme forces
                //  a maximum item number which is lower then the user choice
-               if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+               if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
                        $itemspage_network = $a->force_max_items;
 
                $a->set_pager_itemspage($itemspage_network);
@@ -282,15 +300,19 @@ 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) {
+               foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];
-               }
                $parents_str = implode(', ', $parents_arr);
 
                $items = q(item_query()." AND `item`.`uid` = %d
@@ -305,13 +327,13 @@ function profile_content(App $a, $update = 0) {
                $items = array();
        }
 
-       if ($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
+       if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
                $o .= get_birthdays();
                $o .= get_events();
        }
 
 
-       if ($is_owner) {
+       if($is_owner) {
                $r = q("UPDATE `item` SET `unseen` = 0
                        WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
                        intval(local_user())