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] pppsetup.cgi: Fix site layout when no TYPE is specified
Date: Sun, 18 Oct 2015 18:52:47 +0100
Message-ID: <1445190767.2626.3.camel@ipfire.org>
In-Reply-To: <1445171150-4433-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3036885947263751733=="
List-Id: <development.lists.ipfire.org>

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

Merged. Please take care of the bug report.

-Michael

On Sun, 2015-10-18 at 14:25 +0200, Stefan Schantl wrote:
> There was an issue with false generated HTML code, in case
> of an empty or unset $pppsettings{'TYPE'} variable which results
> in a missplaced website footer.
> 
> This patch moves the code for closeing the table and the call of the
> closebox() function to the correct place to prevent this display
> issue.
> 
> Fixes #10565.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  html/cgi-bin/pppsetup.cgi | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
> index b3e8e6c..36d0ced 100644
> --- a/html/cgi-bin/pppsetup.cgi
> +++ b/html/cgi-bin/pppsetup.cgi
> @@ -980,12 +980,14 @@ print <<END
>          <td colspan='2' width='50%'>$Lang::tr{'legend'}:</td>
>          <td colspan='2' width='50%'><img src='/blob.gif' alt='*'
> />&nbsp;$Lang::tr{'required field'}</td>
>  </tr>
> -</table>
>  END
>  ;
> -&Header::closebox();
>  }
>  
> +print "</table>";
> +
> +&Header::closebox();
> +
>  print "</form>\n";
>  
>  &Header::closebigbox();

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldJOXh2QUFvSkVJQjU4UDl2a0FrSHA0TVFBSXJXeHQ1OTVYN1laRkp0bzhURUIrQjAK
L3poNkNMNTRMdWlaRkN6UksybCtlYzIzWDVvZjVOQXBDeUxhZkRITVUxSnRVeTI5NVhINnQ5UWZm
NzlGN0ZjTwovdXVmaExWU3Z0R2p0RUFNbEt2WlJGYmE1bk01bFlGRHpuRmZiYUljNWFQcEJkVUNq
TXVURW8zb2pHaDJ2TmpOClpnMjE3Q1V4VExDT0ZDTkpXU1VJQXpQUmtEZldvRUt0M3lyejBRdlFK
dFRreUE2a3I2UHBpNmdrV0E5TkpWbFUKRFBCdlVJMSt2cXpuaGFiVEZUNzZuMnJvS3MrLzhiak4z
dEsvTE85OWpkaURYWXZObzJ6OWlCU0VDZkhYMER2NwoyUXUyOXVMblp5ZCtGNlpreVdHSzFlRk43
aXNkRlZlTTZ0ajYycmdxT3crdXQ3V0N1WlBSUEQwUzNVNE1RaHdkCnZrZVJDTjA5RGMwaVgxdjND
MWxralp4ekZwbDYycFMrUXpIUG9iY0R2cVhSdk4zUmFNbjd4bE4ySEY4eTRTU3oKelpyN0ltbXR1
djVWQWdUaWdjTzN0YVBSMTVzNFJCazJzZ1ZOaDkrWklzSmNrSzNtalpXSU5RQUQ1VGRSV3poVwpy
K0Nzdlh5MjZ5K1VyRXZNVStLVWdIaS95UVlLbVdxM0FMZmlGeGRycll1QUVQdURxT2k0aWRaM0JQ
LzFIZUtzClBzSTBmRUVHelNzMWxKZDFVT09Ya1lQY0d1alZpL0MwYXJmazlzOWVrcmc0VU5NOC9D
RXBDbzgySW1NNHZGRXYKbjNZRWorb1hoN21VeHdyZmorL0MvdUdNZXg5eUdpbnlGUTF3SVpRS21C
S2JpaUR5azcyYUxMeUh3ZkdNZGs5bwo2ZkYxV2crOHNrRndlYTlSTkpucgo9L0FJcgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============3036885947263751733==--