X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=8d7af10c49e006ffc01111258b1688b4929a00e8;hb=986e08d996eadd906ecbe6c9ac8ad48aa78bd854;hp=9233628df3b4813862419f957174d9c996b9458f;hpb=90350ff3f3d03b9f6889013a3c8de993cb984789;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 9233628df..8d7af10c4 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -67,21 +67,17 @@ my $dialButtonDisabled = "disabled='disabled'"; &Header::openbigbox('', 'center'); &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); -if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { - if ($connstate =~ /$Lang::tr{'connected'}/) { - if ($ddnssettings{'BEHINDROUTER'} eq 'FETCH_IP') { - if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { - $ipaddr = ; - close IPADDR; - chomp ($ipaddr); - } - } - if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) { - my $ipaddr = ; - close IPADDR; - chomp ($ipaddr); - } - } +if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { + if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { + $ipaddr = ; + close IPADDR; + chomp ($ipaddr); + } + if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) { + my $ipaddr = ; + close IPADDR; + chomp ($ipaddr); + } } elsif ($modemsettings{'VALID'} eq 'no') { print "$Lang::tr{'modem settings have errors'}\n \n"; } else {