Fix #62, fix #60

ArturSierzant · Feb 17, 2018 · c314efc · c314efc
1 parent 6aa0a45
commit c314efc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/include/config.inc.php b/include/config.inc.php
@@ -71,6 +71,7 @@
 //  | $cfg['python_path'] = '/share/HDA_DATA/.qpkg/Python3/src/bin/python3';       |
 //  | $cfg['youtube-dl_path'] = '/share/HDA_DATA/Download/youtube-dl/__main__.py'; |
 //  +------------------------------------------------------------------------------+
+unset($cfg['youtube_indicator']);
 
 $cfg['python_path'] = '';
 $cfg['youtube-dl_path'] = 'youtube-dl';

diff --git a/play.php b/play.php
@@ -871,8 +871,10 @@ function seekImageMap() {
 		$parts = parse_url($currentsong['file']);
 		parse_str($parts['query'], $url_query);
 		$track_id = $url_query['track_id'];
-
-		$query = mysqli_query($db,'SELECT miliseconds FROM track WHERE relative_file = "' . mysqli_real_escape_string($db,$currentsong['file']) . '" OR track_id = "' .$track_id . '"');
+		if ($track_id) 
+			$query = mysqli_query($db,'SELECT miliseconds FROM track WHERE relative_file = "' . mysqli_real_escape_string($db,$currentsong['file']) . '" OR track_id = "' .$track_id . '"');
+		else
+			$query = mysqli_query($db,'SELECT miliseconds FROM track WHERE relative_file = "' . mysqli_real_escape_string($db,$currentsong['file']) . '"');
 
 		$track = mysqli_fetch_assoc($query);
 		if ($track)

diff --git a/playlist.php b/playlist.php
@@ -462,9 +462,9 @@
 $("#time").click(function(){
 	$.ajax({url: "play.php?action=beginOfTrack&menu=playlist"});
 });
-<?php 
-if ($cfg['testing'] == 'on') echo "var testing = 'on';";
-?>
+
+var testing = '<?php echo $cfg['testing']; ?>';
+
 
 function hidePL() {
 	window.scrollTo(0,0);
@@ -842,25 +842,27 @@ function evaluateTrack(data) {
 
 	document.getElementById('tracktime').innerHTML = m + ':' + s;
 	artist = '';
-	l = data.track_artist.length;
-	if (l>1) {
-		for (i=0; i<l; i++) {
-			artist = artist + '<a href="index.php?action=view2&order=year&sort=asc&artist=' + encodeURIComponent(data.track_artist_url[i]) + '">' + data.track_artist[i] + '</a>';
-			if (i!=l-1) {
-				var delimiter = data.track_artist_all.match(data.track_artist_url[i] + "(.*)" + data.track_artist_url[i+1]);
-				if (testing == 'on') {
-					delimiter[1] = delimiter[1].replace(';','&');
+	if ($.isArray(data.track_artist)) {
+		l = data.track_artist.length;
+		if (l>1) {
+			for (i=0; i<l; i++) {
+				artist = artist + '<a href="index.php?action=view2&order=year&sort=asc&artist=' + encodeURIComponent(data.track_artist_url[i]) + '">' + data.track_artist[i] + '</a>';
+				if (i!=l-1) {
+					var delimiter = data.track_artist_all.match(data.track_artist_url[i] + "(.*)" + data.track_artist_url[i+1]);
+					if (testing == 'on') {
+						delimiter[1] = delimiter[1].replace(';','&');
+					}
+					artist = artist + '<a href="index.php?action=view2&order=artist&sort=asc&artist=' + data.track_artist_url_all + '"><span class="artist_all">' + delimiter[1] + '</span></a>';
 				}
-				artist = artist + '<a href="index.php?action=view2&order=artist&sort=asc&artist=' + data.track_artist_url_all + '"><span class="artist_all">' + delimiter[1] + '</span></a>';
 			}
+		} 
+		else if (l>0) {
+			artist = '<a href="index.php?action=view2&order=year&sort=asc&artist=' + encodeURIComponent(data.track_artist_url[0]) + '">' + data.track_artist[0] + '</a>';
 		}
-	} 
-	else if (l>0) {
-		artist = '<a href="index.php?action=view2&order=year&sort=asc&artist=' + encodeURIComponent(data.track_artist_url[0]) + '">' + data.track_artist[0] + '</a>';
 	}
-	/* else {
-		artist = '&nbsp;';
-	} */
+	else {
+		artist = '<a href="index.php?action=view2&order=year&sort=asc&artist=' + data.track_artist_url_all + '">' + data.track_artist + '</a>';
+	}
 
 	document.getElementById('artist1').innerHTML = (data.track_artist[0] == '&nbsp;') ? '&nbsp;' : 'by ' + artist;
 	document.getElementById('artist').innerHTML = artist;