don't refresh if gpl was displayed.
###############################################################################
# #
# IPFire.org - A linux based firewall #
###############################################################################
# #
# 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 #
# #
# 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 #
my $connstate = &Header::connectionstatus();
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'}/ ){
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'}/ ){
} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
$refresh = "<meta http-equiv='refresh' content='30;'>";
}
} 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'})
{
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
{
if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
system('touch /var/ipfire/main/gpl_accepted')
}
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"));
&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
&Pakfire::dblist("upgrade", "notice");
print <<END;
END
&Pakfire::dblist("upgrade", "notice");
print <<END;
END
+if ( -e "/var/run/need_reboot" ) {
print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
}
} else {
print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
}
} else {
-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>';
print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
print `cat /usr/share/doc/licenses/GPLv3`;
print '</textarea>';