X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=143f123b7f71853905175421fe21c55cb73ea96f;hb=7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1;hp=8f20d57767293835e1a036e177784ef73c016ed5;hpb=d59b02f177dce0e077da5256eee68d2cf10b2bfd;p=ipfire-2.x.git diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi old mode 100755 new mode 100644 index 8f20d57767..143f123b7f --- 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,7 +43,6 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; $pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'AUTOUPGRADE'} = 'off'; $pakfiresettings{'HEALTHCHECK'} = 'on'; $pakfiresettings{'UUID'} = 'on'; @@ -62,8 +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"); + 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'} @@ -81,12 +81,12 @@ END - +
- +
END @@ -101,8 +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"); + 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'} @@ -120,12 +121,12 @@ END - +
- +
END @@ -138,10 +139,11 @@ END } elsif ($pakfiresettings{'ACTION'} eq 'update') { system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); - + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { 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,6 @@ 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'"; @@ -191,21 +184,21 @@ if ($return) { print < - $Lang::tr{  + $Lang::tr{  $Lang::tr{'pakfire working'}
- +
- 
+		
 END
 	my @output = `grep pakfire /var/log/messages | tail -20`;
 	foreach (@output) {
-		print "$_";
+		print "$_
";
 	}
 	print <
+			
 		
 END
 	&Header::closebox();
@@ -226,13 +219,19 @@ 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'}
 					

 						
 						

@@ -246,7 +245,7 @@ END
 					
 					

 					
-					
+					
 				 

 
 		 
@@ -263,7 +262,7 @@ print <
 				

 				
-				
+				
 			
 
 		
@@ -278,7 +277,7 @@ print <
 			

 			
-			
+			
 		
 	
 END
@@ -293,9 +292,6 @@ print <$Lang::tr{'pakfire update daily'}
           on  |
            off 
-			$Lang::tr{'pakfire core update auto'}
-          on  |
-           off 
 			$Lang::tr{'pakfire health check'}
           on  |
            off