Implement functions

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 8d5ae8758533cc10a743e2859bb0a2ee45630ad6..b92b8453e6872cf3f1f29903a4892c978b016133 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -5,11 +5,13 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -18,10 +20,11 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Security;
-use Friendica\Protocol\ActivityPub;
+use Friendica\Util\XML;
 
 function profile_init(App $a)
 {
@@ -34,9 +37,9 @@ function profile_init(App $a)
        } else {
                $r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
                if (DBA::isResult($r)) {
-                       goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
+                       $a->internalRedirect('profile/' . $r[0]['nickname']);
                } else {
-                       logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
+                       Logger::log('profile error: mod_profile ' . $a->query_string, Logger::DEBUG);
                        notice(L10n::t('Requested profile is not available.') . EOL);
                        $a->error = 404;
                        return;
@@ -207,7 +210,7 @@ function profile_content(App $a, $update = 0)
                $commvisitor = $commpage && $remote_contact;
 
                $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
-               $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? xmlify($category) : ''));
+               $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? XML::xmlify($category) : ''));
                $a->page['aside'] .= Widget::tagCloud();
 
                if (Security::canWriteToUserWall($a->profile['profile_uid'])) {
@@ -307,9 +310,9 @@ function profile_content(App $a, $update = 0)
                        $itemspage_network = $a->force_max_items;
                }
 
-               $a->setPagerItemsPage($itemspage_network);
+               $pager = new Pager($a->query_string, $itemspage_network);
 
-               $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
+               $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());
 
                $items = q("SELECT `item`.`uri`
                        FROM `thread`
@@ -344,10 +347,10 @@ function profile_content(App $a, $update = 0)
                }
        }
 
-       $o .= conversation($a, $items, 'profile', $update, false, 'created', local_user());
+       $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', local_user());
 
        if (!$update) {
-               $o .= alt_pager($a, count($items));
+               $o .= $pager->renderMinimal(count($items));
        }
 
        return $o;