===================================================================
RCS file: /cvs/mp3/bin/showall.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -r1.1.1.1 -r1.4
--- mp3/bin/showall.pl	2006/03/02 23:20:47	1.1.1.1
+++ mp3/bin/showall.pl	2007/02/08 23:03:15	1.4
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# $RedRiver: showall.pl,v 1.3 2007/02/08 20:04:03 andrew Exp $
 ########################################################################
 # showall.pl *** Displays all MP3's in all subdirs
 #
@@ -12,7 +13,6 @@
 #my qw/ %mp3s %dirs /;
 
 my $basedir = '/home/mp3/Sorted';
-my $subdir = $ENV{'QUERY_STRING'};
 my $addurl = 'addmp3playlist.pl';
 
 my $countdir = 0;
@@ -21,12 +21,19 @@
 # *** MAIN ***
 #######################################################################
 
-if ($subdir) { 
-	$subdir =~ s/%(..)/pack("c",hex($1))/ge;
+my ($prefix, $subdir) = split /\&/, $ENV{'QUERY_STRING'};
+if ($subdir) {
+        $subdir =~ s/%(..)/pack("c",hex($1))/ge;
 } else {
-	$subdir ='';
+        $subdir ='';
 }
 
+if ($prefix) {
+        $prefix =~ s/%(..)/pack("c",hex($1))/ge;
+} else {
+        $prefix ='';
+}
+
 #$basedir = $basedir . "/" . $subdir;
 
 print "Content-Type: text/html\n\n";
@@ -38,8 +45,10 @@
 if ($subdir) {
 	print "<h3>";
 	SplitDir($subdir);
-	print " - <font size=\"-2\"><a href=\"" . "showall.pl" . "\?" . EncodeURL("$subdir") . "\">All</a></font>";
-	print " - <font size=\"-2\"><a href=\"" . "addall.pl" . "\?" . EncodeURL("$subdir") . "\">Add</a></font><br>";
+	print " - <font size=\"-2\"><a href=\"" . "showall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$subdir") . "\">Show</a></font>";
+	print " - <font size=\"-2\"><a href=\"" . "addall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$subdir") . "\">Play</a></font>";
+	print " - <font size=\"-2\"><a href=\"" . "addall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$subdir") . '&' . EncodeURL('fulllist.lst') . "\">Approve</a></font>" if $prefix;
+	print "<br>";
 	print "</h3>\n";
 	print "<hr>\n";
 }
@@ -60,7 +69,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";
@@ -72,7 +81,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++;
 #		}
 #	}
@@ -105,9 +114,11 @@
 	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>";
-		print " - <font size=\"-1\"><a href=\"" . "addall.pl" . "\?" . EncodeURL("$DIR/$directory") . "\">Add</a></font></li>";
+		print "<li><a href=\"showfiles.pl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">$directory</a>";
+		print " - <font size=\"-2\"><a href=\"" . "showall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">Show</a></font>";
+		print " - <font size=\"-2\"><a href=\"" . "addall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . "\">Play</a></font>";
+		print " - <font size=\"-2\"><a href=\"" . "addall.pl" . "\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$directory") . '&' . EncodeURL('fulllist.lst') . "\">Approve</a></font>";
+		print "</li>";
 		
 		$countdir++;
 		my @curdir = GetDirListing("$DIR/$directory");
@@ -115,7 +126,7 @@
 		
 
 #		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);
@@ -138,7 +149,9 @@
 				print "OGG: ";
 			}
 			$songtitle =~ s/\.(mp3|ogg)$//i;
-			print "<a href=\"$addurl\?" . EncodeURL("$DIR/$mp3") . "\" target=\"bottom\">$songtitle</a></li>\n";
+			print "<a href=\"$addurl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$mp3") . "\" target=\"bottom\">$songtitle</a>\n";
+			print " - <font size=\"-2\"><a href=\"$addurl\?" . EncodeURL($prefix) . '&' . EncodeURL("$DIR/$mp3") . '&' . EncodeURL('fulllist.lst') . "\" target=\"bottom\">Approve</a></font>\n" if $prefix;
+			print "</li>";
 			$countmp3++;
 		}
 		print "</ul>\n";
@@ -207,7 +220,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 {