grommunio / grommunio-dav

mapi/class.mapiexception.php

Switch Indentation +25 added lines, -25 removed lines

@@ -25,37 +25,37 @@
 			}
 
 			switch ($this->getCode()) {
-			case MAPI_E_NO_ACCESS:
-				return dgettext("kopano", "You have insufficient privileges to open this object.");
+				case MAPI_E_NO_ACCESS:
+					return dgettext("kopano", "You have insufficient privileges to open this object.");
 
-			case MAPI_E_LOGON_FAILED:
-			case MAPI_E_UNCONFIGURED:
-				return dgettext("kopano", "Logon Failed. Please check your username/password.");
+				case MAPI_E_LOGON_FAILED:
+				case MAPI_E_UNCONFIGURED:
+					return dgettext("kopano", "Logon Failed. Please check your username/password.");
 
-			case MAPI_E_NETWORK_ERROR:
-				return dgettext("kopano", "Can not connect to Kopano server.");
+				case MAPI_E_NETWORK_ERROR:
+					return dgettext("kopano", "Can not connect to Kopano server.");
 
-			case MAPI_E_UNKNOWN_ENTRYID:
-				return dgettext("kopano", "Can not open object with provided id.");
+				case MAPI_E_UNKNOWN_ENTRYID:
+					return dgettext("kopano", "Can not open object with provided id.");
 
-			case MAPI_E_NO_RECIPIENTS:
-				return dgettext("kopano", "There are no recipients in the message.");
+				case MAPI_E_NO_RECIPIENTS:
+					return dgettext("kopano", "There are no recipients in the message.");
 
-			case MAPI_E_NOT_FOUND:
-				return dgettext("kopano", "Can not find object.");
+				case MAPI_E_NOT_FOUND:
+					return dgettext("kopano", "Can not find object.");
 
-			case MAPI_E_INTERFACE_NOT_SUPPORTED:
-			case MAPI_E_INVALID_PARAMETER:
-			case MAPI_E_INVALID_ENTRYID:
-			case MAPI_E_INVALID_OBJECT:
-			case MAPI_E_TOO_COMPLEX:
-			case MAPI_E_CORRUPT_DATA:
-			case MAPI_E_END_OF_SESSION:
-			case MAPI_E_AMBIGUOUS_RECIP:
-			case MAPI_E_COLLISION:
-			case MAPI_E_UNCONFIGURED:
-			default:
-				return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
+				case MAPI_E_INTERFACE_NOT_SUPPORTED:
+				case MAPI_E_INVALID_PARAMETER:
+				case MAPI_E_INVALID_ENTRYID:
+				case MAPI_E_INVALID_OBJECT:
+				case MAPI_E_TOO_COMPLEX:
+				case MAPI_E_CORRUPT_DATA:
+				case MAPI_E_END_OF_SESSION:
+				case MAPI_E_AMBIGUOUS_RECIP:
+				case MAPI_E_COLLISION:
+				case MAPI_E_UNCONFIGURED:
+				default:
+					return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
 			}
 		}
 	}

mapi/class.baserecurrence.php

Switch Indentation +618 added lines, -618 removed lines

