<?php
include_once "songbook.php";
-$set = $_REQUEST ["set"];
+$set = $_REQUEST["set"];
?>
<style>
continue;
} // if
- if (preg_match ("/(.*)\s+-\s+(.*)/", $line, $matches)) {
- $song = trim ($matches[1]);
- $artist = trim ($matches[2]);
+ if (preg_match("/(.*)\s+-\s+(.*)/", $line, $matches)) {
+ $song = trim($matches[1]);
+ $artist = trim($matches[2]);
} else {
- $song = trim ($line);
- $artist = "";
+ $song = trim($line);
+ $artist = '';
} // if
if (file_exists ("$songDir/$song.pro")) {
print "<li><a href=\"webchord.cgi?chordpro=$song.pro\">";
- print basename ($song);
+ print basename($song);
print "</a>";
} else {
print "<li>";
- print basename ($song);
- }
+ print basename($song);
+ } // if
- print " - ";
+ $artist = getArtist ("$songDir/$song.pro");
- if (in_array ($artist, $artists)) {
- print "<a href=\"displayartist.php?artist=$artist\">$artist</a>";
- } else {
- print $artist;
+ if ($artist != '') {
+ print " - ";
+
+ if (in_array ($artist, $artists)) {
+ print "<a href=\"displayartist.php?artist=$artist\">$artist</a>";
+ } else {
+ print $artist;
+ } // if
} // if
print "</li>";
<?php
$baseDir = getcwd();
$songDir = "/opt/songbook/Songs";
-$debug = $_REQUEST["debug"];
+
+if (isset ($_REQUEST['debug'])) {
+ $debug = $_REQUEST['debug'];
+} // if
// Initialize music objects
$songs = getSongs($songDir);
} // setsDropdown
function getArtist ($song) {
- $lyrics = file_get_contents ($song);
+ $lyrics = @file_get_contents ($song);
if (preg_match ("/\{(st|subtitle):(.*)\}/", $lyrics, $matches)) {
return trim ($matches[2]);