Merge develop into 3011_hcard_vcard

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 0072ce447f1d98179f5925348b778a1813c6460f..73c1507e3e044d8ea62538192104eafdc9d1cd0f 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -9,6 +9,8 @@ function notes_init(&$a) {
 
        $which = $a->user['nickname'];
 
+       nav_set_selected('home');
+
 //     profile_load($a,$which,$profile);
 
 }
@@ -46,29 +48,21 @@ function notes_content(&$a,$update = false) {
                $commpage = false;
                $commvisitor = false;
 
-               $celeb = false;
-
-
-
                $x = array(
                        'is_owner' => $is_owner,
-                       'allow_location' => (($a->user['allow_location']) ? true : false),
-               'default_location' => $a->user['default-location'],
-           'nickname' => $a->user['nickname'],
-               'lockstate' => 'lock',
-               'acl' => '',
-           'bang' => '',
-               'visitor' => 'block',
-                   'profile_uid' => local_user(),
-                       'button' => t('Save')
-
-       );
-
-       $o .= status_editor($a,$x,$a->contact['id']);
+                       'allow_location' => (($a->user['allow_location']) ? true : false),
+                       'default_location' => $a->user['default-location'],
+                       'nickname' => $a->user['nickname'],
+                       'lockstate' => 'lock',
+                       'acl' => '',
+                       'bang' => '',
+                       'visitor' => 'block',
+                       'profile_uid' => local_user(),
+                       'button' => t('Save'),
+                       'acl_data' => '',
+               );
 
-               $o .= '<div id="live-notes"></div>' . "\r\n";
-               $o .= "<script> var profile_uid = " . local_user() 
-                       . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+               $o .= status_editor($a,$x,$a->contact['id']);
 
        }
 
@@ -80,7 +74,8 @@ function notes_content(&$a,$update = false) {
 
        $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
+               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
                $sql_extra ",
@@ -95,7 +90,8 @@ function notes_content(&$a,$update = false) {
 
        $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
+               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
                $sql_extra
@@ -115,7 +111,7 @@ function notes_content(&$a,$update = false) {
                $parents_str = implode(', ', $parents_arr);
  
                $r = 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` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -127,9 +123,13 @@ function notes_content(&$a,$update = false) {
                        intval(local_user()),
                        dbesc($parents_str)
                );
-       }
 
-       $o .= conversation($a,$r,'notes',$update);
+               if(count($r)) {
+                       $items = conv_sort($r,"`commented`");
+
+                       $o .= conversation($a,$items,'notes',$update);
+               }
+       }
 
 
        $o .= paginate($a);