@@ -156,94 +156,94 @@ 
 			$rdata = substr($rdata, 10);
 
 			switch ($data["rtype"]) {
-			case 0x0A:
-				// Daily
-				if (strlen($rdata) < 12) {
-					return $ret;
-				}
-				$data = unpack("Vunknown/Veveryn/Vregen", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
+				case 0x0A:
+					// Daily
+					if (strlen($rdata) < 12) {
+						return $ret;
+					}
+					$data = unpack("Vunknown/Veveryn/Vregen", $rdata);
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
 
-				switch ($ret["subtype"]) {
-				case 0:
-					$rdata = substr($rdata, 12);
-					break;
+					switch ($ret["subtype"]) {
+						case 0:
+							$rdata = substr($rdata, 12);
+							break;
 
-				case 1:
-					$rdata = substr($rdata, 16);
-					break;
-				}
+						case 1:
+							$rdata = substr($rdata, 16);
+							break;
+					}
 				break;
 
-			case 0x0B:
-				// Weekly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0B:
+					// Weekly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vconst1/Veveryn/Vregen", $rdata);
-				$rdata = substr($rdata, 12);
+					$data = unpack("Vconst1/Veveryn/Vregen", $rdata);
+					$rdata = substr($rdata, 12);
 
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				$ret["weekdays"] = 0;
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					$ret["weekdays"] = 0;
 
-				if ($data["regen"] == 0) {
-					$data = unpack("Vweekdays", $rdata);
-					$rdata = substr($rdata, 4);
-					$ret["weekdays"] = $data["weekdays"];
-				}
-				break;
+					if ($data["regen"] == 0) {
+						$data = unpack("Vweekdays", $rdata);
+						$rdata = substr($rdata, 4);
+						$ret["weekdays"] = $data["weekdays"];
+					}
+					break;
 
-			case 0x0C:
-				// Monthly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0C:
+					// Monthly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
+					$data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					if ($ret["subtype"] == 3) {
+						$ret["weekdays"] = $data["monthday"];
+					}
+					else {
+						$ret["monthday"] = $data["monthday"];
+					}
 
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
+					$rdata = substr($rdata, 16);
+					if ($ret["subtype"] == 3) {
+						$data = unpack("Vnday", $rdata);
+						$ret["nday"] = $data["nday"];
+						$rdata = substr($rdata, 4);
+					}
+					break;
 
-			case 0x0D:
-				// Yearly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0D:
+					// Yearly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["month"] = $data["month"];
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
+					$data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
+					$ret["month"] = $data["month"];
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					if ($ret["subtype"] == 3) {
+						$ret["weekdays"] = $data["monthday"];
+					}
+					else {
+						$ret["monthday"] = $data["monthday"];
+					}
 
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
+					$rdata = substr($rdata, 16);
+					if ($ret["subtype"] == 3) {
+						$data = unpack("Vnday", $rdata);
+						$ret["nday"] = $data["nday"];
+						$rdata = substr($rdata, 4);
+					}
+					break;
 			}
 
 			if (strlen($rdata) < 16) {
@@ -573,312 +573,312 @@ 
 			$term = (int) $this->recur["type"];
 
 			switch ($term) {
-			case 0x0A:
-				// Daily
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-
-				if ($this->recur["subtype"] == 1) {
-					// Daily every workday
-					$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
-				}
-				else {
-					// Daily every N days (everyN in minutes)
-					$everyn = ((int) $this->recur["everyn"]) / 1440;
-					// Calc first occ
-					$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
-				}
-				break;
-
-			case 0x0B:
-				// Weekly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
-					return;
-				}
-
-				// No need to calculate startdate if sliding flag was set.
-				if (!$this->recur['regen']) {
-					// Calculate start date of recurrence
-
-					// Find the first day that matches one of the weekdays selected
-					$daycount = 0;
-					$dayskip = -1;
-					for ($j = 0; $j < 7; ++$j) {
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							if ($dayskip == -1) {
-								$dayskip = $j;
-							}
-							++$daycount;
-						}
+				case 0x0A:
+					// Daily
+					if (!isset($this->recur["everyn"])) {
+						return;
 					}
 
-					// $dayskip is the number of days to skip from the startdate until the first occurrence
-					// $daycount is the number of days per week that an occurrence occurs
-					$weekskip = 0;
-					if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
-						$weekskip = 1;
+					if ($this->recur["subtype"] == 1) {
+						// Daily every workday
+						$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
 					}
-
-					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-					// remaining occurrences based on the start of the recurrence.
-					if (((int) $this->recur["term"]) == 0x22) {
-						// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
-						// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
-						// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
-						// (eg when numoccur = 2, and daycount = 1)
-						$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
-
-						// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
-						// for the occurrence on the first day
-						$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
-
-						// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-						$forwardcount *= (int) $this->recur["everyn"];
+					else {
+						// Daily every N days (everyN in minutes)
+						$everyn = ((int) $this->recur["everyn"]) / 1440;
+						// Calc first occ
+						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
 					}
+					break;
 
-					// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-					$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
-				}
-
-				// Calc first occ
-				$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
-				$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
-
-				if ($this->recur["regen"]) {
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-				}
-				else {
-					$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
-				}
-				break;
-
-			case 0x0C:
-				// Monthly
-			case 0x0D:
-				// Yearly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
-					return;
-				}
-				if ($term == 0x0C /* monthly */) {
-					$everyn = (int) $this->recur["everyn"];
-				}
-				else {
-					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
-				}
-
-				// Get montday/month/year of original start
-				$curmonthday = gmdate("j", (int) $this->recur["start"]);
-				$curyear = gmdate("Y", (int) $this->recur["start"]);
-				$curmonth = gmdate("n", (int) $this->recur["start"]);
-
-				// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-				// remaining occurrences based on the start of the recurrence.
-				if (((int) $this->recur["term"]) == 0x22) {
-					// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
-					// one to make sure there are always at least one occurrence left)
-					$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
-				}
-
-				// Get month for yearly on D'th day of month M
-				if ($term == 0x0D /* yearly */) {
-					$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
-				} // 1=jan, 2=feb, eg
-
-				switch ((int) $this->recur["subtype"]) {
-				// on D day of every M month
-				case 2:
-					if (!isset($this->recur["monthday"])) {
+				case 0x0B:
+					// Weekly
+					if (!isset($this->recur["everyn"])) {
+						return;
+					}
+					if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
 						return;
 					}
-					// Recalc startdate
-					// Set on the right begin day
-					// Go the beginning of the month
-					$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
-					// Go the the correct month day
-					$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
-
-					// If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
-					if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-						($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
-						if ($term == 0x0D /* yearly */) {
-							$count = ($everyn - ($curmonth - $selmonth));
-						} // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
-						else {
-							$count = $everyn;
-						} // Monthly, go to next occurrence in 'everyn' months
-
-						// Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
-						for ($i = 0; $i < $count; ++$i) {
-							$this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
+
+					// No need to calculate startdate if sliding flag was set.
+					if (!$this->recur['regen']) {
+						// Calculate start date of recurrence
+
+						// Find the first day that matches one of the weekdays selected
+						$daycount = 0;
+						$dayskip = -1;
+						for ($j = 0; $j < 7; ++$j) {
+							if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+								if ($dayskip == -1) {
+									$dayskip = $j;
+								}
+								++$daycount;
 							}
-							++$curmonth;
 						}
-					}
 
-					// "start" is now pointing to the first occurrence, except that it will overshoot if the
-					// month in which it occurs has less days than specified as the day of the month. So 31st
-					// of each month will overshoot in february (29 days). We compensate for that by checking
-					// if the day of the month we got is wrong, and then back up to the last day of the previous
-					// month.
-					if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-						gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
-						$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
+						// $dayskip is the number of days to skip from the startdate until the first occurrence
+						// $daycount is the number of days per week that an occurrence occurs
+						$weekskip = 0;
+						if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
+							$weekskip = 1;
+						}
+
+						// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+						// remaining occurrences based on the start of the recurrence.
+						if (((int) $this->recur["term"]) == 0x22) {
+							// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
+							// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
+							// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
+							// (eg when numoccur = 2, and daycount = 1)
+							$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
+
+							// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
+							// for the occurrence on the first day
+							$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
+
+							// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
+							$forwardcount *= (int) $this->recur["everyn"];
+						}
+
+						// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
+						$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
 					}
 
-					// "start" is now the first occurrence
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+					// Calc first occ
+					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
+					$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
 
-						$firstocc = 0;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+					if ($this->recur["regen"]) {
+						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
 					}
 					else {
-						// Calc first occ
-						$firstocc = 0;
-						$monthIndex = (int) gmdate("n", $this->recur["start"]);
-						for ($i = 1; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+						$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
 					}
 					break;
 
-				case 3:
-					// monthly: on Nth weekday of every M month
-					// yearly: on Nth weekday of M month
-					if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
+				case 0x0C:
+					// Monthly
+				case 0x0D:
+					// Yearly
+					if (!isset($this->recur["everyn"])) {
 						return;
 					}
-
-					$weekdays = (int) $this->recur["weekdays"];
-					$nday = (int) $this->recur["nday"];
-
-					// Calc startdate
-					$monthbegindow = (int) $this->recur["start"];
-
-					if ($nday == 5) {
-						// Set date on the last day of the last month
-						$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+					if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
+						return;
+					}
+					if ($term == 0x0C /* monthly */) {
+						$everyn = (int) $this->recur["everyn"];
 					}
 					else {
-						// Set on the first day of the month
-						$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
+						$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+					}
+
+					// Get montday/month/year of original start
+					$curmonthday = gmdate("j", (int) $this->recur["start"]);
+					$curyear = gmdate("Y", (int) $this->recur["start"]);
+					$curmonth = gmdate("n", (int) $this->recur["start"]);
+
+					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+					// remaining occurrences based on the start of the recurrence.
+					if (((int) $this->recur["term"]) == 0x22) {
+						// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
+						// one to make sure there are always at least one occurrence left)
+						$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
 					}
 
+					// Get month for yearly on D'th day of month M
 					if ($term == 0x0D /* yearly */) {
-						// Set on right month
-						if ($selmonth < $curmonth) {
-							$tmp = 12 - $curmonth + $selmonth;
-						}
-						else {
-							$tmp = ($selmonth - $curmonth);
-						}
+						$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
+					} // 1=jan, 2=feb, eg
 
-						for ($i = 0; $i < $tmp; ++$i) {
-							$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
+					switch ((int) $this->recur["subtype"]) {
+					// on D day of every M month
+						case 2:
+							if (!isset($this->recur["monthday"])) {
+								return;
+							}
+							// Recalc startdate
+							// Set on the right begin day
+							// Go the beginning of the month
+							$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
+							// Go the the correct month day
+							$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
+
+							// If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
+							if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
+								($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
+								if ($term == 0x0D /* yearly */) {
+									$count = ($everyn - ($curmonth - $selmonth));
+								} // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
+								else {
+									$count = $everyn;
+								} // Monthly, go to next occurrence in 'everyn' months
+
+								// Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
+								for ($i = 0; $i < $count; ++$i) {
+									$this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
+									if ($curmonth == 12) {
+										++$curyear;
+										$curmonth = 0;
+									}
+									++$curmonth;
+								}
 							}
-							++$curmonth;
-						}
-					}
-					else {
-						// Check or you exist in the right month
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-								$day = gmdate("j", $monthbegindow) - $i;
 
-								break;
+							// "start" is now pointing to the first occurrence, except that it will overshoot if the
+							// month in which it occurs has less days than specified as the day of the month. So 31st
+							// of each month will overshoot in february (29 days). We compensate for that by checking
+							// if the day of the month we got is wrong, and then back up to the last day of the previous
+							// month.
+							if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+								gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
+								$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
 							}
-							if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-								$day = (($nday - 1) * 7) + ($i + 1);
 
-								break;
+							// "start" is now the first occurrence
+							if ($term == 0x0C /* monthly */) {
+								// Calc first occ
+								$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+
+								$firstocc = 0;
+								for ($i = 0; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+								}
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+							}
+							else {
+								// Calc first occ
+								$firstocc = 0;
+								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								for ($i = 1; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+								}
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+							}
+							break;
+
+						case 3:
+							// monthly: on Nth weekday of every M month
+							// yearly: on Nth weekday of M month
+							if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
+								return;
 							}
-						}
 
-						// Goto the next X month
-						if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+							$weekdays = (int) $this->recur["weekdays"];
+							$nday = (int) $this->recur["nday"];
+
+							// Calc startdate
+							$monthbegindow = (int) $this->recur["start"];
+
 							if ($nday == 5) {
-								$monthbegindow += 24 * 60 * 60;
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
-								}
-								++$curmonth;
+								// Set date on the last day of the last month
+								$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+							}
+							else {
+								// Set on the first day of the month
+								$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
 							}
 
