From: b Date: Mon, 9 Oct 2023 22:40:17 +0000 (+0000) Subject: some viewer bugfix adter test (test not finished) X-Git-Tag: v1.1.0~31 X-Git-Url: http://bicyclesonthemoon.info/git-projects/?a=commitdiff_plain;h=82eb5a4f7231e44602f435300f0a4f762217054a;p=ott%2Fbsta some viewer bugfix adter test (test not finished) --- diff --git a/botm-common b/botm-common index 373116e..dca0f2b 160000 --- 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 720cd7c..aebd62a 100644 --- 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 ':'.$timer_m.''; print $fh ':'.$timer_s.']
'."\n"; } - print '>'; + print '>'; if ($show_command_link) { print $fh ''; } diff --git a/viewer.1.pl b/viewer.1.pl index 5815ef1..f5a5c7b 100644 --- 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,