captive: Save logo in /var/ipfire/captive

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index a060fa95bdbd9f513e80da60abff8eac9dbdff64..d45948ec7f55d383aa8a5b5a98faea22c72b1294 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -6,8 +6,10 @@ WARNING: translation string unused: Captive activate
 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
@@ -682,6 +684,7 @@ WARNING: untranslated string: Captive GAIN ACCESS
 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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 5c8f56dad8889442f47b0c06d9b467a92f9d48a4..02ab1714abb94f1627870aa8bcafc7bc74af47bb 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -7,8 +7,10 @@ WARNING: translation string unused: Captive auth_lic
 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

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 040fcfb4a0296b51ffbe9eae950108d3f2ed3e42..6f82813f39fee8f119f2c91eb5a03be1cf66a153 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -633,8 +633,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4709237967c8158d6e1651d1b4d51a49aaaeb408..31a1b4c2bf9975492f87ce7397f04127f720d2c6 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -643,8 +643,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 93a61b21db31c391770c92c669fc47dadda18134..4dad12cc1bb0f66e5ffa7c3dd31556f878bb5f04 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -710,8 +710,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0acc6a7426b79cb47d6db26a7ef56ce145b6e1be..805d92809620702665d25df362dd77bd65f2fb4d 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -706,8 +706,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 040fcfb4a0296b51ffbe9eae950108d3f2ed3e42..6f82813f39fee8f119f2c91eb5a03be1cf66a153 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -633,8 +633,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 49d0c6569750a5dfcc9cbb78c1b488e4e553c867..b10a7aca67bf25a34c39d064ef912e35626fac13 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -635,8 +635,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 514181e81dedce17f5fe2b3f10431e7726cb8702..75574de50e4616c685e653293eea4bdd73959f08 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -718,8 +718,7 @@ WARNING: untranslated string: Captive coupon
 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

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index ef5efc88ee243dd4a818f47fbadd9906888892c6..9851aba70d89ebf46f3bad243b913b3bc86490d7 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -36,6 +36,8 @@ my %selected = ();
 my $coupons = "${General::swroot}/captive/coupons";
 my %couponhash = ();
 
+my $logo = "${General::swroot}/captive/logo.dat";
+
 my %settings=();
 my %mainsettings;
 my %color;
@@ -46,7 +48,6 @@ my $errormessage='';
 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);
@@ -60,7 +61,7 @@ unless (-e $settingsfile)     { system("touch $settingsfile"); }
 
 #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;
@@ -80,26 +81,18 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
 
        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);
@@ -349,7 +342,7 @@ END
                </tr>
 END
 
-       #Logo Upload
+       # Logo Upload
        print <<END;
                <tr>
                        <td>
@@ -358,18 +351,18 @@ END
                                $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;

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6550d61ebdeaf75bf120b8df45bab00d5faed9d4..86f84b48d3fb5833628731a0163ef9bb963dbf2a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -33,6 +33,7 @@
 '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)',