Fixed the branch
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 11 Nov 2007 12:24:46 +0000 (12:24 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 11 Nov 2007 12:24:46 +0000 (12:24 +0000)
git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1076 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/rootfiles/common/ntfs-3g
html/cgi-bin/mpfire.cgi
html/cgi-bin/qos.cgi
html/cgi-bin/samba.cgi
langs/de/cgi-bin/de.pl

index da175f0d485ac386810989c6e166644b0437c5d7..0b7a86b0cd60454ff3e5fce00f726ce51081a296 100644 (file)
@@ -3,7 +3,7 @@ bin/ntfs-3g
 #lib/libntfs-3g.la
 lib/libntfs-3g.so
 lib/libntfs-3g.so.14
-lib/libntfs-3g.so.14.0.0
+lib/libntfs-3g.so.14.1.0
 sbin/mount.ntfs-3g
 #usr/include/ntfs-3g
 #usr/include/ntfs-3g/attrib.h
index 3b5262f8e4eca0a287f453c84cd1dc2482eac9f8..7d75f0b4510662aa5891741870a9e8f9f09ca067 100644 (file)
@@ -53,7 +53,7 @@ print <<END
 </body>
 END
 ;
-} 
+}
 else{
 &Header::showhttpheaders();
 
@@ -108,6 +108,8 @@ foreach (@songdb){
 
 if ( $mpfiresettings{'ACTION'} eq "scan" )
 {
+&General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
+&Header::getcgihash(\%mpfiresettings);
 delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};delete $mpfiresettings{'PAGE'};
 &General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);
 open(DATEI, "<${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden";
@@ -144,7 +146,7 @@ foreach (keys(%songs)){
        }
 open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
-close(DATEI);  
+close(DATEI);
 
 $message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
 }
@@ -208,7 +210,7 @@ my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'genre'});
 
 foreach (keys(%songs)){
   @song = split(/\|/,$songs{$_});$song[7] =~ s/\W/ /g;
-    
+
   foreach (@select){
     $_ =~ s/\W/ /g;
     if ( $song[7] =~ /$_/ ){push(@temp,$song[0]);}
@@ -220,13 +222,20 @@ print DATEI @temp;
 close(DATEI);
 $message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
 }
-elsif ( $mpfiresettings{'SHOWLIST'} ){delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};delete $mpfiresettings{'PAGE'};&General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);refreshpage();}
+elsif ( $mpfiresettings{'SHOWLIST'} ){
+       &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
+       &Header::getcgihash(\%mpfiresettings);
+       delete $mpfiresettings{'__CGI__'};
+       delete $mpfiresettings{'x'};
+       delete $mpfiresettings{'y'};
+       delete $mpfiresettings{'PAGE'};
+       &General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);refreshpage();
+}
 
 ############################################################################################################################
 ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ####################################
 
 $mpfiresettings{'MUSICDIR'} = "/";
-
 &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
 
 ############################################################################################################################
@@ -243,7 +252,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
@@ -274,8 +283,8 @@ print <<END
 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  
+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>
@@ -384,13 +393,13 @@ else{
        $begin=(($mpfiresettings{'PAGE'}-1) * 100);
        $end=(($mpfiresettings{'PAGE'} * 100)-1);
 }
