[PATCH] BUG10993: fix errormessage when editing static routes

[PATCH] BUG10993: fix errormessage when editing static routes

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

When editing existing static routes and clicking on apply button, there
was an errormessage saying that this route is already in use.
Now the errormessage is only displayed if a new route has the same ip
than an existing one.

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/routing.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index 7636d1e..15989bd 100644
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -149,7 +149,7 @@ 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;
 		}
-- 
1.9.1

Re: [PATCH] BUG10993: fix errormessage when editing static routes

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]

Thank you. Merged. Will probably ship with Core Update 96.

-Michael

On Mon, 2015-12-07 at 14:36 +0100, Alexander Marx wrote:
> When editing existing static routes and clicking on apply button,
> there
> was an errormessage saying that this route is already in use.
> Now the errormessage is only displayed if a new route has the same ip
> than an existing one.
> 
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
>  html/cgi-bin/routing.cgi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
> index 7636d1e..15989bd 100644
> --- a/html/cgi-bin/routing.cgi
> +++ b/html/cgi-bin/routing.cgi
> @@ -149,7 +149,7 @@ 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;
>  		}

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]