aboutsummaryrefslogtreecommitdiffstats
path: root/mod/notes.php
diff options
context:
space:
mode:
authorOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
committerOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
commit273594af62c960b5a52da5ec1cf6d6bd450415ba (patch)
tree5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /mod/notes.php
parent1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff)
parentdfd5cc57c2134067dc6229b8583b5e808f160004 (diff)
downloadvolse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notes.php')
-rw-r--r--mod/notes.php42
1 files changed, 24 insertions, 18 deletions
diff --git a/mod/notes.php b/mod/notes.php
index 9f1a4662d..369f120a7 100644
--- 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);
@@ -52,31 +52,37 @@ function notes_content(&$a) {
));
- $o .= '<h3>' . t('Personal Notes') . '</h3>';
+ if(! $update) {
+ $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