X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcaptive.cgi;h=9851aba70d89ebf46f3bad243b913b3bc86490d7;hp=85b9c5d19e0c4aeeb7c0282b2d1568896f8aec66;hb=e2752bfe719b51b1cb2f9153b8ddfab5d4483938;hpb=97b91e8a946233d1a5cf90ed36d744dd07f434f9

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 85b9c5d19e..9851aba70d 100755
--- 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);
@@ -266,25 +262,13 @@ END
 		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
-		</tr>
-		<tr>
-		<td><br>
-			$Lang::tr{'Captive title'}
-		</td>
-		<td><br>
-			<input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
-		</td>
-		</tr>
-END
-;
-
 print<<END
+		</tr>
 		<tr>
-			<td><br>
+			<td>
 				$Lang::tr{'Captive authentication'}
 			</td>
-			<td><br>
+			<td>
 				<select name='AUTH'>
 END
 ;
@@ -303,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>
@@ -311,39 +303,77 @@ 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
 	}
 
-	#Logo Upload
-	print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><br><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>";
-		print"<td><img src='/captive/logo/logo.png' alt='$logopath/logo.png' width='25%' height='25%' /></td></tr>";
-	}else{
-		print"<td>$Lang::tr{'Captive logo_set'}</td>";
-		print"<td><br>$Lang::tr{'no'}</td></tr>";
-	}
-print<<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>
 		<tr>
 			<td>$Lang::tr{'Captive brand color'}</td>
 			<td>
 				<input type="color" name="COLOR" value="$settings{'COLOR'}">
 			</td>
 		</tr>
+END
 
+	# Logo Upload
+	print <<END;
 		<tr>
 			<td>
+				$Lang::tr{'Captive logo_upload'}
+				<br>
+				$Lang::tr{'Captive logo_upload1'}
+			</td>
+			<td>
+				<input type="file" name="logo">
 			</td>
+		</tr>
+END
+
+	if (-e $logo) {
+		print <<END;
+			<tr>
+				<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'}"/>
+				<input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
 			</td>
 		</tr>
-		</table>
-		<br><br>
+	</table></form>
 END
-;
-	print "</form>";
 
 	&Header::closebox();