sysnotify count in wrong location, and wrong number

diff --git a/mod/ping.php b/mod/ping.php
index c0e61434e92dd6d178a766e33770056884f0e42d..0f6f0a9d68957959c4d1568d03ca7b5627b20070 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -127,12 +127,20 @@ 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 {
-                       echo '  <notif count="'. count($z) .'">';
+                       if(count($z)) {
+                               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'])));

diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index 7f13bd8347efb524019f5aa1189b609c6c587e81..8fff2075583dd019131e8994df85bfa96daa0225 100755 (executable)
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -46,7 +46,7 @@
 
                {{ if $nav.notifications }}
                        <li  id="nav-notifications-linkmenu" class="nav-commlink"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-                               <span id="notify-update" class="nav-notify"></span>
+                               <span id="notify-update" class="nav-ajax-left"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
                                        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>