X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Faliases.cgi;h=7c3ba91ae02fc3a522ba86aa0aac1a0a993f4a15;hp=9043962c2df17d1df660845b1a6baddb709b8937;hb=48fde0b6f999e12d916127d413357720ac5bd670;hpb=a80f6d649e9fdea9061068050a85df68e7ae26c4 diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi index 9043962c2..7c3ba91ae 100644 --- a/html/cgi-bin/aliases.cgi +++ b/html/cgi-bin/aliases.cgi @@ -34,6 +34,13 @@ require '/var/ipfire/general-functions.pl'; # replace /var/ipcop with /var/ipcop require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +my $configfwdfw = "${General::swroot}/firewall/config"; +my $configinput = "${General::swroot}/firewall/input"; +my $configoutgoing = "${General::swroot}/firewall/outgoing"; +my %input=(); +my %forward=(); +my %output=(); + #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colouryellow} ); @dummy = ( ${Header::table1colour} ); @@ -90,7 +97,6 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { # #Validate static Settings1 here # - unless ($errormessage) { # Everything is ok, save settings #map (delete ($settings{$_}) ,(@nosaved,'ACTION','KEY1'));# Must never be saved #&General::writehash($setting, \%settings); # Save good settings @@ -146,6 +152,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { $errormessage = $Lang::tr{'duplicate ip'} . ' (RED)'; $spacer=" & "; } + #Check if we have an emtpy name + if (!$settings{'NAME'}){ + $errormessage=$Lang::tr{'fwhost err name1'}; + }elsif(! &General::validfqdn($settings{'NAME'}) && ! &General::validhostname($settings{'NAME'})){ + $errormessage=$Lang::tr{'invalid hostname'}; + } my $idx=0; foreach my $line (@current) { chomp ($line); @@ -162,6 +174,38 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { } $idx++; } + #Update firewallrules if aliasname is changed + if ($settings{'OLDNAME'} ne $settings {'NAME'}){ + &General::readhasharray("$configfwdfw", \%forward); + &General::readhasharray("$configinput", \%input); + &General::readhasharray("$configoutgoing", \%output); + #Check FORWARD + foreach my $forwardkey (sort keys %forward){ + if ($forward{$forwardkey}[29] eq $settings{'OLDNAME'}){ + $forward{$forwardkey}[29] = $settings {'NAME'}; + } + } + &General::writehasharray($configfwdfw, \%forward); + #Check INPUT + foreach my $inputkey (sort keys %input){ + if ($input{$inputkey}[6] eq $settings{'OLDNAME'}){ + $input{$inputkey}[6] = $settings {'NAME'}; + } + } + &General::writehasharray($configinput, \%input); + #Check OUTPUT + foreach my $outputkey (sort keys %output){ + if ($output{$outputkey}[4] eq $settings{'OLDNAME'}){ + $output{$outputkey}[4] = $settings {'NAME'}; + } + } + &General::writehasharray($configoutgoing, \%output); + &General::firewall_config_changed; + } + #If Alias IP has changed, set firewall_config_changed + if($settings{'OLDIP'} ne $settings{'IP'} && $settings{'OLDIP'}){ + &General::firewall_config_changed; + } unless ($errormessage) { if ($settings{'KEY1'} eq '') { #add or edit ? unshift (@current, "$settings{'IP'},$settings{'ENABLED'},$settings{'NAME'}\n"); @@ -241,16 +285,16 @@ my %checked =(); # Checkbox manipulations if ($errormessage) { &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "$errormessage "; + print "$errormessage "; &Header::closebox(); } unless (( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ ) && ($netsettings{'RED_TYPE'} eq 'STATIC')) { &Header::openbox('100%', 'left', $Lang::tr{'capswarning'}); print < + - +
$Lang::tr{'aliases not active'}$Lang::tr{'aliases not active'}
END @@ -275,23 +319,23 @@ if ($settings{'KEY1'} ne '') { print < - + + +
- + - + - +
$Lang::tr{'name'}: *$Lang::tr{'name'}: $Lang::tr{'alias ip'}: $Lang::tr{'alias ip'}:  $Lang::tr{'enabled'} $Lang::tr{'enabled'} 
+
- +
- - - +
* $Lang::tr{'this field may be blank'} -
@@ -320,11 +364,11 @@ if ($netsettings{'SORT_ALIASES'} eq 'NAMERev') { # &Header::openbox('100%', 'left', $Lang::tr{'current aliases'}); print < + - - - + + + END ; @@ -336,6 +380,7 @@ END # my $key = 0; +my $col=""; foreach my $line (@current) { chomp($line); my @temp = split(/\,/,$line); @@ -353,18 +398,19 @@ foreach my $line (@current) { #Colorize each line if ($settings{'KEY1'} eq $key) { - print ""; + $col="background-color:${Header::colouryellow};"; } elsif ($key % 2) { - print ""; + $col="background-color:${Header::table2colour};"; } else { - print ""; + $col="background-color:${Header::table1colour};"; } + print ""; print <$temp[2] - + + - - -
$Lang::tr{'name'} $sortarrow1$Lang::tr{'alias ip'} $sortarrow2$Lang::tr{'action'}$Lang::tr{'name'} $sortarrow1$Lang::tr{'alias ip'} $sortarrow2$Lang::tr{'action'}
$temp[0]$temp[2]$temp[0] +
@@ -372,7 +418,7 @@ foreach my $line (@current) {
+
@@ -380,7 +426,7 @@ foreach my $line (@current) {
+
@@ -510,3 +556,4 @@ sub BuildConfiguration { # Restart service associated with this system '/usr/local/bin/setaliases'; } +