diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/apps.php | 3 | ||||
| -rw-r--r-- | mod/editpost.php | 4 | ||||
| -rw-r--r-- | mod/notes.php | 129 | ||||
| -rw-r--r-- | mod/ping.php | 2 |
4 files changed, 135 insertions, 3 deletions
diff --git a/mod/apps.php b/mod/apps.php index 1d08d2e7f..58752de32 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -5,10 +5,11 @@ function apps_content(&$a) { $o .= '<h3>' . t('Applications') . '</h3>'; + $o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>'; + if($a->apps) $o .= $a->apps; - return $o; }
\ No newline at end of file diff --git a/mod/editpost.php b/mod/editpost.php index a0ffda167..d211074c9 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -35,7 +35,7 @@ function editpost_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$ispublic' => t('Visible to <strong>everybody</strong>'), + '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] )); @@ -95,11 +95,13 @@ function editpost_content(&$a) { '$noloc' => t('Clear browser location'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), + '$ptyp' => $itm[0]['type'], '$content' => $itm[0]['body'], '$post_id' => $post_id, '$baseurl' => $a->get_baseurl(), '$defloc' => $a->user['default-location'], '$visitor' => 'none', + '$pvisit' => 'none', '$emailcc' => t('CC: email addresses'), '$public' => t('Public post'), '$jotnets' => $jotnets, diff --git a/mod/notes.php b/mod/notes.php new file mode 100644 index 000000000..7a826bf61 --- /dev/null +++ b/mod/notes.php @@ -0,0 +1,129 @@ +<?php + +function notes_init(&$a) { + + if(! local_user()) + return; + + $profile = 0; + + $which = $a->user['nickname']; + +// profile_load($a,$which,$profile); + +} + + +function notes_content(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return; + } + + require_once("include/bbcode.php"); + require_once('include/security.php'); + require_once('include/conversation.php'); + require_once('include/acl_selectors.php'); + $groups = array(); + + + $o = ''; + + $remote_contact = false; + + $contact_id = $_SESSION['cid']; + $contact = $a->contact; + + $is_owner = true; + + + $o .= '<h3>' . t('Private Notes') . '</h3>'; + + $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']); + + + // Construct permissions + + // default permissions - anonymous user + + $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`.`deleted` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 + $sql_extra ", + intval(local_user()) + + ); + + if(count($r)) { + $a->set_pager_total($r[0]['total']); + $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 `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 + $sql_extra + ORDER BY `item`.`created` DESC LIMIT %d ,%d ", + intval(local_user()), + intval($a->pager['start']), + intval($a->pager['itemspage']) + + ); + + $parents_arr = array(); + $parents_str = ''; + + if(count($r)) { + foreach($r as $rr) + $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`.`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 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ", + intval(local_user()), + dbesc($parents_str) + ); + } + + $o .= conversation($a,$r,'notes',$update); + + + $o .= paginate($a); + return $o; +} diff --git a/mod/ping.php b/mod/ping.php index cb067f3fe..b736ea995 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -14,7 +14,7 @@ function ping_init(&$a) { $network = $r[0]['total']; $r = q("SELECT COUNT(*) AS `total` FROM `item` - WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `type` != 'remote' ", + WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 1 ", intval(local_user()) ); $home = $r[0]['total']; |