holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a problem where holidays in the following year are not loaded correctly.

Browse Source
This commit is contained in:
skeeter 2001-12-24 03:07:24 +00:00
parent 99bf9a1305
commit 5e24b7bf9d
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.bocalendar.inc.php
View File

@ -724,6 +724,7 @@
'readsess' => 1 'readsess' => 1
) )
); );
$GLOBALS['phpgw']->common->phpgw_exit(True);
} }
if($event['id']) if($event['id'])
@ -801,10 +802,14 @@
} }
/* Private functions */ /* Private functions */
function read_holidays() function read_holidays($year=0)
{ {
if(!$year)
{
$year = $this->year;
}
$holiday = CreateObject('calendar.boholiday'); $holiday = CreateObject('calendar.boholiday');
$holiday->prepare_read_holidays($this->year,$this->owner); $holiday->prepare_read_holidays($year,$this->owner);
$this->cached_holidays = $holiday->read_holiday(); $this->cached_holidays = $holiday->read_holiday();
unset($holiday); unset($holiday);
} }

7
calendar/inc/class.boholiday.inc.php
View File

@ -174,9 +174,14 @@
function prepare_read_holidays($year=0,$owner=0) function prepare_read_holidays($year=0,$owner=0)
{ {
$datetime = CreateObject('phpgwapi.datetime'); $datetime = CreateObject('phpgwapi.datetime');
$this->year = ($year?$year:$GLOBALS['phpgw']->common->show_date(time() - $datetime->tz_offset,'Y')); $this->year = (isset($year) && $year > 0?$year:$GLOBALS['phpgw']->common->show_date(time() - $datetime->tz_offset,'Y'));
$this->owner = ($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']); $this->owner = ($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']);
if($this->debug)
{
echo 'Setting Year to : '.$this->year.'<br>'."\n";
}
if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country']) if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
{ {
$this->locales[] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country']; $this->locales[] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];

18
calendar/inc/class.uicalendar.inc.php
View File

@ -102,6 +102,17 @@
return; return;
} }
if($params['month'] == 0)
{
$params['month'] = 12;
$params['year'] = $params['year'] - 1;
}
elseif($params['month'] == 13)
{
$params['month'] = 1;
$params['year'] = $params['year'] + 1;
}
$this->bo->store_to_cache( $this->bo->store_to_cache(
Array( Array(
'smonth' => $params['month'], 'smonth' => $params['month'],
@ -114,7 +125,7 @@
$params['buttons'] = (!isset($params['buttons'])?'none':$params['buttons']); $params['buttons'] = (!isset($params['buttons'])?'none':$params['buttons']);
$params['outside_month'] = (!isset($params['outside_month'])?True:$params['outside_month']); $params['outside_month'] = (!isset($params['outside_month'])?True:$params['outside_month']);
$this->bo->read_holidays(); $this->bo->read_holidays($params['year']);
$date = $this->bo->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']); $date = $this->bo->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']);
$month_ago = intval(date('Ymd',mktime(0,0,0,$params['month'] - 1,$params['day'],$params['year']))); $month_ago = intval(date('Ymd',mktime(0,0,0,$params['month'] - 1,$params['day'],$params['year'])));
@ -261,8 +272,6 @@
function get_month() function get_month()
{ {
$this->bo->read_holidays();
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals'])) if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
@ -275,6 +284,7 @@
'link' => 'day' 'link' => 'day'
) )
); );
$minical_next = $this->mini_calendar( $minical_next = $this->mini_calendar(
Array( Array(
'day' => 1, 'day' => 1,
@ -303,6 +313,8 @@
$GLOBALS['phpgw_info']['flags']['nofooter'] = True; $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
} }
$this->bo->read_holidays();
$var = Array( $var = Array(
'printer_friendly' => $printer, 'printer_friendly' => $printer,
'bg_text' => $this->theme['bg_text'], 'bg_text' => $this->theme['bg_text'],