fix ONG; fix update; total reset

[ott/bsta] / bbcode.1.pl

diff --git a/bbcode.1.pl b/bbcode.1.pl
index 68953ab2ecd628c6bf823d040c1567535241181d..ee88ab11ed22efcf07af55f7b1715b6d368e13f6 100644 (file)
--- a/bbcode.1.pl
+++ b/bbcode.1.pl
@@ -27,11 +27,13 @@ use Encode ('encode', 'decode');
 
 ###PERL_LIB: use lib /botm/lib/bsta
 use botm_common (
+       'HTTP_STATUS',
        'read_header_env',
        'read_data_file',
        'url_query_decode',
        'join_path',
-       'merge_url'
+       'merge_url',
+       'http_header_status'
 );
 use bsta_lib (
        'STATE',
@@ -88,7 +90,7 @@ if ($ENV{'REQUEST_METHOD'} =~ /^(HEAD|GET|POST)$/) {
        $method = $1;
 }
 else{
-       exit fail_method($ENV{'REQUEST_METHOD'}, 'GET, POST, HEAD');
+       exit fail_method($ENV{'REQUEST_METHOD'}, ['GET', 'POST', 'HEAD']);
 }
 
 %http = read_header_env(\%ENV);
@@ -148,9 +150,9 @@ else {
        );
 }
 
-print "Content-type: text/plain\n";
+print "Content-type: text/plain; charset=UTF-8\n";
 if(!$access) {
-       print "Status: 403 Forbidden\n";
+       print http_header_status(HTTP_STATUS->{'forbidden'});
 }
 print "\n";
 if($method eq 'HEAD') {
@@ -167,7 +169,12 @@ my $frame_url = merge_url(
        {'path' => CGI_PATH()},
        {'path' => $frame_file}
 );
-my $content = bb_to_bbcode(eval_bb($frame_data{'content'}, 1));
+my $content = bb_to_bbcode(
+       eval_bb(
+               $frame_data{'content'},
+               1
+       )
+);
 
 print '[quote][center][size=200]'.$frame_data{'title'}.'[/size]'."\n";
 print '[url='.$viewer_url.'][img]'.$frame_url.'[/img][/url][/center]'."\n";