VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-21 23:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail if before or after editing or saving command exits with non-zero status

Browse Source
This commit is contained in:
Jamie Cameron
2011-08-26 17:45:16 -07:00
parent 4334a3cef1
commit 1fdbb89bf5
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
custom/lang/en
View File

@ -133,6 +133,9 @@ view_ecannot=You are not allowed to edit this file
view_title=Edit File
view_efile=Write to $1 failed : $2
view_header=Editing file $1
view_ebeforeedit=Before-editing command failed : $1
view_ebefore=Before-saving command failed : $1
view_eafter=After-saving command failed : $1
form_ecannot=You are not allowed to run this command
form_title=Execute Command

6
custom/save.cgi
View File

@ -26,7 +26,8 @@ if ($edit->{'envs'} || @{$edit->{'args'}}) {
# Run the before-command
if ($edit->{'before'}) {
&system_logged("($edit->{'before'}) >/dev/null 2>&1 </dev/null");
$out = &backquote_logged("($edit->{'before'}) 2>&1 </dev/null");
&error(&text('view_ebefore', &html_escape($out))) if ($?);
}
# Save the file
@ -48,7 +49,8 @@ if ($edit->{'perms'}) {
# Run the after-command
if ($edit->{'after'}) {
&system_logged("($edit->{'after'}) >/dev/null 2>&1 </dev/null");
$out = &backquote_logged("($edit->{'after'}) 2>&1 </dev/null");
&error(&text('view_eafter', &html_escape($out))) if ($?);
}
&webmin_log("save", "edit", $cmd->{'id'}, $edit);

3
custom/view.cgi
View File

@ -26,7 +26,8 @@ if ($edit->{'envs'} || @{$edit->{'args'}}) {
# Run any before-edit command
if ($edit->{'beforeedit'}) {
&system_logged("($edit->{'beforeedit'}) >/dev/null 2>&1 </dev/null");
$out = &backquote_logged("($edit->{'beforeedit'}) 2>&1 </dev/null");
&error(&text('view_ebeforeedit', &html_escape($out))) if ($?);
}
# Show the editor form