v1.5.4.2

* Fix: global: API call contained an invalid parameter (merged pull request #62 from ljunkie) * Fix: current activity: music thumbs would not always display
ecleese · Mar 9, 2014 · 7b41045 · 7b41045
1 parent 34c52d4
commit 7b41045
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-plexWatch/Web - v1.5.4.1
+plexWatch/Web - v1.5.4.2
 ========================
 
 A web front-end for plexWatch.

diff --git a/change.log b/change.log
@@ -1,6 +1,10 @@
+1.5.4.2 master
+* Fix:		global: API call contained an invalid parameter (merged pull request #62 from ljunkie)
+* Fix:		current activity: music thumbs would not always display
+
 1.5.4.1 master
-* Minor CSS change to fix offset username in current activity instances.
-* Additional platform images for future use.
+* Fix:		current activity: Minor CSS change to fix offset username in current activity instances.
+* Add:		global: Additional platform images for future use.
 
 1.5.4 master
 * Fix:		global: PMS owners with no gravatar account would display broken user avatar images.

diff --git a/charts.php b/charts.php
@@ -94,7 +94,7 @@
 
 				if (!empty($plexWatch['myPlexAuthToken'])) {
 					$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
-               if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?query=c&X-Plex-Token=".$myPlexAuthToken."")) {
+               if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?X-Plex-Token=".$myPlexAuthToken."")) {
                   $statusSessions = simplexml_load_string($fileContents) or die ("Failed to access Plex Media Server. Please check your settings.");
                }
 

diff --git a/css/plexwatch.css b/css/plexwatch.css
@@ -7027,7 +7027,6 @@ perspective: 1000;
 -o-backface-visibility: hidden;
 backface-visibility: hidden;
 clear: both;
-
 }
 
 .art-face img {
@@ -7063,6 +7062,43 @@ perspective: 1000;
 backface-visibility: hidden;
 }
 
+.art-music-face {
+background-repeat: no-repeat;
+background-position: 50% 50%;
+background-size: 100%;
+width: 250px;
+height: 141px;
+overflow: hidden;
+position: relative;
+-webkit-border-radius: 2px;
+-moz-border-radius: 2px;
+border-radius: 2px;
+-webkit-box-shadow: 0 0 0px rgba(0,0,0,0.75);
+-moz-box-shadow: 0 0 0px rgba(0,0,0,0.75);
+box-shadow: 0 0 0px rgba(0,0,0,0.75);
+-webkit-transform: translateZ(0);
+-moz-transform: translateZ(0);
+-ms-transform: translateZ(0);
+-o-transform: translateZ(0);
+transform: translateZ(0);
+-webkit-transform-style: preserve-3d;
+-moz-transform-style: preserve-3d;
+-ms-transform-style: preserve-3d;
+-o-transform-style: preserve-3d;
+transform-style: preserve-3d;
+-webkit-perspective: 1000;
+-moz-perspective: 1000;
+-ms-perspective: 1000;
+-o-perspective: 1000;
+perspective: 1000;
+-webkit-backface-visibility: hidden;
+-moz-backface-visibility: hidden;
+-ms-backface-visibility: hidden;
+-o-backface-visibility: hidden;
+backface-visibility: hidden;
+clear: both;
+}
+
 .container-fluid-info {
 padding-right: 0px;
 padding-left: 0px;

diff --git a/includes/current_activity.php b/includes/current_activity.php
@@ -12,7 +12,7 @@
 
 if (!empty($plexWatch['myPlexAuthToken'])) {
 	$myPlexAuthToken = $plexWatch['myPlexAuthToken'];			
-	if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?query=c&X-Plex-Token=".$plexWatch['myPlexAuthToken']."")) {
+	if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?X-Plex-Token=".$plexWatch['myPlexAuthToken']."")) {
       $statusSessions = simplexml_load_string($fileContents) or die ('<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>');	
    }
 }else{
@@ -687,12 +687,12 @@
 					}
 				}
 
