projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of defaria.com:/opt/git/clearscm
[clearscm.git]
/
songbook
/
web
/
songbook.php
diff --git
a/songbook/web/songbook.php
b/songbook/web/songbook.php
index
f66bcdb
..
54d5fea
100644
(file)
--- a/
songbook/web/songbook.php
+++ b/
songbook/web/songbook.php
@@
-5,16
+5,16
@@
$songs = glob (dirname($baseDir) . "/Songs/*.pro");
function getSongs () {
global $songs;
function getSongs () {
global $songs;
- $path =
$baseDir . "../Songs/*.pro
";
+ $path =
"/opt/clearscm/songbook/Songs
";
// Why didn't the previous one execute correctly?
// Why didn't the previous one execute correctly?
- $songs = glob(
$baseDir . '../Songs/*.pro'
);
+ $songs = glob(
"$path/*.pro"
);
} // getSongs
function songsDropdown () {
global $songs;
} // getSongs
function songsDropdown () {
global $songs;
- print "<form method=\"
pos
t\" action=\"webchord.cgi\" name=\"song\">";
+ print "<form method=\"
ge
t\" action=\"webchord.cgi\" name=\"song\">";
print "Songs: ";
print "<select name=\"chordpro\">";
print "Songs: ";
print "<select name=\"chordpro\">";
@@
-23,11
+23,11
@@
function songsDropdown () {
$title = basename ($song, ".pro");
$artist = getArtist ($song);
$title = basename ($song, ".pro");
$artist = getArtist ($song);
+ print "<option value=\"$title.pro\">$title</option>";
+
if ($artist != "") {
$title .= " ($artist)";
} // if
if ($artist != "") {
$title .= " ($artist)";
} // if
-
- print "<option value=\"$song\">$title</option>";
} // foreach
print "<input type=\"submit\" value=\"Go\">";
} // foreach
print "<input type=\"submit\" value=\"Go\">";
@@
-40,7
+40,7
@@
function artistsDropdown () {
$artists = getArtists ($songs);
$artists = getArtists ($songs);
- print "<form method=\"
pos
t\" action=\"displayartist.php\" name=\"artist\">";
+ print "<form method=\"
ge
t\" action=\"displayartist.php\" name=\"artist\">";
print "Artists: ";
print "<select name=\"artist\">";
print "Artists: ";
print "<select name=\"artist\">";