-							for ($i = 0; $i < $everyn; ++$i) {
-								$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
+							if ($term == 0x0D /* yearly */) {
+								// Set on right month
+								if ($selmonth < $curmonth) {
+									$tmp = 12 - $curmonth + $selmonth;
+								}
+								else {
+									$tmp = ($selmonth - $curmonth);
+								}
+
+								for ($i = 0; $i < $tmp; ++$i) {
+									$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+									if ($curmonth == 12) {
+										++$curyear;
+										$curmonth = 0;
+									}
+									++$curmonth;
 								}
-								++$curmonth;
 							}
-							if ($nday == 5) {
-								$monthbegindow -= 24 * 60 * 60;
+							else {
+								// Check or you exist in the right month
+								for ($i = 0; $i < 7; ++$i) {
+									if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+										$day = gmdate("j", $monthbegindow) - $i;
+
+										break;
+									}
+									if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+										$day = (($nday - 1) * 7) + ($i + 1);
+
+										break;
+									}
+								}
+
+								// Goto the next X month
+								if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+									if ($nday == 5) {
+										$monthbegindow += 24 * 60 * 60;
+										if ($curmonth == 12) {
+											++$curyear;
+											$curmonth = 0;
+										}
+										++$curmonth;
+									}
+
+									for ($i = 0; $i < $everyn; ++$i) {
+										$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth == 12) {
+											++$curyear;
+											$curmonth = 0;
+										}
+										++$curmonth;
+									}
+									if ($nday == 5) {
+										$monthbegindow -= 24 * 60 * 60;
+									}
+								}
 							}
