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, master has been updated via f341a168ee290d6a556c1d864122f16fc967deea (commit) from cae0079c2f7c86b92cb7d9724e70f38be571a2cd (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 f341a168ee290d6a556c1d864122f16fc967deea Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 14 19:27:43 2010 +0100
index.cgi: Removed "find" for file exist checking. don't refresh if gpl was displayed.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/index.cgi | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-)
Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index cd1c0c2..268ab7e 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -58,14 +58,7 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus();
-# check if reboot is necessary -my $reboot = 0; -if (`find /var/run/need_reboot 2>/dev/null`) { - $reboot = 1; -} - - - + if ( -e "/var/ipfire/main/gpl-acceted" ) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = "<meta http-equiv='refresh' content='300;'>"; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -73,6 +66,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $La } elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { $refresh = "<meta http-equiv='refresh' content='30;'>"; } +}
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) { @@ -142,7 +136,7 @@ my $dialButtonDisabled = "disabled='disabled'"; if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { system('touch /var/ipfire/main/gpl_accepted') } -if (`find /var/ipfire/main/gpl_accepted 2>/dev/null`) { +if ( -e "/var/ipfire/main/gpl_accepted" ) { &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
@@ -453,7 +447,7 @@ END &Pakfire::dblist("upgrade", "notice"); print <<END; END -if ($reboot == 1) { +if ( -e "/var/run/need_reboot" ) { print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>"; } } else { @@ -488,7 +482,7 @@ print <<END; <br /><br /> END ; -if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) { +if ( -e "/usr/share/doc/licenses/GPLv3" ) { print '<textarea rows='25' cols='75' readonly='true'>'; print `cat /usr/share/doc/licenses/GPLv3`; print '</textarea>';
hooks/post-receive -- IPFire 2.x development tree