-foreach (keys(%songs)){
+foreach (sort(keys(%songs))){
        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;
+       my $seconds = sprintf("%02d", ($song[1] % 60) );
 
        if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
        print <<END
index 33a6b90c10e522b4e64ed4fca357d310d3ae6e18..9674a8a9fe5480dbfe7d7aafb960f15eeecfbe8b 100644 (file)
@@ -243,15 +243,15 @@ END
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
+               unless ( &General::validip($qossettings{'QIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+                       $message = "Die Quell-IP-Adresse ist ungueltig.";
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
+               unless ( &General::validip($qossettings{'DIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+                       $message = "Die Ziel-IP-Adresse ist ungueltig.";
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -318,15 +318,15 @@ END
 if ($qossettings{'DOPORT'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
+               unless ( &General::validip($qossettings{'QIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+                       $message = "Die Quell-IP-Adresse ist ungueltig.";
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
+               unless ( &General::validip($qossettings{'DIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+                       $message = "Die Ziel-IP-Adresse ist ungueltig.";
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -405,7 +405,7 @@ $qossettings{'CLASS'};$qossettings{'DEVICE'};$qossettings{'TOS'};
 END
 ;
        close FILE;
-} 
+}
 elsif ($qossettings{'DOTOS'} eq 'Loeschen')
 {
        open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
@@ -508,28 +508,28 @@ imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
 imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
 imq0;210;6;1;$DOWN[1];;;0;Standardklasse;
 imq0;220;7;1;$DOWN[1];;;1;P2P;
-ppp0;101;1;$UP[2];$UP[1];;;8;ACKs oder so;
-ppp0;102;2;$UP[3];$UP[1];;;8;VoIP;
-ppp0;104;5;$UP[10];$UP[1];;;8;Webtraffic;
-ppp0;110;6;1;$UP[1];;;0;Standardklasse;
-ppp0;120;7;1;$UP[1];;;1;P2P;
-ppp0;103;4;$UP[2];$UP[1];;;2;VPN;
+$qossettings{'RED_DEV'};101;1;$UP[2];$UP[1];;;8;ACKs oder so;
+$qossettings{'RED_DEV'};102;2;$UP[3];$UP[1];;;8;VoIP;
+$qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic;
+$qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Standardklasse;
+$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
+$qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
 END
 ;
        close FILE;
        open( FILE, "> $level7file" ) or die "Unable to write $level7file";
        print FILE <<END
-102;ppp0;dns;;;
-102;ppp0;sip;;;
-102;ppp0;skypetoskype;;;
-103;ppp0;ssh;;;
-103;ppp0;rdp;;;
-104;ppp0;http;;;
-104;ppp0;ssl;;;
-104;ppp0;pop3;;;
-110;ppp0;ftp;;;
-120;ppp0;applejuice;;;
-120;ppp0;bittorrent;;;
+102;$qossettings{'RED_DEV'};dns;;;
+102;$qossettings{'RED_DEV'};sip;;;
+102;$qossettings{'RED_DEV'};skypetoskype;;;
+103;$qossettings{'RED_DEV'};ssh;;;
+103;$qossettings{'RED_DEV'};rdp;;;
+104;$qossettings{'RED_DEV'};http;;;
+104;$qossettings{'RED_DEV'};ssl;;;
+104;$qossettings{'RED_DEV'};pop3;;;
+110;$qossettings{'RED_DEV'};ftp;;;
+120;$qossettings{'RED_DEV'};applejuice;;;
+120;$qossettings{'RED_DEV'};bittorrent;;;
 200;imq0;skypetoskype;;;
 203;imq0;ssh;;;
 203;imq0;rdp;;;
@@ -544,14 +544,14 @@ END
        close FILE;
        open( FILE, "> $portfile" ) or die "Unable to write $portfile";
        print FILE <<END
-101;ppp0;icmp;;;;;
-102;ppp0;tcp;;;;53;
-102;ppp0;udp;;;;53;
-103;ppp0;esp;;;;;
-103;ppp0;tcp;;;;1194;
-103;ppp0;udp;;4500;;4500;
-103;ppp0;udp;;500;;500;
-104;ppp0;tcp;;;;80;
+101;$qossettings{'RED_DEV'};icmp;;;;;
+102;$qossettings{'RED_DEV'};tcp;;;;53;
+102;$qossettings{'RED_DEV'};udp;;;;53;
+103;$qossettings{'RED_DEV'};esp;;;;;
+103;$qossettings{'RED_DEV'};tcp;;;;1194;
+103;$qossettings{'RED_DEV'};udp;;4500;;4500;
+103;$qossettings{'RED_DEV'};udp;;500;;500;
+104;$qossettings{'RED_DEV'};tcp;;;;80;
 200;imq0;icmp;;;;;
 203;imq0;esp;;;;;
 203;imq0;tcp;;;;1194;
@@ -571,7 +571,7 @@ END
        $qossettings{'DEFCLASS_OUT'} = "110";
        $qossettings{'ACK'} ="101";
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
-       
+
 }
 elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
 {
@@ -699,8 +699,8 @@ END
                <tr><td width='50%' align='left'><b>Quality of Service:</b>
                    <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font>
                <tr><td width='100%' align='center' colspan='2'>
-               <input type='submit' name='ACTION' value="Start" /> 
-               <input type='submit' name='ACTION' value="Stop" /> 
+               <input type='submit' name='ACTION' value="Start" />
+               <input type='submit' name='ACTION' value="Stop" />
                <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
 END
 ;
@@ -721,7 +721,7 @@ END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='66%'>
                <tr><td colspan='3'><hr />
-               <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}       
+               <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}
                    <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
                <tr><td width='50%' align='right'>$Lang::tr{'uplink std class'}:        <td width='30%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='50%' align='right'>ACKs:                         <td width='30%' align='left'>$qossettings{'ACK'}
@@ -770,7 +770,7 @@ if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png
                <tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'IMQ_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png" border='0' /></a></td></tr>
 END
 ;}
-else 
+else
 {
 print "\t</table><br />".$Lang::tr{'no information available'};
 }
@@ -799,7 +799,7 @@ END
                for ( $c = 200 ; $c <= 220 ; $c++ )
                {
                        if ( $qossettings{'DEFCLASS_INC'} ne $c )
-                       { print "<option value='$c'>$c</option>\n"; } 
+                       { print "<option value='$c'>$c</option>\n"; }
                        else    { print "<option selected value='$c'>$c</option>\n"; }
                }
                print <<END
@@ -872,7 +872,7 @@ END
        if ( $message ne "" ) {
                print "<tr><td colspan='3' align='center'>$message";
        }
-       if ( $qossettings{'EDIT'} eq 'yes' ) { 
+       if ( $qossettings{'EDIT'} eq 'yes' ) {
                print "<input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' />";
                print "<input type='hidden' name='DEVICE' value='$qossettings{'DEVICE'}' />";
        }
@@ -882,7 +882,7 @@ END
                    <td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='DEVICE' disabled>";
                } else {
                        print "<select name='DEVICE'>";
@@ -899,7 +899,7 @@ END
                <tr><td width='33%' align='right'>$Lang::tr{'Class'}:<td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='CLASS' disabled>";
                } else {
                        print "<select name='CLASS'>";
@@ -1067,7 +1067,7 @@ END
                        next if -d "/etc/l7-protocols/protocols/$direntry";
                        @proto = split( /\./, $direntry );
                        if ( $proto[0] eq $qossettings{'L7PROT'} ) {
-                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";                        
+                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";
                        } else {
                                print "<option value='$proto[0]'>$proto[0]</option>\n";
                        }
@@ -1105,7 +1105,7 @@ END
                                @tmpline = split( /\ /, $direntry );
                                next if $tmpline[0] =~ "#";
                                if ( $tmpline[0] eq $qossettings{'PPROT'} ) {
-                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";                    
+                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";
                                } else {
                                        print "<option value='$tmpline[0]'>$tmpline[0]</option>\n";
                                }
index 787104ad5cba5da72a1ce0d268e86f84c65f4963..1f091a830219ca943fb86bf645fb7dd2d8bcf186 100644 (file)
@@ -476,7 +476,7 @@ print <<END
 <tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC='$sambasettings{'REMOTESYNC'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" /></td></tr>
 END
 ;
 if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
index 62c37a66d1e5428981ec1936e787ced8aea17d9e..b8fbd66e4a38a7840a3a4773e46389d5790b76d4 100644 (file)
 'system status information' => 'System-Statusinformationen',
 'telephone not set' => 'Telefonnummer nicht angegeben.',
 'template' => 'Vorlage',
-'template warning' => 'Zur Einrichtugn von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Erstens Sie wählen speichern und erstellen Classen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.',
+'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Erstens Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.',
 'test' => 'test',
 'test email could not be sent' => 'Könnte Testemail nicht senden',
 'test email was sent' => 'Testemail wurde erfolgreich versand',