-						}
-					}
 
-					// FIXME: weekstart?
+							// FIXME: weekstart?
 
-					$day = 0;
-					// Set start on the right day
-					for ($i = 0; $i < 7; ++$i) {
-						if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-							$day = $i;
+							$day = 0;
+							// Set start on the right day
+							for ($i = 0; $i < 7; ++$i) {
+								if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+									$day = $i;
 
-							break;
-						}
-						if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-							$day = ($nday - 1) * 7 + ($i + 1);
+									break;
+								}
+								if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+									$day = ($nday - 1) * 7 + ($i + 1);
 
-							break;
-						}
-					}
-					if ($nday == 5) {
-						$monthbegindow -= $day * 24 * 60 * 60;
-					}
-					else {
-						$monthbegindow += ($day - 1) * 24 * 60 * 60;
-					}
+									break;
+								}
+							}
+							if ($nday == 5) {
+								$monthbegindow -= $day * 24 * 60 * 60;
+							}
+							else {
+								$monthbegindow += ($day - 1) * 24 * 60 * 60;
+							}
 
-					$firstocc = 0;
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-						break;
-					}
-					// Calc first occ
-					$monthIndex = (int) gmdate("n", $this->recur["start"]);
-					for ($i = 1; $i < $monthIndex; ++$i) {
-						$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+							$firstocc = 0;
+							if ($term == 0x0C /* monthly */) {
+								// Calc first occ
+								$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								for ($i = 0; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+								}
+								$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+								break;
+							}
+							// Calc first occ
+							$monthIndex = (int) gmdate("n", $this->recur["start"]);
+							for ($i = 1; $i < $monthIndex; ++$i) {
+								$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+							}
+							$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+							break;
 					}
