diabook-themes: minor bugfixes

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 0f6f0a9d68957959c4d1568d03ca7b5627b20070..e911aaf1f470765ad815588de28d0cd2d872d544 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();
@@ -26,9 +47,10 @@ function ping_init(&$a) {
                $dislikes = array();
                $friends = array();
                $posts = array();
-               
+               $home = 0;
+               $network = 0;
 
-               $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
+               $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, 
                                `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`
@@ -127,13 +149,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 ++;