[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91dd042b20210df0bb0461ebf09791e3c028ea86

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91dd042b20210df0bb0461ebf09791e3c028ea86

[git]

[-- Attachment #1: Type: text/plain, Size: 2770 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  91dd042b20210df0bb0461ebf09791e3c028ea86 (commit)
      from  63f2fb7fda9112d9e39414328e5d4fab28809c63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91dd042b20210df0bb0461ebf09791e3c028ea86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 5 23:53:21 2014 +0100

    gpl.cgi: Fix proper redirection so that the agreement has only to be accepted once.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/gpl.cgi | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi
index 5cfbebd..94187ce 100644
--- a/html/cgi-bin/gpl.cgi
+++ b/html/cgi-bin/gpl.cgi
@@ -29,28 +29,29 @@ 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'}.
@@ -80,3 +81,9 @@ END
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
+
+sub redirect {
+	print "Status: 302 Moved Temporarily\n";
+	print "Location: index.cgi\n\n";
+	exit (0);
+}


hooks/post-receive
--
IPFire 2.x development tree