From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 14 Dec 2010 18:27:43 +0000 (+0100)
Subject: index.cgi: Removed "find" for file exist checking.
X-Git-Tag: v2.9-beta2~23
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f341a168ee290d6a556c1d864122f16fc967deea

index.cgi: Removed "find" for file exist checking.
don't refresh if gpl was displayed.
---

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index cd1c0c200e..268ab7e3ea 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>';