===================================================================
RCS file: /cvs/mp3/bin/addall.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- mp3/bin/addall.pl	2006/03/02 23:20:47	1.1.1.1
+++ mp3/bin/addall.pl	2007/02/08 20:04:03	1.3
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# $RedRiver: addall.pl,v 1.2 2006/08/12 00:14:53 andrew Exp $
 ########################################################################
 # showall.pl *** Displays all MP3's in all subdirs
 #
@@ -12,8 +13,6 @@
 #my qw/ %mp3s %dirs /;
 
 my $basedir = '/home/mp3/Sorted';
-my $subdir = $ENV{'QUERY_STRING'};
-my $playlist = '/var/www/mp3/playlist/playlist.lst';
 
 my $countdir = 0;
 my $countmp3 = 0;
@@ -21,12 +20,25 @@
 # *** MAIN ***
 #######################################################################
 
-if ($subdir) { 
-	$subdir =~ s/%(..)/pack("c",hex($1))/ge;
+my ($prefix, $subdir, $playlist) = split /\&/, $ENV{'QUERY_STRING'};
+if ($subdir) {
+        $subdir =~ s/%(..)/pack("c",hex($1))/ge;
 } else {
-	$subdir ='';
+        $subdir ='';
 }
+if ($playlist) {
+        $playlist =~ s/%(..)/pack("c",hex($1))/ge;
+} else {
+        $playlist = 'playlist.lst';
+}
 
+if ($prefix) {
+        $prefix =~ s/%(..)/pack("c",hex($1))/ge;
+} else {
+        $prefix ='';
+}
+
+my $playlist = '/var/www/mp3/playlist/' . $prefix . $playlist;
 #$basedir = $basedir . "/" . $subdir;
 
 print "Content-Type: text/html\n\n";
@@ -50,7 +62,7 @@
 #	my $count;
 #	my @sorted = sort { lc($dirs{$a}) cmp lc($dirs{$b}) } (keys %dirs);
 #	foreach my $dir (@sorted) {
-#		print "<a href=\"showfiles.pl\?" . EncodeURL("$dir/$dirs{$dir}") . "\">$dirs{$dir}</a><br>";
+#		print "<a href=\"showfiles.pl\?" . EncodeURL($prefix) . '&' . EncodeURL("$dir/$dirs{$dir}") . "\">$dirs{$dir}</a><br>";
 #		$count++;
 #	}
 #	print "Total dirs displayed: $count<p>\n";
@@ -62,7 +74,7 @@
 #	my $count;
 #	foreach my $mp3dir (sort keys %mp3s) {
 #		foreach $mp3 (@{ $mp3s{$mp3dir} }) {
-#			print "\t<li>Song: <a href=\"$addurl\?" . EncodeURL("$mp3dir/$mp3") . "\" target=\"bottom\">$mp3</a></li>\n";
+#			print "\t<li>Song: <a href=\"$addurl\?" . EncodeURL($prefix) . '&' . EncodeURL("$mp3dir/$mp3") . "\" target=\"bottom\">$mp3</a></li>\n";
 #			$count++;
 #		}
 #	}
@@ -95,8 +107,8 @@
 	print "<ul>\n";
 	foreach my $directory (@directories) {
 #		$dirs{"$DIR/$directory"} = $directory;
-		print "<li><a href=\"showfiles.pl\?" . EncodeURL("$DIR/$directory") . "\">$directory</a>";
-		print " - <font size=\"-1\"><a href=\"" . "showall.pl" . "\?" . EncodeURL("$DIR/$directory") . "\">All</a></font></li>";
+		print "<li><a href=\"showfiles.pl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">$directory</a>";
+		print " - <font size=\"-1\"><a href=\"" . "showall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">All</a></font></li>";
 		
 		$countdir++;
 		my @curdir = GetDirListing("$DIR/$directory");
@@ -104,14 +116,14 @@
 		
 
 #		push @dirs, @curdir;
-#		print "<a href=\"showfiles.pl\?" . EncodeURL("$DIR/$directory") . "\">$directory</a><br>";
+#		print "<a href=\"showfiles.pl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">$directory</a><br>";
 	}
 	opendir DIR, "$basedir/$DIR" or bail("Unable to opendir $$!");
 		my @temp = grep /\.(mp3|ogg)$/i, readdir(DIR);
 #		$mp3s{"$DIR/$directory"} = [ @temp ];
 		print "<ul>\n";
 		foreach my $mp3 (@temp) {
-#			print "\t<li>Song: <a href=\"$addurl\?" . EncodeURL("$DIR/$mp3") . "\" target=\"bottom\">$mp3</a></li><br>\n";
+#			print "\t<li>Song: <a href=\"$addurl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$mp3") . "\" target=\"bottom\">$mp3</a></li><br>\n";
 			print "\t<li>";
 			AddSong("$DIR/$mp3");
 			print "</li>\n";
@@ -183,7 +195,7 @@
 			for ($j=0;$j<=$i;$j++) {
 				$url = "$url/$filename[$j]";
 			}
-		print "/<a href=\"showfiles.pl\?" . EncodeURL($url) . "\">$filename[$i]</a>";
+		print "/<a href=\"showfiles.pl\?" . EncodeURL($prefix) . '&' . EncodeURL($url) . "\">$filename[$i]</a>";
 		
 		}
 	} else {