-					$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-					break;
-				}
 				break;
 			}
 
@@ -892,20 +892,20 @@ 
 
 			switch ($term) {
 			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", 10);
-				break;
-			// After a number of times
-			case 0x22:
-				if (!isset($this->recur["numoccur"])) {
-					return;
-				}
-				$rdata .= pack("V", (int) $this->recur["numoccur"]);
-				break;
-			// Never ends
-			case 0x23:
-				$rdata .= pack("V", 0);
-				break;
+				case 0x21:
+					$rdata .= pack("V", 10);
+					break;
+				// After a number of times
+				case 0x22:
+					if (!isset($this->recur["numoccur"])) {
+						return;
+					}
+					$rdata .= pack("V", (int) $this->recur["numoccur"]);
+					break;
+				// Never ends
+				case 0x23:
+					$rdata .= pack("V", 0);
+					break;
 			}
 
 			// Strange little thing for the recurrence type "every workday"
@@ -958,135 +958,135 @@ 
 			// Set enddate
 			switch ($term) {
 			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
-				break;
-			// After a number of times
-			case 0x22:
-				// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-				$occenddate = (int) $this->recur["start"];
-
-				switch ((int) $this->recur["type"]) {
-				case 0x0A: // daily
-					if ($this->recur["subtype"] != 1) {
-						// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-						$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
-						break;
-					}
-					// Daily every workday
-					$restocc = (int) $this->recur["numoccur"];
-					// Get starting weekday
-					$nowtime = $this->gmtime($occenddate);
-					$j = $nowtime["tm_wday"];
-
-					while (1) {
-						if (($j % 7) > 0 && ($j % 7) < 6) {
-							--$restocc;
-						}
-						++$j;
-						if ($restocc <= 0) {
-							break;
-						}
-						$occenddate += 24 * 60 * 60;
-					}
+				case 0x21:
+					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
 					break;
+				// After a number of times
+				case 0x22:
+					// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
+					$occenddate = (int) $this->recur["start"];
+
+					switch ((int) $this->recur["type"]) {
+						case 0x0A: // daily
+							if ($this->recur["subtype"] != 1) {
+								// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
+								$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
+								break;
+							}
+							// Daily every workday
+							$restocc = (int) $this->recur["numoccur"];
+							// Get starting weekday
+							$nowtime = $this->gmtime($occenddate);
+							$j = $nowtime["tm_wday"];
+
+							while (1) {
+								if (($j % 7) > 0 && ($j % 7) < 6) {
+									--$restocc;
+								}
+								++$j;
+								if ($restocc <= 0) {
+									break;
+								}
+								$occenddate += 24 * 60 * 60;
+							}
+							break;
 
-				case 0x0B: // weekly
-					// Needed values
-					// $forwardcount - number of weeks we can skip forward
-					// $restocc - number of remaining occurrences after the week skip
-
-					// Add the weeks till the last item
-					$occenddate += ($forwardcount * 7 * 24 * 60 * 60);
-					$dayofweek = gmdate("w", $occenddate);
-
-					// Loop through the last occurrences until we have had them all
-					for ($j = 1; $restocc > 0; ++$j) {
-						// Jump to the next week (which may be N weeks away) when going over the week boundary
-						if ((($dayofweek + $j) % 7) == $weekstart) {
-							$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
-						}
+						case 0x0B: // weekly
+							// Needed values
+							// $forwardcount - number of weeks we can skip forward
+							// $restocc - number of remaining occurrences after the week skip
 
-						// If this is a matching day, once less occurrence to process
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							--$restocc;
-						}
+							// Add the weeks till the last item
+							$occenddate += ($forwardcount * 7 * 24 * 60 * 60);
+							$dayofweek = gmdate("w", $occenddate);
 
-						// Next day
-						$occenddate += 24 * 60 * 60;
-					}
-					break;
+							// Loop through the last occurrences until we have had them all
+							for ($j = 1; $restocc > 0; ++$j) {
+								// Jump to the next week (which may be N weeks away) when going over the week boundary
+								if ((($dayofweek + $j) % 7) == $weekstart) {
+									$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
+								}
 
-				case 0x0C: // monthly
-				case 0x0D: // yearly
-					$curyear = gmdate("Y", (int) $this->recur["start"]);
-					$curmonth = gmdate("n", (int) $this->recur["start"]);
-					// $forwardcount = months
+								// If this is a matching day, once less occurrence to process
+								if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+									--$restocc;
+								}
 
-					switch ((int) $this->recur["subtype"]) {
-					case 2: // on D day of every M month
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
+								// Next day
+								$occenddate += 24 * 60 * 60;
 							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
+							break;
 
-						// compensation between 28 and 31
-						if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-							gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
-							if (gmdate("j", $occenddate) < 28) {
-								$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
-							}
-							else {
-								$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-							}
-						}
-						break;
+						case 0x0C: // monthly
+						case 0x0D: // yearly
+							$curyear = gmdate("Y", (int) $this->recur["start"]);
+							$curmonth = gmdate("n", (int) $this->recur["start"]);
+							// $forwardcount = months
+
+							switch ((int) $this->recur["subtype"]) {
+								case 2: // on D day of every M month
+									while ($forwardcount > 0) {
+										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth >= 12) {
+											$curmonth = 1;
+											++$curyear;
+										}
+										else {
+											++$curmonth;
+										}
+										--$forwardcount;
+									}
 
-					case 3: // on Nth weekday of every M month
-						$nday = (int) $this->recur["nday"]; // 1 tot 5
-						$weekdays = (int) $this->recur["weekdays"];
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
-							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
-						if ($nday == 5) {
-							// Set date on the last day of the last month
-							$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-						}
-						else {
-							// Set date on the first day of the last month
-							$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
-						}
+									// compensation between 28 and 31
+									if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+										gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
+										if (gmdate("j", $occenddate) < 28) {
+											$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
+										}
+										else {
+											$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+										}
+									}
+									break;
 
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
-								$occenddate -= $i * 24 * 60 * 60;
+								case 3: // on Nth weekday of every M month
+									$nday = (int) $this->recur["nday"]; // 1 tot 5
+									$weekdays = (int) $this->recur["weekdays"];
+									while ($forwardcount > 0) {
+										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth >= 12) {
+											$curmonth = 1;
+											++$curyear;
+										}
+										else {
+											++$curmonth;
+										}
+										--$forwardcount;
+									}
+									if ($nday == 5) {
+										// Set date on the last day of the last month
+										$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+									}
+									else {
+										// Set date on the first day of the last month
+										$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
+									}
 
