Merge branch 'master' into messages

application/helpers/hlp_common_helper.php

@@ -167,3 +167,100 @@ function isEmptyArray($array)
 {
 	return ($array == null) || ($array != null && !is_array($array) || (is_array($array) && count($array) == 0));
 }
+
+/**
+ * The function returns the number of business days between two dates and it skips the (static) holidays
+ * @param string $startDate Date (YYYY-MM-DD) to start counting from (included)
+ * @param string $endDate Date (YYYY-MM-DD) to end counting (included)
+ * @param array $dynamic_holidays Optional. Static holidays that have the same date every year are included automatically.
+ *                                You can give an array with dates (YYYY-MM-DD) that should be included furthermore
+ * @return integer Number of working days between $startDate and $endDate
+ */
+function getWorkingDays($startDate, $endDate, $dynamic_holidays = array())
+{
+	//Get year of $startDate
+	$startYear = substr($startDate, 0, 4);
+	//Get year of $endDate
+	$endYear = substr($endDate, 0, 4);
+
+	$datediff = $endYear - $startYear;
+	$austrian_holidays = array();
+	for ($i = 0; $i <= $datediff; $i++)
+	{
+		$austrian_holidays[] = $startYear.'-01-01'; // Neujahr
+		$austrian_holidays[] = $startYear.'-01-06'; // 3 Könige
+		$austrian_holidays[] = $startYear.'-05-01'; // Staatsfeiertag
+		$austrian_holidays[] = $startYear.'-08-15'; // Maria Himmelfahrt
+		$austrian_holidays[] = $startYear.'-10-26'; // Nationalfeiertag
+		$austrian_holidays[] = $startYear.'-11-01'; // Allerheiligen
+		$austrian_holidays[] = $startYear.'-12-08'; // Maria Empfängnis
+		$austrian_holidays[] = $startYear.'-12-25'; // Weihnachten
+		$austrian_holidays[] = $startYear.'-12-26'; // Stefanitag
+		$startYear++;
+	}
+	if (count($dynamic_holidays) > 0)
+	{
+		$austrian_holidays = array_merge($austrian_holidays, $dynamic_holidays);
+	}
+	// do strtotime calculations just once
+	$endDate = strtotime($endDate);
+	$startDate = strtotime($startDate);
+
+	//The total number of days between the two dates. We compute the no. of seconds and divide it to 60*60*24
+	//We add one to inlude both dates in the interval.
+	$days = ($endDate - $startDate) / 86400 + 1;
+
+	$no_full_weeks = floor($days / 7);
+	$no_remaining_days = fmod($days, 7);
+
+	//It will return 1 if it's Monday,.. ,7 for Sunday
+	$the_first_day_of_week = date("N", $startDate);
+	$the_last_day_of_week = date("N", $endDate);
+
+	//---->The two can be equal in leap years when february has 29 days, the equal sign is added here
+	//In the first case the whole interval is within a week, in the second case the interval falls in two weeks.
+	if ($the_first_day_of_week <= $the_last_day_of_week)
+	{
+		if ($the_first_day_of_week <= 6 && 6 <= $the_last_day_of_week) $no_remaining_days--;
+		if ($the_first_day_of_week <= 7 && 7 <= $the_last_day_of_week) $no_remaining_days--;
+	}
+	else {
+		// (edit by Tokes to fix an edge case where the start day was a Sunday
+		// and the end day was NOT a Saturday)
+
+		// the day of the week for start is later than the day of the week for end
+		if ($the_first_day_of_week == 7) {
+			// if the start date is a Sunday, then we definitely subtract 1 day
+			$no_remaining_days--;
+
+			if ($the_last_day_of_week == 6) {
+				// if the end date is a Saturday, then we subtract another day
+				$no_remaining_days--;
+			}
+		}
+		else {
+			// the start date was a Saturday (or earlier), and the end date was (Mon..Fri)
+			// so we skip an entire weekend and subtract 2 days
+			$no_remaining_days -= 2;
+		}
+	}
+
+	//The no. of business days is: (number of weeks between the two dates) * (5 working days) + the remainder
+	//---->february in none leap years gave a remainder of 0 but still calculated weekends between first and last day, this is one way to fix it
+	$workingDays = $no_full_weeks * 5;
+	if ($no_remaining_days > 0 )
+	{
+		$workingDays += $no_remaining_days;
+	}
+
+	//We subtract the holidays
+	foreach($austrian_holidays as $key=>$value)
+	{
+		$time_stamp=strtotime($value);
+		//If the holiday doesn't fall in weekend
+		if ($startDate <= $time_stamp && $time_stamp <= $endDate && date("N",$time_stamp) != 6 && date("N",$time_stamp) != 7)
+			$workingDays--;
+	}
+
+	return $workingDays;
+}

application/helpers/hlp_sancho_helper.php

@@ -29,7 +29,7 @@ const DEFAULT_SANCHO_FOOTER_IMG = 'sancho_footer_DEFAULT.jpg';
 /**
  * Send single Mail with Sancho Design and Layout.
  * @param string $vorlage_kurzbz Name of the template for specific mail content.
- * @param array $vorlage_data Associative array with specific mail content varibales
+ * @param array $vorlage_data Associative array with specific mail content variables
  *  to be replaced in the content template.
  * @param string $to Email-adress.
  * @param string $subject Subject of mail.