X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FInclude.pm;h=bec7dd5b1e75bb5f3c053b30843c5e344115e309;hb=b3ea6d7f8b9879d759da59d8e445e35fabf16f79;hp=96f64da1e5eee58d5cec4b751ce201f51b51fc5e;hpb=354c2fb813a139fb08476b6d0e7f30308091038a;p=ndwebbie.git diff --git a/ND/Include.pm b/ND/Include.pm index 96f64da..bec7dd5 100644 --- a/ND/Include.pm +++ b/ND/Include.pm @@ -24,35 +24,39 @@ 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 { @@ -99,6 +103,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 => ' ', Selected => not $alliance}; my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name}); $query->execute;