-								break;
-							}
-							if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
-								$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
+									for ($i = 0; $i < 7; ++$i) {
+										if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
+											$occenddate -= $i * 24 * 60 * 60;
 
-								break;
+											break;
+										}
+										if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
+											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
+
+											break;
+										}
+									}
+									break; // case 3:
 							}
-						}
-						break; // case 3:
-					}
-					break;
+						break;
 				}
 
 				if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX) {
@@ -1097,11 +1097,11 @@ 
 				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
 				break;
 			// Never ends
-			case 0x23:
-			default:
-				$this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
-				$rdata .= pack("V", 0x5AE980DF);
-				break;
+				case 0x23:
+				default:
+					$this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
+					$rdata .= pack("V", 0x5AE980DF);
+					break;
 			}
 
 			// UTC date
@@ -1647,188 +1647,188 @@ 
 				// Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
 
 				switch ($this->recur["type"]) {
-				case 10:
-					// Daily
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1440;
-					}
+					case 10:
+						// Daily
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1440;
+						}
 
-					if ($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						if ($this->recur["subtype"] == 0) {
+							// Every Nth day
+							for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							break;
 						}
-						break;
-					}
-					// Every workday
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
-						$nowtime = $this->gmtime($now);
-						if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						// Every workday
+						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
+							$nowtime = $this->gmtime($now);
+							if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
 						}
