webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-06 21:16:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_first_last

Browse Source
This commit is contained in:
Alf Høgemark
2014-02-15 15:13:16 +01:00
parent a1219d9600 e3cbe60f5d
commit 10dfb491b1
27 changed files with 3648 additions and 7129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
html/cgi-bin/index.cgi
View File

@@ -201,21 +201,20 @@ END
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
}
if ( $DNS2 ) { print <<END;
<tr><td><b>$Lang::tr{'dns server'}2:</b></td><td align='center'>$DNS2</td><td></td></tr>
print <<END;
<tr>
<td>
<b>$Lang::tr{'dns server'}</b>
</td>
<td align="center">
$DNS1
</td>
<td align="center">
$DNS2
</td>
</tr>
</table>
END
} else { print <<END;
<td></td>
</tr>
</table>
END
}
#Dial profiles
if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){

4
html/cgi-bin/netexternal.cgi
View File

@@ -83,8 +83,8 @@ if ( $querry[0] ne~ ""){
&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d ,`;
my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d ,`;
my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d " "`;
my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d " "`;
my $lsetme=0;
my $leasetime="";