[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.45,1.66.2.46 hook_email.inc.php,1.3.2.1,1.3.2.2

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php hook_email.inc.php 
Log Message:
fixes to get calendar's hook_email working again, allows to accept invitations 
within the email


Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.45
retrieving revision 1.66.2.46
diff -C2 -r1.66.2.45 -r1.66.2.46
*** class.uicalendar.inc.php    17 Nov 2002 00:23:27 -0000      1.66.2.45
--- class.uicalendar.inc.php    23 Nov 2002 22:57:42 -0000      1.66.2.46
***************
*** 2248,2252 ****
                                }
                        }
!                       if($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'home')
                        {
                                $page_app = 'calendar';
--- 2248,2252 ----
                                }
                        }
!                       if($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'email')
                        {
                                $page_app = 'calendar';
***************
*** 3672,3677 ****
  
                        $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>'
--- 3672,3676 ----
  
                        $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.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** hook_email.inc.php  11 Jun 2002 18:57:07 -0000      1.3.2.1
--- hook_email.inc.php  23 Nov 2002 22:57:42 -0000      1.3.2.2
***************
*** 15,21 ****
        /* $Id$ */
  
!       global $calendar_id;
! 
!       $d1 = strtolower(substr($phpgw_info['server']['app_inc'],0,3));
        if($d1 == 'htt' || $d1 == 'ftp')
        {
--- 15,19 ----
        /* $Id$ */
  
!       $d1 = 
strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
        if($d1 == 'htt' || $d1 == 'ftp')
        {
***************
*** 25,56 ****
        unset($d1);
  
!       $cal = CreateObject('calendar.uicalendar');
!       #echo 'Event ID: '.$calendar_id."<br>\n";
!       echo "<br>";
  
!       $event = $cal->bo->read_entry($calendar_id);
  
!       reset($event['participants']);
!       while(list($participants,$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(
                Array(
!                       'date'          => $freetime,
                        'starttime'     => $cal->bo->splittime('000000',False),
                        'endtime'       => 0,
                        'participants'  => $event['participants'])
!                       );
  
!       echo '</td></tr><tr><td>';
  
!       echo $cal->view_event($event);
  
!       echo '</td></tr><td align="center"><tr>';
  
!       echo $cal->get_response($calendar_id);
  ?>
--- 23,50 ----
        unset($d1);
  
!       $GLOBALS['phpgw']->translation->add_app('calendar');
  
!       $cal = CreateObject('calendar.uicalendar');
!       //echo 'Event ID: '.$GLOBALS['calendar_id']."<br>\n";
!       //echo "<br>";
  
!       $event = $cal->bo->read_entry($GLOBALS['calendar_id']);
  
!       $GLOBALS['hook_email'] = $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($GLOBALS['calendar_id']);
!               
!       unset($cal); unset($event);
  ?>