X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=a25d090ed701faad32ab49fb2dbc7012b13d8e2f;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=369f120a761c80640fe630addbff462eacecc4d1;hpb=57d631b47a0604ac4a50fb9294db1cea35c0944a;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 369f120a76..a25d090ed7 100644
--- 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);
}
@@ -38,19 +40,7 @@ function notes_content(&$a,$update = false) {
$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 .= '
' . t('Personal Notes') . '
';
@@ -58,44 +48,36 @@ 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 .= '' . "\r\n";
- $o .= "\r\n";
+ $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
+ FROM `item` %s
+ WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
+ AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
$sql_extra ",
+ item_joins(), item_condition(),
intval(local_user())
);
@@ -105,13 +87,12 @@ function notes_content(&$a,$update = false) {
$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
+ $r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s
+ WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
+ AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+ item_joins(), item_condition(),
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
@@ -125,23 +106,22 @@ function notes_content(&$a,$update = false) {
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 )
+
+ $r = q("SELECT %s FROM `item` %s
+ WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
+ item_fieldlists(), item_joins(), item_condition(),
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);