some refactoring

[ndwebbie.git] / ND / Include.pm

diff --git a/ND/Include.pm b/ND/Include.pm
index 96f64da1e5eee58d5cec4b751ce201f51b51fc5e..5df59fc2c110ed5cd5f09718c5a9ba487a8c12e5 100644 (file)
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -20,49 +20,55 @@
 package ND::Include;
 use strict;
 use warnings FATAL => 'all';
+use CGI qw{:standard};
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel parseMarkup min max listTargets
+our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel isTech parseMarkup min max listTargets
        alliances intelquery generateClaimXml/;
 
 sub isMember {
-       return exists $ND::GROUPS{Members};
+       return exists $ND::GROUPS{Members} || isTech();
 }
 
 sub isHC {
-       return exists $ND::GROUPS{HC};
+       return exists $ND::GROUPS{HC} || isTech();
 }
 
 sub isDC {
-       return exists $ND::GROUPS{DC};
+       return exists $ND::GROUPS{DC} || isTech();
 }
 
 sub isBC {
-       return exists $ND::GROUPS{BC};
+       return exists $ND::GROUPS{BC} || isTech();
 }
 
 sub isOfficer {
-       return exists $ND::GROUPS{Officers};
+       return exists $ND::GROUPS{Officers} || isTech();
 }
 
 sub isScanner {
-       return exists $ND::GROUPS{Scanners};
+       return exists $ND::GROUPS{Scanners} || isTech();
 }
 
 sub isIntel {
-       return exists $ND::GROUPS{Intel};
+       return exists $ND::GROUPS{Intel} || isTech();
+}
+
+sub isTech {
+       return exists $ND::GROUPS{Tech};
 }
 
 sub parseMarkup {
        my ($text) = @_;
 
        $text =~ s{\n}{\n<br/>}g;
-       $text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>};
+       $text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>}gi;
        return $text;
 }
 
+
 sub min {
     my ($x,$y) = @_;
     return ($x > $y ? $y : $x);
@@ -99,6 +105,7 @@ ORDER BY r.tick+c.wave,x,y,z});
 sub alliances {
        my ($alliance) = @_;
        my @alliances;
+       $alliance = -1 unless defined $alliance;
        push @alliances,{Id => -1, Name => '&nbsp;', Selected => not $alliance};
        my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name});
        $query->execute;