diff options
| author | fukachan <fukachan> | 2003-10-07 08:58:06 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-10-07 08:58:06 +0000 |
| commit | 09909d2c3a815dc799e9ca4b523673c55e2414ce (patch) | |
| tree | 7ef328e99dbbbff6f92321e54d280c6dff4ce54a /fml/lib/FML | |
| parent | 745b77e54200751342e37678fc320d61b56fdcd6 (diff) | |
| download | fml8-09909d2c3a815dc799e9ca4b523673c55e2414ce.tar.gz fml8-09909d2c3a815dc799e9ca4b523673c55e2414ce.tar.bz2 fml8-09909d2c3a815dc799e9ca4b523673c55e2414ce.zip | |
fix html style:
<pre>str1</pre> <pre>str2</pre> ... -> <pre>str1\nstr2 ... </pre>
Diffstat (limited to 'fml/lib/FML')
| -rw-r--r-- | fml/lib/FML/Command/Admin/log.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fml/lib/FML/Command/Admin/log.pm b/fml/lib/FML/Command/Admin/log.pm index a307d746..40e1ec6d 100644 --- a/fml/lib/FML/Command/Admin/log.pm +++ b/fml/lib/FML/Command/Admin/log.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: log.pm,v 1.17 2003/08/29 15:33:59 fukachan Exp $ +# $FML: log.pm,v 1.18 2003/10/06 10:46:47 fukachan Exp $ # package FML::Command::Admin::log; @@ -124,6 +124,8 @@ sub _show_log my $s = ''; $maxline -= $last_n_lines; + if ($is_cgi) { print $wh "<pre>\n";} + # show the last $last_n_lines lines by default. my $buf; LINE: @@ -134,12 +136,15 @@ sub _show_log if ($is_cgi) { print $wh (_html_to_text($s)); + print $wh "\n"; } else { print $wh $s; } } $fh->close; + + if ($is_cgi) { print $wh "</pre>\n";} } } @@ -156,7 +161,7 @@ sub _html_to_text use HTML::FromText; }; unless ($@) { - return text2html($str, urls => 1, pre => 1); + return text2html($str, urls => 1, pre => 0); } else { croak($@); |
