[Phpgroupware-cvs] CVS: addressbook/inc hook_home.inc.php,1.13.2.3,1.13.2.4

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        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.13.2.3
retrieving revision 1.13.2.4
diff -C2 -r1.13.2.3 -r1.13.2.4
*** hook_home.inc.php   31 Oct 2002 01:20:59 -0000      1.13.2.3
--- hook_home.inc.php   15 Feb 2003 20:45:09 -0000      1.13.2.4
***************
*** 11,15 ****
  
        /* $Id$ */
! 
        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )
--- 11,15 ----
  
        /* $Id$ */
!       
        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )
***************
*** 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'])
!                       );
  //                    $tmp = '<a href="'
  //                            . 
$GLOBALS['phpgw']->link('/addressbook/view.php','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'])
!                               );
!                       }
  //                    $tmp = '<a href="'
  //                            . 
$GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
***************
*** 84,91 ****
                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'])
!                       );
  //                    $tmp = '<a href="'
  //                            . 
$GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
--- 87,97 ----
                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'])
!                               );
!                       }
  //                    $tmp = '<a href="'
  //                            . 
$GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'