X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fping.php;h=a5bf315b5bb6ecc530b090f976475337b59bfc77;hb=34e7206ba49b2835ce21a762a59a8a3626f29b60;hp=7380ff7d051e915c25b2450663bdad36827849ca;hpb=18679111f5aed8f1c5e7ccb9857195e52c57765d;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 7380ff7d05..a5bf315b5b 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -10,14 +10,43 @@ function ping_init(&$a) {
";
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+
if(local_user()){
+ // Different login session than the page that is calling us.
+
+ if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
+ echo '1';
+ killme();
+ }
+
$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
- $z = q("select * from notify where uid = %d
- order by seen asc, date desc limit 0, 50",
+ $t = q("select count(*) as total from notify where uid = %d and seen = 0",
intval(local_user())
);
+ if($t && intval($t[0]['total']) > 49) {
+ $z = q("select * from notify where uid = %d
+ and seen = 0 order by date desc limit 0, 50",
+ intval(local_user())
+ );
+ $sysnotify = $t[0]['total'];
+ }
+ else {
+ $z1 = q("select * from notify where uid = %d
+ and seen = 0 order by date desc limit 0, 50",
+ intval(local_user())
+ );
+
+ $z2 = q("select * from notify where uid = %d
+ and seen = 1 order by date desc limit 0, %d",
+ intval(local_user()),
+ intval(50 - intval($t[0]['total']))
+ );
+ $z = array_merge($z1,$z2);
+ $sysnotify = 0; // we will update this in a moment
+ }
+
$tags = array();
@@ -26,21 +55,25 @@ function ping_init(&$a) {
$dislikes = array();
$friends = array();
$posts = array();
+
$home = 0;
$network = 0;
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
+ `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`
- WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
- `item`.`deleted` = 0 AND `item`.`uid` = %d
+ WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
ORDER BY `item`.`created` DESC",
intval(local_user())
);
if(count($r)) {
+ $arr = array('items' => $r);
+ call_hooks('network_ping', $arr);
+
foreach ($r as $it) {
if($it['wall'])
@@ -111,8 +144,52 @@ function ping_init(&$a) {
$register = "0";
}
+ $all_events = 0;
+ $all_events_today = 0;
+ $events = 0;
+ $events_today = 0;
+ $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 ",
+ intval(local_user()),
+ dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+ dbesc(datetime_convert('UTC','UTC','now'))
+ );
+
+ if($ev && count($ev)) {
+ $all_events = intval($ev[0]['total']);
+
+ if($all_events) {
+ $str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
+ foreach($ev as $x) {
+ $bd = false;
+ if($x['type'] === 'birthday') {
+ $birthdays ++;
+ $bd = true;
+ }
+ else {
+ $events ++;
+ }
+ if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
+ $all_events_today ++;
+ if($bd)
+ $birthdays_today ++;
+ else
+ $events_today ++;
+ }
+ }
+ }
+ }
+
+
function xmlize($href, $name, $url, $photo, $date, $seen, $message){
+ $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
+ call_hooks('ping_xmlize', $data);
$notsxml = '%s';
return sprintf ( $notsxml,
xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
@@ -122,19 +199,25 @@ function ping_init(&$a) {
echo "$intro
$mail
$network
- $home";
+ $home\r\n";
if ($register!=0) echo "$register";
+
+ echo "$all_events
+ $all_events_today
+ $events
+ $events_today
+ $birthdays
+ $birthdays_today\r\n";
$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
require_once('include/bbcode.php');
- $sysnotify = 0;
if($firehose) {
echo ' ';
}
else {
- if(count($z)) {
+ if(count($z) && (! $sysnotify)) {
foreach($z as $zz) {
if($zz['seen'] == 0)
$sysnotify ++;