-					}
-					break;
-
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						break;
 
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
+					case 11:
+						// Weekly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+						// If sliding flag is set then move to 'n' weeks
 						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-
-							break;
+							$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
 						}
-						// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-						for ($wday = 0; $wday < 7; ++$wday) {
-							$daynow = $now + $wday * 60 * 60 * 24;
-							// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-							if ($daynow > $dayend) {
-								continue;
-							}
-							$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-							if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
 
-				case 12:
-					// Monthly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+							if ($this->recur['regen']) {
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+								break;
 							}
-
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
+							for ($wday = 0; $wday < 7; ++$wday) {
+								$daynow = $now + $wday * 60 * 60 * 24;
+								// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+								if ($daynow > $dayend) {
+									continue;
+								}
+								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+								if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
-							// Sanitize input
-							if ($this->recur["weekdays"] == 0) {
-								$this->recur["weekdays"] = 1;
-							}
+						break;
 
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+					case 12:
+						// Monthly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										++$ndaycounter;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if ($this->recur["nday"] == $ndaycounter) {
-										$firstday = $day;
+						// Loop through all months from start to end of occurrence, starting at beginning of first month
+						for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+								$difference = 1;
+								if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+									$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+								}
 
-										break;
-									}
+								$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+								// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+								if ($daynow <= $dayend) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
 							}
