Merge pull request #2932 from Hypolite/issue/missing-private-image-src

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 7817e25547f2a119294bf47395e0a991d691b4eb..a25d090ed701faad32ab49fb2dbc7012b13d8e2f 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,5 @@
 <?php
 
-if(! function_exists('notes_init')) {
 function notes_init(&$a) {
 
        if(! local_user())
@@ -13,10 +12,10 @@ function notes_init(&$a) {
        nav_set_selected('home');
 
 //     profile_load($a,$which,$profile);
-}
+
 }
 
-if(! function_exists('notes_content')) {
+
 function notes_content(&$a,$update = false) {
 
        if(! local_user()) {
@@ -74,12 +73,11 @@ function notes_content(&$a,$update = false) {
        $sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
 
        $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`.`moderated` = 0
-               AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
-               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
+               FROM `item` %s
+               WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
+               AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
                $sql_extra ",
+               item_joins(), item_condition(),
                intval(local_user())
 
        );
@@ -89,14 +87,12 @@ function notes_content(&$a,$update = false) {
                $a->set_pager_itemspage(40);
        }
 
-       $r = q("SELECT `item`.`id` 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
-               and `item`.`moderated` = 0 AND `item`.`type` = 'note'
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
-               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
+       $r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s
+               WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
+               AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
                $sql_extra
                ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+               item_joins(), item_condition(),
                intval(local_user()),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
@@ -111,16 +107,11 @@ function notes_content(&$a,$update = false) {
                        $parents_arr[] = $rr['item_id'];
                $parents_str = implode(', ', $parents_arr);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
-                       `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` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       AND `item`.`parent` IN ( %s )
+               $r = q("SELECT %s FROM `item` %s
+                       WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
                        $sql_extra
                        ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
+                       item_fieldlists(), item_joins(), item_condition(),
                        intval(local_user()),
                        dbesc($parents_str)
                );
@@ -136,4 +127,3 @@ function notes_content(&$a,$update = false) {
        $o .= paginate($a);
        return $o;
 }
-}