require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %selected = ();
+
my $coupons = "${General::swroot}/captive/coupons";
my %couponhash = ();
+my $logo = "${General::swroot}/captive/logo.dat";
+
my %settings=();
my %mainsettings;
my %color;
my $clients="${General::swroot}/captive/clients";
my %clientshash=();
my $settingsfile="${General::swroot}/captive/settings";
-my $logopath = "/srv/web/ipfire/html/captive/logo";
unless (-e $settingsfile) { system("touch $settingsfile"); }
&Header::getcgihash(\%cgiparams);
&Header::showhttpheaders();
-#actions
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
- my $file = $cgiparams{'uploaded_file'};
- if ($file){
- #Check if extension is png
+if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
+ my $file = $cgiparams{'logo'};
+ if ($file) {
+ # Check if the file extension is PNG/JPEG
chomp $file;
+
my ($name, $path, $ext) = fileparse($file, qr/\.[^.]*$/);
- if ($ext ne ".png"){
- $errormessage=$Lang::tr{'Captive wrong ext'};
+ if ($ext ne ".png" && $ext ne ".jpg" && $ext ne ".jpeg") {
+ $errormessage = $Lang::tr{'Captive wrong ext'};
}
}
$settings{'TITLE'} = $cgiparams{'TITLE'};
$settings{'UNLIMITED'} = $cgiparams{'UNLIMITED'};
$settings{'COLOR'} = $cgiparams{'COLOR'};
+ $settings{'SESSION_TIME'} = $cgiparams{'SESSION_TIME'};
if (!$errormessage){
#Check if we need to upload a new logo
- if($file){
- #Save File
- my ($filehandle) = CGI::upload('uploaded_file');
- open (UPLOADFILE, ">$logopath/logo.png");
+ if ($file) {
+ # Save logo
+ my ($filehandle) = CGI::upload("logo");
+
+ # XXX check filesize
+
+ open(FILE, ">$logo");
binmode $filehandle;
- while ( <$filehandle> ) {
- print UPLOADFILE;
- }
- close (UPLOADFILE);
-
- #Open file to check if dimensions are within rang
- open (PNG , "<$logopath/logo.png");
- local $/;
- my $PNG1=<PNG>;
- close(PNG);
- my ($width,$height)=&pngsize($PNG1);
- if($width > 1920 || $height > 800 || $width < 1280 || $height < 400){
- $errormessage.="$Lang::tr{'Captive invalid logosize'} <br>Filedimensions width: $width height: $height ";
- unlink("$logopath/logo.png");
+ while (<$filehandle>) {
+ print FILE;
}
+ close(FILE);
}
&General::writehash("$settingsfile", \%settings);
&Header::openpage($Lang::tr{'Captive menu'}, 1, '');
&Header::openbigbox();
-#call error() to see if we have to print an errormessage on website
-&error();
-
-#call config() to display the configuration box
-&config();
-
-sub getterms(){
- my @ret;
-
- open(FILE, "<:utf8", "/var/ipfire/captive/terms.txt");
- while(<FILE>) {
- push(@ret, HTML::Entities::decode_entities($_));
- }
- close(FILE);
-
- return join(/\n/, @ret);
+# If an error message exists, show a box with the error message
+if ($errormessage) {
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print $errormessage;
+ &Header::closebox();
}
-sub config(){
- #prints the config box on the website
- &Header::openbox('100%', 'left', $Lang::tr{'Captive config'});
- print <<END
- <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n
+# Prints the config box on the website
+&Header::openbox('100%', 'left', $Lang::tr{'Captive config'});
+print <<END
+ <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n
<table width='100%' border="0">
<tr>
END
;
- #check which parameters have to be enabled (from settings file)
- $checked{'ENABLE_GREEN'}{'off'} = '';
- $checked{'ENABLE_GREEN'}{'on'} = '';
- $checked{'ENABLE_GREEN'}{$settings{'ENABLE_GREEN'}} = "checked='checked'";
- $checked{'ENABLE_BLUE'}{'off'} = '';
- $checked{'ENABLE_BLUE'}{'on'} = '';
- $checked{'ENABLE_BLUE'}{$settings{'ENABLE_BLUE'}} = "checked='checked'";
+#check which parameters have to be enabled (from settings file)
+$checked{'ENABLE_GREEN'}{'off'} = '';
+$checked{'ENABLE_GREEN'}{'on'} = '';
+$checked{'ENABLE_GREEN'}{$settings{'ENABLE_GREEN'}} = "checked='checked'";
- $checked{'UNLIMITED'}{'off'} = '';
- $checked{'UNLIMITED'}{'on'} = '';
- $checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'";
+$checked{'ENABLE_BLUE'}{'off'} = '';
+$checked{'ENABLE_BLUE'}{'on'} = '';
+$checked{'ENABLE_BLUE'}{$settings{'ENABLE_BLUE'}} = "checked='checked'";
- if ($netsettings{'GREEN_DEV'}){
- print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourgreen'>Green</font></td><td><input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /></td></tr>";
- }
- if ($netsettings{'BLUE_DEV'}){
- print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourblue'>Blue</font></td><td><input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /></td></tr>";
- }
+$checked{'UNLIMITED'}{'off'} = '';
+$checked{'UNLIMITED'}{'on'} = '';
+$checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'";
-print<<END
- </tr>
- <tr>
- <td>
- $Lang::tr{'Captive authentication'}
- </td>
- <td>
- <select name='AUTH'>
-END
-;
- print "<option value='TERMS' ";
- print " selected='selected'" if ($settings{'AUTH'} eq 'TERMS');
- print ">$Lang::tr{'Captive terms'}</option>";
+$selected{'AUTH'} = ();
+$selected{'AUTH'}{'COUPON'} = "";
+$selected{'AUTH'}{'TERMS'} = "";
+$selected{'AUTH'}{$settings{'AUTH'}} = "selected";
- print "<option value='COUPON' ";
- print " selected='selected'" if ($settings{'AUTH'} eq 'COUPON');
- print ">$Lang::tr{'Captive coupon'}</option>";
+if ($netsettings{'GREEN_DEV'}){
+ print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourgreen'>Green</font></td><td><input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /></td></tr>";
+}
+if ($netsettings{'BLUE_DEV'}){
+ print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourblue'>Blue</font></td><td><input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /></td></tr>";
+}
- print<<END
- </select>
- </td>
- </tr>
+print<<END
+ </tr>
+ <tr>
+ <td>
+ $Lang::tr{'Captive authentication'}
+ </td>
+ <td>
+ <select name='AUTH'>
+ <option value="TERMS" $selected{'AUTH'}{'TERMS'} >$Lang::tr{'Captive terms'}</option>
+ <option value="COUPON" $selected{'AUTH'}{'COUPON'}>$Lang::tr{'Captive coupon'}</option>
+ </select>
+ </td>
+ </tr>
END
;
- if ($settings{'AUTH'} eq 'TERMS') {
- my $terms = &getterms();
- print <<END;
- <tr>
- <td></td>
- <td>
- <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
- </td>
- </tr>
-END
- }
- print<<END;
- <tr>
- <td colspan="2">
- <br>
- <strong>$Lang::tr{'Captive branding'}</strong>
- </td>
- </tr>
- <tr>
- <td>
- $Lang::tr{'Captive title'}
- </td>
- <td>
- <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
- </td>
- </tr>
+if ($settings{'AUTH'} eq 'TERMS') {
+ $selected{'SESSION_TIME'} = ();
+ $selected{'SESSION_TIME'}{'0'} = "";
+ $selected{'SESSION_TIME'}{'3600'} = "";
+ $selected{'SESSION_TIME'}{'86400'} = "";
+ $selected{'SESSION_TIME'}{'604800'} = "";
+ $selected{'SESSION_TIME'}{'18144000'} = "";
+ $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";
+
+ my $terms = &getterms();
+ print <<END;
<tr>
- <td>$Lang::tr{'Captive brand color'}</td>
+ <td></td>
<td>
- <input type="color" name="COLOR" value="$settings{'COLOR'}">
+ <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
</td>
</tr>
-END
- #Logo Upload
- print <<END;
<tr>
+ <td>$Lang::tr{'Captive client session expiry time'}</td>
<td>
- $Lang::tr{'Captive logo_upload'}
- <br>
- $Lang::tr{'Captive logo_upload1'}
- </td>
- <td>
- <INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80>
+ <select name="SESSION_TIME">
+ <option value="0" $selected{'SESSION_TIME'}{'0'}>- $Lang::tr{'unlimited'} -</option>
+ <option value="3600" $selected{'SESSION_TIME'}{'3600'}>$Lang::tr{'one hour'}</option>
+ <option value="86400" $selected{'SESSION_TIME'}{'86400'}>$Lang::tr{'24 hours'}</option>
+ <option value="604800" $selected{'SESSION_TIME'}{'604800'}>$Lang::tr{'one week'}</option>
+ <option value="18144000" $selected{'SESSION_TIME'}{'18144000'}>$Lang::tr{'one month'}</option>
+ </select>
</td>
</tr>
END
+}
- #Show Logo in webinterface with 1/2 size if set
- if (-f "$logopath/logo.png"){
- print"<tr><td>$Lang::tr{'Captive logo_set'}</td>";
- print"<td><img src='/captive/logo/logo.png' alt='$logopath/logo.png' width='25%' height='25%' /></td></tr>";
- }else{
- print"<tr><td>$Lang::tr{'Captive logo_set'}</td>";
- print"<td><br>$Lang::tr{'no'}</td></tr>";
- }
+print<<END;
+ <tr>
+ <td colspan="2">
+ <br>
+ <strong>$Lang::tr{'Captive branding'}</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ $Lang::tr{'Captive title'}
+ </td>
+ <td>
+ <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
+ </td>
+ </tr>
+ <tr>
+ <td>$Lang::tr{'Captive brand color'}</td>
+ <td>
+ <input type="color" name="COLOR" value="$settings{'COLOR'}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ $Lang::tr{'Captive upload logo'}
+ </td>
+ <td>
+ <input type="file" name="logo">
+ <br>$Lang::tr{'Captive upload logo recommendations'}
+ </td>
+ </tr>
+END
+if (-e $logo) {
print <<END;
<tr>
- <td></td>
- <td align='right'>
- <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
- </td>
+ <td>$Lang::tr{'Captive logo uploaded'}</td>
+ <td>$Lang::tr{'yes'}</td>
</tr>
+END
+}
+
+print <<END;
+ <tr>
+ <td></td>
+ <td align='right'>
+ <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
+ </td>
+ </tr>
</table></form>
END
- &Header::closebox();
+&Header::closebox();
- #if settings is set to use coupons, the coupon part has to be displayed
- if ($settings{'AUTH'} eq 'COUPON'){
- &coupons();
- }else{
- #otherwise we show the licensepart
- &show_license_connections();
+#if settings is set to use coupons, the coupon part has to be displayed
+if ($settings{'AUTH'} eq 'COUPON') {
+ &coupons();
+} else {
+ #otherwise we show the licensepart
+ &show_license_connections();
+}
+
+sub getterms() {
+ my @ret;
+
+ open(FILE, "<:utf8", "/var/ipfire/captive/terms.txt");
+ while(<FILE>) {
+ push(@ret, HTML::Entities::decode_entities($_));
}
+ close(FILE);
+
+ return join(/\n/, @ret);
}
sub gencode(){
return 1;
}
-sub pngsize {
- my $Buffer = shift;
- my ($width,$height) = ( undef, undef );
-
- if ($Buffer =~ /IHDR(.{8})/) {
- my $PNG = $1;
- ($width,$height) = unpack( "NN", $PNG );
- } else {
- $width="invalid";
- $height= "invalid";
- };
- return ($width,$height);
-}
-
-sub error{
- #if an errormessage exits, show a box with errormessage
- if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<class name='base'>$errormessage\n";
- print " </class>\n";
- &Header::closebox();
- }
-}
-
&Header::closebigbox();
&Header::closepage();
projects / people / pmueller / ipfire-2.x.git / blobdiff