X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fnotes.php;h=608d01cf8c63fbf1ed718788ab0eba5f5ffd3db6;hb=dd2d680258e1c594cc585fa31108da5a151a6e47;hp=a98577e546d73a4eb1289071b304796402add152;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index a98577e546..608d01cf8c 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,12 +2,16 @@
/**
* @file mod/notes.php
*/
+
use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Content\Nav;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
-function notes_init(App $a) {
-
+function notes_init(App $a)
+{
if (! local_user()) {
return;
}
@@ -16,47 +20,29 @@ function notes_init(App $a) {
$which = $a->user['nickname'];
- nav_set_selected('home');
+ Nav::setSelected('home');
//Profile::load($a, $which, $profile);
-
}
-function notes_content(App $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 = [];
-
-
- $o = '';
-
- $remote_contact = false;
+ require_once 'include/security.php';
+ require_once 'include/conversation.php';
- $contact_id = $_SESSION['cid'];
- $contact = $a->contact;
+ $o = Profile::getTabs($a, true);
- $is_owner = true;
-
- $o ="";
- $o .= Profile::getTabs($a, true);
-
- if(! $update) {
- $o .= '
' . t('Personal Notes') . '
';
-
- $commpage = false;
- $commvisitor = false;
+ if (!$update) {
+ $o .= '' . L10n::t('Personal Notes') . '
';
$x = [
- 'is_owner' => $is_owner,
+ 'is_owner' => true,
'allow_location' => (($a->user['allow_location']) ? true : false),
'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'],
@@ -65,72 +51,43 @@ function notes_content(App $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
+ $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+ 'wall' => false, 'contact-id'=> $a->contact['id']];
- // default permissions - anonymous user
+ $a->set_pager_itemspage(40);
- $sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
+ $params = ['order' => ['created' => true],
+ 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+ $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
- $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(),
- intval(local_user())
+ $count = 0;
- );
+ if (DBA::isResult($r)) {
+ $count = count($r);
+ $parents_arr = [];
- if (DBM::is_result($r)) {
- $a->set_pager_total($r[0]['total']);
- $a->set_pager_itemspage(40);
- }
+ while ($rr = Item::fetch($r)) {
+ $parents_arr[] = $rr['id'];
+ }
+ DBA::close($r);
+
+ $condition = ['uid' => local_user(), 'parent' => $parents_arr];
+ $result = Item::selectForUser(local_user(), [], $condition);
- $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'])
-
- );
-
- $parents_arr = [];
- $parents_str = '';
-
- 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);
+ if (DBA::isResult($result)) {
+ $items = conv_sort(Item::inArray($result), 'commented');
+ $o .= conversation($a, $items, 'notes', $update);
}
}
+ $o .= alt_pager($a, $count);
- $o .= paginate($a);
return $o;
}