Merge branch '2020.09-rc' into stable

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 01f283870ef8ec2ed119d84a458fd2db67d7e33d..d3ce0fa40c9d2e1fee19d70c6dd09197b3c53374 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,14 +1,31 @@
 <?php
 /**
- * @file mod/notes.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\L10n;
+use Friendica\Content\Pager;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Module\BaseProfile;
 
 function notes_init(App $a)
 {
@@ -16,30 +33,21 @@ function notes_init(App $a)
                return;
        }
 
-       $profile = 0;
-
-       $which = $a->user['nickname'];
-
        Nav::setSelected('home');
-
-       //Profile::load($a, $which, $profile);
 }
 
 
 function notes_content(App $a, $update = false)
 {
        if (!local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
-       require_once 'include/security.php';
-       require_once 'include/conversation.php';
-
-       $o = Profile::getTabs($a, true);
+       $o = BaseProfile::getTabsHTML($a, 'notes', true);
 
        if (!$update) {
-               $o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
+               $o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
 
                $x = [
                        'is_owner' => true,
@@ -47,11 +55,11 @@ function notes_content(App $a, $update = false)
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => 'lock',
-                       'acl' => '',
+                       'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'button' => L10n::t('Save'),
+                       'button' => DI::l10n()->t('Save'),
                        'acl_data' => '',
                ];
 
@@ -59,25 +67,33 @@ function notes_content(App $a, $update = false)
        }
 
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-               'wall' => false, 'contact-id'=> $a->contact['id']];
+               'contact-id'=> $a->contact['id']];
+
+       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'));
+       }
 
-       $a->set_pager_itemspage(40);
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
        $params = ['order' => ['created' => true],
-               'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+               'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
        $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
        $count = 0;
 
        if (DBA::isResult($r)) {
-               $notes = DBA::toArray($r);
+               $notes = Item::inArray($r);
 
                $count = count($notes);
 
                $o .= conversation($a, $notes, 'notes', $update);
        }
 
-       $o .= alt_pager($a, $count);
+       $o .= $pager->renderMinimal($count);
 
        return $o;
 }