]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Tue, 13 Dec 2016 08:59:43 +0000 (09:59 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 13 Dec 2016 08:59:43 +0000 (09:59 +0100)
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/ping.php
view/lang/fr/messages.po
view/lang/fr/strings.php

1  2 
library/langdet/Text/LanguageDetect.php
mod/ping.php

index d3caaff39023107a6e9951449190c02bc8159fd7,d3caaff39023107a6e9951449190c02bc8159fd7..45337ea8fca6054206f3b7851a989e474fe0f981
@@@ -396,7 -396,7 +396,7 @@@ class Text_LanguageDetec
       * Returns the list of detectable languages
       *
       * @access public
--     * @return array        the names of the languages known to this object<<<<<<<
++     * @return array        the names of the languages known to this object
       * @throws   Text_LanguageDetect_Exception
       */
      function getLanguages()
diff --combined mod/ping.php
index 3f6dc730b20423a82da7235d260e092d03ff76f6,7e20b9383d6788cb68bf8c6a08c060a87ee46f36..1bbddbe5c359666889388f5f64b3506e183f9de6
@@@ -3,43 -3,119 +3,119 @@@ require_once("include/datetime.php")
  require_once('include/bbcode.php');
  require_once('include/ForumManager.php');
  require_once('include/group.php');
- require_once("mod/proxy.php");
+ require_once('mod/proxy.php');
  require_once('include/xml.php');
  
- function ping_init(&$a) {
+ /**
+  * @brief 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)
+  * - json (outputs JSONP with the 'callback' GET parameter)
+  *
+  * 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": [ ]
+  *                    }
+  *            }
+  *    }
+  *
+  * @param App $a The Friendica App instance
+  */
+ function ping_init(App $a)
+ {
+       $format = 'xml';
+       if (isset($_GET['format']) && $_GET['format'] == 'json') {
+               $format = 'json';
+       }
  
-       $xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">";
+       $tags          = array();
+       $comments      = array();
+       $likes         = array();
+       $dislikes      = array();
+       $friends       = array();
+       $posts         = array();
+       $regs          = array();
+       $mails         = array();
+       $notifications = array();
+       $intro_count    = 0;
+       $mail_count     = 0;
+       $home_count     = 0;
+       $network_count  = 0;
+       $register_count = 0;
+       $sysnotify_count = 0;
+       $groups_unseen  = array();
+       $forums_unseen  = array();
+       $all_events       = 0;
+       $all_events_today = 0;
+       $events           = 0;
+       $events_today     = 0;
+       $birthdays        = 0;
+       $birthdays_today  = 0;
+       $data = array();
+       $data['intro']    = $intro_count;
+       $data['mail']     = $mail_count;
+       $data['net']      = $network_count;
+       $data['home']     = $home_count;
+       $data['register'] = $register_count;
+       $data['all-events']       = $all_events;
+       $data['all-events-today'] = $all_events_today;
+       $data['events']           = $events;
+       $data['events-today']     = $events_today;
+       $data['birthdays']        = $birthdays;
+       $data['birthdays-today']  = $birthdays_today;
  
        if (local_user()){
                // Different login session than the page that is calling us.
                if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
-                       $data = array("invalid" => 1);
-                       header("Content-type: text/xml");
-                       echo xml::from_array(array("result" => $data), $xml);
+                       $data = array('result' => array('invalid' => 1));
+                       if ($format == 'json') {
+                               if (isset($_GET['callback'])) {
+                                       // JSONP support
+                                       header("Content-type: application/javascript");
+                                       echo $_GET['callback'] . '(' . json_encode($data) . ')';
+                               } else {
+                                       header("Content-type: application/json");
+                                       echo json_encode($data);
+                               }
+                       } else {
+                               header("Content-type: text/xml");
+                               echo xml::from_array($data, $xml);
+                       }
                        killme();
                }
  
                $notifs = ping_get_notifications(local_user());
-               $sysnotify = 0; // we will update this in a moment
-               $tags = array();
-               $comments = array();
-               $likes = array();
-               $dislikes = array();
-               $friends = array();
-               $posts = array();
-               $regs = array();
-               $mails = array();
-               $home = 0;
-               $network = 0;
-               $groups_unseen = array();
-               $forums_unseen = array();
-               $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
+               $items_unseen = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
                                `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
-                               `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
-                               FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
+                               `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
+                               FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
                                WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
                                AND `item`.`contact-id` != %d
                        intval(local_user()), intval(local_user())
                );
  
-               if (dbm::is_result($r)) {
-                       $arr = array('items' => $r);
+               if (dbm::is_result($items_unseen)) {
+                       $arr = array('items' => $items_unseen);
                        call_hooks('network_ping', $arr);
  
-                       foreach ($r as $it) {
-                               if ($it['wall'])
-                                       $home ++;
-                               else
-                                       $network ++;
-                               switch($it['verb']){
-                                       case ACTIVITY_TAG:
-                                               $obj = parse_xml_string($xmlhead.$it['object']);
-                                               $it['tname'] = $obj->content;
-                                               $tags[] = $it;
-                                               break;
-                                       case ACTIVITY_LIKE:
-                                               $likes[] = $it;
-                                               break;
-                                       case ACTIVITY_DISLIKE:
-                                               $dislikes[] = $it;
-                                               break;
-                                       case ACTIVITY_FRIEND:
-                                               $obj = parse_xml_string($xmlhead.$it['object']);
-                                               $it['fname'] = $obj->title;
-                                               $friends[] = $it;
-                                               break;
-                                       default:
-                                               if ($it['parent']!=$it['id']) {
-                                                       $comments[] = $it;
-                                               } else {
-                                                       if (!$it['wall'])
-                                                               $posts[] = $it;
-                                               }
+                       foreach ($items_unseen as $item) {
+                               if ($item['wall']) {
+                                       $home_count++;
+                               } else {
+                                       $network_count++;
                                }
                        }
                }
  
-               if ($network) {
-                       if (intval(feature_enabled(local_user(),'groups'))) {
+               if ($network_count) {
+                       if (intval(feature_enabled(local_user(), 'groups'))) {
                                // Find out how unseen network posts are spread across groups
-                               $groups_unseen = groups_count_unseen();
+                               $group_counts = groups_count_unseen();
+                               if (dbm::is_result($group_counts)) {
+                                       foreach ($group_counts as $group_count) {
+                                               if ($group_count['count'] > 0) {
+                                                       $groups_unseen[] = $group_count;
+                                               }
+                                       }
+                               }
                        }
  
-                       if (intval(feature_enabled(local_user(),'forumlist_widget'))) {
-                               $forums_unseen = ForumManager::count_unseen_items();
+                       if (intval(feature_enabled(local_user(), 'forumlist_widget'))) {
+                               $forum_counts = ForumManager::count_unseen_items();
+                               if (dbm::is_result($forums_counts)) {
+                                       foreach ($forums_counts as $forum_count) {
+                                               if ($forum_count['count'] > 0) {
+                                                       $forums_unseen[] = $forum_count;
+                                               }
+                                       }
+                               }
                        }
                }
  
-               $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
+               $intros1 = qu("SELECT  `intro`.`id`, `intro`.`datetime`,
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
                        FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
+                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
                        intval(local_user())
                );
-               $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
+               $intros2 = qu("SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
+                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
                        intval(local_user())
                );
  
-               $intro = count($intros1) + count($intros2);
-               $intros = $intros1+$intros2;
+               $intro_count = count($intros1) + count($intros2);
 -              $intros = $intros1+$intros2;
++              $intros = $intros1 + $intros2;
  
                $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-               $mails = q("SELECT * FROM `mail`
+               $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
                        intval(local_user()),
                        dbesc($myurl)
                );
-               $mail = count($mails);
+               $mail_count = count($mails);
  
                if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-                       $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
-                       $register = count($regs);
-               } else {
-                       $register = 0;
-               }
+                       $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+                               FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
+                               WHERE `contact`.`self` = 1");
 -                      if ($regs) {
 +
-               $all_events = 0;
-               $all_events_today = 0;
-               $events = 0;
-               $events_today = 0;
-               $birthdays = 0;
-               $birthdays_today = 0;
++                      $register_count = 0;
 +
++                      if (dbm::is_result($regs)) {
+                               $register_count = $regs[0]['total'];
+                       }
+               }
  
-               $ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+               $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
                        WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
                        ORDER BY `start` ASC ",
                        intval(local_user()),
-                       dbesc(datetime_convert('UTC','UTC','now + 7 days')),
-                       dbesc(datetime_convert('UTC','UTC','now'))
+                       dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
+                       dbesc(datetime_convert('UTC', 'UTC', 'now'))
                );
  
                if (dbm::is_result($ev)) {
                        $all_events = intval($ev[0]['total']);
  
                        if ($all_events) {
-                               $str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
+                               $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
                                foreach($ev as $x) {
                                        $bd = false;
                                        if ($x['type'] === 'birthday') {
                                        else {
                                                $events ++;
                                        }
-                                       if (datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
+                                       if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
                                                $all_events_today ++;
                                                if ($bd)
                                                        $birthdays_today ++;
                        }
                }
  
-               $data = array();
-               $data["intro"] = $intro;
-               $data["mail"] = $mail;
-               $data["net"] = $network;
-               $data["home"] = $home;
-               if ($register!=0)
-                       $data["register"] = $register;
-               $groups = array();
+               $data['intro']    = $intro_count;
+               $data['mail']     = $mail_count;
+               $data['net']      = $network_count;
+               $data['home']     = $home_count;
+               $data['register'] = $register_count;
  
-               if (dbm::is_result($groups_unseen)) {
-                       $count = 0;
-                       foreach ($groups_unseen as $it)
-                               if ($it['count'] > 0) {
-                                       $count++;
-                                       $groups[$count.":group"] = $it['count'];
-                                       $groups[$count.":@attributes"] = array("id" => $it['id']);
-                               }
-                       $data["groups"] = $groups;
-               }
-               $forums = array();
+               $data['all-events']       = $all_events;
+               $data['all-events-today'] = $all_events_today;
+               $data['events']           = $events;
+               $data['events-today']     = $events_today;
+               $data['birthdays']        = $birthdays;
+               $data['birthdays-today']  = $birthdays_today;
  
-               if (dbm::is_result($forums_unseen)) {
-                       $count = 0;
-                       foreach ($forums_unseen as $it)
-                               if ($it['count'] > 0) {
-                                       $count++;
-                                       $forums[$count.":forum"] = $it['count'];
-                                       $forums[$count.":@attributes"] = array("id" => $it['id']);
+               if (dbm::is_result($notifs)) {
+                       foreach ($notifs as $notif) {
+                               if ($notif['seen'] == 0) {
+                                       $sysnotify_count ++;
                                }
-                       $data["forums"] = $forums;
-               }
-               $data["all-events"] = $all_events;
-               $data["all-events-today"] = $all_events_today;
-               $data["events"] = $events;
-               $data["events-today"] = $events_today;
-               $data["birthdays"] = $birthdays;
-               $data["birthdays-today"] = $birthdays_today;
-               if (dbm::is_result($notifs) && !$sysnotify) {
-                       foreach ($notifs as $zz) {
-                               if ($zz['seen'] == 0)
-                                       $sysnotify ++;
                        }
                }
  
                // merge all notification types in one array
                if (dbm::is_result($intros)) {
-                       foreach ($intros as $i) {
-                               $n = array(
-                                       'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
-                                       'name' => $i['name'],
-                                       'url' => $i['url'],
-                                       'photo' => $i['photo'],
-                                       'date' => $i['datetime'],
-                                       'seen' => false,
-                                       'message' => t("{0} wants to be your friend"),
+                       foreach ($intros as $intro) {
+                               $notif = array(
+                                       'href'    => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+                                       'name'    => $intro['name'],
+                                       'url'     => $intro['url'],
+                                       'photo'   => $intro['photo'],
+                                       'date'    => $intro['datetime'],
+                                       'seen'    => false,
+                                       'message' => t('{0} wants to be your friend'),
                                );
-                               $notifs[] = $n;
+                               $notifs[] = $notif;
                        }
                }
  
                if (dbm::is_result($mails)) {
-                       foreach ($mails as $i) {
-                               $n = array(
-                                       'href' => $a->get_baseurl().'/message/'.$i['id'],
-                                       'name' => $i['from-name'],
-                                       'url' => $i['from-url'],
-                                       'photo' => $i['from-photo'],
-                                       'date' => $i['created'],
-                                       'seen' => false,
-                                       'message' => t("{0} sent you a message"),
+                       foreach ($mails as $mail) {
+                               $notif = array(
+                                       'href'    => $a->get_baseurl() . '/message/' . $mail['id'],
+                                       'name'    => $mail['from-name'],
+                                       'url'     => $mail['from-url'],
+                                       'photo'   => $mail['from-photo'],
+                                       'date'    => $mail['created'],
+                                       'seen'    => false,
+                                       'message' => t('{0} sent you a message'),
                                );
-                               $notifs[] = $n;
+                               $notifs[] = $notif;
                        }
                }
  
                if (dbm::is_result($regs)) {
-                       foreach ($regs as $i) {
-                               $n = array(
-                                       'href' => $a->get_baseurl().'/admin/users/',
-                                       'name' => $i['name'],
-                                       'url' => $i['url'],
-                                       'photo' => $i['micro'],
-                                       'date' => $i['created'],
-                                       'seen' => false,
-                                       'message' => t("{0} requested registration"),
+                       foreach ($regs as $reg) {
+                               $notif = array(
+                                       'href'    => $a->get_baseurl() . '/admin/users/',
+                                       'name'    => $reg['name'],
+                                       'url'     => $reg['url'],
+                                       'photo'   => $reg['micro'],
+                                       'date'    => $reg['created'],
+                                       'seen'    => false,
+                                       'message' => t('{0} requested registration'),
                                );
-                               $notifs[] = $n;
+                               $notifs[] = $notif;
                        }
                }
  
                usort($notifs, $sort_function);
  
                if (dbm::is_result($notifs)) {
-                       // Are the nofications calles from the regular process or via the friendica app?
+                       // Are the nofications called from the regular process or via the friendica app?
                        $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
  
-                       $count = 0;
-                       foreach($notifs as $n) {
-                               $count++;
-                               if ($a->is_friendica_app() OR !$regularnotifications)
-                                       $n['message'] = str_replace("{0}", $n['name'], $n['message']);
-                               $notifications[$count.":note"] = $n['message'];
-                               $contact = get_contact_details_by_url($n['url']);
-                               if (isset($contact["micro"]))
-                                       $n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
-                               else
-                                       $n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
-                               $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
-                               call_hooks('ping_xmlize', $n);
+                       foreach ($notifs as $notif) {
+                               if ($a->is_friendica_app() OR !$regularnotifications) {
+                                       $notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
+                               }
  
-                               $notifications[$count.":@attributes"] = array("id" => $n["id"],
-                                                                               "href" => $n['href'],
-                                                                               "name" => $n['name'],
-                                                                               "url" => $n['url'],
-                                                                               "photo" => $n['photo'],
-                                                                               "date" => relative_date($n['date']),
-                                                                               "seen" => $n['seen'],
-                                                                               "timestamp" => strtotime($local_time));
+                               $contact = get_contact_details_by_url($notif['url']);
+                               if (isset($contact['micro'])) {
+                                       $notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO);
+                               } else {
+                                       $notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO);
+                               }
  
+                               $local_time = datetime_convert('UTC', date_default_timezone_get(), $notif['date']);
+                               $notifications[] = array(
+                                       'id'        => $notif['id'],
+                                       'href'      => $notif['href'],
+                                       'name'      => $notif['name'],
+                                       'url'       => $notif['url'],
+                                       'photo'     => $notif['photo'],
+                                       'date'      => relative_date($notif['date']),
+                                       'message'   => $notif['message'],
+                                       'seen'      => $notif['seen'],
+                                       'timestamp' => strtotime($local_time)
+                               );
                        }
                }
-               $data["notif"] = $notifications;
-               $data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register);
        }
  
-       $sysmsg = array();
+       $sysmsgs = array();
+       $sysmsgs_info = array();
  
-       if (x($_SESSION,'sysmsg')){
-               $count = 0;
-               foreach ($_SESSION['sysmsg'] as $m){
-                       $count++;
-                       $sysmsg[$count.":notice"] = $m;
-               }
+       if (x($_SESSION, 'sysmsg')) {
+               $sysmsgs = $_SESSION['sysmsg'];
                unset($_SESSION['sysmsg']);
        }
  
-       if (x($_SESSION,'sysmsg_info')){
-               $count = 0;
-               foreach ($_SESSION['sysmsg_info'] as $m){
-                       $count++;
-                       $sysmsg[$count.":info"] = $m;
-               }
+       if (x($_SESSION, 'sysmsg_info')) {
+               $sysmsgs_info = $_SESSION['sysmsg_info'];
                unset($_SESSION['sysmsg_info']);
        }
  
-       $data["sysmsgs"] = $sysmsg;
+       if ($format == 'json') {
+               $data['groups'] = $groups_unseen;
+               $data['forums'] = $forums_unseen;
+               $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
+               $data['notifications'] = $notifications;
+               $data['sysmsgs'] = array(
+                       'notice' => $sysmsgs,
+                       'info' => $sysmsgs_info
+               );
+               $json_payload = json_encode(array("result" => $data));
+               if (isset($_GET['callback'])) {
+                       // JSONP support
+                       header("Content-type: application/javascript");
+                       echo $_GET['callback'] . '(' . $json_payload . ')';
+               } else {
+                       header("Content-type: application/json");
+                       echo $json_payload;
+               }
+       } else {
+               // Legacy slower XML format output
+               $data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
+               header("Content-type: text/xml");
+               echo xml::from_array(array("result" => $data), $xml);
+       }
  
-       header("Content-type: text/xml");
-       echo xml::from_array(array("result" => $data), $xml);
        killme();
  }
  
- function ping_get_notifications($uid) {
-       $result = array();
-       $offset = 0;
-       $seen = false;
+ /**
+  * @brief Retrieves the notifications array for the given user ID
+  *
+  * @param int $uid User id
+  * @return array Associative array of notifications
+  */
+ function ping_get_notifications($uid)
+ {
+       $result  = array();
+       $offset  = 0;
+       $seen    = false;
        $seensql = "NOT";
-       $order = "DESC";
-       $quit = false;
+       $order   = "DESC";
+       $quit    = false;
  
        $a = get_app();
  
        do {
-               $r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+               $r = qu("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
                        FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
                        WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
                        AND NOT (`notify`.`type` IN (%d, %d))
                        $seensql = "";
                        $order = "DESC";
                        $offset = 0;
-               } elseif (!$r)
+               } elseif (!$r) {
                        $quit = true;
-               else
+               } else {
                        $offset += 50;
+               }
  
                foreach ($r AS $notification) {
-                       if (is_null($notification["visible"]))
+                       if (is_null($notification["visible"])) {
                                $notification["visible"] = true;
+                       }
  
-                       if (is_null($notification["spam"]))
+                       if (is_null($notification["spam"])) {
                                $notification["spam"] = 0;
+                       }
  
-                       if (is_null($notification["deleted"]))
+                       if (is_null($notification["deleted"])) {
                                $notification["deleted"] = 0;
+                       }
  
-                       $notification["message"] = strip_tags(bbcode($notification["msg"]));
-                       $notification["name"] = strip_tags(bbcode($notification["name"]));
-                       // Replace the name with {0} but ensure to make that only once
-                       // The {0} is used later and prints the name in bold.
-                       if ($notification['name'] != "")
-                               $pos = strpos($notification["message"],$notification['name']);
-                       else
-                               $pos = false;
-                       if ($pos !== false)
-                               $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
+                       if ($notification["msg_cache"]) {
+                               $notification["name"] = $notification["name_cache"];
+                               $notification["message"] = $notification["msg_cache"];
+                       } else {
+                               $notification["name"] = strip_tags(bbcode($notification["name"]));
+                               $notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"])));
+                               q("UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
+                                       dbesc($notification["name"]),
+                                       dbesc($notification["message"]),
+                                       intval($notification["id"])
+                               );
+                       }
  
-                       $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
+                       $notification["href"] = $a->get_baseurl() . "/notify/view/" . $notification["id"];
  
                        if ($notification["visible"] AND !$notification["spam"] AND
                                !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
                                $result[$notification["parent"]] = $notification;
                        }
                }
        } while ((count($result) < 50) AND !$quit);
  
        return($result);
  }
+ /**
+  * @brief Backward-compatible XML formatting for ping.php output
+  * @deprecated
+  *
+  * @param array $data The initial ping data array
+  * @param int $sysnotify_count Number of unseen system notifications
+  * @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 int $groups_unseen Number of unseen group items
+  * @param int $forums_unseen Number of unseen forum items
+  * @return array XML-transform ready data array
+  */
+ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
+ {
+       $notifications = array();
+       foreach($notifs as $key => $notif) {
+               $notifications[$key . ':note'] = $notif['message'];
+               $notifications[$key . ':@attributes'] = array(
+                       'id'        => $notif['id'],
+                       'href'      => $notif['href'],
+                       'name'      => $notif['name'],
+                       'url'       => $notif['url'],
+                       'photo'     => $notif['photo'],
+                       'date'      => $notif['date'],
+                       'seen'      => $notif['seen'],
+                       'timestamp' => $notif['timestamp']
+               );
+       }
+       $sysmsg = array();
+       foreach ($sysmsgs as $key => $m){
+               $sysmsg[$key . ':notice'] = $m;
+       }
+       foreach ($sysmsgs_info as $key => $m){
+               $sysmsg[$key . ':info'] = $m;
+       }
+       $data['notif'] = $notifications;
+       $data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']);
+       $data['sysmsgs'] = $sysmsg;
+       if ($data['register'] == 0) {
+               unset($data['register']);
+       }
+       $groups = array();
+       if (count($groups_unseen)) {
+               foreach ($groups_unseen as $key => $item) {
+                       $groups[$key . ':group'] = $item['count'];
+                       $groups[$key . ':@attributes'] = array('id' => $item['id']);
+               }
+               $data['groups'] = $groups;
+       }
+       $forums = array();
+       if (count($forums_unseen)) {
+               foreach ($forums_unseen as $key => $item) {
+                       $forums[$count . ':forum'] = $item['count'];
+                       $forums[$count . ':@attributes'] = array('id' => $item['id']);
+               }
+               $data['forums'] = $forums;
+       }
+       return $data;
+ }