name change stragglers, fix newmember links, liveupdate glitch

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 9f1a4662da968d5f4a844af6dc5560142be53ef8..94ea10e81133f7da20151b3bdaa91cbcf0520f54 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,39 @@ 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 .= profile_tabs($a,True);
+
+       if(! $update) {
+               $o .= '<h3>' . t('Personal Notes') . '</h3>';
 
-       $o .= '<h3>' . t('Personal Notes') . '</h3>';
+               $commpage = false;
+               $commvisitor = false;
 
-       $commpage = false;
-       $commvisitor = false;
+               $celeb = 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')
+       );
 
-    );
+       $o .= status_editor($a,$x,$a->contact['id']);
 
-    $o .= status_editor($a,$x,$a->contact['id']);
+               $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";
 
+       }
 
        // Construct permissions