Merge branch 'v2-develop' of https://github.com/causefx/Organizr into v2-develop

api/functions/homepage-connect-functions.php

@@ -1237,19 +1237,23 @@ function getCalendar()
 							switch (trim(strtolower(getCalenderRepeat($repeat)))) {
 								case 'daily':
 									$repeat = $totalDays;
-									$term = 'day';
+									$term = 'days';
 									break;
 								case 'weekly':
 									$repeat = round($totalDays / 7);
-									$term = 'week';
+									$term = 'weeks';
 									break;
 								case 'monthly':
 									$repeat = round($totalDays / 30);
-									$term = 'month';
+									$term = 'months';
+									break;
+								case 'yearly':
+									$repeat = round($totalDays / 365);
+									$term = 'years';
 									break;
 								default:
 									$repeat = $totalDays;
-									$term = 'day';
+									$term = 'days';
 									break;
 							}
 						} else {
@@ -1294,6 +1298,13 @@ function getCalendar()
 							if (!calendarDaysCheck($calendarStartDiff->format('%R') . $calendarStartDiff->days, $calendarEndDiff->format('%R') . $calendarEndDiff->days)) {
 								break;
 							}
+							if (getCalenderRepeatUntil(trim($repeat))) {
+								$untilDate = new DateTime (getCalenderRepeatUntil(trim($repeat)));
+								$untilDiff = date_diff($currentDate, $untilDate);
+								if ($untilDiff->days > 0) {
+									break;
+								}
+							}
 							$icalEvents[] = array(
 								'title' => $eventName,
 								'imagetype' => 'calendar-o text-warning text-custom-calendar ' . $extraClass,
@@ -1343,6 +1354,16 @@ function getCalenderRepeat($value)
 	}
 }
 
+function getCalenderRepeatUntil($value)
+{
+	$first = explode('UNTIL=', $value);
+	if (count($first) > 1) {
+		return $first[1];
+	} else {
+		return false;
+	}
+}
+
 function getSonarrCalendar($array, $number)
 {
 	$array = json_decode($array, true);