Force avatar update for Contact Advanced page

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 9b844cc48ddc02ad7ce52f3753e20f3d74cd08ce..70c580d3d31ff4f5c7385ee8125789d15334a2b3 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -6,13 +6,10 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -22,7 +19,7 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
 /**
- * @brief Outputs the counts and the lists of various notifications
+ * Outputs the counts and the lists of various notifications
  *
  * The output format can be controlled via the GET parameter 'format'. It can be
  * - xml (deprecated legacy default)
@@ -44,7 +41,7 @@ use Friendica\Util\XML;
  *            "birthdays-today": 0,
  *            "groups": [ ],
  *            "forums": [ ],
- *            "notify": 0,
+ *            "notification": 0,
  *            "notifications": [ ],
  *            "sysmsgs": {
  *                "notice": [ ],
@@ -123,7 +120,7 @@ function ping_init(App $a)
                $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ?", local_user(), local_user()];
                $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
                        'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall'];
-               $params = ['order' => ['created' => true]];
+               $params = ['order' => ['received' => true]];
                $items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
                if (DBA::isResult($items)) {
@@ -179,7 +176,7 @@ function ping_init(App $a)
                $intro_count = count($intros1) + count($intros2);
                $intros = $intros1 + $intros2;
 
-               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'];
+               $myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
                $mails = q(
                        "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -188,7 +185,7 @@ function ping_init(App $a)
                );
                $mail_count = count($mails);
 
-               if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
+               if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
                        $regs = Friendica\Model\Register::getPending();
 
                        if (DBA::isResult($regs)) {
@@ -197,7 +194,7 @@ function ping_init(App $a)
                }
 
                $cachekey = "ping_init:".local_user();
-               $ev = Cache::get($cachekey);
+               $ev = DI::cache()->get($cachekey);
                if (is_null($ev)) {
                        $ev = q(
                                "SELECT type, start, adjust FROM `event`
@@ -208,7 +205,7 @@ function ping_init(App $a)
                                DBA::escape(DateTimeFormat::utcNow())
                        );
                        if (DBA::isResult($ev)) {
-                               Cache::set($cachekey, $ev, Cache::HOUR);
+                               DI::cache()->set($cachekey, $ev, Duration::HOUR);
                        }
                }
 
@@ -263,13 +260,13 @@ function ping_init(App $a)
                        foreach ($intros as $intro) {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
+                                       'href'    => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
                                        'name'    => $intro['name'],
                                        'url'     => $intro['url'],
                                        'photo'   => $intro['photo'],
                                        'date'    => $intro['datetime'],
                                        'seen'    => false,
-                                       'message' => L10n::t('{0} wants to be your friend'),
+                                       'message' => DI::l10n()->t('{0} wants to be your friend'),
                                ];
                                $notifs[] = $notif;
                        }
@@ -279,13 +276,13 @@ function ping_init(App $a)
                        foreach ($regs as $reg) {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => System::baseUrl() . '/admin/users/',
+                                       'href'    => DI::baseUrl() . '/admin/users/',
                                        'name'    => $reg['name'],
                                        'url'     => $reg['url'],
                                        'photo'   => $reg['micro'],
                                        'date'    => $reg['created'],
                                        'seen'    => false,
-                                       'message' => L10n::t('{0} requested registration'),
+                                       'message' => DI::l10n()->t('{0} requested registration'),
                                ];
                                $notifs[] = $notif;
                        }
@@ -354,7 +351,7 @@ function ping_init(App $a)
        if ($format == 'json') {
                $data['groups'] = $groups_unseen;
                $data['forums'] = $forums_unseen;
-               $data['notify'] = $sysnotify_count + $intro_count + $register_count;
+               $data['notification'] = $sysnotify_count + $intro_count + $register_count;
                $data['notifications'] = $notifications;
                $data['sysmsgs'] = [
                        'notice' => $sysmsgs,
@@ -383,7 +380,7 @@ function ping_init(App $a)
 }
 
 /**
- * @brief Retrieves the notifications array for the given user ID
+ * Retrieves the notifications array for the given user ID
  *
  * @param int $uid User id
  * @return array Associative array of notifications
@@ -436,7 +433,7 @@ function ping_get_notifications($uid)
                                $notification["message"] = $notification["msg_cache"];
                        } else {
                                $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-                               $notification["message"] = format_notification_message($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
+                               $notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
                                q(
                                        "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
@@ -446,14 +443,14 @@ function ping_get_notifications($uid)
                                );
                        }
 
-                       $notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
+                       $notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
 
                        if ($notification["visible"]
                                && !$notification["deleted"]
                                && empty($result[$notification["parent"]])
                        ) {
                                // Should we condense the notifications or show them all?
-                               if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
+                               if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
                                        $result[$notification["id"]] = $notification;
                                } else {
                                        $result[$notification["parent"]] = $notification;
@@ -466,7 +463,7 @@ function ping_get_notifications($uid)
 }
 
 /**
- * @brief Backward-compatible XML formatting for ping.php output
+ * Backward-compatible XML formatting for ping.php output
  * @deprecated
  *
  * @param array $data            The initial ping data array