-                    $sessionsThumbUrl = "".$plexWatchPmsUrl."/photo/:/transcode?url=http://127.0.0.1:".$plexWatch['pmsHttpPort']."".$sessions['art']."&width=300&height=169"; 
+                    $sessionsThumbUrl = "".$plexWatchPmsUrl."/photo/:/transcode?url=http://127.0.0.1:".$plexWatch['pmsHttpPort']."".$sessions['thumb']."&width=300&height=300"; 
 
 
 					echo "<div class='instance'>";
 
-						echo "<div class='poster'><div class='dashboard-activity-poster-face'><img src='includes/img.php?img=".urlencode($sessionsThumbUrl)."'></img></div>";
+						echo "<div class='poster'><div class='dashboard-activity-poster-face'><div class='art-music-face' style='background-image:url(includes/img.php?img=".urlencode($sessionsThumbUrl).")'></div></div>";
 
 							echo "<div class='dashboard-activity-metadata-wrapper'>";
 

diff --git a/includes/current_activity_header.php b/includes/current_activity_header.php
@@ -12,7 +12,7 @@
 
 if (!empty($plexWatch['myPlexAuthToken'])) {
         $myPlexAuthToken = $plexWatch['myPlexAuthToken'];                        
-        if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?query=c&X-Plex-Token=".$plexWatch['myPlexAuthToken']."")) {
+        if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?X-Plex-Token=".$plexWatch['myPlexAuthToken']."")) {
       		$statusSessions = simplexml_load_string($fileContents) or die ('<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>');
   		}
 }else{

diff --git a/includes/recently_added.php b/includes/recently_added.php
@@ -24,12 +24,12 @@
 
 			if (!empty($plexWatch['myPlexAuthToken'])) {
 				$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
-            if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/library/recentlyAdded?query=c&X-Plex-Container-Start=0&X-Plex-Container-Size=".$containerSize."&X-Plex-Token=".$myPlexAuthToken."")) {
+            if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/library/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=".$containerSize."&X-Plex-Token=".$myPlexAuthToken."")) {
                $recentRequest = simplexml_load_string($fileContents) or die ("<div class='alert alert-warning'>Failed to access Plex Media Server. Please check your settings.</div>");
             }
 			}else{
 				$myPlexAuthToken = '';
-				if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/library/recentlyAdded?query=c&X-Plex-Container-Start=0&X-Plex-Container-Size=".$containerSize)) {
+				if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/library/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=".$containerSize)) {
                $recentRequest = simplexml_load_string($fileContents) or die ("<div class='alert alert-warning'>Failed to access Plex Media Server. Please check your settings.</div>");
             }
 

diff --git a/index.php b/index.php
@@ -79,13 +79,13 @@
 				if (!empty($plexWatch['myPlexAuthToken'])) {
 					$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
 					$fileContents = '';
-					if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?query=c&X-Plex-Token=".$myPlexAuthToken."")) {
+					if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?X-Plex-Token=".$myPlexAuthToken."")) {
  	             		$statusSessions = simplexml_load_string($fileContents) or die ("<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>");
                  	}
