Moved lists back to same folder as songs.

[songbook.git] / web / songbook.php

diff --git a/web/songbook.php b/web/songbook.php
index 113af43..ae50faa 100644 (file)
--- a/web/songbook.php
+++ b/web/songbook.php
@@ -1,7 +1,12 @@
 <?php
-$baseDir = getcwd();
-$songDir = "/opt/songbook/Songs";
-$debug   = $_REQUEST["debug"];
+$baseDir    = getcwd();
+$songbook   = "/opt/songbook";
+$songFolder = "Andrew";
+$songDir    = "/opt/songbook/$songFolder";
+
+if (isset ($_REQUEST['debug'])) {
+  $debug = $_REQUEST['debug'];
+} // if
 
 // Initialize music objects
 $songs   = getSongs($songDir);
@@ -86,7 +91,7 @@ function setsDropdown () {
 } // 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]);