From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11137: Captive save action messes up the form Date: Wed, 29 Jun 2016 12:47:55 +0200 Message-ID: <1467197275-6949-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4667865396111771937==" List-Id: --===============4667865396111771937== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When configuring the captiveportal for the first time the form will be empty after clicking on save button if not all relevant fields are se= t. Now the settings are stored even if there is an error. Signed-off-by: Alexander Marx --- html/cgi-bin/captive.cgi | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index ab5e932..803c03d 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -72,6 +72,18 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $errormessage=3D$Lang::tr{'Captive wrong ext'}; } } + + $settings{'ENABLE_GREEN'} =3D $cgiparams{'ENABLE_GREEN'}; + $settings{'ENABLE_BLUE'} =3D $cgiparams{'ENABLE_BLUE'}; + $settings{'AUTH'} =3D $cgiparams{'AUTH'}; + $settings{'EXPIRE'} =3D $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cg= iparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'}; + $settings{'EXP_HOUR'} =3D $cgiparams{'EXP_HOUR'}; + $settings{'EXP_DAY'} =3D $cgiparams{'EXP_DAY'}; + $settings{'EXP_WEEK'} =3D $cgiparams{'EXP_WEEK'}; + $settings{'EXP_MONTH'} =3D $cgiparams{'EXP_MONTH'}; + $settings{'TITLE'} =3D $cgiparams{'TITLE'}; + $settings{'UNLIMITED'} =3D $cgiparams{'UNLIMITED'}; + if (!$errormessage){ #Check if we need to upload a new logo if($file){ @@ -103,17 +115,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $cgiparams{'EXP_WEEK'} =3D '0'; $cgiparams{'EXP_MONTH'} =3D '0'; } - - $settings{'ENABLE_GREEN'} =3D $cgiparams{'ENABLE_GREEN'}; - $settings{'ENABLE_BLUE'} =3D $cgiparams{'ENABLE_BLUE'}; - $settings{'AUTH'} =3D $cgiparams{'AUTH'}; - $settings{'EXPIRE'} =3D $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$c= giparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'}; - $settings{'EXP_HOUR'} =3D $cgiparams{'EXP_HOUR'}; - $settings{'EXP_DAY'} =3D $cgiparams{'EXP_DAY'}; - $settings{'EXP_WEEK'} =3D $cgiparams{'EXP_WEEK'}; - $settings{'EXP_MONTH'} =3D $cgiparams{'EXP_MONTH'}; - $settings{'TITLE'} =3D $cgiparams{'TITLE'}; - $settings{'UNLIMITED'} =3D $cgiparams{'UNLIMITED'}; +=09 &General::writehash("$settingsfile", \%settings); =20 #write Licensetext if defined --=20 2.7.4 --===============4667865396111771937==--