Merge pull request #8178 from nupplaphil/task/mod_noscrape

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index b6b6faefab2a275728ffdade428001d23b4f0481..38a72a741fd7e4ba2c3a0bfe62ab22034687fa79 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -6,10 +6,10 @@
 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\Module\BaseProfile;
 
 function notes_init(App $a)
 {
@@ -17,29 +17,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.') . EOL);
                return;
        }
 
-       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,
@@ -51,7 +43,7 @@ function notes_content(App $a, $update = false)
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'button' => L10n::t('Save'),
+                       'button' => DI::l10n()->t('Save'),
                        'acl_data' => '',
                ];
 
@@ -59,9 +51,9 @@ 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']];
 
-       $pager = new Pager($a->query_string, null, 40);
+       $pager = new Pager(DI::args()->getQueryString(), 40);
 
        $params = ['order' => ['created' => true],
                'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
@@ -70,7 +62,7 @@ function notes_content(App $a, $update = false)
        $count = 0;
 
        if (DBA::isResult($r)) {
-               $notes = DBA::toArray($r);
+               $notes = Item::inArray($r);
 
                $count = count($notes);