CGIs angepasst

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

html/cgi-bin/index.cgi

@@ -58,7 +58,7 @@ my $connstate = &Header::connectionstatus();
 
 if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
 	$refresh = "<meta http-equiv='refresh' content='300;'>";
-} elsif ($connstate =~ /$Lang::tr{'connecting'}/) {
+} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
 	$refresh = "<meta http-equiv='refresh' content='5;'>";
 } elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
 	$refresh = "<meta http-equiv='refresh' content='30;'>";

html/cgi-bin/mpfire.cgi

@@ -38,6 +38,21 @@ my $errormessage = "";
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
+if ( $ENV{'QUERY_STRING'} =~ /title/){
+my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
+if ( $song eq "" ){$song = "None";}
+if ( length($song) > 125 ) {$song = substr($song,0,125)."...";}
+&Header::showhttpheaders();
+print"<meta http-equiv='refresh' content='30'>";
+print <<END
+<div class="body"><table width='95%' cellspacing='0'>
+<tr bgcolor='$color{'color20'}'><td align='center'><font color=red><marquee behavior='alternate' scrollamount='1' scrolldelay='5'>-= $song =-</marquee></font></td></tr>
+</table>
+END
+;
+} 
+else{
+
 &Header::showhttpheaders();
 
 sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;' />" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
@@ -84,7 +99,7 @@ foreach (@songdb){
   my $genrecount = $#genre+1;
 
 &Header::getcgihash(\%mpfiresettings);
-&Header::openpage($Lang::tr{'mpfire'}, 1, "<meta http-equiv='refresh' content='120' />");
+&Header::openpage($Lang::tr{'mpfire'}, 1,);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
@@ -234,10 +249,6 @@ END
 ;
 &Header::closebox();
 
-my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
-if ( $song eq "" ){$song = "None";}
-if ( length($song) > 125 ) {$song = substr($song,0,125)."...";}
-
 my $Volume = `/usr/local/bin/mpfirectrl volume 2>/dev/null`;
 $Volume=~s/<break>/<br \/>/g;
 my $stats = `mpc stats | tail -4 2>/dev/null`;
@@ -247,7 +258,7 @@ $stats=~s/\\/<br \/>/g
 print <<END
 
     <table width='95%' cellspacing='0'>
-    <tr bgcolor='$color{'color20'}'>    <td colspan='5' align='center'><marquee behavior='alternate' scrollamount='1' scrolldelay='5'><font color=red>-= $song =-</font></marquee></td></tr>
+    <iframe height='30' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' ></iframe> 
 END
 ;
 my $countsongs=`/usr/local/bin/mpfirectrl stats 2>/dev/null`;
@@ -455,3 +466,4 @@ print "</table>";
 
 &Header::closebigbox();
 &Header::closepage();
+}

langs/de/cgi-bin/de.pl

@@ -467,7 +467,6 @@
 'concentrator name' => 'Name des Konzentrators:',
 'confirmation' => 'Bestätigung',
 'connect' => 'OVPN Start / Verbinden',
-'connect on ipfire restart' => 'Verbinden bei IPFire-Neustart',
 'connect the modem' => 'Das Modem anschließen',
 'connect timeout' => 'Anwahl-Wartezeit:',
 'connected' => 'Verbunden',

langs/en/cgi-bin/en.pl

@@ -487,7 +487,6 @@
 'concentrator name' => 'Concentrator name:',
 'confirmation' => 'confirmation',
 'connect' => 'OVPN Start / Connect',
-'connect on ipfire restart' => 'Connect on IPFire restart:',
 'connect the modem' => 'Connect the modem',
 'connect timeout' => 'Connect timeout:',
 'connected' => 'Connected',