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=41845e4fbda10d9c5f886991608b58392848bfbd;hb=bac7231b69d9847a51673bda2dde9956609b8ccd;hpb=78331e301975a38f952ad9311a7ff3201e5a5e2e

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 41845e4fbd..464d8d8c18 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -6,20 +6,18 @@
 # 
 # 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;
 
 # enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "/opt/pakfire/lib/functions.pl";
 
 my %pakfiresettings=();
 my $errormessage = '';
@@ -29,75 +27,186 @@ my $errormessage = '';
 $pakfiresettings{'ACTION'} = '';
 $pakfiresettings{'VALID'} = '';
 
-$pakfiresettings{'INSTALLED'} = '';
-$pakfiresettings{'AVAIL'} = '';
-$pakfiresettings{'AUTOUPD'} = '';
+$pakfiresettings{'INSPAKS'} = '';
+$pakfiresettings{'DELPAKS'} = '';
+$pakfiresettings{'AUTOUPDATE'} = 'off';
+$pakfiresettings{'UUID'} = 'on';
 
 &Header::getcgihash(\%pakfiresettings);
 
-if ($pakfiresettings{'ACTION'} eq $Lang::tr{'save'})
-{
+&Header::openpage($Lang::tr{'pakfire configuration'}, 1);
+&Header::openbigbox('100%', 'left', '', $errormessage);
+
+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 <<END;
+		<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
+		<pre>		
+END
+		foreach (@output) {
+			print "$_\n";
+		}
+		print <<END;
+		</pre>
+		<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
+		<tr><td colspan='2'>&nbsp;
+		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+							<input type='hidden' name='INSPAKS' value='$pakfiresettings{'INSPAKS'}' />
+							<input type='hidden' name='FORCE' value='on' />
+							<input type='hidden' name='ACTION' value='install' />
+							<input type='image' alt='$Lang::tr{'install'}' src='/images/go-next.png' />
+						</form>
+				<td align='left'>
+						<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+							<input type='hidden' name='ACTION' value='' />
+							<input type='image' alt='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
+						</form>
+		</table>
+END
+		&Header::closebox();
+		&Header::closebigbox();
+		&Header::closepage();
+		exit;
+	}
+} 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{'AUTOUPD'}{'off'} = '';
-$checked{'AUTOUPD'}{'on'} = '';
-$checked{'AUTOUPD'}{$pakfiresettings{'AUTOUPD'}} = "checked='checked'";
-
-&Header::openpage($Lang::tr{'pakfire configuration'}, 1, $refresh);
-
-&Header::openbigbox('100%', 'left', '', $errormessage);
+$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 "<font class='base'>$errormessage&nbsp;</font>\n";
 	&Header::closebox();
-	}
+}
 
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-
-&Header::openbox('100%', 'left', $Lang::tr{'network pakfire'});
-print <<END
-<table width='100%'>
-<tr>
-	<td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
-	<td width='100%' colspan='4' class='base'>$Lang::tr{'network pakfire from'}</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td width='100%' class='base' colspan='4'>
+my $return = `pidof pakfire`;
+chomp($return);
+if ($return) {
+	&Header::openbox("100%", "center", "Aktiv");
+	print <<END;
+	<table>
+		<tr><td>
+				<img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
+			<td>
+				$Lang::tr{'pakfire working'}
+		<tr><td colspan='2' align='center'>
+			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+				<input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
+			</form>
+		### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+		<tr><td colspan='2' align='left'><pre>
 END
-;
-
-
-print <<END
-</table>
-<br />
-<hr />
-<table width='100%'>
-<tr>
-	<td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-	<td width='33%' align='right'>
-		<a href='${General::adminmanualurl}/services.html#services_pakfire' target='_blank'><img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a>
-	</td>
-</tr>
-</table>
+my @output = `tail /var/log/messages | grep pakfire`;
+foreach (@output) {
+	print "$_";
+}
+print <<END;
+		</pre>
+	</table>
 END
-;
+  	### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+	&Header::closebox();
+	&Header::closebigbox();
+	&Header::closepage();
+	exit;
+}
 
-&Header::closebox();
+&Header::openbox("100%", "center", "Pakfire");
 
-print "</form>\n";
+system("pakfire update &>dev/null");
 
-&Header::closebigbox();
+print <<END;
+	<table width='100%'>
+		<tr><td width='40%' align="center">Verfuegbare Addons:<br />
+			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+				<select name="INSPAKS" size="10" multiple>
+END
+			&Pakfire::dblist("notinstalled", "forweb");
+		
+print <<END;
+				</select>
+		</td>
+		<td width='20%' align="center">
+				<input type='hidden' name='ACTION' value='install' />
+				<input type='image' alt='$Lang::tr{'install'}' src='/images/list-add.png' />
+			</form><br />
+			
+			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+				<input type='hidden' name='ACTION' value='update' />
+				<input type='submit' value='Liste aktualisieren' /><br />
+			</form>
+			
+			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+				<input type='hidden' name='ACTION' value='remove' />
+				<input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
+		</td>
+		<td width='40%' align="center">$Lang::tr{'pakfire installed addons'}<br />
+			<select name="DELPAKS" size="10" multiple>
+END
 
-&Header::closepage();
+			&Pakfire::dblist("installed", "forweb");
+
+print <<END;
+		</select>
+	</table></form>
+		<br /><hr /><br />
+	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<table width='100%'>
+		<tr><td colspan='2'>$Lang::tr{'pakfire updates'}
+		<tr><td width='20%'>&nbsp;<td width='60%' align='center'>
+			<select name="UPDPAKS" size="5" disabled>
+END
+
+			&Pakfire::dblist("upgrade", "forweb");
+
+print <<END;
+			</select>
+		<td width='20%' align='center' valign='middle'><input type='hidden' name='ACTION' value='upgrade' />
+			<input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
+	</table></form>
+		<br /><hr /><br />
+	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+		<table width='100%'>
+			<tr><td width='40%' align="right">$Lang::tr{'pakfire update daily'}
+					<td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
+					<td width='40%' align="right">$Lang::tr{'pakfire register'} 
+					<td width='10%' align="left"><input type="checkbox" name="UUID" $checked{'UUID'}{'on'} />
+			<tr><td width='100%' colspan="4" align="right"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+		</table>
+	</form>
+END
 
+&Header::closebox();
+&Header::closebigbox();
+&Header::closepage();