michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix unzip in usermin

Browse Source
This commit is contained in:
Jamie Cameron
2010-07-26 07:55:55 -07:00
parent 9e6acf17fd
commit 14cb2d1964
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
updown/updown-lib.pl
View File

@@ -269,5 +269,19 @@ else {
}
}
# webmin_command_as_user(user, env, command)
# Return a command as some user with su if this is webmin, or un-changed for
# usermin
sub webmin_command_as_user
{
my ($user, $env, @args) = @_;
if ($module_info{'usermin'}) {
return join(" ", @args);
}
else {
return &command_as_user($user, $env, @args);
}
}
1;

8
updown/upload.cgi
View File

@@ -83,7 +83,7 @@ for($i=0; defined($d = $in{"upload$i"}); $i++) {
$err = &text('upload_ecmd', "unzip");
}
else {
open(OUT, &command_as_user($uinfo[0], 0, "(cd $qdir && unzip -o $qpath)")." 2>&1 </dev/null |");
open(OUT, &webmin_command_as_user($uinfo[0], 0, "(cd $qdir && unzip -o $qpath)")." 2>&1 </dev/null |");
while(<OUT>) {
$out .= $_;
if (/^\s*[a-z]+:\s+(.*)/) {
@@ -101,7 +101,7 @@ for($i=0; defined($d = $in{"upload$i"}); $i++) {
$err = &text('upload_ecmd', "tar");
}
else {
open(OUT, &command_as_user($uinfo[0], 0, "(cd $qdir && tar xvf $qpath)")." 2>&1 </dev/null |");
open(OUT, &webmin_command_as_user($uinfo[0], 0, "(cd $qdir && tar xvf $qpath)")." 2>&1 </dev/null |");
while(<OUT>) {
$out .= $_;
if (/^(.*)/) {
@@ -119,7 +119,7 @@ for($i=0; defined($d = $in{"upload$i"}); $i++) {
$err = &text('upload_ecmd', "lha");
}
else {
open(OUT, &command_as_user($uinfo[0], 0, "(cd $qdir && lha xf $qpath)")." 2>&1 </dev/null |");
open(OUT, &webmin_command_as_user($uinfo[0], 0, "(cd $qdir && lha xf $qpath)")." 2>&1 </dev/null |");
while(<OUT>) {
$out .= $_;
if (/(\S[^\t]*\S)\s+\-\s+/) {
@@ -142,7 +142,7 @@ for($i=0; defined($d = $in{"upload$i"}); $i++) {
$err = &text('upload_ecmd', $zipper);
}
else {
open(OUT, &command_as_user($uinfo[0], 0, "(cd $qdir && $zipper -c $qpath | tar xvf -)")." 2>&1 </dev/null |");
open(OUT, &webmin_command_as_user($uinfo[0], 0, "(cd $qdir && $zipper -c $qpath | tar xvf -)")." 2>&1 </dev/null |");
while(<OUT>) {
$out .= $_;
if (/^(.*)/) {