[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.83,1.84
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.83,1.84 class.bopreferences.inc.php,1.5,1.6 class.uicalendar.inc.php,1.86,1.87 class.uipreferences.inc.php,1.6,1.7 |
|
Date: |
Sat, 21 Sep 2002 17:50:32 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv32370/inc
Modified Files:
class.bocalendar.inc.php class.bopreferences.inc.php
class.uicalendar.inc.php class.uipreferences.inc.php
Log Message:
GNU Patch #495.
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** class.bocalendar.inc.php 19 Sep 2002 23:45:19 -0000 1.83
--- class.bocalendar.inc.php 21 Sep 2002 21:50:30 -0000 1.84
***************
*** 239,243 ****
$this->year = $year;
}
! else // if($this->year == 0)
{
$this->year =
date('Y',$GLOBALS['phpgw']->datetime->users_localtime);
--- 239,243 ----
$this->year = $year;
}
! else
{
$this->year =
date('Y',$GLOBALS['phpgw']->datetime->users_localtime);
***************
*** 247,251 ****
$this->month = $month;
}
! else // if($this->month == 0)
{
$this->month =
date('m',$GLOBALS['phpgw']->datetime->users_localtime);
--- 247,251 ----
$this->month = $month;
}
! else
{
$this->month =
date('m',$GLOBALS['phpgw']->datetime->users_localtime);
***************
*** 255,259 ****
$this->day = $day;
}
! else // if($this->day == 0)
{
$this->day =
date('d',$GLOBALS['phpgw']->datetime->users_localtime);
--- 255,259 ----
$this->day = $day;
}
! else
{
$this->day =
date('d',$GLOBALS['phpgw']->datetime->users_localtime);
***************
*** 273,281 ****
$this->today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
! if($this->debug)
! {
! echo '<!-- BO Filter : ('.$this->filter.')
-->'."\n";
! echo '<!-- Owner : '.$this->owner.' -->'."\n";
! }
}
--- 273,278 ----
$this->today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
! print_debug('BO Filter','('.$this->filter.')');
! print_debug('Owner',$this->owner);
}
***************
*** 725,732 ****
$this->store_to_appsession($event);
$datetime_check =
$this->validate_update($event);
! if($this->debug)
! {
! echo '<!-- bo->validate_update()
returned : '.$datetime_check.' -->'."\n";
! }
if($datetime_check)
{
--- 722,728 ----
$this->store_to_appsession($event);
$datetime_check =
$this->validate_update($event);
!
! print_debug('bo->validate_update()
returnval',$datetime_check);
!
if($datetime_check)
{
***************
*** 781,802 ****
if(!$event['id'])
{
! if($this->debug)
! {
! echo '<!-- Creating a new
event. -->'."\n";
! }
$this->so->cal->event = $event;
$this->so->add_entry($event);
$this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event());
! if($this->debug)
! {
! echo '<!-- New event ID =
'.$event['id'].' -->'."\n";
! }
}
else
{
! if($this->debug)
! {
! echo '<!-- Updating an existing
event. -->'."\n";
! }
$new_event = $event;
$old_event =
$this->read_entry($event['id']);
--- 777,789 ----
if(!$event['id'])
{
! print_debug('Creating a new event.');
$this->so->cal->event = $event;
$this->so->add_entry($event);
$this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event());
! print_debug('New Event
ID',$event['id']);
}
else
{
! print_debug('Updating an existing
event.');
$new_event = $event;
$old_event =
$this->read_entry($event['id']);
***************
*** 928,935 ****
}
- // $temp_start =
intval($GLOBALS['phpgw']->common->show_date($starttime,'Ymd'));
- // $temp_start_time =
intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi'));
- // $temp_end =
intval($GLOBALS['phpgw']->common->show_date($endtime,'Ymd'));
- // $temp_end_time =
intval($GLOBALS['phpgw']->common->show_date($endtime,'Hi'));
$temp_start = intval(date('Ymd',$starttime));
$temp_start_time = intval(date('Hi',$starttime));
--- 915,918 ----
***************
*** 1044,1140 ****
return $retval;
-
- // if($starttime == $endtime &&
$GLOBALS['phpgw']->common->show_date($starttime,'Hi') == 0)
- // {
- // $endtime =
mktime(23,59,59,$GLOBALS['phpgw']->common->show_date($starttime,'m'),$GLOBALS['phpgw']->common->show_date($starttime,'d')
+ 1,$GLOBALS['phpgw']->common->show_date($starttime,'Y')) -
$GLOBALS['phpgw']->datetime->tz_offset;
- // }
- //
- // - $sql = 'AND ((('.$starttime.' <= phpgw_cal.datetime)
AND ('.$endtime.' >= phpgw_cal.datetime) AND ('.$endtime.' <=
phpgw_cal.edatetime)) '
- // . 'OR (('.$starttime.' >=
phpgw_cal.datetime) AND ('.$starttime.' < phpgw_cal.edatetime) AND
('.$endtime.' >= phpgw_cal.edatetime)) '
- // - . 'OR (('.$starttime.' <=
phpgw_cal.datetime) AND ('.$endtime.' >= phpgw_cal.edatetime)) '
- // - . 'OR (('.$starttime.' >=
phpgw_cal.datetime) AND ('.$endtime.' <= phpgw_cal.edatetime))) ';
- //
- // if(count($participants) > 0)
- // {
- // $p_g = '';
- // if(count($participants))
- // {
- // $users = Array();
- // while(list($user,$status) =
each($participants))
- // {
- // $users[] = $user;
- // }
- // if($users)
- // {
- // $p_g .=
'phpgw_cal_user.cal_login IN ('.implode(',',$users).')';
- // }
- // }
- // if($p_g)
- // {
- // $sql .= ' AND (' . $p_g . ')';
- // }
- // }
- //
- // if(count($id) >= 1)
- // {
- // @reset($id);
- // $sql .= ' AND phpgw_cal.cal_id NOT IN
('.(count($id)==1?$id[0]:implode(',',$id)).')';
- // }
- //
- // $sql .= ' ORDER BY phpgw_cal.datetime ASC,
phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
- //
- // $events = $this->so->get_event_ids(False,$sql);
- // if($events == False)
- // {
- // return false;
- // }
- //
- // $db2 = $GLOBALS['phpgw']->db;
- //
- // for($i=0;$i<count($events);$i++)
- // {
- // $db2->query('SELECT recur_type FROM
phpgw_cal_repeats WHERE cal_id='.$events[$i],__LINE__,__FILE__);
- // if($db2->num_rows() == 0)
- // {
- // $retval[] = $events[$i];
- // $ok = True;
- // }
- // else
- // {
- // $db2->next_record();
- // if($db2->f('recur_type') <>
MCAL_RECUR_MONTHLY_MDAY)
- // {
- // $retval[] = $events[$i];
- // $ok = True;
- // }
- // }
- // }
- // if($ok == True)
- // {
- // return $retval;
- // }
- // else
- // {
- // return False;
- // }
}
- // function check_perms($needed,$user=0)
- // {
- // if($user == 0)
- // {
- // $allowed = !!($this->grants[$this->owner] &
$needed);
- // if($this->debug)
- // {
- // echo '<!-- Grantor: '.$this->owner.'
Rights: '.$this->grants[$this->owner].' Allowed: '.$allowed.'-->'."\n";
- // }
- // return $allowed;
- // }
- // else
- // {
- // return !!($this->grants[intval($user)] &
$needed);
- // }
- // }
-
function check_perms($needed,$event=0)
{
--- 1027,1032 ----
***************
*** 1372,1379 ****
while($inserted == False &&
list($key,$exception_time) = each($event['recur_exception']))
{
! if($this->debug)
! {
! echo '<!-- checking exception
datetime '.$exception_time.' to event datetime '.$event_time.' -->'."\n";
! }
if($exception_time == $event_time)
{
--- 1264,1270 ----
while($inserted == False &&
list($key,$exception_time) = each($event['recur_exception']))
{
! print_debug('Checking Exception
DateTime',$exception_time);
! print_debug('Checking Event
DateTime',$event_time);
!
if($exception_time == $event_time)
{
***************
*** 1384,1400 ****
if($this->cached_events[$date] && $inserted == False)
{
!
! if($this->debug)
! {
! echo '<!-- Cached Events found for
'.$date.' -->'."\n";
! }
$year = substr($date,0,4);
$month = substr($date,4,2);
$day = substr($date,6,2);
! if($this->debug)
! {
! echo '<!-- Date : '.$date.' Count :
'.count($this->cached_events[$date]).' -->'."\n";
! }
for($i=0;$i<count($this->cached_events[$date]);$i++)
--- 1275,1287 ----
if($this->cached_events[$date] && $inserted == False)
{
!
! print_debug('Cached Events Found',$date);
!
$year = substr($date,0,4);
$month = substr($date,4,2);
$day = substr($date,6,2);
! print_debug('Date',$date);
!
print_debug('Count',count($this->cached_events[$date]));
for($i=0;$i<count($this->cached_events[$date]);$i++)
***************
*** 1403,1410 ****
if($this->cached_events[$date][$i]['id'] == $event['id'] ||
$this->cached_events[$date][$i]['reference'] == $event['id'])
{
! if($this->debug)
! {
! echo '<!-- Item already
inserted! -->'."\n";
! }
$inserted = True;
break;
--- 1290,1294 ----
if($this->cached_events[$date][$i]['id'] == $event['id'] ||
$this->cached_events[$date][$i]['reference'] == $event['id'])
{
! print_debug('Item Already
Inserted!');
$inserted = True;
break;
***************
*** 1424,1431 ****
$this->cached_events[$date][$j] = $this->cached_events[$date][$j-1];
}
! if($this->debug)
! {
! echo '<!-- Adding event
ID: '.$event['id'].' to cached_events -->'."\n";
! }
$inserted = True;
$this->cached_events[$date][$i]
= $event;
--- 1308,1312 ----
$this->cached_events[$date][$j] = $this->cached_events[$date][$j-1];
}
! print_debug('Adding to cached
events:ID',$event['id']);
$inserted = True;
$this->cached_events[$date][$i]
= $event;
***************
*** 1436,1443 ****
if(!$inserted)
{
! if($this->debug)
! {
! echo '<!-- Adding event ID:
'.$event['id'].' to cached_events -->'."\n";
! }
$this->cached_events[$date][] = $event;
}
--- 1317,1321 ----
if(!$inserted)
{
! print_debug('Adding to cached
events:ID',$event['id']);
$this->cached_events[$date][] = $event;
}
***************
*** 1453,1460 ****
$search_date_dow = date('w',$datetime);
$search_beg_day =
mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year);
! if($this->debug)
! {
! echo '<!-- Search Date Full =
'.$search_date_full.' -->'."\n";
! }
$repeated = $this->repeating_events;
$r_events = count($repeated);
--- 1331,1337 ----
$search_date_dow = date('w',$datetime);
$search_beg_day =
mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year);
!
! print_debug('Search Date Full',$search_date_full);
!
$repeated = $this->repeating_events;
$r_events = count($repeated);
***************
*** 1475,1484 ****
$full_event_date = date('Ymd',$event_beg_day);
! if($this->debug)
! {
! echo '<!-- check_repeating_events -
Processing ID - '.$id.' -->'."\n";
! echo '<!-- check_repeating_events -
Recurring End Date - '.$end_recur_date.' -->'."\n";
! }
!
// only repeat after the beginning, and if
there is an rpt_end before the end date
if (($search_date_full > $end_recur_date) ||
($search_date_full < $full_event_date))
--- 1352,1358 ----
$full_event_date = date('Ymd',$event_beg_day);
! print_debug('check_repeating_events:Processing
ID',$id);
! print_debug('check_repeating_events:Recurring
End Date',$end_recur_date);
!
// only repeat after the beginning, and if
there is an rpt_end before the end date
if (($search_date_full > $end_recur_date) ||
($search_date_full < $full_event_date))
***************
*** 1606,1613 ****
unset($owner_id);
$owner_id = $this->g_owner;
! if($this->debug)
! {
! echo '<!-- owner_id in
('.implode($owner_id,',').') -->'."\n";
! }
}
--- 1480,1484 ----
unset($owner_id);
$owner_id = $this->g_owner;
! print_debug('owner_id
in','('.implode($owner_id).')');
}
***************
*** 1640,1650 ****
$edate = mktime(23,59,59,$emonth,$eday,$eyear);
}
-
- if($this->debug)
- {
- echo '<!-- Start Date :
'.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
- echo '<!-- End Date :
'.sprintf("%04d%02d%02d",$eyear,$emonth,$eday).' -->'."\n";
- }
if($owner_id)
{
--- 1511,1518 ----
$edate = mktime(23,59,59,$emonth,$eday,$eyear);
}
+ print_debug('Start
Date',sprintf("%04d%02d%02d",$syear,$smonth,$sday));
+ print_debug('End
Date',sprintf("%04d%02d%02d",$eyear,$emonth,$eday));
+
if($owner_id)
{
***************
*** 1661,1669 ****
$c_cached_ids_repeating =
count($cached_event_ids_repeating);
! if($this->debug)
! {
! echo '<!-- events cached : '.$c_cached_ids.' :
for : '.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
! echo '<!-- repeating events cached :
'.$c_cached_ids_repeating.' : for :
'.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
! }
$this->cached_events = Array();
--- 1529,1535 ----
$c_cached_ids_repeating =
count($cached_event_ids_repeating);
!
print_debug('Date',sprintf("%04d%02d%02d",$syear,$smonth,$sday));
! print_debug('Events Cached',$c_cached_ids);
! print_debug('Repeating Events
Cached',$c_cached_ids_repeating);
$this->cached_events = Array();
***************
*** 1694,1707 ****
$c_evt_day = 0;
}
! if($this->debug)
! {
! echo '<!--
Date: '.$j.' Count : '.$c_evt_day.' -->'."\n";
! }
if($this->cached_events[$j][$c_evt_day]['id'] != $event['id'])
{
! if($this->debug)
! {
! echo
'<!-- Adding Event for Date: '.$j.' -->'."\n";
! }
$this->cached_events[$j][] = $event;
}
--- 1560,1568 ----
$c_evt_day = 0;
}
! print_debug('Date',$j);
!
print_debug('Count',$c_evt_day);
if($this->cached_events[$j][$c_evt_day]['id'] != $event['id'])
{
!
print_debug('Adding Event For Date',$j);
$this->cached_events[$j][] = $event;
}
***************
*** 2038,2041 ****
--- 1899,1917 ----
}
+ //Added to construct the participant's list to an event
+ $event_participants = '';
+ reset($participants);
+ $ac=CreateObject('phpgwapi.accounts');
+
+ while(list($userid,$statid)=each($participants))
+ {
+ $event_participants .=
($event_participants?"\n":'');
+ $ac->account_id=$userid;
+ $ac->read_repository();
+ $event_participants .=
'<'.$ac->data['account_lid'].'> '.$ac->data['fullname'];
+ }
+ //End
+
+ reset($participants);
while($participants && list($userid,$statusid) =
each($participants))
{
***************
*** 2072,2076 ****
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] =
$part_prefs['common']['dateformat'];
! $new_tz_offset = ((60 * 60) *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
if($old_event != False)
--- 1948,1952 ----
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] =
$part_prefs['common']['dateformat'];
! $GLOBALS['phpgw']->datetime->tz_offset
= ((60 * 60) *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
if($old_event != False)
***************
*** 2089,2100 ****
--- 1965,1982 ----
$action_date =
$old_event_date;
$body = lang ('Your
meeting scheduled for') .' '. $old_event_date .' '. lang('has been canceled');
+
$event_head=$old_event['title'];
+
$event_description=$old_event['description'];
break;
case MSG_MODIFIED:
$action_date =
$new_event_date;
$body = lang ('Your
meeting that had been scheduled for').' '.$old_event_date.' '. lang('has been
rescheduled to') .' '.$new_event_date;
+
$event_head=$old_event['title'];
+
$event_description=$old_event['description'];
break;
case MSG_ADDED:
$action_date =
$new_event_date;
$body = lang ('You have
a meeting scheduled for').' '. $new_event_date;
+
$event_head=$new_event['title'];
+
$event_description=$new_event['description'];
break;
case MSG_REJECTED:
***************
*** 2102,2109 ****
case MSG_ACCEPTED:
$action_date =
$old_event_date;
! $body = 'On
'.$GLOBALS['phpgw']->common->show_date(time() - $new_tz_offset).'
'.$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']).'
'.$action.' your meeting request for '.$old_event_date;
break;
}
$subject = lang('Calendar Event') . '
('. lang($action) .') #'.$event_id.': '.$action_date.' (L)';
$returncode =
$send->msg('email',$to,$subject,$body,$msgtype,'','','',$sender);
}
--- 1984,2002 ----
case MSG_ACCEPTED:
$action_date =
$old_event_date;
! $body = 'On
'.$GLOBALS['phpgw']->common->show_date(time() -
$GLOBALS['phpgw']->datetime->tz_offset).'
'.$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']).'
'.$action.' your meeting request for '.$old_event_date;
!
$event_head=$old_event['title'];
!
$event_description=$old_event['description'];
break;
}
+
$subject = lang('Calendar Event') . '
('. lang($action) .') #'.$event_id.': '.$action_date.' (L)';
+
if(isset($part_prefs['calendar']['send_extra']) &&
$part_prefs['calendar']['send_extra'])
+ {
+ $body .=
"\n\n".'***'.lang('Please confirm,accept,reject or examine changes in the
corresponding entry in your calendar').'***'."\n\n"
+ . '----'.lang('Event
Details Follow').'----';
+ $body .=
($event_head?"\n\n".lang('TITLE').':'."\n".' '.$event_head:'');
+ $body .=
($event_description?"\n\n".lang('DESCRIPTION').':'."\n".'
'.$event_description:'');
+ $body .=
($event_participants?"\n\n".lang('Participants').':'."\n".'
'.$event_participants:'');
+ }
$returncode =
$send->msg('email',$to,$subject,$body,$msgtype,'','','',$sender);
}
***************
*** 2118,2121 ****
--- 2011,2015 ----
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'] =
$temp_tz_offset;
+ $GLOBALS['phpgw']->datetime->tz_offset = ((60 * 60) *
$temp_tz_offset);
$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] =
$temp_timeformat;
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] =
$temp_dateformat;
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bopreferences.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bopreferences.inc.php 19 Sep 2002 23:45:19 -0000 1.5
--- class.bopreferences.inc.php 21 Sep 2002 21:50:30 -0000 1.6
***************
*** 54,59 ****
$pref_list = Array(
- 'mainscreen_showevents',
'send_updates',
'display_status',
'default_private',
--- 54,81 ----
$pref_list = Array(
'send_updates',
+ 'send_extra'
+ );
+
+ if($prefs[$pref_list[1] == True)
+ {
+
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[1],$prefs[$pref_list[1]]);
+ if($prefs[$pref_list[2] == True)
+ {
+
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[2],$prefs[$pref_list[2]]);
+ }
+ else
+ {
+
$GLOBALS['phpgw']->preferences->delete('calendar',$pref_list[2]);
+ }
+ }
+ else
+ {
+
$GLOBALS['phpgw']->preferences->delete('calendar',$pref_list[1]);
+
$GLOBALS['phpgw']->preferences->delete('calendar',$pref_list[2]);
+ }
+
+ $pref_list = Array(
+ 'mainscreen_showevents',
'display_status',
'default_private',
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** class.uicalendar.inc.php 19 Sep 2002 23:45:19 -0000 1.86
--- class.uicalendar.inc.php 21 Sep 2002 21:50:30 -0000 1.87
***************
*** 86,93 ****
$this->bo = CreateObject('calendar.bocalendar',1);
! if($this->debug)
! {
! echo "BO Owner : ".$this->bo->owner."<br>\n";
! }
$this->template = $GLOBALS['phpgw']->template;
--- 86,90 ----
$this->bo = CreateObject('calendar.bocalendar',1);
! print_debug('BO Owner',$this->bo->owner);
$this->template = $GLOBALS['phpgw']->template;
***************
*** 117,124 ****
}
! if($this->debug)
! {
! $this->_debug_sqsof();
! }
}
--- 114,118 ----
}
! print_debug('UI',$this->_debug_sqsof());
}
***************
*** 2172,2177 ****
'num_months' => $this->bo->num_months
);
! echo '<br>UI:';
! _debug_array($data);
}
--- 2166,2170 ----
'num_months' => $this->bo->num_months
);
! return _debug_array($data,False);
}
Index: class.uipreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uipreferences.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uipreferences.inc.php 19 Sep 2002 23:45:19 -0000 1.6
--- class.uipreferences.inc.php 21 Sep 2002 21:50:30 -0000 1.7
***************
*** 172,175 ****
--- 172,176 ----
$checkboxes = Array(
'send_updates' => lang('Send/receive updates
via email'),
+ 'send_extra' => lang('Receive extra
information in event mails'),
'weekdays_only' => lang('Display week days only
in Month/Week View'),
'display_status' => lang('Display status
of events'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.83,1.84 class.bopreferences.inc.php,1.5,1.6 class.uicalendar.inc.php,1.86,1.87 class.uipreferences.inc.php,1.6,1.7,
Mark A Peters <address@hidden> <=