&_title;

'; - #$add_html .= '

'; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $add_html .= '
'; + } + else { + $add_html .= '
'; + } } else { if ($tag_value =~ m/^"(.*)"$/gs) { $tag_value = bbcode_to_html($cmd_options, $post, $1); } else { - $tag_value = 'QUOTE MARKS MISSING; '.html_entity_encode_dec($tag_value) + $tag_value = 'QUOTE MARKS MISSING; '.html_entity_encode_dec($tag_value, 1) + } + if ($cmd_options->{'post-style'} eq 'phpbb') { + $add_html .= '
'.$tag_value.' wrote:'; + } + else { + $add_html .= '
'.$tag_value.' wrote:
'; } - $add_html .= '
'.$tag_value.' wrote:'; - # $add_html .= '
'.$tag_value.' wrote:
'; } } @@ -827,11 +1025,15 @@ sub bbcode_to_html { if ($print) { print "not a tag, actually\n"; } - $add_html .= html_entity_encode_dec($tag); + $add_html .= html_entity_encode_dec($tag, 1); } else { - $add_html .= '
Code: Select all
'; - # $add_html .= 'Code: Select all '; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $add_html .= 'Code: Select all '; + } + else { + $add_html .= 'Code: Select all '; + } } if ($tag_value ne '') { $add_html .= 'INVALID VALUE; '; @@ -850,7 +1052,7 @@ sub bbcode_to_html { print 'Implied value: '.$tag_value."\n"; } } - $add_html .= ''; + $add_html .= ''; } elsif ($tag_name eq 'size') { @@ -907,8 +1109,12 @@ sub bbcode_to_html { } elsif ($tag_name eq 'spoiler') { - $add_html .= 'Spoiler: '; - # $add_html .= 'Spoiler: '; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $add_html .= 'Spoiler: '; + } + else { + $add_html .= 'Spoiler: '; + } if ($tag_value ne '') { $add_html .= 'INVALID VALUE; '; } @@ -953,7 +1159,7 @@ sub bbcode_to_html { if ($print) { print "unknown tag\n" } - $add_html .= html_entity_encode_dec($tag); + $add_html .= html_entity_encode_dec($tag, 1); } } @@ -964,7 +1170,7 @@ sub bbcode_to_html { if ($print) { print "unmatched tag\n"; } - $add_html .= html_entity_encode_dec($tag_end); + $add_html .= html_entity_encode_dec($tag_end, 1); } elsif ($tag_name eq '_') { @@ -985,7 +1191,7 @@ sub bbcode_to_html { if ($print) { print "not a tag, actually\n"; } - $add_html .= html_entity_encode_dec($tag_end); + $add_html .= html_entity_encode_dec($tag_end, 1); } else { $add_html .= ' '; @@ -993,8 +1199,12 @@ sub bbcode_to_html { } elsif ($tag_name eq 'img') { - $add_html .= '" alt="Image" />'; - # $add_html .= '" alt="Image">'; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $add_html .= '" alt="Image" />'; + } + else { + $add_html .= '" alt="Image">'; + } if ($tag_value ne '') { $add_html .= 'INVALID VALUE; '; } @@ -1042,7 +1252,7 @@ sub bbcode_to_html { if ($print) { print "unknown tag\n"; } - $add_html .= html_entity_encode_dec($tag_end); + $add_html .= html_entity_encode_dec($tag_end, 1); } } @@ -1062,7 +1272,7 @@ sub bbcode_to_html { # and this will not interfere with detecting the start and end # of an URL which needs to be escaped anyway. - $text = html_entity_encode_dec($text); + $text = html_entity_encode_dec($text, 1); # preserve indentation in [code] if ($in_code > 0) { @@ -1077,13 +1287,21 @@ sub bbcode_to_html { # convert smilies if (($post->{'smilies'}) and ($tag_name !~ /^((code)|(img))$/)) { - $text =~ s/(^|[ \t])((:([Do\?xP\|]|(((shock)|(lol)|(oops)|(cry)|(evil)|(twisted)|(roll)|(wink)|(idea)|(arrow)|(mrgreen)|[!\?]):)))|(8-\))|(;\)))($|[ \t])/' '/gme; - # $text =~ s/(^|[ \t])((:([Do\?xP\|]|(((shock)|(lol)|(oops)|(cry)|(evil)|(twisted)|(roll)|(wink)|(idea)|(arrow)|(mrgreen)|[!\?]):)))|(8-\))|(;\)))($|[ \t])/' '/gme; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $text =~ s/(^|[ \t])((:([Do\?xP\|]|(((shock)|(lol)|(oops)|(cry)|(evil)|(twisted)|(roll)|(wink)|(idea)|(arrow)|(mrgreen)|[!\?]):)))|(8-\))|(;\)))($|[ \t])/' '/gme; + } + else { + $text =~ s/(^|[ \t])((:([Do\?xP\|]|(((shock)|(lol)|(oops)|(cry)|(evil)|(twisted)|(roll)|(wink)|(idea)|(arrow)|(mrgreen)|[!\?]):)))|(8-\))|(;\)))($|[ \t])/' '/gme; + } } # convert NL - $text =~ s/\r?\n/\n/gs; - # $text =~ s/\r?\n/ \n/gs; + if ($cmd_options->{'post-style'} eq 'phpbb') { + $text =~ s/\r?\n/\n/gs; + } + else { + $text =~ s/\r?\n/ \n/gs; + } $add_html .= $text; } diff --git a/preview.1.pl b/preview.1.pl index e1489aa..e176711 100644 --- a/preview.1.pl +++ b/preview.1.pl @@ -23,12 +23,15 @@ use Encode ('encode', 'decode'); ###PERL_LIB: use lib '/botm/lib/post'; use botm_common ( - 'read_data_file', 'write_data_file' + 'read_data_file', 'write_data_file', + 'html_entity_encode_dec' ); use post_common ( 'prepare_post', 'CODE', - 'bbcode_to_html' + 'bbcode_to_html', + 'HTML_PAGE_START', 'HTML_PAGE_END', 'HTML_POST_START', 'HTML_POST_END', + 'HTML_STYLE' ); ###PERL_VERSION: use constant VERSION => 'x.x.x'; @@ -59,6 +62,14 @@ use constant HELP_TEXT => "\n". " -o, --output-file=OUTPUT_FILE\n". "\n". + " --content-only\n". + " --smiley-url=SMILEY_URL\n". + " --css-url=CSS_URL\n". + " --inline-css\n". + " --post-style=\n". + " phpbb\n". + " botm\n". + "\n". " -q, --quiet\n". " -v, --verbose\n". # " --keep-tempfile\n". @@ -95,7 +106,13 @@ GetOptions ( 'notify|N' => \$options{ 'notify'}, 'no-notify|n' => \$options{'no-notify'}, - 'output-file|o=s' => \$options{'output-file'}, + 'output-file|o=s'=> \$options{'output-file'}, + + 'content-only' => \$options{'content-only'}, + 'smiley-url=s' => \$options{'smiley-url'}, + 'css-url=s' => \$options{'css-url'}, + 'inline-css' => \$options{'inline-css'}, + 'post-style=s' => \$options{'post-style'}, 'quiet|q' => \$options{'quiet'}, 'verbose|v' => \$options{'verbose'}, @@ -127,6 +144,10 @@ if ($options{'quiet'} ne '') { if (($options{'output-file'} eq '') and ($options{'verbose'} eq '')) { $options{'quiet'} = '1'; } +if ($options{'post-style'} !~ /^((botm)|(bsta)|(phpbb))$/) { + # $options{'post-style'} = 'phpbb'; + $options{'post-style'} = 'botm'; +} unless ($options{'quiet'} ne '') { print "PREVIEW $$ $time - $timetext\n\n"; @@ -142,6 +163,11 @@ if ((scalar @ARGV) == 0) { } my $fh; +my $code; +my %data; +my %post; +my $html; + if ($options{'output-file'} ne '') { unless (open ($fh, '>:encoding(UTF-8)', encode('locale_fs', $options{'output-file'}))) { unless ($options{'quiet'} ne '') { @@ -153,12 +179,16 @@ if ($options{'output-file'} ne '') { } else { $fh = \*STDOUT; + binmode STDOUT, ':encoding(UTF-8)'; +} + +$code = CODE->{'OK'}; + +unless ($options{'content-only'} ne '') { + print_preview($fh, HTML_PAGE_START(), \%post, \%options); } -my $code = CODE->{'OK'}; foreach my $arg (@ARGV) { - my $r; - unless ($options{'quiet'} ne '') { if ($arg == \*STDIN) { print "STDIN\n"; @@ -168,7 +198,7 @@ foreach my $arg (@ARGV) { } } - my %data = (); + %data = (); unless (($arg == \*STDIN) and ($options{'content'} ne '') and ($options{'data-only'} ne '')) { %data = read_data_file($arg, ENCODING_FILE, $options{'data-only'}); @@ -192,7 +222,7 @@ foreach my $arg (@ARGV) { print "\n"; } - my %post = prepare_post(\%options, \%data); + %post = prepare_post(\%options, \%data); if ($options{'verbose'} ne '') { print "POST\n"; write_data_file(\*STDOUT, 'console_out', 0, \%post); @@ -200,7 +230,7 @@ foreach my $arg (@ARGV) { } # now generate preview - my $html = bbcode_to_html(\%options, \%post); + $html = bbcode_to_html(\%options, \%post); if ($options{'verbose'} ne '') { print "HTML\n"; @@ -208,9 +238,53 @@ foreach my $arg (@ARGV) { print "\n"; } + unless ($options{'content-only'} ne '') { + print_preview($fh, HTML_POST_START(), \%post, \%options); + } + print $fh $html."\n"; + + unless ($options{'content-only'} ne '') { + print_preview($fh, HTML_POST_END(), \%post, \%options); + } +} +unless ($options{'content-only'} ne '') { + print_preview($fh, HTML_PAGE_END(), \%post, \%options); } - close ($fh); exit $code; + + +sub print_preview { + (my $fh, my $data, my $post, my $options) = @_; + + my @data_list = @{$data->{$options->{'post-style'}}}; + + foreach my $data_line (@data_list) { + + if ($data_line =~ m/&_css_url;/gs) { + if ($options->{'css-url'} ne '') { + print $fh $`. $options->{'css-url'} . $' . "\n"; + } + next; + } + + if ($data_line =~ m/&_inline_css;/gs) { + if ($options->{'inline-css'} ne '') { + print $fh $`; + print_preview($fh, HTML_STYLE(), $post, $options); + print $fh $' . "\n"; + } + next; + } + + $data_line =~ s/&_title;/preview/gs; + $data_line =~ s/&_subject;/html_entity_encode_dec($post->{'subject'},1)/gse; + $data_line =~ s/&_username;/html_entity_encode_dec($post->{'username'},1)/gse; + $data_line =~ s/&_time;/\$time/gs; # TODO + $data_line =~ s/&_post_class;/html_entity_encode_dec($post->{'class'},1)/gse; + + print $fh $data_line."\n"; + } +} \ No newline at end of file