samba: Make changing shares taking effect immediately

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / routing.cgi

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index 7636d1ec59d45fa8fe2804bcb68231ec454e8d98..be21007fa837ee4857da4fea0cb93b6d14afafc7 100644 (file)
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -137,6 +137,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
        $errormessage = $Lang::tr{'invalid ip'}. " - ".$Lang::tr{'gateway ip'};
        }
 
+       # Escape input in REMARK field
+       $settings{'REMARK'} = &Header::escape($settings{'REMARK'});
+
        #set networkip if not already correctly defined
        my($ip,$cidr) = split(/\//,$settings{'IP'});
        my $netip=&General::getnetworkip($ip,$cidr);
@@ -149,12 +152,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
                $temp[2] ='' unless defined $temp[2]; # not always populated
                $temp[3] ='' unless defined $temp[2]; # not always populated
                #Same ip already used?
-               if($temp[1] eq $settings{'IP'}){
+               if($temp[1] eq $settings{'IP'} && $settings{'KEY1'} eq ''){
                        $errormessage = $Lang::tr{'ccd err irouteexist'};
                        last;
                }
                #Is the network part of an internal network?
-               $errormessage .= &General::check_net_internal($settings{'IP'});
+               $errormessage .= &General::check_net_internal_exact($settings{'IP'});
                last;
        }