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

[ott/bsta] / bsta_lib.1.pm

diff --git a/bsta_lib.1.pm b/bsta_lib.1.pm
index fc713655d741193ca947b488d2d3dc7e593ff99a..fe1f349eebb43f99a971cfb0f1e43b87ee9ceb7e 100644 (file)
--- a/bsta_lib.1.pm
+++ b/bsta_lib.1.pm
@@ -715,7 +715,7 @@ sub bb_to_bbcode {
 }
 
 sub eval_bb {
-       (my $bb, my $full_url) = @_;
+       (my $bb, my $full_url, my $password) = @_;
        my $value;
        my $before;
        my $after;
@@ -753,6 +753,12 @@ sub eval_bb {
                else {
                        $value = '';
                }
+               if (($value ne '') && ($password ne '')) {
+                       $value = merge_url(
+                               $value,
+                               {'query' => {'p' => $password}}
+                       );
+               }
                $bb = $before . $value . $after;
        }
        return $bb;
@@ -1226,14 +1232,27 @@ sub print_viewer_page {
                
                print $fh '[quote][center][size=200]'.$_title.'[/size]<br>'."\n";
                print $fh '[url='.$_viewer_full_url.'][img]'.$_frame_full_url.'[/img][/url][/center]<br>'."\n";
-               print $fh html_encode_line(bb_to_bbcode(eval_bb($frame_data->{'content'}, 1)));
+               print $fh html_encode_line(
+                       bb_to_bbcode(
+                               eval_bb(
+                                       $frame_data->{'content'},
+                                       1
+                               )
+                       )
+               );
                print $fh '[/quote]'."\n";
                
                print $fh '    </div>'."\n";
        }
        elsif ($frame_data->{'content'} ne '') {
                print $fh '    <div id="undertext">'."\n";
-               print $fh bb_to_html(eval_bb($frame_data->{'content'}), 0)."\n";
+               print $fh bb_to_html(
+                       eval_bb(
+                               $frame_data->{'content'},
+                               0,
+                               $password_ok ? $settings->{'password'} : ''
+                       )
+               )."\n";
                print $fh '    </div>'."\n";
        }
        
@@ -1483,7 +1502,13 @@ sub print_comments {
                        print $fh '       </div>'."\n";
                        print $fh '      </div>'."\n";
                        print $fh '      <div class="opomba_text">'."\n";
-                 print $fh bb_to_html(eval_bb($post_data{'content'}), 0)."\n";
+                 print $fh bb_to_html(
+                               eval_bb(
+                                       $post_data{'content'},
+                                       0,
+                                       $password_ok ? $settings->{'password'} : ''
+                               )
+                       )."\n";
                        print $fh '      </div>'."\n";
                        print $fh '     </div>'."\n";
                        print $fh '     <br>'."\n";