Merge branch 'v2-develop' into patch-6

api/homepage/ical.php

@@ -30,11 +30,26 @@ trait ICalHomepageItem
 			case('Eastern Standard Time'):
 				$timezone = 'America/New_York';
 				break;
+			case('MST'):
+			case('Mountain Time'):
+			case('Mountain Standard Time'):
+				$timezone = 'America/Denver';
+				break;
 			case('PST'):
 			case('Pacific Time'):
 			case('Pacific Standard Time'):
 				$timezone = 'America/Los_Angeles';
 				break;
+			case('AKST'):
+			case('Alaska Time'):
+			case('Alaska Standard Time'):
+				$timezone = 'America/Anchorage';
+				break;
+			case('HST'):
+			case('Hawaii Time'):
+			case('Hawaii Standard Time'):
+				$timezone = 'Pacific/Honolulu';
+				break;
 			case('China Time'):
 			case('China Standard Time'):
 				$timezone = 'Asia/Beijing';
@@ -44,11 +59,21 @@ trait ICalHomepageItem
 			case('India Standard Time'):
 				$timezone = 'Asia/New_Delhi';
 				break;
-			case('JST');
+			case('JST'):
 			case('Japan Time'):
 			case('Japan Standard Time'):
 				$timezone = 'Asia/Tokyo';
 				break;
+			case('WET'):
+			case('WEST'):
+			case('Western European Time'):
+			case('Western European Standard Time'):
+			case('Western European Summer Time'):
+			case('W. Europe Time'):
+			case('W. Europe Standard Time'):
+			case('W. Europe Summer Time'):
+				$timezone = 'Europe/Lisbon';
+				break;
 		}
 		return $timezone;
 	}
@@ -292,4 +317,4 @@ trait ICalHomepageItem
 		$this->setAPIResponse('success', null, 200, $calendarSources);
 		return $calendarSources;
 	}
-}
+}

api/homepage/radarr.php

@@ -335,15 +335,15 @@ trait RadarrHomepageItem
 					"overview" => $child['overview'],
 					"runtime" => $child['runtime'],
 					"image" => $banner,
-					"ratings" => $child['ratings']['value'],
+					"ratings" => $child['ratings']['value'] ?? 0,
 					"videoQuality" => $child["hasFile"] ? @$child['movieFile']['quality']['quality']['name'] : "unknown",
 					"audioChannels" => $child["hasFile"] ? @$child['movieFile']['mediaInfo']['audioChannels'] : "unknown",
 					"audioCodec" => $child["hasFile"] ? @$child['movieFile']['mediaInfo']['audioFormat'] : "unknown",
 					"videoCodec" => $child["hasFile"] ? @$child['movieFile']['mediaInfo']['videoCodec'] : "unknown",
 					"size" => $child["hasFile"] ? @$child['movieFile']['size'] : "unknown",
 					"genres" => $child['genres'],
-					"year" => isset($child['year']) ? $child['year'] : '',
-					"studio" => isset($child['studio']) ? $child['studio'] : '',
+					"year" => $child['year'] ?? '',
+					"studio" => $child['studio'] ?? '',
 					"href" => strtolower($href),
 					"icon" => "/plugins/images/tabs/radarr.png",
 				);