Remove a few warnings

[ndwebbie.git] / lib / NDWeb / Include.pm

diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm
index 5bea31bec699e2ee55594cd271935118ac824116..b5acfbb43d8ca8f6e7d6eb58515b92f5e7f368b0 100644 (file)
--- a/lib/NDWeb/Include.pm
+++ b/lib/NDWeb/Include.pm
@@ -26,7 +26,7 @@ use CGI qw/:standard/;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/parseMarkup min max
+our @EXPORT = qw/parseMarkup
        intelquery html_escape
        comma_value array_expand/;
 
@@ -60,17 +60,6 @@ sub parseMarkup ($) {
        return $text;
 }
 
-
-sub min {
-    my ($x,$y) = @_;
-    return ($x > $y ? $y : $x);
-}
-
-sub max {
-    my ($x,$y) = @_;
-    return ($x < $y ? $y : $x);
-}
-
 sub intelquery {
        my ($columns,$where) = @_;
        return qq{
@@ -79,7 +68,7 @@ FROM (fleets 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
+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};
 }