corrected mpfire stream url

changed some directories for backup

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1001 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 86b9eb5bd4a0717ac23f9553c94b280c189f7b68..8ccc3ad6937d584ab8e2d09718a890416cf2ee94 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -76,6 +76,9 @@ elsif ($ARGV[0] =~ /ipf$/ ) {
 elsif ($ARGV[0] eq '') {
  printf "No argument given, please use <include><exclude><cli>\n"
 }
+elsif ($ARGV[0] eq 'makedirs') {
+ system("mkdir /var/ipfire/backup/addons && mkdir /var/ipfire/backup/addons/backup && mkdir /var/ipfire/backup/addons/includes");
+}
 
 sub createinclude(){
 

diff --git a/config/backup/includes/mpfire b/config/backup/includes/mpfire
index 7aecb66e8ff61edcc8d5f05b749a166723c97269..4ea18a2a1aedb1dcdf6089347dc0601fe126d0f4 100644 (file)
--- a/config/backup/includes/mpfire
+++ b/config/backup/includes/mpfire
@@ -1,4 +1,6 @@
+/etc/asound.state
 /var/ipfire/mpfire/db/
 /var/ipfire/mpfire/mpd.conf
 /var/ipfire/mpfire/mpd_state
+/var/ipfire/mpfire/settings
 /var/ipfire/mpfire/webradio

diff --git a/config/rootfiles/common/backup b/config/rootfiles/common/backup
index a871499cd41b3a5e1e378bd8b60f56034289d3d8..7e66e800bebb805a22388a08b03c7b29f1ccb971 100644 (file)
--- a/config/rootfiles/common/backup
+++ b/config/rootfiles/common/backup
@@ -1,4 +1,4 @@
-var/ipfire/backup/addons
+#var/ipfire/backup/addons
 #var/ipfire/backup/bin
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/exclude

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 02bae96e1a2ebb5697fb1b000327c4322f778eda..5088629dfd077408c1b23846ffa9d7d0805890e9 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,225 @@
+------------------------------------------------------------------------
+r1000 | ms | 2007-10-26 19:14:59 +0400 (Fri, 26 Oct 2007) | 2 lines
+
+Dropped wireless drivers from kernel.
+
+------------------------------------------------------------------------
+r999 | ms | 2007-10-26 18:02:15 +0400 (Fri, 26 Oct 2007) | 2 lines
+
+A small number of buildfixes by Maniac.
+
+------------------------------------------------------------------------
+r998 | maniacikarus | 2007-10-25 12:51:31 +0400 (Thu, 25 Oct 2007) | 4 lines
+
+Update mldonkey openssh openssl ntfs-3g nfs and hdparm
+Change samba default config
+Some fixes for mpfire
+
+------------------------------------------------------------------------
+r997 | maniacikarus | 2007-10-21 14:06:04 +0400 (Sun, 21 Oct 2007) | 4 lines
+
+Added some Radio Streams for MPFire
+Added Reload function to apache init script
+Changed the packages to use reload instead of restart
+
+------------------------------------------------------------------------
+r996 | ms | 2007-10-21 02:00:55 +0400 (Sun, 21 Oct 2007) | 2 lines
+
+Hab das Pear auch mal in die ISO gebaut...
+
+------------------------------------------------------------------------
+r995 | skav3n | 2007-10-20 21:35:15 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added some usage instructions and license info
+------------------------------------------------------------------------
+r994 | ms | 2007-10-20 20:01:14 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Einmal wieder auf den richtigen Stand gebracht...
+------------------------------------------------------------------------
+r993 | ms | 2007-10-20 19:59:58 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Bitte nicht so viele einzelne Commits...
+------------------------------------------------------------------------
+r992 | skav3n | 2007-10-20 17:51:16 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r991 | skav3n | 2007-10-20 17:51:02 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r990 | skav3n | 2007-10-20 16:08:01 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r989 | skav3n | 2007-10-20 16:07:47 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r988 | skav3n | 2007-10-20 15:49:31 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r987 | skav3n | 2007-10-20 15:49:14 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r986 | skav3n | 2007-10-20 15:39:18 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r985 | skav3n | 2007-10-20 15:39:08 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r984 | ms | 2007-10-20 15:35:27 +0400 (Sat, 20 Oct 2007) | 3 lines
+
+Fehlende Rechter der IMAP-Ordner.
+Pear::Log fuer das openmailadmin implementiert.
+
+------------------------------------------------------------------------
+r983 | ms | 2007-10-20 15:28:34 +0400 (Sat, 20 Oct 2007) | 3 lines
+
+Openmailadmin fehlt die Apache-Config...
+Tippfehler im Names des Spamassassin-Scripts.
+
+------------------------------------------------------------------------
+r982 | skav3n | 2007-10-20 14:17:59 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Added a file remotely
+------------------------------------------------------------------------
+r981 | skav3n | 2007-10-20 14:17:26 +0400 (Sat, 20 Oct 2007) | 1 line
+
+Removed file/folder
+------------------------------------------------------------------------
+r980 | ms | 2007-10-20 13:53:00 +0400 (Sat, 20 Oct 2007) | 3 lines
+
+Import eines Scripts fuer die Anzeige des aktuellen Titels in XChat.
+Vielen Dank an Skaven.
+
+------------------------------------------------------------------------
+r979 | maniacikarus | 2007-10-19 20:21:32 +0400 (Fri, 19 Oct 2007) | 2 lines
+
+Weiter am Backup gebastelt
+
+------------------------------------------------------------------------
+r978 | ms | 2007-10-19 19:21:00 +0400 (Fri, 19 Oct 2007) | 5 lines
+
+Alte Stylesheets entfernt. Wir haben ja Themes.
+Ne Menge Pakete geloescht, da wir nicht den Eindruck hatten, dass diese 
+benutzt werden.
+Initscripts fuer Amavisd-new und Spamassassin gebaut.
+
+------------------------------------------------------------------------
+r977 | ms | 2007-10-18 23:51:15 +0400 (Thu, 18 Oct 2007) | 2 lines
+
+Kleinere fixes an der Backup Routine
+
+------------------------------------------------------------------------
+r976 | ms | 2007-10-18 09:55:08 +0400 (Thu, 18 Oct 2007) | 2 lines
+
+Buildfixes
+
+------------------------------------------------------------------------
+r975 | ms | 2007-10-16 22:35:15 +0400 (Tue, 16 Oct 2007) | 4 lines
+
+Korrekturen damit der Build wieder laeuft
+MPFire fix damit der shuffle funktioniert
+Backup der Addons weiter gebaut
+
+------------------------------------------------------------------------
+r974 | maniacikarus | 2007-10-15 23:36:15 +0400 (Mon, 15 Oct 2007) | 3 lines
+
+MPFire CGI korrigiert
+Backupfunktionen fuer Addons begonnen
+
+------------------------------------------------------------------------
+r973 | ms | 2007-10-15 00:49:19 +0400 (Mon, 15 Oct 2007) | 6 lines
+
+Den cyrus-imapd umbenannt.
+Die Abhaengigkeiten von openmailadmin angepasst.
+Moblock erstmal raus bis wir damit beginnen.
+Begonnen die Pakfire-functions.sh zu erweitern.
+Cups soll automatisch starten.
+
+------------------------------------------------------------------------
+r972 | maniacikarus | 2007-10-14 19:17:50 +0400 (Sun, 14 Oct 2007) | 3 lines
+
+MPFire CGI Update
+Fehlende Datei in die Backup Include eingefuegt
+
+------------------------------------------------------------------------
+r971 | ms | 2007-10-14 18:04:38 +0400 (Sun, 14 Oct 2007) | 10 lines
+
+Clamav kommt erstma ohne Virendefinitionen daher.
+Die laedt der sich dann alleine.
+rsync-Update.
+Das Pakfire-Update kann beim Verbinden auch im Hintergrund ablaufen.
+Einige Shell-Kommandos interaktiv gemacht.
+AdoDB ins Paket von Openmailadmin hinzugefuegt.
+Prompt ist wieder farbig.
+Das MySQL-Setup ist noch nicht so besonders fit.
+Der Server braucht zu lange zum starten - somit kann noch kein Passwort gesetzt werden.
+
+------------------------------------------------------------------------
+r970 | maniacikarus | 2007-10-14 17:28:58 +0400 (Sun, 14 Oct 2007) | 3 lines
+
+Clamav Update
+Fix in der MPFire CGI
+
+------------------------------------------------------------------------
+r969 | ms | 2007-10-14 14:59:34 +0400 (Sun, 14 Oct 2007) | 2 lines
+
+Der Grub findet leider ohne diesen Patch nicht die richtige Partition.
+
+------------------------------------------------------------------------
+r968 | ms | 2007-10-14 13:58:02 +0400 (Sun, 14 Oct 2007) | 2 lines
+
+Ein Fix fuer die Verwendung von Loop-Devices.
+
+------------------------------------------------------------------------
+r967 | ms | 2007-10-14 13:57:11 +0400 (Sun, 14 Oct 2007) | 3 lines
+
+Kernel Update auf 2.6.16.55.
+Den Kaspersky n bisschen gefixxt.
+
+------------------------------------------------------------------------
+r966 | ms | 2007-10-14 13:48:23 +0400 (Sun, 14 Oct 2007) | 2 lines
+
+Den RC1 getaggt.
+
+------------------------------------------------------------------------
+r965 | ms | 2007-10-14 13:38:06 +0400 (Sun, 14 Oct 2007) | 2 lines
+
+Die RC1 zum Downloadbereich und auf der Hauptseite hinzugefuegt.
+
+------------------------------------------------------------------------
+r964 | ms | 2007-10-14 00:25:24 +0400 (Sun, 14 Oct 2007) | 2 lines
+
+Eine kleine Aenderung in der pppsetup.cgi von Arne.
+
+------------------------------------------------------------------------
+r963 | ms | 2007-10-13 23:29:30 +0400 (Sat, 13 Oct 2007) | 2 lines
+
+Der Grub lies sich auf einigen RAID-Controllern nicht installieren...
+
+------------------------------------------------------------------------
+r962 | ms | 2007-10-13 21:10:12 +0400 (Sat, 13 Oct 2007) | 9 lines
+
+Foomatic ist gegen die libtiff gelinkt.
+Der Dump der Maildatenbank muss die Datenbank noch anlegen.
+Die Adresse der server.met soll nicht funktionieren. Ausgetauscht.
+Initscript fuer Asterisk geschrieben.
+Der Pakfire macht ein Update, wenn sich die Maschine einwaehlt (Ohne --force).
+Die Beep-Melodie ein bisschen schneller gemacht, weil der rowie die nicht mag. ;)
+Das applejuice-Paket startet nun den Client von allein.
+...und somit wird es dann bald Zeit fuer einen Release Candidate...
+
+------------------------------------------------------------------------
+r961 | maniacikarus | 2007-10-13 13:59:54 +0400 (Sat, 13 Oct 2007) | 2 lines
+
+CGIs angepasst
+
 ------------------------------------------------------------------------
 r960 | maniacikarus | 2007-10-12 21:18:57 +0400 (Fri, 12 Oct 2007) | 3 lines
 

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 3c59ef62233cde17ee3ab305b05b08541c44440a..2d84b70b68104c8a33ce01630f0f7464d1fc65d8 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -21,8 +21,8 @@
 
 use strict;
 # enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
 use File::Copy;
 
 require '/var/ipfire/general-functions.pl';
@@ -48,6 +48,11 @@ $cgiparams{'BACKUPLOGS'} = '';
 
 &Header::getcgihash(\%cgiparams);
 
+############################################################################################################################
+################################################ Workaround for Directories ################################################
+
+system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ipfire/backup/addons');
+
 ############################################################################################################################
 ############################################## System calls ohne Http Header ###############################################
 

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index a068be87640d5ce7a94f33a30de04f3d3b40b273..3b5262f8e4eca0a287f453c84cd1dc2482eac9f8 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -43,8 +43,7 @@ my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
 if ( $song eq "" ){$song = "None";}
 &Header::showhttpheaders();
 print <<END
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-  "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <meta http-equiv='refresh' content='5'>
 <head><title>Song</title></head>
 <body>
@@ -69,37 +68,36 @@ close(DATEI);
 my @artist; my @album;  my @genre;  my @year; my $linecount = 0; my %songs;
 my $key;my $file;my $Time;my $Artist;my $Title;my $Album;my $Track;my $Date;my $Genre;
 foreach (@songdb){
-  
-  if ( $_ =~ /mtime: / ){
-   $songs{$key}="$file|$Time|$Artist|$Title|$Album|$Track|$Date|$Genre";
-   push(@artist,$Artist);push(@album,$Album);push(@year,$Date);push(@genre,$Genre);
-   $key="";$file="";$Time="";$Artist="";$Title="";$Album="";$Track="";$Date="";$Genre="";
-   }
-  elsif ( $_ =~ /key: / ){my @temp = split(/: /,$_);$key=$temp[1];}
-  elsif ( $_ =~ /file: / ){my @temp = split(/: /,$_);$file=$temp[1];}
-  elsif ( $_ =~ /Time: / ){my @temp = split(/: /,$_);$Time=$temp[1];}
-  elsif ( $_ =~ /Artist: / ){my @temp = split(/: /,$_);$Artist=$temp[1];}
-  elsif ( $_ =~ /Title: / ){my @temp = split(/: /,$_);$Title=$temp[1];}
-  elsif ( $_ =~ /Album: / ){my @temp = split(/: /,$_);$Album=$temp[1];}
-  elsif ( $_ =~ /Track: / ){my @temp = split(/: /,$_);$Track=$temp[1];}
-  elsif ( $_ =~ /Date: / ){my @temp = split(/: /,$_);$Date=$temp[1];}
-  elsif ( $_ =~ /Genre: / ){my @temp = split(/: /,$_);$Genre=$temp[1];}
-  else {next;}
- }
- 
-  my %hash = map{ $_, 1 }@artist;
-  @artist = sort keys %hash;
-  my %hash = map{ $_, 1 }@album;
-  @album = sort keys %hash;
-   my %hash = map{ $_, 1 }@year;
-  @year = sort keys %hash;
-  my %hash = map{ $_, 1 }@genre;
-  @genre = sort keys %hash;
-  
-  my $artistcount = $#artist+1;
-  my $albumcount = $#album+1;
-  my $yearcount = $#year+1;
-  my $genrecount = $#genre+1;
+       if ( $_ =~ /mtime: / ){
+               $songs{$key}="$file|$Time|$Artist|$Title|$Album|$Track|$Date|$Genre";
+               push(@artist,$Artist);push(@album,$Album);push(@year,$Date);push(@genre,$Genre);
+               $key="";$file="";$Time="";$Artist="";$Title="";$Album="";$Track="";$Date="";$Genre="";
+               }
+       elsif ( $_ =~ /key: / ){my @temp = split(/: /,$_);$key=$temp[1];}
+       elsif ( $_ =~ /file: / ){my @temp = split(/: /,$_);$file=$temp[1];}
+       elsif ( $_ =~ /Time: / ){my @temp = split(/: /,$_);$Time=$temp[1];}
+       elsif ( $_ =~ /Artist: / ){my @temp = split(/: /,$_);$Artist=$temp[1];}
+       elsif ( $_ =~ /Title: / ){my @temp = split(/: /,$_);$Title=$temp[1];}
+       elsif ( $_ =~ /Album: / ){my @temp = split(/: /,$_);$Album=$temp[1];}
+       elsif ( $_ =~ /Track: / ){my @temp = split(/: /,$_);$Track=$temp[1];}
+       elsif ( $_ =~ /Date: / ){my @temp = split(/: /,$_);$Date=$temp[1];}
+       elsif ( $_ =~ /Genre: / ){my @temp = split(/: /,$_);$Genre=$temp[1];}
+       else {next;}
+       }
+
+       my %hash = map{ $_, 1 }@artist;
+       @artist = sort keys %hash;
+       my %hash = map{ $_, 1 }@album;
+       @album = sort keys %hash;
+       my %hash = map{ $_, 1 }@year;
+       @year = sort keys %hash;
+       my %hash = map{ $_, 1 }@genre;
+       @genre = sort keys %hash;
+
+       my $artistcount = $#artist+1;
+       my $albumcount = $#album+1;
+       my $yearcount = $#year+1;
+       my $genrecount = $#genre+1;
 
 &Header::getcgihash(\%mpfiresettings);
 &Header::openpage($Lang::tr{'mpfire'}, 1,);
