X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcfgroot%2Fheader.pl;h=a7f209d9cbaed7c7ef485b0f2cd74c2ad6978d21;hb=57097305a610383d013c87ef32ae117c18846e46;hp=e3098177819ea88a41c8f29245f47b788576469b;hpb=7f9f851640e27a2b655e626b9ecd6b5995db1c2e;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index e30981778..a7f209d9c 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -157,14 +157,17 @@ sub genmenu {
     if ( $ethsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $ethsettings{'RED_TYPE'} eq 'STATIC' ) {
 	$menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} = 1;
     }
+
+    if (&General::RedIsWireless()) {
+        $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1;
+    }
 }
 
 sub showhttpheaders
 {
-	print "Pragma: no-cache\n";
-	print "Cache-control: no-cache\n";
+	print "Cache-control: private\n";
 	print "Connection: close\n";
-	print "Content-type: text/html\n\n";
+	print "Content-type: text/html; charset=UTF-8\n\n";
 }
 
 sub is_menu_visible($) {
@@ -353,7 +356,7 @@ sub CheckSortOrder {
 #Sorting of allocated leases
     if ($ENV{'QUERY_STRING'} =~ /^IPADDR|^ETHER|^HOSTNAME|^ENDTIME/ ) {
         my $newsort=$ENV{'QUERY_STRING'};
-        &readhash("${swroot}/dhcp/settings", \%dhcpsettings);
+        &General::readhash("${swroot}/dhcp/settings", \%dhcpsettings);
         $act=$dhcpsettings{'SORT_LEASELIST'};
         #Reverse actual ?
         if ($act =~ $newsort) {
@@ -362,7 +365,7 @@ sub CheckSortOrder {
         };
 
         $dhcpsettings{'SORT_LEASELIST'}=$newsort;
-        &writehash("${swroot}/dhcp/settings", \%dhcpsettings);
+        &General::writehash("${swroot}/dhcp/settings", \%dhcpsettings);
         $dhcpsettings{'ACTION'} = 'SORT';  # avoid the next test "First lauch"
     }
 
@@ -494,3 +497,29 @@ sub leasesort {
 	}
     }
 }
+
+sub colorize {
+	my $string =  $_[0];
+	my @array = split(/\//,$string);
+	my $string2 = $array[0];
+
+	if ( $string eq "*" or $string eq "" ){
+		return $string;
+	} elsif ( $string =~ "ipsec" ){
+		return "<font color='".${Header::colourvpn}."'>".$string."</font>";
+	} elsif ( $string =~ "tun" ){
+		return "<font color='".${Header::colourovpn}."'>".$string."</font>";
+	} elsif ( $string =~ "lo" or $string =~ "127.0.0.0" ){
+		return "<font color='".${Header::colourfw}."'>".$string."</font>";
+	} elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){
+		return "<font color='".${Header::colourgreen}."'>".$string."</font>";
+	} elsif (  $string =~ "ppp0" or $string =~ $ethsettings{'RED_DEV'} or $string =~ "0.0.0.0" or $string =~ $ethsettings{'RED_ADDRESS'} ){
+		return "<font color='".${Header::colourred}."'>".$string."</font>";
+	} elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){
+		return "<font color='".${Header::colourblue}."'>".$string."</font>";
+	} elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){
+		return "<font color='".${Header::colourorange}."'>".$string."</font>";
+	} else {
+		return $string;
+	}
+}