Object Oriented Perl

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

diff --git a/ND/Web/Include.pm b/ND/Web/Include.pm
index 220a7819a6b772beb7ffaeeded7fb7f04032fe4e..1bf1e852825b9724cee2d0726b9f6d329e521ac8 100644 (file)
--- a/ND/Web/Include.pm
+++ b/ND/Web/Include.pm
@@ -19,49 +19,17 @@
 
 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;
@@ -72,9 +40,11 @@ sub parseMarkup {
        #$text =~ s{\[PRE\](.*?)\[/PRE\]}{<pre>$1</pre>}sgi;
        #$1 =~ s{<br/>}{}g;
 
-       my $tree = BBCode::Parser->DEFAULT->parse($text);
-
-       return scalar $tree->bodyHTML;;
+       eval{
+               my $tree = BBCode::Parser->DEFAULT->parse($text);
+               $text = $tree->toHTML;
+       };
+       return $text;
 }