-							else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth = $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+								// Sanitize input
+								if ($this->recur["weekdays"] == 0) {
+									$this->recur["weekdays"] = 1;
+								}
+
+								// If nday is not set to the last day in the month
+								if ($this->recur["nday"] < 5) {
+									// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+									$ndaycounter = 0;
+									// Find matching weekday in this month
+									for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
+										$daynow = $now + $day * 60 * 60 * 24;
+										$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+										if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+											++$ndaycounter;
+										}
+										// check the selected pattern is same as asked Nth weekday,If so set the firstday
+										if ($this->recur["nday"] == $ndaycounter) {
+											$firstday = $day;
+
+											break;
+										}
+									}
+									// $firstday is the day of the month on which the asked pattern of nth weekday matches
+									$daynow = $now + $firstday * 60 * 60 * 24;
+								}
+								else {
+									// Find last day in the month ($now is the firstday of the month)
+									$NumDaysInMonth = $this->daysInMonth($now, 1);
+									$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
 
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
-									$daynow -= 86400;
 									$nowtime = $this->gmtime($daynow);
+									while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
+										$daynow -= 86400;
+										$nowtime = $this->gmtime($daynow);
+									}
 								}
-							}
 
-							/*
+								/*
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the			* recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								if ($daynow <= $dayend && $daynow >= $daystart) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
-						}
-						elseif ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							elseif ($this->recur['regen']) {
+								$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+								$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+								if ($now <= $dayend) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
-					break;
-
-				case 13:
-					// Yearly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 12;
-					}
+						break;
 
-					for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if ($monthday > $this->daysInMonth($monthstart, 1)) {
-								$monthday = $this->daysInMonth($monthstart, 1);
-							}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+					case 13:
+						// Yearly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 12;
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
-							// Find first matching weekday in this month
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+						for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+								// recur["month"] is in minutes since the beginning of the year
+								$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+								$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+								$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+								if ($monthday > $this->daysInMonth($monthstart, 1)) {
+									$monthday = $this->daysInMonth($monthstart, 1);
+								}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
+								$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+								// Go the correct month
+								$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
-								if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
+								// Find first matching weekday in this month
+								for ($wday = 0; $wday < 7; ++$wday) {
+									$daynow = $monthnow + $wday * 60 * 60 * 24;
+									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
 
-									break;
+									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										$firstday = $wday;
+
+										break;
+									}
 								}
-							}
 
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
-							while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
+								// Same as above (monthly)
+								$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+								while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+									$daynow -= 7 * 60 * 60 * 24;
+								}
 
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
-							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif ($this->recur['regen']) {
+								$year_starttime = $this->gmtime($now);
+								$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
+								$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
+								if ($now <= $dayend) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
 				}
 				// to get all exception items
 				if (!empty($this->recur['changed_occurrences'])) {