captive: Save logo in /var/ipfire/captive

[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 e7081e96ba87cf282678a11d844f8c4baa80ff91..9851aba70d89ebf46f3bad243b913b3bc86490d7 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -31,9 +31,13 @@ require '/var/ipfire/general-functions.pl';
 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;
@@ -44,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);
@@ -58,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;
@@ -74,29 +77,22 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
        $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);
@@ -291,6 +287,14 @@ END
 END
 ;
        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>
@@ -299,6 +303,19 @@ END
                                        <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
                                </td>
                        </tr>
+
+                       <tr>
+                               <td>$Lang::tr{'Captive client session expiry time'}</td>
+                               <td>
+                                       <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
        }
 
@@ -325,7 +342,7 @@ END
                </tr>
 END
 
-       #Logo Upload
+       # Logo Upload
        print <<END;
                <tr>
                        <td>
@@ -334,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;