[Phpgroupware-cvs] messenger/inc class.bomessenger.inc.php hook_af...

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    messenger
Changes by:     Dave Hall <skwashd>     07/01/07 01:18:40

Modified files:
        inc            : class.bomessenger.inc.php 
                         hook_after_navbar.inc.php 

Log message:
        fix link in hook after navbar and notice in bo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/messenger/inc/class.bomessenger.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/messenger/inc/hook_after_navbar.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5

Patches:
Index: class.bomessenger.inc.php
===================================================================
RCS file: /sources/phpgroupware/messenger/inc/class.bomessenger.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.bomessenger.inc.php   28 Dec 2006 15:01:05 -0000      1.6
+++ class.bomessenger.inc.php   7 Jan 2007 01:18:40 -0000       1.7
@@ -12,7 +12,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: class.bomessenger.inc.php,v 1.6 2006/12/28 15:01:05 skwashd Exp 
$ */
+       /* $Id: class.bomessenger.inc.php,v 1.7 2007/01/07 01:18:40 skwashd Exp 
$ */
 
        class bomessenger
        {
@@ -200,7 +200,7 @@
                                }
 
                                // Cache our results, so we don't query the 
same account multiable times
-                               if (! $cached[$message['from']])
+                               if ( !isset($cached[$message['from']]) || 
!$cached[$message['from']] )
                                {
                                        $acct = 
createobject('phpgwapi.accounts',$message['from']);
                                        $acct->read_repository();

Index: hook_after_navbar.inc.php
===================================================================
RCS file: /sources/phpgroupware/messenger/inc/hook_after_navbar.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- hook_after_navbar.inc.php   22 Sep 2001 02:22:54 -0000      1.4
+++ hook_after_navbar.inc.php   7 Jan 2007 01:18:40 -0000       1.5
@@ -12,19 +12,19 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: hook_after_navbar.inc.php,v 1.4 2001/09/22 02:22:54 milosch Exp 
$ */
+       /* $Id: hook_after_navbar.inc.php,v 1.5 2007/01/07 01:18:40 skwashd Exp 
$ */
 
        if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'messenger' &&
                $GLOBALS['phpgw_info']['flags']['currentapp'] != 'welcome')
        {
-               $GLOBALS['phpgw']->db->query("select count(*) from 
phpgw_messenger_messages where message_owner='"
+               $GLOBALS['phpgw']->db->query("SELECT COUNT(*) AS msg_cnt FROM 
phpgw_messenger_messages WHERE message_owner='"
                                . $GLOBALS['phpgw_info']['user']['account_id'] 
. "' and message_status='N'",__LINE__,__FILE__);
-               $GLOBALS['phpgw']->db->next_record();
        
-               if ($GLOBALS['phpgw']->db->f(0))
+               if ( $GLOBALS['phpgw']->db->next_record() 
+                       && $GLOBALS['phpgw']->db->f('msg_cnt'))
                {
-                       echo '<center><a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.inbox')
-                               . '">' . lang('You have %1 new message' . 
($GLOBALS['phpgw']->db->f(0)>1?'s':''),$GLOBALS['phpgw']->db->f(0)) . '</a>'
-                               . '</center>';
+                       echo '<div class="msg"><a href="' . 
$GLOBALS['phpgw']->link('/index.php', array('messenger.uimessenger.inbox') )
+                               . '">' . lang('You have %1 new message' . 
($GLOBALS['phpgw']->db->f('msg_cnt') > 1 ? 's' : '' ), 
$GLOBALS['phpgw']->db->f('msg_cnt')) . '</a>'
+                               . '</div>';
                }
        }