X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=5903d8525939d02ba3c2c4c770fd79699907ddda;hb=7cc8a0e526d20b2bf75a68ff208a3dbf0723c552;hp=cadc23534f34c2d8addd9fd1d3867b3ea0c84078;hpb=d2414ee76e5927d10aa1dbec5534175639fbe73a;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index cadc23534..5903d8525 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 Michael Tremer & Christian Schmidt # # # # 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 # @@ -43,9 +43,11 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; $pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'AUTOUPGRADE'} = 'off'; +$pakfiresettings{'HEALTHCHECK'} = 'on'; $pakfiresettings{'UUID'} = 'on'; +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} + &Header::getcgihash(\%pakfiresettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); @@ -59,9 +61,9 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; system("$command"); - sleep(2); + system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; print <$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} @@ -99,9 +101,9 @@ END if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; system("$command"); - sleep(2); + system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; print <$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} @@ -136,12 +138,12 @@ END } elsif ($pakfiresettings{'ACTION'} eq 'update') { - system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null"); - + system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { - - system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null"); - + my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; + system("$command"); + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { @@ -150,12 +152,6 @@ END system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1"); } - if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') { - system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1"); - } else { - system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1"); - } - &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); } @@ -167,9 +163,9 @@ my %checked=(); $checked{'AUTOUPDATE'}{'off'} = ''; $checked{'AUTOUPDATE'}{'on'} = ''; $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'"; -$checked{'AUTOUPGRADE'}{'off'} = ''; -$checked{'AUTOUPGRADE'}{'on'} = ''; -$checked{'AUTOUPGRADE'}{$pakfiresettings{'AUTOUPGRADE'}} = "checked='checked'"; +$checked{'HEALTHCHECK'}{'off'} = ''; +$checked{'HEALTHCHECK'}{'on'} = ''; +$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'"; $checked{'UUID'}{'off'} = ''; $checked{'UUID'}{'on'} = ''; $checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'"; @@ -197,7 +193,7 @@ if ($return) { 
 END
-	my @output = `tail -20 /var/log/pakfire.log`;
+	my @output = `grep pakfire /var/log/messages | tail -20`;
 	foreach (@output) {
 		print "$_";
 	}
@@ -209,6 +205,7 @@ END
 	&Header::closebigbox();
 	&Header::closepage();
 	exit;
+	refreshpage();
 }
 
 my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;
@@ -222,16 +219,22 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
 
 print <
+END
+if ( -e "/var/run/need_reboot") {
+	print "$Lang::tr{'needreboot'}!";
+	print " "
+}
+print <$Lang::tr{'pakfire system state'}:
 				
 		$Lang::tr{'pakfire core update level'}: $core_release

-					$Lang::tr{'pakfire last update'} $core_update_age ago

-					$Lang::tr{'pakfire last serverlist update'} $server_update_age ago

-					$Lang::tr{'pakfire last core list update'} $corelist_update_age ago

-					$Lang::tr{'pakfire last package update'} $packages_update_age ago
+					$Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}

+					$Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}

+					$Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}

+					$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'}
 					

 						
-						

+						

 					

 				
 				 

@@ -286,16 +289,16 @@ print <
 		
-			
-			
-			          
+			
-			
+			

 			
$Lang::tr{'basic options'}
$Lang::tr{'pakfire update daily'}
-          on /
+			
$Lang::tr{'pakfire update daily'}
+          on  |
            off 
$Lang::tr{'pakfire core update auto'}
-          on /
-           off 
$Lang::tr{'pakfire register'}
-          on /
+			
$Lang::tr{'pakfire health check'}
+          on  |
+           off 
$Lang::tr{'pakfire register'}
+          on  |
            off 

 		

 	
 END