[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.46,
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.46,1.66.2.47 hook_email.inc.php,1.3.2.2,1.3.2.3 |
Date: |
Sat, 23 Nov 2002 20:45:59 -0500 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv19028
Modified Files:
Tag: Version-0_9_14-branch
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.66.2.46
retrieving revision 1.66.2.47
diff -C2 -r1.66.2.46 -r1.66.2.47
*** class.uicalendar.inc.php 23 Nov 2002 22:57:42 -0000 1.66.2.46
--- class.uicalendar.inc.php 24 Nov 2002 01:45:57 -0000 1.66.2.47
***************
*** 2248,2252 ****
}
}
! if($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'email')
{
$page_app = 'calendar';
--- 2248,2253 ----
}
}
! if($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home' ||
!
strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail')) // email,
felamimail, ...
{
$page_app = 'calendar';
Index: hook_email.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_email.inc.php,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** hook_email.inc.php 23 Nov 2002 22:57:42 -0000 1.3.2.2
--- hook_email.inc.php 24 Nov 2002 01:45:57 -0000 1.3.2.3
***************
*** 15,18 ****
--- 15,20 ----
/* $Id$ */
+ global $calendar_id;
+
$d1 =
strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
if($d1 == 'htt' || $d1 == 'ftp')
***************
*** 26,35 ****
$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),
--- 28,36 ----
$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),
***************
*** 45,49 ****
'</td></tr><tr><td align="center">' .
! $cal->get_response($GLOBALS['calendar_id']);
unset($cal); unset($event);
--- 46,50 ----
'</td></tr><tr><td align="center">' .
! $cal->get_response($calendar_id);
unset($cal); unset($event);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.46,1.66.2.47 hook_email.inc.php,1.3.2.2,1.3.2.3,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.auth_ldap.inc.php,1.17,1.18
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.bomessage.inc.php,1.12,1.13 class.mail_dcom_base.inc.php,1.7,1.8 class.uimessage.inc.php,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.auth_ldap.inc.php,1.17,1.18
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.bomessage.inc.php,1.12,1.13 class.mail_dcom_base.inc.php,1.7,1.8 class.uimessage.inc.php,1.7,1.8
- Index(es):