oo points

[ndwebbie.git] / ND / Web / Include.pm

diff --git a/ND/Web/Include.pm b/ND/Web/Include.pm
index 9206ba489cf5947e2149ccd4e82f5bfea1b2d08c..1bf1e852825b9724cee2d0726b9f6d329e521ac8 100644 (file)
--- a/ND/Web/Include.pm
+++ b/ND/Web/Include.pm
@@ -19,52 +19,31 @@
 
 package ND::Web::Include;
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 use CGI qw{:standard};
 require Exporter;
+use BBCode::Parser;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel isTech parseMarkup min max listTargets
+our @EXPORT = qw/parseMarkup min max listTargets
        alliances intelquery generateClaimXml/;
 
-sub isMember {
-       return exists $ND::GROUPS{Members} || isTech();
-}
-
-sub isHC {
-       return exists $ND::GROUPS{HC} || isTech();
-}
-
-sub isDC {
-       return exists $ND::GROUPS{DC} || isTech();
-}
-
-sub isBC {
-       return exists $ND::GROUPS{BC} || isTech();
-}
-
-sub isOfficer {
-       return exists $ND::GROUPS{Officers} || isTech();
-}
-
-sub isScanner {
-       return exists $ND::GROUPS{Scanners} || isTech();
-}
-
-sub isIntel {
-       return exists $ND::GROUPS{Intel} || isTech();
-}
-
-sub isTech {
-       return exists $ND::GROUPS{Tech};
-}
-
-sub parseMarkup {
+sub parseMarkup ($) {
        my ($text) = @_;
 
-       $text =~ s{\n}{\n<br/>}g;
-       $text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>}gi;
+       #$text =~ s{\n}{\n<br/>}g;
+       #$text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>}gi;
+       #$text =~ s{\[I\](.*?)\[/I\]}{<i>$1</i>}gi;
+       #$text =~ s{\[url\](.*?)\[/url\]}{<a href="$1">$1</a>}gi;
+       #$text =~ s{\[PRE\](.*?)\[/PRE\]}{<pre>$1</pre>}sgi;
+       #$text =~ s{\[PRE\](.*?)\[/PRE\]}{<pre>$1</pre>}sgi;
+       #$1 =~ s{<br/>}{}g;
+
+       eval{
+               my $tree = BBCode::Parser->DEFAULT->parse($text);
+               $text = $tree->toHTML;
+       };
        return $text;
 }