X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=0b38237b6a3c6de732f4e0d4f0edc47274a68223;hp=3b44baad3453540984d61810f5a6afcac80aacd8;hb=4e7c3114cade2f653d703d8a64db7bc4f15f18eb;hpb=9d38669861117bc30253483cd314ff6ed563ff02

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 3b44baad3..0b38237b6 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -158,6 +158,11 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || (
     	    close IPADDR;
     	    chomp ($ipaddr);
 	}
+	if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
+	    $ipaddr = <IPADDR>;
+	    close IPADDR;
+	    chomp ($ipaddr);
+	}
 } elsif ($modemsettings{'VALID'} eq 'no') {
 	print "$Lang::tr{'modem settings have errors'}\n </b></font>\n";
 } else {
@@ -177,7 +182,7 @@ END
 	my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
 	if ( "$HOSTNAME" ne "" ) {
 		print <<END;
-	<tr><td><b>Hostname:</b><td align='center'>$HOSTNAME</td><td></td>
+	<tr><td><b>$Lang::tr{'hostname'}:</b><td align='center'>$HOSTNAME</td><td></td>
 END
 	}
 
@@ -187,35 +192,35 @@ END
 		chomp($GATEWAY);
 		close TMP;
 		print <<END;
-	<tr><td><b>Gateway:</b><td align='center'>$GATEWAY</td><td></td></tr>
+	<tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr>
 END
 	}
-	#Read DNS server 1
-	open (DNS1, "<${General::swroot}/red/dns1");
-	my $DNS1 = <DNS1>;
-	chomp($DNS1);
-	close DNS1;
-	#Read DNS server 2
-	open (DNS2, "<${General::swroot}/red/dns2");
-	my $DNS2 = <DNS2>;
-	chomp($DNS2);
-	close DNS2;
-
-	if ( $DNS1 ) { print <<END;
-	<tr><td><b>$Lang::tr{'dns server'}1:</b></td><td align='center'>$DNS1</td><td></td></tr>
-END
+
+	my @dns_servers = ();
+	foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") {
+		open(DNS, "<$f");
+		my $dns_server = <DNS>;
+		close(DNS);
+
+		chomp($dns_server);
+		if ($dns_server) {
+			push(@dns_servers, $dns_server);
+		}
 	}
-	if ( $DNS2 ) { print <<END;
-	<tr><td><b>$Lang::tr{'dns server'}2:</b></td><td align='center'>$DNS2</td><td></td></tr>
-	</table>
-END
-	} else { print <<END;
-	<td></td>
-	</tr>
-	</table>
+	my $dns_servers_str = join(", ", @dns_servers);
 
+	print <<END;
+		<tr>
+			<td>
+				<b>$Lang::tr{'dns servers'}:</b>
+			</td>
+			<td align="center">
+				$dns_servers_str
+			</td>
+			<td align="center"></td>
+		</tr>
+	</table>
 END
-	}
 
 #Dial profiles
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){