@@ -142,8 +140,8 @@ elsif ( $mpfiresettings{'ACTION'} eq "playall" ){
 my @temp = ""; my @song = "";
 
 foreach (keys(%songs)){
-  @song = split(/\|/,$songs{$_});push(@temp,$song[0])
-  }
+       @song = split(/\|/,$songs{$_});push(@temp,$song[0])
+       }
 open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
 close(DATEI);  
@@ -155,14 +153,14 @@ elsif ( $mpfiresettings{'ACTION'} eq "playalbum" )
 my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'album'});
 
 foreach (keys(%songs)){
-  @song = split(/\|/,$songs{$_});$song[4] =~ s/\W/ /g;
-    
-  foreach (@select){
-    $_ =~ s/\W/ /g;
-    if ( $song[4] =~ /$_/ ){push(@temp,$song[0]);}
-  }
+       @song = split(/\|/,$songs{$_});$song[4] =~ s/\W/ /g;
+
+       foreach (@select){
+               $_ =~ s/\W/ /g;
+               if ( $song[4] =~ /$_/ ){push(@temp,$song[0]);}
+       }
 }
- 
+
 open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
 close(DATEI);
@@ -173,12 +171,12 @@ elsif ( $mpfiresettings{'ACTION'} eq "playartist" )
 my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'artist'});
 
 foreach (keys(%songs)){
-  @song = split(/\|/,$songs{$_});$song[2] =~ s/\W/ /g;
-    
-  foreach (@select){
-    $_ =~ s/\W/ /g;
-    if ( $song[2] =~ /$_/ ){push(@temp,$song[0]);}
-  }
+       @song = split(/\|/,$songs{$_});$song[2] =~ s/\W/ /g;
+
+       foreach (@select){
+               $_ =~ s/\W/ /g;
+               if ( $song[2] =~ /$_/ ){push(@temp,$song[0]);}
+       }
 }
 
 open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
