X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fgpl.cgi;h=029b048e8c3280797beee969d98dd95603cc989d;hb=HEAD;hp=7589054b642de19894f5cf0431cac3b5894a4159;hpb=9d38669861117bc30253483cd314ff6ed563ff02;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi
index 7589054b64..029b048e8c 100644
--- a/html/cgi-bin/gpl.cgi
+++ b/html/cgi-bin/gpl.cgi
@@ -29,37 +29,50 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "/opt/pakfire/lib/functions.pl";
 
-
-my %cgiparams;
-my $refresh;
-
+# If the license has already been accepted.
 if ( -e "/var/ipfire/main/gpl_accepted" ) {
-	print "Status: 302 Moved Temporarily\n";
-	print "Location: index.cgi\n\n";
-	exit (0);
+	&redirect();
 }
-&Header::showhttpheaders();
 
+my %cgiparams;
 $cgiparams{'ACTION'} = '';
+
 &Header::getcgihash(\%cgiparams);
 
-&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
-&Header::openbigbox('', 'center');
+# Check if the license agreement has been accepted.
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'yes'}" && $cgiparams{'gpl_accepted'} eq '1') {
+	open(FILE, ">/var/ipfire/main/gpl_accepted");
+	close(FILE);
 
-# licence agreement
-if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
-	system('touch /var/ipfire/main/gpl_accepted');
+	&redirect();
 }
 
+&Header::showhttpheaders();
+
+&Header::openpage($Lang::tr{'main page'}, 1);
+&Header::openbigbox('', 'center');
+
 &Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
 print <<END;
 	$Lang::tr{'gpl please read carefully the general public license and accept it below'}.
 	<br /><br />
 END
-;	
+;
 if ( -e "/usr/share/doc/licenses/GPLv3" ) {
-	print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
-	print `cat /usr/share/doc/licenses/GPLv3`;
+	print '<textarea rows=\'25\' cols=\'75\' readonly=\'readonly\'>';
+
+	# Open and read-in GPL file content.
+	open(FILE, "/usr/share/doc/licenses/GPLv3");
+
+	# Grab license.
+	my @license = <FILE>;
+
+	# Close filehandle.
+	close(FILE);
+
+	# Print license to textarea.
+	print "@license";
+
 	print '</textarea>';
 }
 else {
@@ -70,7 +83,7 @@ print <<END;
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 			<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
 			<br/ >
-			<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+			<input type='submit' name='ACTION' value='$Lang::tr{'yes'}' />
 		</form>
 	</p>
 	<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
@@ -80,3 +93,9 @@ END
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
+
+sub redirect {
+	print "Status: 302 Moved Temporarily\n";
+	print "Location: index.cgi\n\n";
+	exit (0);
+}