Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 69f044e89f4561f02bf4cfe357cd129cf22eec70..24e03d6eac25589bf2bab80e391dfd508d8d6225 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -67,11 +67,23 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-        if (x($a->category)) {
-               $category = $a->category;
+       $category = $datequery = $datequery2 = '';
+
+       if($a->argc > 2) {
+               for($x = 2; $x < $a->argc; $x ++) {
+                       if(is_a_date_arg($a->argv[$x])) {
+                               if($datequery)
+                                       $datequery2 = escape_tags($a->argv[$x]);
+                               else
+                                       $datequery = escape_tags($a->argv[$x]);
+                       }
+                       else
+                               $category = $a->argv[$x];
+               }
        }
-        else {
-               $category = ((x($_GET,'category')) ? $_GET['category'] : '');
+
+       if(! x($category)) {
+               $category = ((x($_GET,'category')) ? $_GET['category'] : '');
        }
 
        if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
@@ -82,6 +94,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';
@@ -97,6 +111,7 @@ function profile_content(&$a, $update = 0) {
                }
        }
 
+
        $contact = null;
        $remote_contact = false;
 
@@ -155,6 +170,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'])) {
@@ -200,16 +216,24 @@ function profile_content(&$a, $update = 0) {
        }
        else {
 
-                if(x($category)) {
-                       $sql_extra .= file_tag_file_query('item',$category,'category');
+               if(x($category)) {
+                       $sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
+               }
+
+               if($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(date_default_timezone_get(),'',$datequery2))));
                }
 
+
                $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_extra $sql_extra2 ",
                        intval($a->profile['profile_uid'])
                );
 
@@ -225,7 +249,7 @@ function profile_content(&$a, $update = 0) {
                        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_extra $sql_extra2
                        ORDER BY `item`.`created` DESC $pager_sql ",
                        intval($a->profile['profile_uid'])
 
@@ -242,7 +266,7 @@ function profile_content(&$a, $update = 0) {
                $parents_str = implode(', ', $parents_arr);
  
                $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
+                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, 
                        `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        FROM `item`, `contact`