Frost-mobile: media query in css for tablets

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index c0e61434e92dd6d178a766e33770056884f0e42d..55dcb26bb5b199c70e7ddab8cb277e8d2f386e5d 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -10,14 +10,43 @@ function ping_init(&$a) {
                <result>";
 
        $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 '<invalid>1</invalid></result>';
+                       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,9 +55,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`
@@ -112,6 +142,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)
@@ -127,12 +159,19 @@ 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');
-               
+
                if($firehose) {
                        echo '  <notif count="'.$tot.'">';
                }
                else {
-                       echo '  <notif count="'. count($z) .'">';
+                       if(count($z) && (! $sysnotify)) {
+                               foreach($z as $zz) {
+                                       if($zz['seen'] == 0)
+                                               $sysnotify ++;
+                               }
+                       }                                               
+
+                       echo '  <notif count="'. $sysnotify .'">';
                        if(count($z)) {
                                foreach($z as $zz) {
                                        echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '&rarr; ') .strip_tags(bbcode($zz['msg'])));