Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 9f1a4662da968d5f4a844af6dc5560142be53ef8..09dac72b0c9437dec1a7ee1063dd79ef4370eddf 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -14,7 +14,7 @@ function notes_init(&$a) {
 }
 
 
-function notes_content(&$a) {
+function notes_content(&$a,$update = false) {
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -38,45 +38,35 @@ function notes_content(&$a) {
        $is_owner = true;
 
        $o ="";
-       // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => t('Events') ,
-               '$notes' => t('Personal Notes'),
-               '$activetab' => "notes",
-       ));     
-       
-
-       $o .= '<h3>' . t('Personal Notes') . '</h3>';
+       $o .= profile_tabs($a,True);
 
-       $commpage = false;
-       $commvisitor = false;
+       if(! $update) {
+               $o .= '<h3>' . t('Personal Notes') . '</h3>';
 
-       $celeb = 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')
 
-    );
+               $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'),
+                       'acl_data' => '',
+       );
 
-    $o .= status_editor($a,$x,$a->contact['id']);
+       $o .= status_editor($a,$x,$a->contact['id']);
 
+       }
 
        // Construct permissions
 
@@ -86,8 +76,9 @@ function notes_content(&$a) {
 
        $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 `contact`.`blocked` = 0 AND `contact`.`pending` = 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 ",
                intval(local_user())
@@ -101,8 +92,9 @@ function notes_content(&$a) {
 
        $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 `contact`.`blocked` = 0 AND `contact`.`pending` = 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
                ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
@@ -121,11 +113,11 @@ function notes_content(&$a) {
                $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`
-                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+                       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 )
                        $sql_extra
@@ -133,9 +125,13 @@ function notes_content(&$a) {
                        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);