require_once('include/group.php');
require_once('mod/proxy.php');
require_once('include/xml.php');
+require_once('include/cache.php');
/**
* @brief Outputs the counts and the lists of various notifications
$data['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today;
- if (false && local_user()){
+ if (local_user()){
// Different login session than the page that is calling us.
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
$notifs = ping_get_notifications(local_user());
- $items_unseen = 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`
if ($item['wall']) {
$home_count++;
} else {
- $network++;
+ $network_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",
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",
intval(local_user())
);
- $intro = count($intros1) + count($intros2);
- $intros = $intros1+$intros2;
+ $intro_count = count($intros1) + count($intros2);
+ $intros = $intros1 + $intros2;
- $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
- $mails = q("SELECT * FROM `mail`
+ $myurl = App::get_baseurl() . '/profile/' . $a->user['nickname'] ;
+ $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 = 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`
+ $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) {
- $register = $regs[0]['total'];
+
+ if (dbm::is_result($regs)) {
+ $register_count = $regs[0]['total'];
}
- } else {
- $register = 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 ",
- intval(local_user()),
- dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
- dbesc(datetime_convert('UTC', 'UTC', 'now'))
- );
+ $cachekey = "ping_init:".local_user();
+ $ev = Cache::get($cachekey);
+ if (is_null($ev)) {
+ $ev = qu("SELECT 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'))
+ );
+ if (dbm::is_result($ev)) {
+ Cache::set($cachekey, $ev, CACHE_HOUR);
+ }
+ }
if (dbm::is_result($ev)) {
- $all_events = intval($ev[0]['total']);
+ $all_events = count($ev);
if ($all_events) {
$str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
$data['intro'] = $intro_count;
$data['mail'] = $mail_count;
- $data['net'] = $network;
- $data['home'] = $home;
- $data['register'] = $register;
+ $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['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today;
- if (dbm::is_result($notifs) && !$sysnotify) {
+ if (dbm::is_result($notifs)) {
foreach ($notifs as $notif) {
if ($notif['seen'] == 0) {
- $sysnotify ++;
+ $sysnotify_count ++;
}
}
}
if (dbm::is_result($intros)) {
foreach ($intros as $intro) {
$notif = array(
- 'href' => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+ 'href' => App::get_baseurl() . '/notifications/intros/' . $intro['id'],
'name' => $intro['name'],
'url' => $intro['url'],
'photo' => $intro['photo'],
if (dbm::is_result($mails)) {
foreach ($mails as $mail) {
$notif = array(
- 'href' => $a->get_baseurl() . '/message/' . $mail['id'],
+ 'href' => App::get_baseurl() . '/message/' . $mail['id'],
'name' => $mail['from-name'],
'url' => $mail['from-url'],
'photo' => $mail['from-photo'],
if (dbm::is_result($regs)) {
foreach ($regs as $reg) {
$notif = array(
- 'href' => $a->get_baseurl() . '/admin/users/',
+ 'href' => App::get_baseurl() . '/admin/users/',
'name' => $reg['name'],
'url' => $reg['url'],
'photo' => $reg['micro'],
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
- $adate = date($a['date']);
- $bdate = date($b['date']);
+ $adate = strtotime($a['date']);
+ $bdate = strtotime($b['date']);
+
+ // Unseen messages are kept at the top
+ // The value 31536000 means one year. This should be enough :-)
+ if (!$a['seen']) {
+ $adate += 31536000;
+ }
+ if (!$b['seen']) {
+ $bdate += 31536000;
+ }
+
if ($adate == $bdate) {
return 0;
}
if ($format == 'json') {
$data['groups'] = $groups_unseen;
$data['forums'] = $forums_unseen;
- $data['notify'] = $sysnotify + $intro + $mail_count + $register;
+ $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
$data['notifications'] = $notifications;
$data['sysmsgs'] = array(
'notice' => $sysmsgs,
}
} else {
// Legacy slower XML format output
- $data = ping_format_xml_data($data, $sysnotify, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
+ $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);
$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))
);
}
- $notification["href"] = $a->get_baseurl() . "/notify/view/" . $notification["id"];
+ $notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"];
if ($notification["visible"] AND !$notification["spam"] AND
!$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
* @deprecated
*
* @param array $data The initial ping data array
- * @param int $sysnotify Number of unseen system notifications
+ * @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
projects / friendica.git / blobdiff