X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FInclude.pm;h=e619a228d7506402b232975eebf5ac6155d7f58c;hb=ab1ec1721c11a109546e162f87488db7dcfb9108;hp=8105dad2f89c54bbfaab521b540410fe83c8945b;hpb=2c8cd1ee01b115d3c0290a2050bbb076aa6508dc;p=ndwebbie.git diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm index 8105dad..e619a22 100644 --- a/lib/NDWeb/Include.pm +++ b/lib/NDWeb/Include.pm @@ -27,7 +27,7 @@ use CGI qw/:standard/; our @ISA = qw/Exporter/; our @EXPORT = qw/parseMarkup - intelquery html_escape + html_escape comma_value array_expand/; sub html_escape($) { @@ -56,6 +56,8 @@ my $bbc = Parse::BBCode->new({ code => 'block:
%{html}s
', img => 'url:%s', li => 'block:
  • %{parse}s
  • ', + size => '%s', + }, close_open_tags => 1, }); @@ -74,18 +76,6 @@ sub parseMarkup ($) { return $text; } -sub intelquery { - my ($columns,$where) = @_; - return qq{ -SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username -FROM (intel i NATURAL JOIN users u) - JOIN current_planet_stats t ON i.target = t.id - JOIN current_planet_stats o ON i.sender = o.id -WHERE $where -GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick,i.sender,i.target -ORDER BY i.tick DESC, i.mission}; -} - sub array_expand ($) { my ($array) = @_;