Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 2ac8fe586deefa181f5c27463d9f5b753c6e25be..b33b181de1b1b7332611799ac225d366c12fd48a 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,8 +1,9 @@
 <?php
 
-function profile_init(&$a) {
+require_once('include/contact_widgets.php');
+
 
-       require_once('include/contact_widgets.php');
+function profile_init(&$a) {
 
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
@@ -94,6 +95,8 @@ function profile_content(&$a, $update = 0) {
        require_once('include/security.php');
        require_once('include/conversation.php');
        require_once('include/acl_selectors.php');
+       require_once('include/items.php');
+
        $groups = array();
 
        $tab = 'posts';
@@ -113,8 +116,18 @@ function profile_content(&$a, $update = 0) {
        $contact = null;
        $remote_contact = false;
 
-       if(remote_user()) {
-               $contact_id = $_SESSION['visitor_id'];
+       $contact_id = 0;
+
+       if(is_array($_SESSION['remote'])) {
+               foreach($_SESSION['remote'] as $v) {
+                       if($v['uid'] == $a->profile['profile_uid']) {
+                               $contact_id = $v['cid'];
+                               break;
+                       }
+               }
+       }
+
+       if($contact_id) {
                $groups = init_groups_visitor($contact_id);
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact_id),
@@ -168,6 +181,7 @@ function profile_content(&$a, $update = 0) {
 
                $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+               $a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true); 
                $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
                if(can_write_wall($a,$a->profile['profile_uid'])) {
@@ -201,7 +215,8 @@ function profile_content(&$a, $update = 0) {
 
                $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
+                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
+                       (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
                        and `item`.`moderated` = 0 and `item`.`unseen` = 1
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        AND `item`.`wall` = 1
@@ -218,26 +233,33 @@ function profile_content(&$a, $update = 0) {
                }
 
                if($datequery) {
-                       $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('','',$datequery))));
+                       $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
                }
                if($datequery2) {
-                       $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('','',$datequery2))));
+                       $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
                }
 
+               if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+                   $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 $sql_extra2 ",
+                           intval($a->profile['profile_uid'])
+                   );
+
+               if(count($r)) {
+                       $a->set_pager_total($r[0]['total']);
+                       }
+               }
 
-               $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 $sql_extra2 ",
-                       intval($a->profile['profile_uid'])
-               );
+               $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+               $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+               if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+                       $itemspage_network = $a->force_max_items;
 
-               if(count($r)) {
-                       $a->set_pager_total($r[0]['total']);
-                       $a->set_pager_itemspage(40);
-               }
+               $a->set_pager_itemspage($itemspage_network);
 
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
@@ -282,7 +304,7 @@ function profile_content(&$a, $update = 0) {
                $items = array();
        }
 
-       if($is_owner && ! $update) {
+       if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
                $o .= get_birthdays();
                $o .= get_events();
        }
@@ -308,7 +330,12 @@ function profile_content(&$a, $update = 0) {
        $o .= conversation($a,$items,'profile',$update);
 
        if(! $update) {
-               $o .= paginate($a);
+         if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+                       $o .= paginate($a);
+               }
+               else {
+                       $o .= alt_pager($a,count($items));
+               }
        }
 
        return $o;