use strict;
# enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
my %pakfiresettings=();
my $errormessage = '';
+my %color = ();
+my %mainsettings = ();
&Header::showhttpheaders();
$pakfiresettings{'INSPAKS'} = '';
$pakfiresettings{'DELPAKS'} = '';
-$pakfiresettings{'AUTOUPDATE'} = '';
+$pakfiresettings{'AUTOUPDATE'} = 'off';
+$pakfiresettings{'UUID'} = 'on';
+
+system("/usr/local/bin/pakfire update >/dev/null") if not -e "/opt/pakfire/db/lists/packages_list.db";
&Header::getcgihash(\%pakfiresettings);
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&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") {
- system("/usr/local/bin/pakfire", "install", "--non-interactive", "$pakfiresettings{'INSPAKS'}", "&");
- sleep(1);
+ my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
+ system("$command");
+ sleep(2);
} else {
&Header::openbox("100%", "center", "Abfrage");
- my @output = `/usr/local/bin/pakfire resolvedeps $pakfiresettings{'INSPAKS'}`;
+ my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
print <<END;
- <table><tr><td colspan='2'>Sie maechten folgende Pakete installieren: $pakfiresettings{'INSPAKS'}. Moeglicherweise haben diese Pakete Abhaengigkeiten, d.h. andere Pakete muessen zusaetzlich installiert werden. Dazu sehen sie unten eine Liste.
+ <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
<pre>
END
foreach (@output) {
}
print <<END;
</pre>
- <tr><td colspan='2'>Moechten Sie der Installation aller Pakete zustimmen?
+ <tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
<tr><td colspan='2'>
<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='INSPAKS' value='$pakfiresettings{'INSPAKS'}' />
}
} elsif ($pakfiresettings{'ACTION'} eq 'remove') {
+ $pakfiresettings{'DELPAKS'} =~ s/\|/\ /g;
+ if ("$pakfiresettings{'FORCE'}" eq "on") {
+ my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
+ system("$command");
+ sleep(2);
+ } else {
+ &Header::openbox("100%", "center", "Abfrage");
+ my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
+ print <<END;
+ <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$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'>
+ <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='DELPAKS' value='$pakfiresettings{'DELPAKS'}' />
+ <input type='hidden' name='FORCE' value='on' />
+ <input type='hidden' name='ACTION' value='remove' />
+ <input type='image' alt='$Lang::tr{'uninstall'}' 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 'update') {
- system("/usr/local/bin/pakfire update --force");
+ system("/usr/local/bin/pakfire update --force --no-colors");
-} elsif ($pakfiresettings{'ACTION'} eq 'unlock') {
+} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
- &Pakfire::lock("off");
+ system("/usr/local/bin/pakfire upgrade -y --no-colors");
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
&General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+
}
&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
$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::closebox();
}
-if ( -e "/opt/pakfire/pakfire.lock" ) {
- &Header::openbox("100%", "center", "Aktiv");
+my $return = `pidof pakfire`;
+chomp($return);
+if ($return) {
+ &Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='10;'>" );
print <<END;
<table>
<tr><td>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='unlock' />
- <input type='image' src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />
- </form>
+ <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />
<td>
- Pakfire fuehrt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.
+ $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>
- </table>
+ <tr><td colspan='2' align='left'><pre>
+END
+ my @output = `tail -20 /var/log/pakfire.log`;
+ foreach (@output) {
+ print "$_";
+ }
+ print <<END;
+ </pre>
+ </table>
END
&Header::closebox();
&Header::closebigbox();
&Header::openbox("100%", "center", "Pakfire");
+system("pakfire update &>dev/null");
+
print <<END;
<table width='100%'>
- <tr><td width='40%' align="center">Verfuegbare Addons:<br />
+ <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b></td><td bgcolor='$color{'color20'}'></td><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
+ <tr><td width='40%' align="center">
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<select name="INSPAKS" size="10" multiple>
END
<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">Installierte Addons:<br />
+ <td width='40%' align="center">
<select name="DELPAKS" size="10" multiple>
END
print <<END;
</select>
</table></form>
- <br /><hr /><br />
+ <br />
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%'>
+ <tr><td colspan='3' bgcolor='$color{'color20'}'><b>$Lang::tr{'pakfire updates'}</b></br>
+ <tr><td width='20%'> <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 />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
- <tr><td width='40%' align="right">Automatische Updates taeglich ausfuehren:
- <td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
- <td width='40%' align="right">Test:
+ <tr><td colspan='4' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></br>
+ <tr><td width='40%' align="right">$Lang::tr{'pakfire update daily'}
<td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
- <tr><td width='100%' colspan="4" align="right"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+ <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="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
</table>
</form>
END
projects / people / pmueller / ipfire-2.x.git / blobdiff