X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=f1a82bd4579207df774950cf9a0b9eaf6342eae5;hb=b26c5e7f732add163c1661a3f91c089b703965aa;hp=74ab18a6f95f0aeeb16418b584709163a471c981;hpb=e54ee2e5091eafe7fa22baa213a798f9e6f58b01;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 74ab18a6f9..f1a82bd457 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,33 +1,40 @@
user['nickname'];
- nav_set_selected('home');
-
-// 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 = '';
@@ -40,15 +47,15 @@ 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;
- $x = array(
+ $x = [
'is_owner' => $is_owner,
'allow_location' => (($a->user['allow_location']) ? true : false),
'default_location' => $a->user['default-location'],
@@ -58,31 +65,30 @@ function notes_content(&$a,$update = false) {
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
- 'button' => t('Save'),
+ 'button' => L10n::t('Save'),
'acl_data' => '',
- );
-
- $o .= status_editor($a,$x,$a->contact['id']);
+ ];
+ $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` %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(),
+ item_joins(local_user()),
+ item_condition(),
intval(local_user())
-
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->set_pager_total($r[0]['total']);
$a->set_pager_itemspage(40);
}
@@ -92,38 +98,30 @@ function notes_content(&$a,$update = false) {
AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
- item_joins(), item_condition(),
+ 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 (dbm::is_result($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 %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)
- );
-
- if (dbm::is_result($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;
}