X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=464d8d8c18e4485d6c38ee8ebe00a6f3ab5647b2;hp=83a0524c412b7c8826a485b267756579cefea702;hb=bac7231b69d9847a51673bda2dde9956609b8ccd;hpb=1bd42c892ccaa879d6a06e762a10c6934f177f7f diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 83a0524c41..464d8d8c18 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -6,9 +6,6 @@ # # This code is distributed under the terms of the GPL # -# (c) Eric Oberlander June 2002 -# -# (c) Darren Critchley June 2003 - added real time clock setting, etc # use strict; @@ -32,56 +29,123 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; -$pakfiresettings{'AUTOUPDATE'} = ''; +$pakfiresettings{'AUTOUPDATE'} = 'off'; +$pakfiresettings{'UUID'} = 'on'; &Header::getcgihash(\%pakfiresettings); &Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); -if ($pakfiresettings{'ACTION'} eq 'install') -{ - my @inspaks = split(/\|/, "$pakfiresettings{'INSPAKS'}"); - &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); - my @deps = ""; - foreach (@inspaks) { - push(@deps, $_); - my @add = split(/ /, `/usr/local/bin/pakfire resolvedeps $_`); - foreach (@add) { push(@deps, $_); } +if ($pakfiresettings{'ACTION'} eq 'install'){ + $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g; + if ("$pakfiresettings{'FORCE'}" eq "on") { + my $command = "/usr/local/bin/pakfire install --non-interactive $pakfiresettings{'INSPAKS'} &>/dev/null &"; + system("$command"); + sleep(2); + } else { + &Header::openbox("100%", "center", "Abfrage"); + my @output = `/usr/local/bin/pakfire resolvedeps $pakfiresettings{'INSPAKS'}`; + print <$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} + 
		
+END
+		foreach (@output) {
+			print "$_\n";
+		}
+		print <
+		$Lang::tr{'pakfire accept all'}
+		 
+		

+							
+							
+							
+							
+						

+				
+						

+							
+							
+						

+		
+END
+		&Header::closebox();
+		&Header::closebigbox();
+		&Header::closepage();
+		exit;
 	}
-	&Header::openbox("100%", "center", "Pakfire");
-	print "Wenn sie die Pakete @inspaks installieren wollen müssen sie auch folgende Pakete installieren: @deps";
-	&Header::closebox();
-	exit 0;
-}
-elsif ($pakfiresettings{'ACTION'} eq 'remove')
-{
-	$errormessage = "$pakfiresettings{'DELPAKS'}";
-	&General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
-} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}")
-{
+} elsif ($pakfiresettings{'ACTION'} eq 'remove') {
+
+} elsif ($pakfiresettings{'ACTION'} eq 'update') {
+	
+	system("/usr/local/bin/pakfire update --force");
+
+} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
+	
+	system("/usr/local/bin/pakfire upgrade -y");
+	
+} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
+
 	&General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+
 }
 
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 
-
 my %selected=();
 my %checked=();
 
 $checked{'AUTOUPDATE'}{'off'} = '';
 $checked{'AUTOUPDATE'}{'on'} = '';
 $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
+$checked{'UUID'}{'off'} = '';
+$checked{'UUID'}{'on'} = '';
+$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";
 
 # DPC move error message to top so it is seen!
 if ($errormessage) {
 	&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
 	print "$errormessage \n";
 	&Header::closebox();
-	}
+}
+
+my $return = `pidof pakfire`;
+chomp($return);
+if ($return) {
+	&Header::openbox("100%", "center", "Aktiv");
+	print <
+		
+				$Lang::tr{ 
+			
+				$Lang::tr{'pakfire working'}
+		
+			

+				
+			

+		### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+		
+END
+my @output = `tail /var/log/messages | grep pakfire`;
+foreach (@output) {
+	print "$_";
+}
+print <
+	
+END
+  	### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+	&Header::closebox();
+	&Header::closebigbox();
+	&Header::closepage();
+	exit;
+}
 
 &Header::openbox("100%", "center", "Pakfire");
 
+system("pakfire update &>dev/null");
+
 print <
 		Verfuegbare Addons:

@@ -99,6 +163,7 @@ print <

 			
 			

+				
 				

 			

 			
@@ -106,26 +171,42 @@ print <
 				
 		
-		Installierte Addons:

+		$Lang::tr{'pakfire installed addons'}

 			
+END
+
+			&Pakfire::dblist("upgrade", "forweb");
+
+print <
+		
+			
+	
+		


 	

 		
-			
Automatische Updates taeglich ausfuehren:
-					
-					Test:
+			
$Lang::tr{'pakfire update daily'}
 					
-			
					
+					$Lang::tr{'pakfire register'} 
+					
+			

 		

 	

 END
 
 &Header::closebox();
-
 &Header::closebigbox();
-
 &Header::closepage();
-