@@ -191,12 +189,12 @@ elsif ( $mpfiresettings{'ACTION'} eq "playyear" )
 my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'year'});
 
 foreach (keys(%songs)){
-  @song = split(/\|/,$songs{$_});$song[6] =~ s/\W/ /g;
-    
-  foreach (@select){
-    $_ =~ s/\W/ /g;
-    if ( $song[6] =~ /$_/ ){push(@temp,$song[0]);}
-  }
+       @song = split(/\|/,$songs{$_});$song[6] =~ s/\W/ /g;
+
+       foreach (@select){
+               $_ =~ s/\W/ /g;
+               if ( $song[6] =~ /$_/ ){push(@temp,$song[0]);}
+       }
 }
 
 open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
@@ -245,7 +243,7 @@ print <<END
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'Scan for Files'}</b></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'Scan from Directory'}</td><td align='left'><input type='text' name='MUSICDIR' value='$mpfiresettings{'MUSICDIR'}' size="50" /></td></tr>
 <tr><td align='center' colspan='2'><input type='hidden' name='ACTION' value='scan' />
-                              <input type='image' alt='$Lang::tr{'Scan for Files'}' title='$Lang::tr{'Scan for Files'}' src='/images/edit-find.png' /></td></tr>                                                                                                                                                               
+                                                                                                                                               <input type='image' alt='$Lang::tr{'Scan for Files'}' title='$Lang::tr{'Scan for Files'}' src='/images/edit-find.png' /></td></tr>                                                                                                                                                              
 </table>
 </form>
 END
