[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.71.2.33.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.2.3,1.71.2.33.2.4 class.uicalendar.inc.php,1.66.2.55.2.7,1.66.2.55.2.8 |
|
Date: |
Sat, 03 May 2003 21:16:26 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv27152
Modified Files:
Tag: Version-0_9_16-branch
class.bocalendar.inc.php class.uicalendar.inc.php
Log Message:
implemented user-pref show_rejected
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.3
retrieving revision 1.71.2.33.2.4
diff -C2 -r1.71.2.33.2.3 -r1.71.2.33.2.4
*** class.bocalendar.inc.php 4 May 2003 00:21:33 -0000 1.71.2.33.2.3
--- class.bocalendar.inc.php 4 May 2003 01:16:23 -0000 1.71.2.33.2.4
***************
*** 2431,2434 ****
--- 2431,2449 ----
_debug_array($data);
}
+
+ /*!
+ @function rejected_no_show
+ @abstract checks if event is rejected from user and he's not
the owner and dont want rejected
+ @param $event to check
+ @returns True if event should not be shown
+ */
+ function rejected_no_show($event)
+ {
+ $ret = !$this->prefs['calendar']['show_rejected'] &&
+ $event['owner'] != $this->owner &&
+ $event['participants'][$this->owner] == 'R';
+ //echo "<p>rejected_no_show($event[title])='$ret':
user=$this->owner, event-owner=$event[owner],
status='".$event['participants'][$this->owner]."',
show_rejected='".$this->prefs['calendar']['show_rejected']."'</p>\n";
+ return $ret;
+ }
}
?>
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.7
retrieving revision 1.66.2.55.2.8
diff -C2 -r1.66.2.55.2.7 -r1.66.2.55.2.8
*** class.uicalendar.inc.php 1 May 2003 23:42:52 -0000 1.66.2.55.2.7
--- class.uicalendar.inc.php 4 May 2003 01:16:23 -0000 1.66.2.55.2.8
***************
*** 259,264 ****
unset($var);
$daily = $this->set_week_array($i -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
! @reset($daily);
! while(list($date,$day_params) = each($daily))
{
print_debug('Mini-Cal Date',$date);
--- 259,263 ----
unset($var);
$daily = $this->set_week_array($i -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
! foreach($daily as $date => $day_params)
{
print_debug('Mini-Cal Date',$date);
***************
*** 1249,1255 ****
$var = Array(
! 'printer_friendly' => $printer,
'bg_text' =>
$this->theme['bg_text'],
! 'daily_events' =>
$this->print_day(
Array(
'year' => $this->bo->year,
--- 1248,1254 ----
$var = Array(
! 'printer_friendly' => $printer,
'bg_text' =>
$this->theme['bg_text'],
! 'daily_events' => $this->print_day(
Array(
'year' => $this->bo->year,
***************
*** 1258,1262 ****
)
),
! 'small_calendar' => $minical,
'date' =>
$this->bo->long_date($now),
'username' =>
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
--- 1257,1261 ----
)
),
! 'small_calendar' => $minical,
'date' =>
$this->bo->long_date($now),
'username' =>
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
***************
*** 1901,1905 ****
{
$daily = $this->bo->cached_events[$v];
- @reset($daily);
print_debug('For Date',$v);
--- 1900,1903 ----
***************
*** 1908,1912 ****
// process all events on day $v
//
! while (list(,$event) = @each($daily))
{
if ($event['recur_type']) //
calculate start- + end-datetime for recuring events
--- 1906,1910 ----
// process all events on day $v
//
! if (is_array($daily)) foreach($daily as $event)
{
if ($event['recur_type']) //
calculate start- + end-datetime for recuring events
***************
*** 1914,1918 ****
$this->bo->set_recur_date($event,$v);
}
! $this->planner_process_event($event);
}
}
--- 1912,1919 ----
$this->bo->set_recur_date($event,$v);
}
! if
(!$this->bo->rejected_no_show($event))
! {
!
$this->planner_process_event($event);
! }
}
}
***************
*** 2863,2868 ****
$today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
$daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
! @reset($daily);
! while(list($date,$day_params) = each($daily))
{
$year = intval(substr($date,0,4));
--- 2864,2868 ----
$today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
$daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
! foreach($daily as $date => $day_params)
{
$year = intval(substr($date,0,4));
***************
*** 2904,2909 ****
if(@$day_params['holidays'])
{
! reset($day_params['holidays']);
! while(list($key,$value) =
each($day_params['holidays']))
{
$var = Array(
--- 2904,2908 ----
if(@$day_params['holidays'])
{
! foreach($day_params['holidays']
as $key => $value)
{
$var = Array(
***************
*** 2921,2930 ****
);
$p->set_var($var);
! $rep_events =
$this->bo->cached_events[$date];
! $c_rep_events =
count($rep_events);
! for ($k=0;$k<$c_rep_events;$k++)
{
! $lr_events =
$rep_events[$k];
!
$p->set_var('day_events',$this->link_to_entry($lr_events,$month,$day,$year));
$p->parse('events','event',True);
$p->set_var('day_events','');
--- 2920,2931 ----
);
$p->set_var($var);
! $events =
$this->bo->cached_events[$date];
! foreach($events as $event)
{
! if
($this->bo->rejected_no_show($event))
! {
! continue;
// user does not want to see rejected events
! }
!
$p->set_var('day_events',$this->link_to_entry($event,$month,$day,$year));
$p->parse('events','event',True);
$p->set_var('day_events','');
***************
*** 3354,3363 ****
$this->bo->store_to_cache(
Array(
! 'syear' => $params['year'],
! 'smonth' => $params['month'],
! 'sday' => $params['day'],
! 'eyear' => $params['year'],
! 'emonth' => $params['month'],
! 'eday' => $params['day']
)
);
--- 3355,3364 ----
$this->bo->store_to_cache(
Array(
! 'syear' => $params['year'],
! 'smonth' => $params['month'],
! 'sday' => $params['day'],
! 'eyear' => $params['year'],
! 'emonth' => $params['month'],
! 'eday' => $params['day']
)
);
***************
*** 3380,3384 ****
! $this->bo->prefs['calendar']['workdayends'])
{
-
$GLOBALS['phpgw']->preferences->add('calendar','workdaystarts',8);
$GLOBALS['phpgw']->preferences->add('calendar','workdayends',16);
--- 3381,3384 ----
***************
*** 3424,3427 ****
--- 3424,3431 ----
foreach($events as $event)
{
+ if ($this->bo->rejected_no_show($event))
+ {
+ continue; // user does
not want to see rejected events
+ }
if ($event['recur_type']) //
calculate start- + end-datetime for recuring events
{
***************
*** 4161,4169 ****
print_debug('set_week_array : Date ',$date);
! if($this->bo->cached_events[$date])
{
print_debug('Date',$date);
! print_debug('Appointments
Found',count($this->bo->cached_events[$date]));
! $appts = True;
}
else
--- 4165,4189 ----
print_debug('set_week_array : Date ',$date);
! if($events = $this->bo->cached_events[$date])
{
print_debug('Date',$date);
! print_debug('Appointments
Found',count($events));
!
! if
(!$this->bo->prefs['calendar']['show_rejected'])
! {
! $appts = False;
! foreach($events as $event)
// check for a not-rejected event
! {
! if
(!$this->bo->rejected_no_show($event))
! {
! $appts = True;
! break;
! }
! }
! }
! else
! {
! $appts = True;
! }
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.2.3,1.71.2.33.2.4 class.uicalendar.inc.php,1.66.2.55.2.7,1.66.2.55.2.8,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.2.2,1.71.2.33.2.3 class.socalendar_sql.inc.php,1.28.2.4.2.1,1.28.2.4.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/inc hook_settings.inc.php,1.1.2.3,1.1.2.4
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.2.2,1.71.2.33.2.3 class.socalendar_sql.inc.php,1.28.2.4.2.1,1.28.2.4.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/inc hook_settings.inc.php,1.1.2.3,1.1.2.4
- Index(es):