X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=c5c45be7243c8a7081b9d5de0056df7d55d15267;hb=008c97c570ea62749a3f486b42c424365863d627;hp=369f120a761c80640fe630addbff462eacecc4d1;hpb=273594af62c960b5a52da5ec1cf6d6bd450415ba;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 369f120a76..c5c45be724 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,22 +1,28 @@
user['nickname'];
+ nav_set_selected('home');
+
// profile_load($a,$which,$profile);
}
-function notes_content(&$a,$update = false) {
+function notes_content(App $a, $update = false) {
- if(! local_user()) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
@@ -38,19 +44,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,60 +52,51 @@ 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'] . ">' ";
+
+ $sql_extra = " AND `item`.`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())
);
- if(count($r)) {
+ if (DBM::is_result($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
+ $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'])
@@ -121,27 +106,26 @@ function notes_content(&$a,$update = false) {
$parents_arr = array();
$parents_str = '';
- if(count($r)) {
+ if (DBM::is_result($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 )
+
+ $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 (DBM::is_result($r)) {
+ $items = conv_sort($r,"`commented`");
+
+ $o .= conversation($a,$items,'notes',$update);
+ }
+ }
$o .= paginate($a);