[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.91,1.92 hook_email.inc.php,1.4,1.5

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv16962

Modified Files:
        class.uicalendar.inc.php hook_email.inc.php 
Log Message:
fix to get hook_email working with both email and felamimail


Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** class.uicalendar.inc.php    23 Nov 2002 20:48:41 -0000      1.91
--- class.uicalendar.inc.php    24 Nov 2002 10:34:28 -0000      1.92
***************
*** 2511,2515 ****
                                }
                        }
!                       if($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'home')
                        {
                                $page_app = 'calendar';
--- 2511,2516 ----
                                }
                        }
!                       if($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'home' ||
!                          
strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail'))        // email, 
felamimail, ...
                        {
                                $page_app = 'calendar';
***************
*** 3953,3958 ****
  
                        $str = 
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
!                               . ', 
'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F'))
!                               . ' 
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'d, Y').'<br>'
                                . '<table width="85%" border="0" 
cellspacing="0" cellpadding="0" cols="'.((24 * $interval) + 1).'">'
                                . '<tr><td height="1" colspan="'.((24 * 
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>'
--- 3954,3958 ----
  
                        $str = 
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
!                               . ', '.$this->bo->long_date($date).'<br>'
                                . '<table width="85%" border="0" 
cellspacing="0" cellpadding="0" cols="'.((24 * $interval) + 1).'">'
                                . '<tr><td height="1" colspan="'.((24 * 
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>'

Index: hook_email.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_email.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_email.inc.php  28 Sep 2002 20:01:43 -0000      1.4
--- hook_email.inc.php  24 Nov 2002 10:34:28 -0000      1.5
***************
*** 17,21 ****
        global $calendar_id;
  
!       $d1 = strtolower(substr($phpgw_info['server']['app_inc'],0,3));
        if($d1 == 'htt' || $d1 == 'ftp')
        {
--- 17,21 ----
        global $calendar_id;
  
!       $d1 = 
strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
        if($d1 == 'htt' || $d1 == 'ftp')
        {
***************
*** 26,50 ****
        unset($d1);
  
        $cal = CreateObject('calendar.uicalendar');
!       echo 'Event ID: '.$calendar_id."<br>\n";
  
        $event = $cal->bo->read_entry($calendar_id);
  
!       reset($event['participants']);
!       while(list($particpants,$status) = each($event['participants']))
!       {
!               $parts[] = $participants;
!       }
!       @reset($parts);
! 
!       $freetime = 
$cal->bo->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
 - $phpgw->calendar->tz_offset);
!       echo 
$cal->timematrix($freetime,$cal->bo->splittime('000000',False),0,$parts);
! 
!       echo '</td></tr><tr><td>';
! 
!       echo $cal->view_event($event);
! 
!       echo '</td></tr><td align="center"><tr>';
! 
!       echo $cal->get_response($calendar_id);
  ?>
--- 26,52 ----
        unset($d1);
  
+       $GLOBALS['phpgw']->translation->add_app('calendar');
+ 
        $cal = CreateObject('calendar.uicalendar');
!       //echo "Event ID: $calendar_id<br>\n";
  
        $event = $cal->bo->read_entry($calendar_id);
  
!       echo $cal->timematrix(
!               Array(
!                       'date'          => 
$GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
 - $phpgw->calendar->tz_offset),
!                       'starttime'     => $cal->bo->splittime('000000',False),
!                       'endtime'       => 0,
!                       'participants'  => $event['participants'])
!                       ) .
! 
!               '</td></tr><tr><td>' .
! 
!               $cal->view_event($event) .
! 
!               '</td></tr><tr><td align="center">' .
! 
!               $cal->get_response($calendar_id);
!               
!       unset($cal); unset($event);
  ?>