From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] BUG10993: fix errormessage when editing static routes
Date: Thu, 10 Dec 2015 17:19:30 +0000
Message-ID: <1449767970.31655.109.camel@ipfire.org>
In-Reply-To: <1449495391-14881-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2751523889539097885=="
List-Id: <development.lists.ipfire.org>

--===============2751523889539097885==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

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;
>  		}

--===============2751523889539097885==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldhYlFpQUFvSkVJQjU4UDl2a0FrSHg5b1AvaklkVWtJZXlMVzRjUzcrN1NxblBVdWsK
Wk52K2tIdGNRWUhvbGpoellRUUN3cXphM2hsNE9Da1pYeWw3VEx2dHh4T2U1SU5ZYWhYMTl5TnB5
WVB2Q0RNZApOQk82K0MzNXBzQ2ZMWDN6QXA0WnBQYkRxbjFnMWFkSGpaYXBYWmxWclZkU2E4eC9r
azFqK0VLcUZTdHVsbklkCk8ydC8wSzhGYjRMZGhuMTlnMzdBWE5ROWV5aVZEZzNLNkZNRGVXdXR6
clVaUUZROTFPaE9vNmVyb2p1MDZHUFEKVWQrNTdMY2V4bW1qejVNaEJhZk5EUURlOVVPM1ZwWVlQ
TnZ1K2ZHbThNclZ0cjNSRDZyUFdic01Za21JK1VoQQpjRDNRZnBCYnBkTDMvOTBHOGZ5SW1wclZm
MWVWNmdncEk1U29GamlDNnRHK3NCU1o4YUp0cjJNN1IzZWw0RnFVCkN5eEE1eXhwSmdjcUFNWi9W
Z2x4Nnp4eDRTanRLYkpXUmJPeTJSeVhFM0x6dnpvQkZmK1FYL2pkdTVaKzZ5bEYKTjNsUXdQY1lv
dnE4TXhhZ2psZjNFK3JXUlVvM2VIdzRXS1hRNTlWVTJIZzIrZy92ajdsaGRXQkduWFpNZ3VlUQpz
NG1jQmlOUnR3eFN2b3QwTXY1VFhlUEIvcHlCamU2UzMxZU5iSEw5U2w0UUhjTk1YUHQzZEV1VEVk
MEFwVnV0Cm9DbzhWeDZXYWdRYUc2OWl2cWh2NE9OeDJhZVVTYW5ZNzVadENXQUYxWkJIbWM4cVRY
U2NMVzA3VmFXNlo4MnMKRmQ1SnFyOVd2aDQ1UlBwV1c2VjRRYmlmY2tiS0Z2enovU1BKeUZ3bnlR
N1Uyb1ZwQlIwL3k1Y0Q2R1hwRFhtRAphamZvTk12NEY1RzFuMmdJME8rVwo9cmg4agotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============2751523889539097885==--