X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=ND%2FInclude.pm;h=5df59fc2c110ed5cd5f09718c5a9ba487a8c12e5;hb=ba0d22272efc046f7feaf07ebf190fa9ec6474c7;hp=796ed68dbd10acabcc81244d97d295d335044e20;hpb=49477962790fe1b056d500783d36b6bcb5dd0707;p=ndwebbie.git diff --git a/ND/Include.pm b/ND/Include.pm index 796ed68..5df59fc 100644 --- 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
}g; - $text =~ s{\[B\](.*?)\[/B\]}{$1}; + $text =~ s{\[B\](.*?)\[/B\]}{$1}gi; return $text; } + sub min { my ($x,$y) = @_; return ($x > $y ? $y : $x);