@@ -259,30 +257,30 @@ $stats=~s/\\/<br \/>/g
 
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire controls'});
 print <<END
-    <iframe height='35' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' marginheight='0'></iframe>
-    <table width='95%' cellspacing='0'>
+       <iframe height='35' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' marginheight='0'></iframe>
+       <table width='95%' cellspacing='0'>
 END
 ;
 my $countsongs=`/usr/local/bin/mpfirectrl stats 2>/dev/null`;
 print "<tr><td colspan='5' align='center'><b>".$countsongs."</b></td></tr>";
 print <<END
-    <tr>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='x' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/media-playback-stop.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='<<' /><input type='image' alt='$Lang::tr{'prev'}' title='$Lang::tr{'prev'}' src='/images/media-skip-backward.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='|>' /><input type='image' alt='$Lang::tr{'toggle'}' title='$Lang::tr{'toggle'}' src='/images/media-resume.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='playall' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>>' /><input type='image' alt='$Lang::tr{'next'}' title='$Lang::tr{'next'}' src='/images/media-skip-forward.png' /></form></td>
-    </tr>
+       <tr>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='x' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/media-playback-stop.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='<<' /><input type='image' alt='$Lang::tr{'prev'}' title='$Lang::tr{'prev'}' src='/images/media-skip-backward.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='|>' /><input type='image' alt='$Lang::tr{'toggle'}' title='$Lang::tr{'toggle'}' src='/images/media-resume.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='playall' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>>' /><input type='image' alt='$Lang::tr{'next'}' title='$Lang::tr{'next'}' src='/images/media-skip-forward.png' /></form></td>
+       </tr>
 END
 ;
 if ( $mpfiresettings{'SHOWLIST'} eq "on" ){print"<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='SHOWLIST' value='off' /><input type='image' alt='$Lang::tr{'off'}' title='$Lang::tr{'off'}' src='/images/audio-x-generic.png' /></form></td>";}
 else { print"<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='SHOWLIST' value='on' /><input type='image' alt='$Lang::tr{'on'}' title='$Lang::tr{'on'}' src='/images/audio-x-generic-red.png' /></form></td>";}    
 print <<END  
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='--' /><input type='image' alt='$Lang::tr{'voldown10'}' title='$Lang::tr{'voldown10'}' src='/images/audio-volume-low-red.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='-' /><input type='image' alt='$Lang::tr{'voldown5'}' title='$Lang::tr{'voldown5'}' src='/images/audio-volume-low.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='+' /><input type='image' alt='$Lang::tr{'volup5'}' title='$Lang::tr{'volup5'}' src='/images/audio-volume-high.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='++' /><input type='image' alt='$Lang::tr{'volup10'}' title='$Lang::tr{'volup10'}' src='/images/audio-volume-high-red.png' /></form></td>
-    </tr>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='--' /><input type='image' alt='$Lang::tr{'voldown10'}' title='$Lang::tr{'voldown10'}' src='/images/audio-volume-low-red.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='-' /><input type='image' alt='$Lang::tr{'voldown5'}' title='$Lang::tr{'voldown5'}' src='/images/audio-volume-low.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='+' /><input type='image' alt='$Lang::tr{'volup5'}' title='$Lang::tr{'volup5'}' src='/images/audio-volume-high.png' /></form></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='++' /><input type='image' alt='$Lang::tr{'volup10'}' title='$Lang::tr{'volup10'}' src='/images/audio-volume-high-red.png' /></form></td>
+       </tr>
 <tr><td colspan='5' align='center'>$Volume</td></tr>
 <tr><td colspan='5' align='center'><br />$stats</td></tr>
 </table>
