[Phpgroupware-cvs] CVS: addressbook/inc hook_home.inc.php,1.16,1.16.2.1

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv3942

Modified Files:
      Tag: eTemplate
        hook_home.inc.php 
Log Message:
corrected birthday check: a birthday of 12/x/y was shown on a date like 2/x/y


Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_home.inc.php,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** hook_home.inc.php   19 Aug 2002 12:42:06 -0000      1.16
--- hook_home.inc.php   15 Feb 2003 20:57:01 -0000      1.16.2.1
***************
*** 33,39 ****
                $now = time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
                $today = $GLOBALS['phpgw']->common->show_date($now,'n/d/');
! 
                $bdays = 
$c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['phpgw_info']['user']['account_id']);
! 
                $title = '<center><font 
color="#FFFFFF">'.lang('Birthdays').'</font></center>';
  
--- 33,39 ----
                $now = time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
                $today = $GLOBALS['phpgw']->common->show_date($now,'n/d/');
!               
                $bdays = 
$c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['phpgw_info']['user']['account_id']);
!               
                $title = '<center><font 
color="#FFFFFF">'.lang('Birthdays').'</font></center>';
  
***************
*** 68,75 ****
                while(list($key,$val) = @each($bdays))
                {
!                       $portalbox->data[] = array(
!                               'text' => lang("Today is x's birthday!", 
$val['n_given'] . ' ' . $val['n_family']),
!                               'link' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id'])
!                       );
                }
  
--- 68,78 ----
                while(list($key,$val) = @each($bdays))
                {
!                       if (substr($val['bday'],0,strlen($today)) == $today)
!                       {
!                               $portalbox->data[] = array(
!                                       'text' => lang("Today is x's 
birthday!", $val['n_given'] . ' ' . $val['n_family']),
!                                       'link' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id'])
!                               );
!                       }
                }
  
***************
*** 80,87 ****
                while(list($key,$val) = @each($bdays))
                {
!                       $portalbox->data[] = array(
!                               'text' => lang("Tomorrow is x's birthday.", 
$val['n_given'] . ' ' . $val['n_family']),
!                               'link' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
!                       );
                }
                if(count($portalbox->data))
--- 83,93 ----
                while(list($key,$val) = @each($bdays))
                {
!                       if (substr($val['bday'],0,strlen($tomorrow)) == 
$tomorrow)
!                       {
!                               $portalbox->data[] = array(
!                                       'text' => lang("Tomorrow is x's 
birthday.",$val['n_given'] . ' ' . $val['n_family']),
!                                       'link' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
!                               );
!                       }
                }
                if(count($portalbox->data))