Sprachfix und FTP-Upload-Fix

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / index.cgi

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 921e299e2e5a53a72bbe937607c7f9eee2893d3d..6e85043ca4c32ab97be57394025e8cae66946ce6 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -115,7 +115,7 @@ END
                        print "\t<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
                }
        }
-       $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipcop.pid' || -e "${General::swroot}/red/active");
+       $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active");
        if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
                print <<END;
                                </select>
@@ -136,6 +136,23 @@ END
        print "$Lang::tr{'profile has errors'}\n </b></font>\n";
        }
 
+       my $DNS1 = `cat /var/ipfire/red/dns1`;
+       my $DNS2 = `cat /var/ipfire/red/dns2`;
+       chomp($DNS1);
+       chomp($DNS1);
+
+       if ( $DNS1 ) { print <<END;
+       <tr><td><b>DNS-Server:</b><td>$DNS1
+END
+       }
+       if ( $DNS2 ) { print <<END;
+       <td>$DNS2
+END
+       } else { print <<END;
+       <td>&nbsp;
+END
+       }
+
        if ( $netsettings{'GREEN_DEV'} ) { print <<END;
                <tr><td bgcolor='$Header::colourgreen' width='25%'><a href="/cgi-bin/dhcp.cgi"><font size='2' color='white'><b>$Lang::tr{'lan'}:</b></font></a>
                <td width='30%'>$netsettings{'GREEN_ADDRESS'}
@@ -207,15 +224,6 @@ END
                <td width='45%'><font color=$Header::colourgreen>Online</font>
 END
        }
-       if ( $netsettings{'DNS1'} ) { print <<END;
-       <tr><td>DNS-Server: <td>$netsettings{'DNS1'}
-END
-       }
-       if ( $netsettings{'DNS2'} ) { print <<END;
-       <td>$netsettings{'DNS2'}
-END
-       }
-
 
 # Memory usage warning
 my @free = `/usr/bin/free`;