some viewer bugfix adter test (test not finished)

diff --git a/botm-common b/botm-common
index 373116e970d4474d1154fdde9e9d0a033acd27e9..dca0f2b9cc42433ef0f9bf5b0d7d8b0a8f6fce43 160000 (submodule)
--- a/botm-common
+++ b/botm-common
@@ -1 +1 @@
-Subproject commit 373116e970d4474d1154fdde9e9d0a033acd27e9
+Subproject commit dca0f2b9cc42433ef0f9bf5b0d7d8b0a8f6fce43

diff --git a/bsta_lib.1.pm b/bsta_lib.1.pm
index 720cd7c14717d37aa5b6740ee9ad88877f39e530..aebd62aa44426e78ee48e52c96edd4d0fe59b40c 100644 (file)
--- a/bsta_lib.1.pm
+++ b/bsta_lib.1.pm
@@ -655,7 +655,7 @@ sub bb_to_bbcode {
        my $debug;
        
        ($debug, %bbtree) = bbtree($bb, $printdebug);
-       ($debug, $ht) = convtree ($printdebug, $debug, 'bb', %bbtree);
+       ($debug, $ht) = convtree ($printdebug, $debug, 'bb', \%bbtree);
        
        return $ht;
 }
@@ -793,7 +793,7 @@ sub print_html_data {
        
        foreach my $key (keys %$data) {
                unless ($key eq 'content') {
-                       my $val = $data->{'ind'};
+                       my $val = $data->{$key};
                        $val =~ s/(\r)?\n/\n /gs; # does the space make sense in HTML anyway?
                        print $fh html_encode_line("$key: $val\n", 1);
                }
@@ -991,10 +991,10 @@ sub print_viewer_page {
                $viewer_next_url = merge_url($viewer_next_url, {'query' => $password_query, 'append_query' => 1});
                $viewer_last_url = merge_url($viewer_last_url, {'query' => $password_query, 'append_query' => 1});
                if ($frame_indirect) {
-                       $frame_url = merge_url($frame_url     , {'query' => $password_query});
+                       $frame_url = merge_url($frame_url     , {'query' => $password_query, 'append_query' => 1});
                }
                if ($nextframe_indirect) {
-                       $frame_url = merge_url($frame_next_url, {'query' => $password_query});
+                       $frame_url = merge_url($frame_next_url, {'query' => $password_query, 'append_query' => 1});
                }
        }
        my $_base_url        = html_entity_encode_dec($base_url       , 1);
@@ -1102,7 +1102,7 @@ sub print_viewer_page {
                print $fh ':<span id="ongm" class="'.$timer_color_m.'">'.$timer_m.'</span>';
                print $fh ':<span id="ongs" class="'.$timer_color_s.'">'.$timer_s.'</span>]<br>'."\n";
        }
-       print '&gt';
+       print '&gt;';
        if ($show_command_link) {
                print $fh '<a href="'.($access ? $_viewer_next_url : $_viewer_last_url).'">';
        }

diff --git a/viewer.1.pl b/viewer.1.pl
index 5815ef19a11989e89705ae89f9c80b60faaeb4d3..f5a5c7b2282ff7ebcb7d3273cb22d272cfc94bc1 100644 (file)
--- a/viewer.1.pl
+++ b/viewer.1.pl
@@ -158,6 +158,10 @@ if (open ($state_file, "+<:encoding(UTF-8)", DATA_STATE_PATH())) {
                                }
                                elsif ($state{'ip3'} eq '') {
                                        $new_state{'ip3'} = $IP;
+                                       $new_state{'state'} = STATE->{'ready'};
+                               }
+                               else {
+                                       $new_state{'state'} = STATE->{'ready'};
                                }
                                write_data_file($state_file, '', '', \%new_state);
                        }
@@ -301,6 +305,7 @@ print_viewer_page (
                'timer'         => $timer,
                'static'        => 0,
                'show_command'  => $show_command,
+               'text_mode'     => $text_mode,
        },
        \%state,
        \%settings,