don't make -desc so obnoxious looking

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 7380ff7d051e915c25b2450663bdad36827849ca..63aaa0f45f3c5263f6bf0f98fe1cb7b2d5270972 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -14,10 +14,31 @@ function ping_init(&$a) {
 
                $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();
@@ -113,6 +134,8 @@ function ping_init(&$a) {
 
 
                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 = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
                        return sprintf ( $notsxml,
                                xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
@@ -128,13 +151,12 @@ function ping_init(&$a) {
                $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 '  <notif count="'.$tot.'">';
                }
                else {
-                       if(count($z)) {
+                       if(count($z) && (! $sysnotify)) {
                                foreach($z as $zz) {
                                        if($zz['seen'] == 0)
                                                $sysnotify ++;