Removed commented code

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index b02570d5afcca60960a6f25726225c052bd50167..279f8635231591e8e2444fa54453aa12169023bc 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -3,14 +3,14 @@
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
 
-if(! function_exists('profile_init')) {
+
 function profile_init(&$a) {
 
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
        if($a->argc > 1)
-               $which = $a->argv[1];
+               $which = htmlspecialchars($a->argv[1]);
        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(count($r)) {
@@ -27,7 +27,7 @@ function profile_init(&$a) {
        $profile = 0;
        if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
                $which = $a->user['nickname'];
-               $profile = $a->argv[1];
+               $profile = htmlspecialchars($a->argv[1]);
        }
        else {
                auto_redir($a, $which);
@@ -65,10 +65,10 @@ function profile_init(&$a) {
        foreach($dfrn_pages as $dfrn)
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".$a->get_baseurl()."/poco/{$which}\" />\r\n";
-}
+
 }
 
-if(! function_exists('profile_content')) {
+
 function profile_content(&$a, $update = 0) {
 
        $category = $datequery = $datequery2 = '';
@@ -216,8 +216,7 @@ function profile_content(&$a, $update = 0) {
 
        if($update) {
 
-               $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`,
-                       `contact`.`uid` AS `contact-uid`
+               $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`
                        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
@@ -282,39 +281,34 @@ function profile_content(&$a, $update = 0) {
 
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
-               $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`,
-                       `thread`.`uid` AS `contact-uid`
-                       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_extra $sql_extra2
-                       ORDER BY `thread`.`created` DESC $pager_sql ",
-                       intval($a->profile['profile_uid'])
-
+               $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
+                       FROM `thread`
+                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       $sql_post_table
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
+                               AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+                       WHERE `thread`.`uid` = %d AND `thread`.`visible`
+                               AND `thread`.`contact-id` = %d
+                               AND NOT `thread`.`deleted`
+                               AND NOT `thread`.`moderated`
+                               AND `thread`.`wall`
+                               $sql_extra $sql_extra2
+                       ORDER BY `thread`.`created` DESC $pager_sql",
+                       intval($a->profile['profile_uid']),
+                       intval($a->profile['contact_id'])
                );
        }
 
        $parents_arr = array();
        $parents_str = '';
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];
                $parents_str = implode(', ', $parents_arr);
 
-               $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-                       `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`
-                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-                       and `item`.`moderated` = 0
-                       AND `contact`.`id` = `item`.`contact-id`
-                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       AND `item`.`parent` IN ( %s )
+               $items = q(item_query()." AND `item`.`uid` = %d
+                       AND `item`.`parent` IN (%s)
                        $sql_extra ",
                        intval($a->profile['profile_uid']),
                        dbesc($parents_str)
@@ -350,4 +344,3 @@ function profile_content(&$a, $update = 0) {
 
        return $o;
 }
-}