From b0466e19b8ca049fcce1f2ef72d81712c7c38e17 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 21 Jul 2004 14:01:33 +0000
Subject: [PATCH] patch from Michael Robellard to fix "call time by reference"
 warning

---
 calendar/inc/class.holidaycalc_US.inc.php | 105 ++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100755 calendar/inc/class.holidaycalc_US.inc.php

diff --git a/calendar/inc/class.holidaycalc_US.inc.php b/calendar/inc/class.holidaycalc_US.inc.php
new file mode 100755
index 0000000000..434b76e13f
--- /dev/null
+++ b/calendar/inc/class.holidaycalc_US.inc.php
@@ -0,0 +1,105 @@
+<?php
+  /**************************************************************************\
+  * eGroupWare - holidaycalc_US                                              *
+  * http://www.egroupware.org                                                *
+  * Based on Yoshihiro Kamimura <your@itheart.com>                           *
+  *          http://www.itheart.com                                          *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	class holidaycalc
+	{
+		function add($holiday,&$holidays,$year,&$i,$day_offset=0)
+		{
+			$i++;
+			$holidays[$i]= $holiday;
+			if ($day_offset)
+			{
+				$holidays[$i]['name'] .= ' (Observed)';
+			}
+			$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$holiday['day']+$day_offset,$year);
+			foreach(array('day'=>'d','month'=>'m','occurence'=>'Y') as $key => $frmt)
+			{
+				$holidays[$i][$key] = date($frmt,$holidays[$i]['date']);
+			}
+			$holidays[$i]['obervance_rule'] = 0;
+
+			//echo "<p>holidaycalc::add(".print_r($holiday,True).",,$year,,$day_offset)=".print_r($holidays[$i],True)."</p>";
+		}
+
+		function calculate_date($holiday, &$holidays, $year, &$i)
+		{
+			//echo "<p>holidaycalc::calculate_date(".print_r($holiday,True).",,$year,)</p>";
+
+			if($holiday['day'] == 0 && $holiday['occurence'] != 0)
+			{
+				if($holiday['occurence'] != 99)
+				{
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],1);
+					$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
+					$day += ($day < 1 ? 7 : 0);
+
+					// Sometimes the 5th occurance of a weekday (ie the 5th monday)
+					// can spill over to the next month.  This prevents that.
+					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
+					if ($day > $ld)
+					{
+						return;
+					}
+				}
+				else
+				{
+					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$ld);
+					$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
+				}
+			}
+			else
+			{
+				$day = $holiday['day'];
+				if($holiday['observance_rule'] == True)
+				{
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
+					// This now calulates Observed holidays and creates a new entry for them.
+
+					// 0 = sundays are observed on monday (+1), 6 = saturdays are observed on fridays (-1)
+					if($dow == 0 || $dow == 6)
+					{
+						$this->add($holiday,$holidays,$year,$i,$dow == 0 ? 1 : -1);
+					}
+					if ($holiday['month'] == 1 && $day == 1)
+					{
+						$dow = $GLOBALS['phpgw']->datetime->day_of_week($year+1,$holiday['month'],$day);
+						// checking if next year's newyear might be observed in this year
+						if ($dow == 6)
+						{
+							$this->add($holiday,$holidays,$year+1,$i,-1);
+						}
+						// add the next years newyear, to show it in a week- or month-view
+						$this->add($holiday,$holidays,$year+1,$i);
+					}
+					// checking if last year's new year's eve might be observed in this year
+					if ($holiday['month'] == 12 && $day == 31)
+					{
+						$dow = $GLOBALS['phpgw']->datetime->day_of_week($year-1,$holiday['month'],$day);
+						if ($dow == 0)
+						{
+							$this->add($holiday,$holidays,$year-1,$i,1);
+						}
+						// add the last years new year's eve, to show it in a week- or month-view
+						$this->add($holiday,$holidays,$year-1,$i);
+					}
+				}
+			}
+			$date = mktime(0,0,0,$holiday['month'],$day,$year);
+
+			return $date;
+		}
+	}
+?>