Merge pull request #801 from causefx/develop

1.75

config/configDefaults.php

@@ -35,6 +35,7 @@
 	"sonarrURL" => "",
 	"sonarrKey" => "",
 	"sonarrHomeAuth" => false,
+        "sonarrUnmonitored" => false,
 	"sickrageURL" => "",
 	"sickrageKey" => "",
 	"sickrageHomeAuth" => false,

functions.php

@@ -2,7 +2,7 @@
 
 // ===================================
 // Define Version
- define('INSTALLEDVERSION', '1.7');
+ define('INSTALLEDVERSION', '1.75');
 // ===================================
 $debugOrganizr = true;
 if($debugOrganizr == true && file_exists('debug.php')){ require_once('debug.php'); }
@@ -3236,7 +3236,8 @@ function getSonarrCalendar($array){
         if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
 
         $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"; }
+        $monitored = $child['monitored'];
+        if($downloaded == "0" && isset($unaired) && $episodePremier == "true"){ $downloaded = "light-blue-bg"; }elseif(isset($unaired) && $monitored == "0"){ $downloaded = "light-gray-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 tvID--$episodeID\", imagetype: \"tv\" }, \n";
 		array_push($gotCalendar, array(
@@ -4267,8 +4268,9 @@ function getCalendar(){
 	$calendarItems = array();
 	if (SONARRURL != "" && qualifyUser(SONARRHOMEAUTH)){
 		try {
-			$sonarrCalendar = getSonarrCalendar($sonarr->getCalendar($startDate, $endDate));
-			if(!empty($sonarrCalendar)) { $calendarItems = array_merge($calendarItems, $sonarrCalendar); }
+			$sonarrCalendar = getSonarrCalendar($sonarr->getCalendar($startDate, $endDate, SONARRUNMONITORED));
+			if(!empty($sonarrCalendar)) { $calendarItems = array_merge($calendarItems, $sonarrCalendar); 
+      }
 		} catch (Exception $e) {
 			writeLog("error", "SONARR ERROR: ".strip($e->getMessage()));
 		}

homepage.php

@@ -971,7 +971,7 @@ function convertCast(a){
                 $.each( a.cast, function( key, value ) {
                     if( value['profile_path'] ){
                         if (count <= 6){
-                            result += '<div class="col-lg-4 col-xs-4"><div class="zero-m"><img class="pull-left" style="border-radius:10%;margin-left: auto;margin-right: auto;display: block;" height="100px" src="https://image.tmdb.org/t/p/w150'+value['profile_path']+'" alt="profile"><h5 class="text-center"><strong>'+value['name']+'</strong></h5><h6 class="text-center">'+value['character']+'</h6></div></div>';
+                            result += '<div class="col-lg-4 col-xs-4"><div class="zero-m"><img class="pull-left" style="border-radius:10%;margin-left: auto;margin-right: auto;display: block;" height="100px" src="https://image.tmdb.org/t/p/w154'+value['profile_path']+'" alt="profile"><h5 class="text-center"><strong>'+value['name']+'</strong></h5><h6 class="text-center">'+value['character']+'</h6></div></div>';
                             count++;
                         }
                     }

lang/de.ini

@@ -21,7 +21,7 @@ REMEMBER_ME = "Angemeldet bleiben"
 FORGOT_PASSWORD = "Passwort vergessen"
 RESET_PASSWORD = "Passwort zurücksetzen"
 DATABASE_PATH = "Datenbankverzeichnis"
-SPECIFY_LOCATION = "Festlegen, wo Datenbankdateien gespeichert werden sollen.  Please choose a location outside of Web Root!  Your DB files will contain sensitive information!"
+SPECIFY_LOCATION = "Festlegen, wo Datenbankdateien gespeichert werden sollen. Bitte ein Verzeichnis außerhalb des Web-Root wählen. Die DB wird sicherheitsrelevante Informationen enthalten!"
 CURRENT_DIRECTORY = "Aktuelles Verzeichnis"
 PARENT_DIRECTORY = "Überverzeichnis"
 SET_DATABASE_LOCATION = "Datenbankverzeichnis festlegen"
@@ -309,7 +309,7 @@ PLAYLISTS = "Playlisten"
 DOWNLOAD_REFRESH = "Download-Warteschlange  neu laden"
 HISTORY_REFRESH = "Verlauf neu laden"
 CHECK_FRAME = "Frame testen"
-GENERATE_API_KEY = "Generate API Schlüssel"
+GENERATE_API_KEY = "Generiere API Schlüssel"
 ORGANIZR_API_KEY = "Organizr API Schlüssel"
 TEST_EMAIL = "Test E-Mail senden"
 BACKUP_CREATED = "Sicherung erstellt"
@@ -333,15 +333,15 @@ COUCH_URL = "Couchpotato URL"
 COUCH_KEY = "Couchpotato API/Schlüssel"
 DELETE_CHAT_DATABASE = "Chat Datenbank löschen"
 INSTALLED_THEME = "Installiertes Thema"
-PLEX_TAB_URL = "Plex Tab URL - i.e. https://domain.com/plex or https://plex.domain.com"
-RECENT_REFRESH = "Recent Items Refresh Rate"
-NOW_PLAYING_REFRESH = "Now Playing Refresh Rate"
-REQUEST_REFRESH = "Requests Refresh Rate"
-COLOR_TEMPLATE = "Color Templates"
-REQUESTED_ONLY = "Show only requests for that user - if Off it will show all requests"
-SIZE = "Size"
-OR_ICON_NAME = "or Icon Name"
+PLEX_TAB_URL = "Plex Tab URL - bswp. https://domain.com/plex oder https://plex.domain.com"
+RECENT_REFRESH = "Aktualisierungsintervall kürzlich hinzugefügter Titel"
+NOW_PLAYING_REFRESH = "Aktualisierungsintervall aktuell abgespielter Titel"
+REQUEST_REFRESH = "Aktualisierungsintervalll von Wünschen"
+COLOR_TEMPLATE = "Farbvorlagen"
+REQUESTED_ONLY = "Zeige nur Wünsche dieses Nutzers - wenn Aus, werden alle Wünsche gezeigt"
+SIZE = "Größe"
+OR_ICON_NAME = "oder Name des Icons"
 OMBI_URL = "Ombi V3 URL"
-OMBI_KEY = "Ombi V3 API Key"
-ENABLE_WEATHER = "Enable Weather Widget"
-WEATHER_AUTH = "Minimum authentication level to access Weather Widget"
+OMBI_KEY = "Ombi V3 API Schlüssel"
+ENABLE_WEATHER = "Wetter-Widget aktivieren"
+WEATHER_AUTH = "Mindestauthentifizierungslevel um Wetter-Widget anzuzeigen"

lang/en.ini

@@ -186,6 +186,7 @@ MUSIC = "Recent Music"
 SONARR_URL = "Sonarr URL"
 SONARR_PORT = "Sonarr Port"
 SONARR_KEY = "Sonarr API Key"
+SONARR_UNMONITORED = "Show unmonitored"
 RADARR_URL = "Radarr URL"
 RADARR_PORT = "Radarr Port"
 RADARR_KEY = "Radarr API Key"