michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTML escape error messages

Browse Source
This commit is contained in:
Jamie Cameron
2008-04-20 20:23:27 +00:00
parent 352ac86612
commit be1c09df40
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apache/apache-lib.pl
View File

@@ -1418,7 +1418,7 @@ elsif ($config{'apply_cmd'}) {
local $out = &backquote_logged("$config{'apply_cmd'} 2>&1");
&reset_environment();
if ($?) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
elsif (-x &translate_filename($config{'apachectl_path'})) {
@@ -1429,7 +1429,7 @@ elsif (-x &translate_filename($config{'apachectl_path'})) {
local $out = &backquote_logged("$config{'apachectl_path'} graceful 2>&1");
&reset_environment();
if ($?) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
else {
@@ -1437,7 +1437,7 @@ elsif (-x &translate_filename($config{'apachectl_path'})) {
local $out = &backquote_logged("$config{'apachectl_path'} restart 2>&1");
&reset_environment();
if ($out !~ /httpd restarted/) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
}
@@ -1461,14 +1461,14 @@ if ($config{'stop_cmd'}) {
# use the configured stop command
$out = &backquote_logged("($config{'stop_cmd'}) 2>&1");
if ($?) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
elsif (-x $config{'apachectl_path'}) {
# use the apachectl program
$out = &backquote_logged("($config{'apachectl_path'} stop) 2>&1");
if ($httpd_modules{'core'} >= 2 ? $? : $out !~ /httpd stopped/) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
else {
@@ -1498,7 +1498,7 @@ if ($config{'start_cmd'}) {
$out = &backquote_logged("($config{'start_cmd'}) 2>&1");
&reset_environment();
if ($?) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
elsif (-x $config{'apachectl_path'}) {
@@ -1506,7 +1506,7 @@ elsif (-x $config{'apachectl_path'}) {
$out = &backquote_logged("($config{'apachectl_path'} start) 2>&1");
&reset_environment();
if ($out =~ /\S/ && $out !~ /httpd started/) {
return "<pre>$out</pre>";
return "<pre>".&html_escape($out)."</pre>";
}
}
else {
@@ -1521,11 +1521,12 @@ else {
}
local $temp = &transname();
local $rv = &system_logged("( $cmd ) >$temp 2>&1 </dev/null");
$out = `cat $temp`;
$out = &read_file_contents($temp);
unlink($temp);
&reset_environment();
if ($out =~ /\S/ && $out !~ /httpd started/) {
return "<pre>$cmd :\n$out</pre>";
return "<pre>".&html_escape($cmd)." :\n".
&html_escape($out)."</pre>";
}
}

2
apache/restart.cgi
View File

@@ -11,7 +11,7 @@ $conf = &get_config();
if ($config{'test_config'}) {
$err = &test_config();
&error("<pre>$err</pre>") if ($err);
&error("<pre>".&html_escape($err)."</pre>") if ($err);
}
$err = &restart_apache();
&error($err) if ($err);