@@ -296,29 +294,29 @@ print "<table width='95%' cellspacing='0'>";
 if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'}</b></td></tr>";}
 else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'} - ".$artistcount."</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'} - ".$albumcount."</b></td></tr>";}
 print <<END
-  <tr><td align='center'>
-      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <select name='artist' size='8' multiple='multiple' style='width:300px;'>
+       <tr><td align='center'>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <select name='artist' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
 foreach (@artist){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
-      </select><br/>
-      <input type='hidden' name='ACTION' value='playartist' />
-      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form></td>
-      <td align='center'>
-      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <select name='album' size='8' multiple='multiple' style='width:300px;'>
+       </select><br/>
+       <input type='hidden' name='ACTION' value='playartist' />
+       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+       </form></td>
+       <td align='center'>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <select name='album' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
   foreach (@album){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
-      </select><br/>
-      <input type='hidden' name='ACTION' value='playalbum' />
-      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form></td>
-      </tr>
+       </select><br/>
+       <input type='hidden' name='ACTION' value='playalbum' />
+       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+       </form></td>
+       </tr>
 END
 ;
 if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'}</b></td></tr>";}
@@ -331,22 +329,22 @@ END
 ;
   foreach (@year){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
-      </select><br/>
-      <input type='hidden' name='ACTION' value='playyear' />
-      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form></td>
-      <td align='center'>
-      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <select name='genre' size='8' multiple='multiple' style='width:300px;'>
+       </select><br/>
+       <input type='hidden' name='ACTION' value='playyear' />
+       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+       </form></td>
+       <td align='center'>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <select name='genre' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
   foreach (@genre){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
-      </select><br/>
-      <input type='hidden' name='ACTION' value='playgenre' />
-      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form></td>
-      </tr></table>
+       </select><br/>
+       <input type='hidden' name='ACTION' value='playgenre' />
+       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+       </form></td>
+       </tr></table>
 END
 ;
 &Header::closebox();
@@ -369,45 +367,45 @@ if (!($i % 205)){print"<br/>";}
 print <<END
 </form></td></tr>
 <tr><td align='center'></td>
-    <td align='center'><b>$Lang::tr{'artist'}<br/>$Lang::tr{'title'}</b></td>
-    <td align='center'><b>$Lang::tr{'number'}</b></td>
-    <td align='center'><b>$Lang::tr{'album'}</b></td>
-    <td align='center'><b>$Lang::tr{'year'}</b></td>
-    <td align='center'><b>$Lang::tr{'genre'}</b></td>
-    <td align='center'><b>$Lang::tr{'length'}</b></td></tr>
+       <td align='center'><b>$Lang::tr{'artist'}<br/>$Lang::tr{'title'}</b></td>
+       <td align='center'><b>$Lang::tr{'number'}</b></td>
+       <td align='center'><b>$Lang::tr{'album'}</b></td>
+       <td align='center'><b>$Lang::tr{'year'}</b></td>
+       <td align='center'><b>$Lang::tr{'genre'}</b></td>
+       <td align='center'><b>$Lang::tr{'length'}</b></td></tr>
 END
 ;
 my $lines=0;my $i=0;my $begin;my $end;
 if ( $mpfiresettings{'PAGE'} eq 'all' ){
-  $begin=0;
-  $end=keys(%songs);
+       $begin=0;
+       $end=keys(%songs);
 }
 else{
-  $begin=(($mpfiresettings{'PAGE'}-1) * 100);
-  $end=(($mpfiresettings{'PAGE'} * 100)-1);
+       $begin=(($mpfiresettings{'PAGE'}-1) * 100);
+       $end=(($mpfiresettings{'PAGE'} * 100)-1);
 }
 foreach (keys(%songs)){
-  if (!($i >= $begin && $i <= $end)){
+       if (!($i >= $begin && $i <= $end)){
 # print $begin."->".$i."<-".$end."\n";
-  $i++;next;}
-  my @song = split(/\|/,$songs{$_});
-  my $minutes = sprintf ("%.0f", $song[1] / 60 );
-  my $seconds = $song[1] % 60;
-  
-  if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
-  print <<END
-  <td align='center' style="white-space:nowrap;"><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'mpfire songs'}'><input type='hidden' name='ACTION' value='addtoplaylist' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/list-add.png' /></form><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
-  <td align='center'>$song[2]<br/>$song[3]</td>
-  <td align='center'>$song[5]</td>
-  <td align='center'>$song[4]</td>
-  <td align='center'>$song[6]</td>
-  <td align='center'>$song[7]</td>
-  <td align='center'>$minutes:$seconds</td></tr>
+       $i++;next;}
+       my @song = split(/\|/,$songs{$_});
+       my $minutes = sprintf ("%.0f", $song[1] / 60 );
+       my $seconds = $song[1] % 60;
+
+       if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
+       print <<END
+       <td align='center' style="white-space:nowrap;"><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'mpfire songs'}'><input type='hidden' name='ACTION' value='addtoplaylist' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/list-add.png' /></form><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+       <td align='center'>$song[2]<br/>$song[3]</td>
+       <td align='center'>$song[5]</td>
+       <td align='center'>$song[4]</td>
+       <td align='center'>$song[6]</td>
+       <td align='center'>$song[7]</td>
+       <td align='center'>$minutes:$seconds</td></tr>
 END
 ;
-  $lines++;
-  $i++;
-  }
+       $lines++;
+       $i++;
+       }
 print "</table>";
 &Header::closebox();
 }
