Merge pull request #225 from causefx/develop

Develop
causefx · Apr 4, 2017 · b1b95c1 · b1b95c1
2 parents 8de5579 + 4e85791
commit b1b95c1
Show file tree

Hide file tree

Showing 7 changed files with 290 additions and 227 deletions.
diff --git a/bower_components/fullcalendar/dist/fullcalendar.js b/bower_components/fullcalendar/dist/fullcalendar.js
@@ -6671,7 +6671,7 @@ DayGrid.mixin({
 
 		return '<a class="' + classes.join(' ') + '"' +
 				(event.url ?
-					' href="' + htmlEscape(event.url) + '"' :
+					' target="_blank" href="' + htmlEscape(event.url) + '"' :
 					''
 					) +
 				(skinCss ?
@@ -8051,7 +8051,7 @@ TimeGrid.mixin({
 
 		return '<a class="' + classes.join(' ') + '"' +
 			(event.url ?
-				' href="' + htmlEscape(event.url) + '"' :
+				' target="_blank" href="' + htmlEscape(event.url) + '"' :
 				''
 				) +
 			(skinCss ?

diff --git a/css/style.css b/css/style.css
diff --git a/error.php b/error.php
@@ -24,6 +24,7 @@
        502 => array('Bad Gateway', 'The server received an invalid response from the upstream server while trying to fulfill the request.', 'confused'),
        503 => array('Service Unavailable', 'The server is currently unavailable (because it is overloaded or down for maintenance).', 'confused'),
        504 => array('Gateway Timeout', 'The upstream server failed to send a request in the time allowed by the server.', 'confused'),
+       999 => array('Not Logged In', 'You need to be logged in to access this page.', 'confused'),
 
 );
 

diff --git a/functions.php b/functions.php
@@ -409,7 +409,6 @@ function getPlexStreams($url, $port, $token, $size, $header){
 
         $plexLink = "";
 
-
     }
 
     $gotPlex .= '</div>';
@@ -542,8 +541,8 @@ function getSonarrCalendar($array){
 
         $i++;
         $seriesName = $child['series']['title'];
-        $runtime = $child['series']['runtime'];
         $episodeID = $child['series']['imdbId'];
+        if(!isset($episodeID)){ $episodeID = ""; }
         $episodeName = htmlentities($child['title'], ENT_QUOTES);
         if($child['episodeNumber'] == "1"){ $episodePremier = "true"; }else{ $episodePremier = "false"; }
         $episodeAirDate = $child['airDateUtc'];
@@ -575,7 +574,7 @@ function getRadarrCalendar($array){
             $i++;
             $movieName = $child['title'];
             $movieID = $child['imdbId'];
-            $runtime = $child['runtime'];
+            if(!isset($movieID)){ $movieID = ""; }
 
             if(isset($child['inCinemas']) && isset($child['physicalRelease'])){ 
 

diff --git a/index.php b/index.php
@@ -201,7 +201,7 @@
 if(!defined('ENABLEMAIL')) : define('ENABLEMAIL', 'false'); endif;
 if(!defined('CUSTOMCSS')) : define('CUSTOMCSS', 'false'); endif;
 if(!defined('LOADINGSCREEN')) : define('LOADINGSCREEN', 'true'); endif;
-if(!defined('INSTALLEDVERSION')) : define('INSTALLEDVERSION', 'Awaiting Install...'); endif;
+if(!defined('INSTALLEDVERSION')) : define('INSTALLEDVERSION', 'Awaiting-Install...'); endif;
 if(!isset($notifyExplode)) :
 
     $notifyExplode = array("bar","slidetop");
@@ -262,7 +262,7 @@
         <script type="text/javascript" src="<?=$baseURL;?>js/sha1.js"></script>
 		<script type="text/javascript" src="<?=$baseURL;?>js/user.js"></script>
 
-        <link rel="stylesheet" href="<?=$baseURL;?>css/style.css">
+        <link rel="stylesheet" href="<?=$baseURL;?>css/style.css?v=<?php echo INSTALLEDVERSION; ?>">
         <link rel="stylesheet" href="bower_components/animate.css/animate.min.css">
 
         <link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/android-chrome-192x192.png" sizes="192x192">