character encoding information in generated headers; password in eval_bb()

[ott/bsta] / opomba.1.pl

diff --git a/opomba.1.pl b/opomba.1.pl
index 28b3b49bb8f670c49760145b7bccaa04d6b041f8..3b2adb567abb7ecc3ee68ff521e1faa568273f43 100644 (file)
--- a/opomba.1.pl
+++ b/opomba.1.pl
@@ -441,7 +441,7 @@ sub output {
                return redirect ($method, $return_url, 303);
        }
        
-       print "Content-type: text/html\n";
+       print "Content-type: text/html; charset=UTF-8\n";
        if ($status ne '') {
                print 'Status: '.$status."\n";
        }
@@ -577,7 +577,13 @@ sub output {
                        print '       Preview:'."\n";
                        print '      </div>'."\n";
                        print '      <div class="opomba_text">'."\n";
-                 print bb_to_html(eval_bb($content, 0))."\n";
+                 print bb_to_html(
+                               eval_bb(
+                                       $content,
+                                       0,
+                                       $password_ok ? $settings{'password'} : ''
+                               )
+                       )."\n";
                        print '      </div>'."\n";
                        print '     </div>'."\n";
                }