Emby Support & Fixes

Fixed #224 - Support for Plex Cloud
Fixed #185 - Emby support on homepage - thanks Cerothen
Added new Organizr logo for loading screen
Fixed calendar navigation
Fixed calendar bug with imdb

functions.php

@@ -282,14 +282,14 @@ function outputCarousel($header, $size, $type, $items) {
 	$buttons = '';
 	if (count($items) > 1) {
 		$buttons = '
-			<a class="left carousel-control '.$type.'" href="#carousel-'.$type.'" role="button" data-slide="prev"><span class="fa fa-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span></a>
-			<a class="right carousel-control '.$type.'" href="#carousel-'.$type.'" role="button" data-slide="next"><span class="fa fa-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span></a>';
+			<a class="left carousel-control '.$type.'" href="#carousel-'.$type.'-emby" role="button" data-slide="prev"><span class="fa fa-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span></a>
+			<a class="right carousel-control '.$type.'" href="#carousel-'.$type.'-emby" role="button" data-slide="next"><span class="fa fa-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span></a>';
 	}
 	
 	return '
 	<div class="col-lg-'.$size.'">
 		<h5 class="text-center">'.$header.'</h5>
-		<div id="carousel-'.$type.'" class="carousel slide box-shadow white-bg" data-ride="carousel"><div class="carousel-inner" role="listbox">
+		<div id="carousel-'.$type.'-emby" class="carousel slide box-shadow white-bg" data-ride="carousel"><div class="carousel-inner" role="listbox">
 			'.implode('',$items).'
 		</div>'.$buttons.'
 	</div></div>'; 
@@ -375,13 +375,9 @@ function getPlexRecent($url, $port, $type, $token, $size, $header){
     
     $api = file_get_contents($address."/library/recentlyAdded?X-Plex-Token=".$token);
     $api = simplexml_load_string($api);
-    $getServer = file_get_contents($address."/servers?X-Plex-Token=".$token);
+    $getServer = file_get_contents($address."/?X-Plex-Token=".$token);
     $getServer = simplexml_load_string($getServer);
-    
-    foreach($getServer AS $child) {
-
-       $gotServer = $child['machineIdentifier'];
-    }
+    $gotServer = $getServer['machineIdentifier'];
 
     $i = 0;
     
@@ -673,8 +669,7 @@ function getSonarrCalendar($array){
 
         $i++;
         $seriesName = $child['series']['title'];
-        $episodeID = $child['series']['imdbId'];
-        if(!isset($episodeID)){ $episodeID = ""; }
+        $episodeID = $child['series']['tvdbId'];
         $episodeName = htmlentities($child['title'], ENT_QUOTES);
         if($child['episodeNumber'] == "1"){ $episodePremier = "true"; }else{ $episodePremier = "false"; }
         $episodeAirDate = $child['airDateUtc'];
@@ -686,7 +681,7 @@ function getSonarrCalendar($array){
         $downloaded = $child['hasFile'];
         if($downloaded == "0" && isset($unaired) && $episodePremier == "true"){ $downloaded = "light-blue-bg"; }elseif($downloaded == "0" && isset($unaired)){ $downloaded = "indigo-bg"; }elseif($downloaded == "1"){ $downloaded = "green-bg";}else{ $downloaded = "red-bg"; }
         
-        $gotCalendar .= "{ title: \"$seriesName\", start: \"$episodeAirDate\", className: \"$downloaded\", imagetype: \"tv\", url: \"http://www.imdb.com/title/$episodeID\" }, \n";
+        $gotCalendar .= "{ title: \"$seriesName\", start: \"$episodeAirDate\", className: \"$downloaded\", imagetype: \"tv\", url: \"https://thetvdb.com/?tab=series&id=$episodeID\" }, \n";
         
     }
 

homepage.php

@@ -366,7 +366,7 @@ endif; ?>
                     
                     <sort>1</sort>
                     
-                    <div class="col-lg-4 content-form form-inline">
+                    <div class="col-lg-12 content-form form-inline">
                         
                         <div class="form-group">
                         

image.php

@@ -17,7 +17,7 @@ switch ($image_source) {
 			$embyAddress = EMBYURL;	
 		}
 		
-		if(PLEXPORT !== ""){ $embyAddress .= ":" . EMBYPORT; }
+		if(EMBYPORT !== ""){ $embyAddress .= ":" . EMBYPORT; }
 		
 		if(isset($image_url) && isset($image_height) && isset($image_width)) {
 			$image_src = $embyAddress . '/Items/'.$image_url.'/Images/Primary?maxHeight='.$image_height.'&maxWidth='.$image_width;

index.php

@@ -23,7 +23,7 @@ $inactiveicon = "#66D9EF";
 $inactivetext = "#66D9EF";
 $loading = "#66D9EF";
 $hovertext = "#000000";
-$loadingIcon = "images/organizr.png";
+$loadingIcon = "images/organizr_logo_d.png";
 $baseURL = "";
 require_once("translate.php");
 require_once("functions.php");

lang/de.ini

@@ -220,3 +220,8 @@ SMTP_HOST_USERNAME = "SMTP Benutzername"
 SMTP_HOST_PASSWORD = "SMTP Passwort"
 SMTP_HOST_SENDER_NAME = "SMTP Absender"
 SMTP_HOST_SENDER_EMAIL = "SMTP Absendeadresse"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/en.ini

@@ -224,4 +224,4 @@ EMBY_URL = "Emby URL"
 EMBY_PORT = "Emby Port"
 EMBY_TOKEN = "Emby Token"
 PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
-RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/es.ini

@@ -219,4 +219,9 @@ SMTP_HOST_AUTH = "SMTP Auth"
 SMTP_HOST_USERNAME = "SMTP Username"
 SMTP_HOST_PASSWORD = "SMTP Password"
 SMTP_HOST_SENDER_NAME = "SMTP Sender Name"
-SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/fr.ini

@@ -219,4 +219,9 @@ SMTP_HOST_AUTH = "SMTP Auth"
 SMTP_HOST_USERNAME = "SMTP Username"
 SMTP_HOST_PASSWORD = "SMTP Password"
 SMTP_HOST_SENDER_NAME = "SMTP Sender Name"
-SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/it.ini

@@ -219,4 +219,9 @@ SMTP_HOST_AUTH = "SMTP Auth"
 SMTP_HOST_USERNAME = "SMTP Username"
 SMTP_HOST_PASSWORD = "SMTP Password"
 SMTP_HOST_SENDER_NAME = "SMTP Sender Name"
-SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/nl.ini

@@ -219,4 +219,9 @@ SMTP_HOST_AUTH = "SMTP Auth"
 SMTP_HOST_USERNAME = "SMTP Username"
 SMTP_HOST_PASSWORD = "SMTP Password"
 SMTP_HOST_SENDER_NAME = "SMTP Sender Name"
-SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

lang/pl.ini

@@ -219,4 +219,9 @@ SMTP_HOST_AUTH = "SMTP Auth"
 SMTP_HOST_USERNAME = "SMTP Username"
 SMTP_HOST_PASSWORD = "SMTP Password"
 SMTP_HOST_SENDER_NAME = "SMTP Sender Name"
-SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+SMTP_HOST_SENDER_EMAIL = "SMTP Sender Email"
+EMBY_URL = "Emby URL"
+EMBY_PORT = "Emby Port"
+EMBY_TOKEN = "Emby Token"
+PLAYING_NOW_ON_EMBY = "Playing Now on EMBY"
+RECENTLY_ADDED_TO_EMBY = "Recently Added to EMBY"

user.php

@@ -8,7 +8,7 @@
 	 * salting subsequent password checks.
 	 */
 
-    define('INSTALLEDVERSION', '1.29');
+    define('INSTALLEDVERSION', '1.30');
 
     require __DIR__ . '/vendor/autoload.php';