X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=lib%2FNDWeb%2FInclude.pm;h=e619a228d7506402b232975eebf5ac6155d7f58c;hb=935116e73806d105bf3097b62e3e231fe834d672;hp=5bea31bec699e2ee55594cd271935118ac824116;hpb=57f880656c4486f68583058121a5bcb3b316199c;p=ndwebbie.git
diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm
index 5bea31b..e619a22 100644
--- a/lib/NDWeb/Include.pm
+++ b/lib/NDWeb/Include.pm
@@ -21,13 +21,13 @@ package NDWeb::Include;
use strict;
use warnings;
require Exporter;
-use BBCode::Parser;
+use Parse::BBCode;
use CGI qw/:standard/;
our @ISA = qw/Exporter/;
-our @EXPORT = qw/parseMarkup min max
- intelquery html_escape
+our @EXPORT = qw/parseMarkup
+ html_escape
comma_value array_expand/;
sub html_escape($) {
@@ -40,49 +40,42 @@ sub comma_value ($) {
return $v;
}
+
+my $bbc = Parse::BBCode->new({
+ tags => {
+ Parse::BBCode::HTML->defaults,
+ '' => sub {
+ my $e = ($_[2]);
+ $e =~ s/\r?\n|\r/
\n/g;
+ $e
+ },
+ url => 'url:%s',
+ quote => 'block:
',
+ code => 'block:',
+ img => 'url:%s',
+ li => 'block:%{parse}s',
+ size => '%s',
+
+ },
+ close_open_tags => 1,
+ });
+
sub parseMarkup ($) {
my ($text) = @_;
- #$text =~ s{\n}{\n
}g;
- #$text =~ s{\[B\](.*?)\[/B\]}{$1}gi;
- #$text =~ s{\[I\](.*?)\[/I\]}{$1}gi;
- #$text =~ s{\[url\](.*?)\[/url\]}{$1}gi;
- #$text =~ s{\[PRE\](.*?)\[/PRE\]}{$1
}sgi;
- #$text =~ s{\[PRE\](.*?)\[/PRE\]}{$1
}sgi;
- #$1 =~ s{
}{}g;
-
- eval{
- my $tree = BBCode::Parser->DEFAULT->parse($text);
- $text = $tree->toHTML;
- };
+ $text = $bbc->render($text);
+ if ($bbc->error){
+ my $tree = $bbc->get_tree;
+ $text = $tree->raw_text;
+ $text = $bbc->render($text);
+ }
$text =~ s/\x{3}\d\d?//g; #mirc color TODO: possibly match until \x{0F} and change to [color] block
$text =~ s/[^\x{9}\x{A}\x{D}\x{20}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]//g;
return $text;
}
-
-sub min {
- my ($x,$y) = @_;
- return ($x > $y ? $y : $x);
-}
-
-sub max {
- my ($x,$y) = @_;
- return ($x < $y ? $y : $x);
-}
-
-sub intelquery {
- my ($columns,$where) = @_;
- return qq{
-SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
-FROM (fleets i NATURAL JOIN users u)
- JOIN current_planet_stats t ON i.target = t.id
- JOIN current_planet_stats o ON i.sender = o.id
-WHERE $where
-GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick
-ORDER BY i.tick DESC, i.mission};
-}
-
sub array_expand ($) {
my ($array) = @_;