webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

corrected pakfire cgi displaying bash color codes

Browse Source 
updated samba


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1086 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-11-16 15:42:18 +00:00
parent 61a704394b
commit fee5c6b77d
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
html/cgi-bin/pakfire.cgi
View File

@@ -65,9 +65,10 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
print <<END;
<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
<pre>
<pre>
END
foreach (@output) {
$_ =~ s/\\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;
@@ -104,9 +105,10 @@ END
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>
<pre>
END
foreach (@output) {
$_ =~ s/\\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;
@@ -133,13 +135,13 @@ END
}
} elsif ($pakfiresettings{'ACTION'} eq 'update') {
system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null");
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
if ($pakfiresettings{'AUTOUPDATE'} == "on") {
@@ -147,7 +149,7 @@ END
} else {
system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1");
}
if ($pakfiresettings{'AUTOUPGRADE'} == "on") {
system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
} else {
@@ -242,17 +244,17 @@ END
<input type='hidden' name='ACTION' value='upgrade' />
<input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
</form>
<tr><td colspan="2"><!-- Just an empty line -->&nbsp;
<tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
<td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
<tr><td align="center">
<p>$Lang::tr{'pakfire install description'}</p>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<select name="INSPAKS" size="10" multiple>
END
&Pakfire::dblist("notinstalled", "forweb");
print <<END;
</select>
<br />