Merge pull request #6065 from annando/fix-forum

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 3524cd4ce10eff1fb7ac30c04f38948d337256e7..5d571e30e1e8d7271e2a2587767cedd8923d5f58 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -5,9 +5,11 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Content\Pager;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -465,7 +467,7 @@ class Contact extends BaseObject
                        $fields['micro'] = $prefix . '6' . $suffix;
                } else {
                        // We hadn't found a photo entry, so we use the default avatar
-                       $fields['photo'] = System::baseUrl() . '/images/person-175.jpg';
+                       $fields['photo'] = System::baseUrl() . '/images/person-300.jpg';
                        $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
                        $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
                }
@@ -585,7 +587,7 @@ class Contact extends BaseObject
                                return;
                        }
                } elseif (!isset($contact['url'])) {
-                       logger('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+                       Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG);
                }
 
                // Contact already archived or "self" contact? => nothing to do
@@ -1026,7 +1028,7 @@ class Contact extends BaseObject
         */
        public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
        {
-               logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG);
+               Logger::log("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), Logger::DEBUG);
 
                $contact_id = 0;
 
@@ -1345,25 +1347,27 @@ class Contact extends BaseObject
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                }
 
+               $pager = new Pager($a->query_string);
+
                $params = ['order' => ['created' => true],
-                       'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+                       'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
                if ($thread_mode) {
                        $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
                        $items = Item::inArray($r);
 
-                       $o = conversation($a, $items, 'contacts', $update);
+                       $o = conversation($a, $items, $pager, 'contacts', $update);
                } else {
                        $r = Item::selectForUser(local_user(), [], $condition, $params);
 
                        $items = Item::inArray($r);
 
-                       $o = conversation($a, $items, 'contact-posts', false);
+                       $o = conversation($a, $items, $pager, 'contact-posts', false);
                }
 
                if (!$update) {
-                       $o .= alt_pager($a, count($items));
+                       $o .= $pager->renderMinimal(count($items));
                }
 
                return $o;
@@ -1615,7 +1619,7 @@ class Contact extends BaseObject
                }
 
                if (($network != '') && ($ret['network'] != $network)) {
-                       logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
+                       Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
                        return $result;
                }
 
@@ -1767,10 +1771,10 @@ class Contact extends BaseObject
                                }
                        } elseif ($contact['network'] == Protocol::DIASPORA) {
                                $ret = Diaspora::sendShare($a->user, $contact);
-                               logger('share returns: ' . $ret);
+                               Logger::log('share returns: ' . $ret);
                        } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
                                $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
-                               logger('Follow returns: ' . $ret);
+                               Logger::log('Follow returns: ' . $ret);
                        }
                }
 
@@ -1852,7 +1856,7 @@ class Contact extends BaseObject
                        // send email notification to owner?
                } else {
                        if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
-                               logger('ignoring duplicated connection request from pending contact ' . $url);
+                               Logger::log('ignoring duplicated connection request from pending contact ' . $url);
                                return;
                        }
                        // create contact record
@@ -1958,7 +1962,7 @@ class Contact extends BaseObject
                $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
                if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
-                               logger('update_contact_birthday: ' . $rr['bd']);
+                               Logger::log('update_contact_birthday: ' . $rr['bd']);
 
                                $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);