X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=f30d1a61b9da5175af37a86a91406f537fe641b6;hb=80f81e670c721067cddf0ffff4ed4f2def1ad69c;hp=872e9f935b1d7dfdec7182ecb5acbb352dc8f2cf;hpb=55e54bb9500f54bb075dcbc2054018de0969d9e7;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 872e9f935b..f30d1a61b9 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -30,30 +30,31 @@ use Friendica\Util\XML;
  *
  * Expected JSON structure:
  * {
- *		"result": {
- *			"intro": 0,
- *			"mail": 0,
- *			"net": 0,
- *			"home": 0,
- *			"register": 0,
- *			"all-events": 0,
- *			"all-events-today": 0,
- *			"events": 0,
- *			"events-today": 0,
- *			"birthdays": 0,
- *			"birthdays-today": 0,
- *			"groups": [ ],
- *			"forums": [ ],
- *			"notify": 0,
- *			"notifications": [ ],
- *			"sysmsgs": {
- *				"notice": [ ],
- *				"info": [ ]
- *			}
- *		}
- *	}
+ *        "result": {
+ *            "intro": 0,
+ *            "mail": 0,
+ *            "net": 0,
+ *            "home": 0,
+ *            "register": 0,
+ *            "all-events": 0,
+ *            "all-events-today": 0,
+ *            "events": 0,
+ *            "events-today": 0,
+ *            "birthdays": 0,
+ *            "birthdays-today": 0,
+ *            "groups": [ ],
+ *            "forums": [ ],
+ *            "notify": 0,
+ *            "notifications": [ ],
+ *            "sysmsgs": {
+ *                "notice": [ ],
+ *                "info": [ ]
+ *            }
+ *        }
+ *    }
  *
  * @param App $a The Friendica App instance
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 function ping_init(App $a)
 {
@@ -122,7 +123,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)) {
@@ -187,7 +188,7 @@ function ping_init(App $a)
 		);
 		$mail_count = count($mails);
 
-		if (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE && is_site_admin()) {
+		if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
 			$regs = Friendica\Model\Register::getPending();
 
 			if (DBA::isResult($regs)) {
@@ -312,14 +313,7 @@ function ping_init(App $a)
 		usort($notifs, $sort_function);
 
 		if (DBA::isResult($notifs)) {
-			// Are the nofications called from the regular process or via the friendica app?
-			$regularnotifications = (!empty($_GET['uid']) && !empty($_GET['_']));
-
 			foreach ($notifs as $notif) {
-				if ($a->isFriendicaApp() || !$regularnotifications) {
-					$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
-				}
-
 				$contact = Contact::getDetailsByURL($notif['url']);
 				if (isset($contact['micro'])) {
 					$notif['photo'] = ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO);
@@ -393,6 +387,7 @@ function ping_init(App $a)
  *
  * @param int $uid User id
  * @return array Associative array of notifications
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 function ping_get_notifications($uid)
 {
@@ -479,8 +474,8 @@ function ping_get_notifications($uid)
  * @param array $notifs          Complete list of notification
  * @param array $sysmsgs         List of system notice messages
  * @param array $sysmsgs_info    List of system info messages
- * @param array $groups_unseen   List of unseen group messages
- * @param array $forums_unseen   List of unseen forum messages
+ * @param array $groups_unseen   List of unseen group items
+ * @param array $forums_unseen   List of unseen forum items
  *
  * @return array XML-transform ready data array
  */