X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=74ab18a6f95f0aeeb16418b584709163a471c981;hb=b26c5e7f732add163c1661a3f91c089b703965aa;hp=62796ed13f8fc0dc7757895aaa114b9cfc41dd07;hpb=c51e057fe6ac1380c15c0e9ce1ab66f6b451eb53;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 62796ed13f..f1a82bd457 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,31 +1,40 @@
user['nickname'];
-// profile_load($a,$which,$profile);
+ Nav::setSelected('home');
+ //Profile::load($a, $which, $profile);
}
-function notes_content(&$a,$update = false) {
-
- if(! local_user()) {
- notice( t('Permission denied.') . EOL);
+function notes_content(App $a, $update = false)
+{
+ if (! local_user()) {
+ notice(L10n::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();
+ require_once 'include/security.php';
+ require_once 'include/conversation.php';
+ $groups = [];
$o = '';
@@ -38,101 +47,80 @@ function notes_content(&$a,$update = false) {
$is_owner = true;
$o ="";
- $o .= profile_tabs($a,True);
+ $o .= Profile::getTabs($a, true);
- if(! $update) {
- $o .= '
' . t('Personal Notes') . '
';
+ if (!$update) {
+ $o .= '' . L10n::t('Personal Notes') . '
';
$commpage = false;
$commvisitor = false;
- $celeb = false;
-
-
-
- $x = array(
+ $x = [
'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' => L10n::t('Save'),
+ 'acl_data' => '',
+ ];
+
+ $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`.`moderated` = 0
- AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
- 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(local_user()),
+ 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 `item`.`moderated` = 0 AND `item`.`type` = 'note'
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
- 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(local_user()),
+ item_condition(),
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
- $parents_arr = array();
+ $parents_arr = [];
$parents_str = '';
- if(count($r)) {
- foreach($r as $rr)
+ 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`.`alias`, `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`.`moderated` = 0 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)
- );
-
- if(count($r)) {
- $items = conv_sort($r,"`commented`");
-
- $o .= conversation($a,$items,'notes',$update);
}
- }
+ $condition = ['uid' => local_user(), 'parent' => $parents_arr];
+ $result = Item::select(local_user(), [], $condition);
+ if (DBM::is_result($result)) {
+ $items = conv_sort(dba::inArray($result), 'commented');
+ $o .= conversation($a, $items, 'notes', $update);
+ }
+ }
$o .= paginate($a);
return $o;