[Phpgroupware-cvs] CVS: calendar/inc class.holidaycalc_JP.inc.php,1.1,1.1.2.1 class.holidaycalc_US.inc.php,1.5.2.1,1.5.2.2

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.holidaycalc_JP.inc.php class.holidaycalc_US.inc.php 
Log Message:
This part of a major fix for the calendar.

Index: class.holidaycalc_JP.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc_JP.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** class.holidaycalc_JP.inc.php        19 Jun 2001 00:44:04 -0000      1.1
--- class.holidaycalc_JP.inc.php        16 Apr 2002 15:45:50 -0000      1.1.2.1
***************
*** 93,102 ****
                                $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                $holidays[$i]['dow'] = $holiday['dow'];
!                               $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year) - $datetime->tz_offset;
                                $holidays[$i]['obervance_rule'] = 0;
                        }
                }
  
!               $date = mktime(0,0,0,$holiday['month'],$day,$year) - 
$datetime->tz_offset;
  
                return $date;
--- 93,102 ----
                                $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                $holidays[$i]['dow'] = $holiday['dow'];
!                               $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year);
                                $holidays[$i]['obervance_rule'] = 0;
                        }
                }
  
!               $date = mktime(0,0,0,$holiday['month'],$day,$year);
  
                return $date;

Index: class.holidaycalc_US.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc_US.inc.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** class.holidaycalc_US.inc.php        20 Feb 2002 02:02:08 -0000      1.5.2.1
--- class.holidaycalc_US.inc.php        16 Apr 2002 15:45:50 -0000      1.5.2.2
***************
*** 61,65 ****
                                        $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                        $holidays[$i]['dow'] = $holiday['dow'];
!                                       $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year) - $datetime->tz_offset;
                                        $holidays[$i]['obervance_rule'] = 0;
                                }
--- 61,65 ----
                                        $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                        $holidays[$i]['dow'] = $holiday['dow'];
!                                       $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year);
                                        $holidays[$i]['obervance_rule'] = 0;
                                }
***************
*** 73,82 ****
                                        $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                        $holidays[$i]['dow'] = $holiday['dow'];
!                                       $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day-1,$year) - $datetime->tz_offset;
                                        $holidays[$i]['obervance_rule'] = 0;
                                }
                        }
                }
!               $date = mktime(0,0,0,$holiday['month'],$day,$year) - 
$datetime->tz_offset;
  
                return $date;
--- 73,82 ----
                                        $holidays[$i]['occurence'] = 
$holiday['occurence'];
                                        $holidays[$i]['dow'] = $holiday['dow'];
!                                       $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day-1,$year);
                                        $holidays[$i]['obervance_rule'] = 0;
                                }
                        }
                }
!               $date = mktime(0,0,0,$holiday['month'],$day,$year);
  
                return $date;