WARNING: translation string unused: Captive auth_lic
WARNING: translation string unused: Captive auth_vou
WARNING: translation string unused: Captive genvoucher
+WARNING: translation string unused: Captive invalid logosize
WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
+WARNING: translation string unused: Captive logo_set
WARNING: translation string unused: Captive nr
WARNING: translation string unused: Captive time
WARNING: translation string unused: Captive voucher
WARNING: untranslated string: Captive agree tac
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: translation string unused: Captive auth_vou
WARNING: translation string unused: Captive heading terms
WARNING: translation string unused: Captive heading voucher
+WARNING: translation string unused: Captive invalid logosize
WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
+WARNING: translation string unused: Captive logo_set
WARNING: translation string unused: Captive nr
WARNING: translation string unused: Captive time
WARNING: translation string unused: Captive voucher
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
-WARNING: untranslated string: Captive invalid logosize
-WARNING: untranslated string: Captive logo_set
+WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
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);
#actions
if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
- my $file = $cgiparams{'uploaded_file'};
+ my $file = $cgiparams{'logo'};
if ($file){
#Check if extension is png
chomp $file;
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);
</tr>
END
- #Logo Upload
+ # Logo Upload
print <<END;
<tr>
<td>
$Lang::tr{'Captive logo_upload1'}
</td>
<td>
- <INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80>
+ <input type="file" name="logo">
</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>";
+ if (-e $logo) {
+ print <<END;
+ <tr>
+ <td>$Lang::tr{'Captive logo uploaded'}</td>
+ <td>$Lang::tr{'yes'}</td>
+ </tr>
+END
}
print <<END;
'Captive invalid logosize' => 'The uploaded image file does not meet the required resolution of at least 1280x400 but not larger than 1920x800 pixels',
'Captive invalid_voucher' => 'Invalid code. Please try again',
'Captive ip' => 'IP Address',
+'Captive logo uploaded' => 'Logo uploaded',
'Captive logo_set' => 'Current Logo',
'Captive logo_upload' => 'Upload Logo',
'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',