BUG11140: Captive logo dimensions

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

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 2d995663231c97f82bc2d7b2197d5943ad61010e..50f4795ddfe4205331486f066c735babcbcf1d49 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -72,6 +72,18 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
                        $errormessage=$Lang::tr{'Captive wrong ext'};
                }
        }
+
+       $settings{'ENABLE_GREEN'}               = $cgiparams{'ENABLE_GREEN'};
+       $settings{'ENABLE_BLUE'}                = $cgiparams{'ENABLE_BLUE'};
+       $settings{'AUTH'}                               = $cgiparams{'AUTH'};
+       $settings{'EXPIRE'}                             = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'};
+       $settings{'EXP_HOUR'}                   = $cgiparams{'EXP_HOUR'};
+       $settings{'EXP_DAY'}                    = $cgiparams{'EXP_DAY'};
+       $settings{'EXP_WEEK'}                   = $cgiparams{'EXP_WEEK'};
+       $settings{'EXP_MONTH'}                  = $cgiparams{'EXP_MONTH'};
+       $settings{'TITLE'}                              = $cgiparams{'TITLE'};
+       $settings{'UNLIMITED'}                  = $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'}  = '0';
                        $cgiparams{'EXP_MONTH'} = '0';
                }
-
-               $settings{'ENABLE_GREEN'}               = $cgiparams{'ENABLE_GREEN'};
-               $settings{'ENABLE_BLUE'}                = $cgiparams{'ENABLE_BLUE'};
-               $settings{'AUTH'}                               = $cgiparams{'AUTH'};
-               $settings{'EXPIRE'}                             = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'};
-               $settings{'EXP_HOUR'}                   = $cgiparams{'EXP_HOUR'};
-               $settings{'EXP_DAY'}                    = $cgiparams{'EXP_DAY'};
-               $settings{'EXP_WEEK'}                   = $cgiparams{'EXP_WEEK'};
-               $settings{'EXP_MONTH'}                  = $cgiparams{'EXP_MONTH'};
-               $settings{'TITLE'}                              = $cgiparams{'TITLE'};
-               $settings{'UNLIMITED'}                  = $cgiparams{'UNLIMITED'};
+       
                &General::writehash("$settingsfile", \%settings);
 
                #write Licensetext if defined
@@ -126,6 +128,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
                }
                #execute binary to reload firewall rules
                system("/usr/local/bin/captivectrl");
+
+               if ($cgiparams{'ENABLE_BLUE'} eq 'on'){
+                               system("/usr/local/bin/wirelessctrl");
+               }
        }
 }
 
@@ -301,7 +307,7 @@ END
        &agbbox();
 
        #Logo Upload
-       print "<tr><td>$Lang::tr{'Captive logo_upload'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
+       print "<tr><td>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
        #Show Logo in webinterface with 1/2 size if set
        if (-f "$logopath/logo.png"){
                print"<td>$Lang::tr{'Captive logo_set'}</td>";
@@ -436,14 +442,14 @@ sub voucher(){
        &Header::openbox('100%', 'left', $Lang::tr{'Captive voucher'});
 print<<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <table class='tbl'>
+       <table class='tbl' width='100%'>
        <tr>
-               <th align='center' width='20%'>$Lang::tr{'Captive voucher'}</th><th th align='center' width='25%'>$Lang::tr{'Captive expire'}</th><th align='center' width='55%'>$Lang::tr{'remark'}</th></tr>
+               <th align='center' width='20%'>$Lang::tr{'Captive voucher'}</th><th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='65%'>$Lang::tr{'remark'}</th></tr>
 END
 ;
 
        $cgiparams{'CODE'} = &gencode();
-       print "<tr><td><center><b><font size='5'>$cgiparams{'CODE'}</font></b></center></td><td><center><font size='3'>$expire</font></center></td><td><input type='text' name='REMARK' align='left' size='80'></td></tr>";
+       print "<tr><td><center><b><font size='5'>$cgiparams{'CODE'}</font></b></center></td><td><center><font size='2'>$expire</font></center></td><td><input type='text' style='width: 96%;' name='REMARK'  align='left'></td></tr>";
        print "</table><br>";
        print "<center><input type='submit' name='ACTION' value='$Lang::tr{'Captive voucherout'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'</center></form>";
        &Header::closebox();