@@ -426,17 +424,17 @@ foreach (@playlist){$_=~s/&/&amp\;/g;;print $_;}
 print <<END
 </textarea></td></tr><tr>
 <td align='right'>
-      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <input type='hidden' name='ACTION' value='emptyplaylist' />
-      <input type='image' alt='$Lang::tr{'clear playlist'}' title='$Lang::tr{'clear playlist'}' src='/images/user-trash.png' />
-      </form>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <input type='hidden' name='ACTION' value='emptyplaylist' />
+       <input type='image' alt='$Lang::tr{'clear playlist'}' title='$Lang::tr{'clear playlist'}' src='/images/user-trash.png' />
+       </form>
 </td>
 <td align='left'>
-      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <input type='hidden' name='ACTION' value='playlist' />
-      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form>
-      </td></tr>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <input type='hidden' name='ACTION' value='playlist' />
+       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+       </form>
+</td></tr>
 </table>
 END
 ;
@@ -456,22 +454,22 @@ END
 ;
 my $lines=0;
 foreach (@webradio){
- my @stream = split(/\|/,$_);
- $lines++;
- chomp($stream[2]);
- if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
+       my @stream = split(/\|/,$_);
+       $lines++;
+       chomp($stream[2]);
+       if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
 print <<END
- <td align='left'><a href="$stream[2]" target="_blank">$stream[1]</a></td>
-     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+       <td align='left'><a href="$stream[2]" target="_blank">$stream[1]</a></td>
+       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' align='middle' /></form></td>
 </tr>
 END
 ;
- }
- $lines++;
- if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
+       }
+       $lines++;
+       if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
 print <<END
- <td align='left'><form method='post' action='$ENV{'SCRIPT_NAME'}'>http://<input type=text name='FILE' value='www.meineradiourl:1234' size='75' /></form></td>
-     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+       <td align='center' colspan='2'><form method='post' action='$ENV{'SCRIPT_NAME'}'><br />http://<input type=text name='FILE' value='www.meineradiourl:1234' size='75' />
+       <input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' align='top' /></form></td>
 </tr>
 END
 ;