X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=5996c140f19e52bdacb92940b8f2323c4097c360;hb=b5d2d32b443f7aa8ec6e0e91f36da3cc0a0f2a82;hp=223e030232aa567ed91a865a822218d4373c1f47;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 223e030232..5996c140f1 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,16 +1,32 @@
.
+ *
*/
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Model\Post;
+use Friendica\Module\BaseProfile;
function notes_init(App $a)
{
@@ -25,49 +41,50 @@ function notes_init(App $a)
function notes_content(App $a, $update = false)
{
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
- $o = Profile::getTabs($a, 'notes', true);
+ $o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getLoggedInUserNickname(), false);
if (!$update) {
$o .= '
' . DI::l10n()->t('Personal Notes') . '
';
$x = [
- 'is_owner' => true,
- '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(),
+ 'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
'button' => DI::l10n()->t('Save'),
'acl_data' => '',
];
- $o .= status_editor($a, $x, $a->contact['id']);
+ $o .= DI::conversation()->statusEditor($x, $a->getContactId());
}
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
- 'contact-id'=> $a->contact['id']];
+ 'contact-id'=> $a->getContactId()];
+
+ if (DI::mode()->isMobile()) {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+ DI::config()->get('system', 'itemspage_network_mobile'));
+ } else {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+ DI::config()->get('system', 'itemspage_network'));
+ }
- $pager = new Pager(DI::args()->getQueryString(), 40);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
$params = ['order' => ['created' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+ $r = Post::selectThreadForUser(local_user(), ['uri-id'], $condition, $params);
$count = 0;
if (DBA::isResult($r)) {
- $notes = Item::inArray($r);
+ $notes = Post::toArray($r);
$count = count($notes);
- $o .= conversation($a, $notes, $pager, 'notes', $update);
+ $o .= DI::conversation()->create($notes, 'notes', $update);
}
$o .= $pager->renderMinimal($count);