-					$sections = simplexml_load_file("".$plexWatchPmsUrl."/library/sections?query=c&X-Plex-Token=".$myPlexAuthToken."") or die ("<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>");
+					$sections = simplexml_load_file("".$plexWatchPmsUrl."/library/sections?X-Plex-Token=".$myPlexAuthToken."") or die ("<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>");
 				}else{
 					$myPlexAuthToken = '';
-					if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?query=c&X-Plex-Token=".$myPlexAuthToken."")) {
+					if ($fileContents = file_get_contents("".$plexWatchPmsUrl."/status/sessions?X-Plex-Token=".$myPlexAuthToken."")) {
  	             		$statusSessions = simplexml_load_string($fileContents) or die ("<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>");
                  	}
 					$sections = simplexml_load_file("".$plexWatchPmsUrl."/library/sections") or die ("<div class=\"alert alert-warning \">Failed to access Plex Media Server. Please check your settings.</div>");	

diff --git a/info.php b/info.php
@@ -72,7 +72,7 @@
 		if (!empty($plexWatch['myPlexAuthToken'])) {
 			$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
 			$id = $_GET['id'];
-			$infoUrl = "".$plexWatchPmsUrl."/library/metadata/".$id."?query=c&X-Plex-Token=".$myPlexAuthToken."";
+			$infoUrl = "".$plexWatchPmsUrl."/library/metadata/".$id."?X-Plex-Token=".$myPlexAuthToken."";
 		}else{
 			$myPlexAuthToken = '';		
 			$id = $_GET['id'];
@@ -537,7 +537,7 @@
 						}else if ($xml->Directory['type'] == "season") {
 
 							if (!empty($plexWatch['myPlexAuthToken'])) {
-								$parentInfoUrl = "".$plexWatchPmsUrl."/library/metadata/".$xml->Directory['parentRatingKey']."?query=c&X-Plex-Token=".$myPlexAuthToken."";
+								$parentInfoUrl = "".$plexWatchPmsUrl."/library/metadata/".$xml->Directory['parentRatingKey']."?X-Plex-Token=".$myPlexAuthToken."";
 							}else{
 								$parentInfoUrl = "".$plexWatchPmsUrl."/library/metadata/".$xml->Directory['parentRatingKey']."";
 							}
@@ -613,7 +613,7 @@
 						echo "</div>"; 
 
 								if (!empty($plexWatch['myPlexAuthToken'])) {
-									$seasonEpisodesUrl = "".$plexWatchPmsUrl."/library/metadata/".$id."/children?query=c&X-Plex-Token=".$myPlexAuthToken."";
+									$seasonEpisodesUrl = "".$plexWatchPmsUrl."/library/metadata/".$id."/children?X-Plex-Token=".$myPlexAuthToken."";
 								}else{
 									$seasonEpisodesUrl = "".$plexWatchPmsUrl."/library/metadata/".$id."/children";
 								}	

diff --git a/settings.php b/settings.php
@@ -111,7 +111,7 @@
 							<div class="settings-general-info">
 
 								<ul>
-									<li>plexWatch/Web Version: <strong>v1.5.4.1</strong></li>	
+									<li>plexWatch/Web Version: <strong>v1.5.4.2</strong></li>	
 
 									<?php
 									    $db = dbconnect(); 	

diff --git a/user.php b/user.php
@@ -486,7 +486,7 @@
 									if ($recentXml['type'] == "episode") {
 										if (!empty($plexWatch['myPlexAuthToken'])) {
 											$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
-											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?query=c&X-Plex-Token=".$myPlexAuthToken."";
+											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?X-Plex-Token=".$myPlexAuthToken."";
 										}else{
 											$myPlexAuthToken = '';
 											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."";
@@ -516,7 +516,7 @@
 									}else if ($recentXml['type'] == "movie") {	
 										if (!empty($plexWatch['myPlexAuthToken'])) {
 											$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
-											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?query=c&X-Plex-Token=".$myPlexAuthToken."";
+											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?X-Plex-Token=".$myPlexAuthToken."";
 										}else{
 											$myPlexAuthToken = '';
 											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."";
@@ -547,7 +547,7 @@
 									}else if ($recentXml['type'] == "clip") {	
 										if (!empty($plexWatch['myPlexAuthToken'])) {
 											$myPlexAuthToken = $plexWatch['myPlexAuthToken'];
-											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?query=c&X-Plex-Token=".$myPlexAuthToken."";
+											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."?X-Plex-Token=".$myPlexAuthToken."";
 										}else{
 											$myPlexAuthToken = '';
 											$recentMetadata = "".$plexWatchPmsUrl."/library/metadata/".$recentXml['ratingKey']."";