From c6fbb46108ae40b3f50833946d2bc5fb5bc9a2e9 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 16 Nov 2016 23:26:43 -0500 Subject: [PATCH] ping.php performance: Add JSON output - Added JSON/JSONP support - Added XML backward-compatible output - Updated main.js to handle JSON data - Removed unused references to non-existant DOM elements --- js/main.js | 184 +++++++++--------------- mod/ping.php | 385 +++++++++++++++++++++++++++++---------------------- 2 files changed, 287 insertions(+), 282 deletions(-) diff --git a/js/main.js b/js/main.js index 008d84b0bf..958b0a8ae3 100644 --- a/js/main.js +++ b/js/main.js @@ -179,110 +179,77 @@ $('#nav-notifications-menu, aside').perfectScrollbar(); /* nav update event */ - $('nav').bind('nav-update', function(e,data){ - var invalid = $(data).find('invalid').text(); + $('nav').bind('nav-update', function(e, data){ + var invalid = data.invalid || 0; if(invalid == 1) { window.location.href=window.location.href } - var net = $(data).find('net').text(); - if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') } - $('#net-update').html(net); - - var home = $(data).find('home').text(); - if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } - $('#home-update').html(home); - - var intro = $(data).find('intro').text(); - if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } - $('#intro-update').html(intro); - - var mail = $(data).find('mail').text(); - if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } - $('#mail-update').html(mail); + ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) { + var number = data[type]; + if (number == 0) { + number = ''; + $('#' + type + '-update').removeClass('show'); + } else { + $('#' + type + '-update').addClass('show'); + } + $('#' + type + '-update').text(number); + }); - var intro = $(data).find('intro').text(); - if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + var intro = data['intro']; + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } $('#intro-update-li').html(intro); - var mail = $(data).find('mail').text(); - if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + var mail = data['mail']; + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } $('#mail-update-li').html(mail); - - var allevents = $(data).find('all-events').text(); - if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') } - $('#allevents-update').html(allevents); - - var alleventstoday = $(data).find('all-events-today').text(); - if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') } - - var events = $(data).find('events').text(); - if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') } - $('#events-update').html(events); - - var eventstoday = $(data).find('events-today').text(); - if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') } - - var birthdays = $(data).find('birthdays').text(); - if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') } - $('#birthdays-update').html(birthdays); - - var birthdaystoday = $(data).find('birthdays-today').text(); - if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') } - $(".sidebar-group-li .notify").removeClass("show"); - $(data).find("group").each(function() { - var gid = this.id; - var gcount = this.innerHTML; + $(data.groups).each(function(key, group) { + var gid = group.id; + var gcount = group.count; $(".group-"+gid+" .notify").addClass("show").text(gcount); }); $(".forum-widget-entry .notify").removeClass("show"); - $(data).find("forum").each(function() { - var fid = this.id; - var fcount = this.innerHTML; + $(data.forums).each(function(key, forum) { + var fid = forum.id; + var fcount = forum.count; $(".forum-"+fid+" .notify").addClass("show").text(fcount); }); - - var eNotif = $(data).find('notif') - - if (eNotif.children("note").length==0){ + if (data.notifications.length == 0) { $("#nav-notifications-menu").html(notifications_empty); } else { - nnm = $("#nav-notifications-menu"); + var nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); - //nnm.attr('popup','true'); var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); var notification_id = 0; - eNotif.children("note").each(function(){ - e = $(this); - var text = e.text().format(""+e.attr('name')+""); - var contact = (""+e.attr('name')+""); - var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen"; + $(data.notifications).each(function(key, notif){ + var text = notif.message.format('' + notif.name + ''); + var contact = ('' + notif.name + ''); + var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen"; var html = notifications_tpl.format( - e.attr('href'), // {0} // link to the source - e.attr('photo'), // {1} // photo of the contact - text, // {2} // preformatted text (autor + text) - e.attr('date'), // {3} // date of notification (time ago) - seenclass, // {4} // visited status of the notification - new Date(e.attr('timestamp')*1000), // {5} // date of notification - e.attr('url'), // {6} // profile url of the contact - e.text().format(contact), // {7} // preformatted html (text including author profile url) - '' // {8} // Deprecated + notif.href, // {0} // link to the source + notif.photo, // {1} // photo of the contact + text, // {2} // preformatted text (autor + text) + notif.date, // {3} // date of notification (time ago) + seenclass, // {4} // visited status of the notification + new Date(notif.timestamp*1000), // {5} // date of notification + notif.url, // {6} // profile url of the contact + notif.message.format(contact), // {7} // preformatted html (text including author profile url) + '' // {8} // Deprecated ); nnm.append(html); }); - $(eNotif.children("note").get().reverse()).each(function(){ - e = $(this); - notification_id = parseInt(e.attr('timestamp')); - if (notification_lastitem!== null && notification_id > notification_lastitem) { - if (getNotificationPermission()==="granted") { + $(data.notifications.reverse()).each(function(key, e){ + notification_id = parseInt(e.timestamp); + if (notification_lastitem !== null && notification_id > notification_lastitem) { + if (getNotificationPermission() === "granted") { var notification = new Notification(document.title, { - body: decodeHtml(e.text().replace('→ ','').format(e.attr('name'))), - icon: e.attr('photo'), + body: decodeHtml(e.message.replace('→ ', '').format(e.name)), + icon: e.photo, }); - notification['url'] = e.attr('href'); + notification['url'] = e.href; notification.addEventListener("click", function(ev){ window.location = ev.target.url; }); @@ -303,23 +270,20 @@ }); } - notif = eNotif.attr('count'); - if (notif>0){ + var notif = data['notify']; + if (notif > 0){ $("#nav-notifications-linkmenu").addClass("on"); } else { $("#nav-notifications-linkmenu").removeClass("on"); } - if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } - $('#notify-update').html(notif); - var eSysmsg = $(data).find('sysmsgs'); - eSysmsg.children("notice").each(function(){ - text = $(this).text(); - $.jGrowl(text, { sticky: true, theme: 'notice' }); + console.log(data.sysmsgs); + + $(data.sysmsgs.notice).each(function(key, message){ + $.jGrowl(message, {sticky: true, theme: 'notice'}); }); - eSysmsg.children("info").each(function(){ - text = $(this).text(); - $.jGrowl(text, { sticky: false, theme: 'info', life: 5000 }); + $(data.sysmsgs.info).each(function(key, message){ + $.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); }); /* update the js scrollbars */ @@ -374,50 +338,38 @@ function NavUpdate() { - if(! stopped) { - var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); - $.get(pingCmd,function(data) { - $(data).find('result').each(function() { + if (!stopped) { + var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : ''); + $.get(pingCmd, function(data) { + if (data.result) { // send nav-update event - $('nav').trigger('nav-update', this); - + $('nav').trigger('nav-update', data.result); // start live update - - if($('#live-network').length) { src = 'network'; liveUpdate(); } - if($('#live-profile').length) { src = 'profile'; liveUpdate(); } - if($('#live-community').length) { src = 'community'; liveUpdate(); } - if($('#live-notes').length) { src = 'notes'; liveUpdate(); } - if($('#live-display').length) { src = 'display'; liveUpdate(); } -/* if($('#live-display').length) { - if(liking) { - liking = 0; - window.location.href=window.location.href + ['network', 'profile', 'community', 'notes', 'display'].forEach(function (src) { + if ($('#live-' + src).length) { + liveUpdate(src); } - }*/ - if($('#live-photos').length) { - if(liking) { + }); + if ($('#live-photos').length) { + if (liking) { liking = 0; - window.location.href=window.location.href + window.location.href = window.location.href; } } - - - - - }); + } }) ; } - timer = setTimeout(NavUpdate,updateInterval); + timer = setTimeout(NavUpdate, updateInterval); } - function liveUpdate() { + function liveUpdate(src) { if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } if(($('.comment-edit-text-full').length) || (in_progress)) { if(livetime) { clearTimeout(livetime); } - livetime = setTimeout(liveUpdate, 5000); + livetime = setTimeout(function() {liveUpdate(src)}, 5000); return; } if(livetime != null) diff --git a/mod/ping.php b/mod/ping.php index 0ed7eb3fed..4dc3e8b395 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -3,33 +3,50 @@ 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) { - $xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $format = 'xml'; + + if (isset($_GET['format']) && $_GET['format'] == 'json') { + $format = 'json'; + } 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(); + $tags = array(); $comments = array(); - $likes = array(); + $likes = array(); $dislikes = array(); - $friends = array(); - $posts = array(); - $regs = array(); - $mails = array(); + $friends = array(); + $posts = array(); + $regs = array(); + $mails = array(); $home = 0; $network = 0; @@ -53,36 +70,10 @@ function ping_init(&$a) { 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; - } + if ($it['wall']) { + $home++; + } else { + $network++; } } } @@ -90,11 +81,25 @@ function ping_init(&$a) { if ($network) { 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 ($groups_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(); + $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; + } + } + } } } @@ -120,14 +125,15 @@ function ping_init(&$a) { 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`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); - if ($regs) + if ($regs) { $register = $regs[0]['total']; + } } else { - $register = "0"; + $register = 0; } $all_events = 0; @@ -137,7 +143,6 @@ function ping_init(&$a) { $birthdays = 0; $birthdays_today = 0; - $ev = q("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 ", @@ -171,99 +176,71 @@ function ping_init(&$a) { } } - $data = array(); - $data["intro"] = $intro; - $data["mail"] = $mail; - $data["net"] = $network; - $data["home"] = $home; - - if ($register!=0) - $data["register"] = $register; - - $groups = array(); - - 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(); - - 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']); - } - $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; + $data = array(); + $data['intro'] = $intro; + $data['mail'] = $mail_count; + $data['net'] = $network; + $data['home'] = $home; + $data['register'] = $register; + $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) + foreach ($notifs as $notif) { + if ($notif['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; } } @@ -279,68 +256,79 @@ function ping_init(&$a) { 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 + $intro + $mail_count + $register; + $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, $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(); } @@ -422,3 +410,68 @@ function ping_get_notifications($uid) { return($result); } + +/** + * @brief Backward-compatible XML formatting for ping.php output + * @deprecated + * + * @param array $data The initial ping data array + * @param int $sysnotify 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 + * @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 => $n) { + $notifications[$key . ":note"] = $n['message']; + + $notifications[$key . ":@attributes"] = array( + "id" => $n["id"], + "href" => $n['href'], + "name" => $n['name'], + "url" => $n['url'], + "photo" => $n['photo'], + "date" => $n['date'], + "seen" => $n['seen'], + "timestamp" => $n['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 + $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; +} \ No newline at end of file -- 2.39.5