Minor fixes to remove some warnings

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index aa1c33d27408f78c525bffb41db3a24edcff708a..983ccea3b30bd95d5284fcae4aa13eeb9fbc955e 100644 (file)
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -96,7 +96,7 @@ sub edit : Local {
        my $ticks = $c->req->param('ticks') || 48;
        $c->stash(showticks => $ticks);
 
-       my $query = $dbh->prepare(intelquery q{
+       $query = $dbh->prepare(intelquery q{
                        o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender
                        ,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target
                },q{NOT ingal AND (o.alliance_id = $1 OR t.alliance_id = $1)
@@ -242,12 +242,11 @@ sub resources : Local {
 
 =head1 AUTHOR
 
-A clever guy
+Michael Andreen (harv@ruin.nu)
 
 =head1 LICENSE
 
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
+GPL 2.0, or later.
 
 =cut
 

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index a41553f9169ff26d60b019dba57c4d61fc7dda96..cbb78da89284aefc63a5e27bc4e8440930a6f254 100644 (file)
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -57,10 +57,10 @@ sub list : Local {
                        ,(0.2*(attack_points/a.attack)+ 0.4*(defense_points/a.defense)
                                + 0.2*(c.size/a.size) + 0.05*(c.score/a.score)
                                + 0.15*(c.value/a.value))::Numeric(3,2) AS defprio
-                       ,array_accum(race::text) AS race
-                       ,array_accum(amount) AS amount
-                       ,array_accum(eta) AS eta
-                       ,array_accum(shiptype) AS shiptype
+                       ,array_accum(COALESCE(race::text,'')) AS race
+                       ,array_accum(COALESCE(amount,0)) AS amount
+                       ,array_accum(COALESCE(eta,0)) AS eta
+                       ,array_accum(COALESCE(shiptype,'')) AS shiptype
                        ,array_accum(COALESCE(alliance,'?')) AS alliance
                        ,array_accum(coords) AS attackers
                FROM (SELECT c.id, p.x,p.y,p.z,p.id AS planet, p.size, p.value, p.score
@@ -329,7 +329,7 @@ sub findCall : Private {
 
        my $query = $dbh->prepare(q{
                SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered
-                       ,open, dc.username AS dc, u.defense_points,c.member
+                       ,open, dc.username AS dc, u.defense_points,c.member AS uid
                        ,u.planet, u.username AS member, u.sms,c.ftid
                FROM calls c 
                JOIN users u ON c.member = u.uid
@@ -339,7 +339,7 @@ sub findCall : Private {
                });
        $call = $dbh->selectrow_hashref($query,undef,$call);
 
-       $c->assert_user_roles(qw/calls_edit/) unless $c->user->id == $call->{member};
+       $c->assert_user_roles(qw/calls_edit/) unless $c->user->id == $call->{uid};
        $c->stash(call => $call);
 }
 

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index bb1f741bd39505f458d5ead5cb6d04f798b9f489..8c44e056590cb0e5832c4ab3281c1f79a79b3a71 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -250,7 +250,7 @@ sub points : Local {
        my ( $self, $c, $order ) = @_;
        my $dbh = $c->model;
 
-       if ($order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){
+       if ($order && $order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){
                $order = "$1 DESC";
        }else{
                $order = 'total_points DESC';
@@ -417,7 +417,7 @@ sub postconfirmation : Local {
                        });
                my @missions;
                $dbh->begin_work;
-               while ($missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)
+               while ($missions && $missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)
                        \s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins?\s+
                        (Attack|Defend|Return|Fake\ Attack|Fake\ Defend)
                        (.*?)

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 205e1056fb8485ec35e3cc4f67af3877a04edd71..86465bc0d25246d1685f4c9ee9c0789ced4680e5 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -248,9 +248,9 @@ sub edit : Local {
        $c->stash(removegroups => \@remgroups);
        $c->stash(addgroups => \@addgroups);
 
-       if ($order =~ /^(score|size|value|xp)rank$/){
+       if ($order && $order =~ /^(score|size|value|xp)rank$/){
                $order .= " ASC";
-       }elsif ($order eq 'race'){
+       }elsif ($order && $order eq 'race'){
                $order .= ' ASC';
        }else {
                $order .= 'p.x,p.y,p.z';
@@ -534,11 +534,12 @@ sub targetlist : Local {
 
        $c->stash(comma => \&comma_value);
        $c->stash(allies => $alliances);
+       $alliances ||= '';
        my @alliances = split /,/, $alliances;
 
        $c->forward('listAlliances');
 
-       if ($order =~ /^(sizerank|valuerank|scorerank|xprank|nfvalue|nfvalue2)$/){
+       if ($order && $order =~ /^(sizerank|valuerank|scorerank|xprank|nfvalue|nfvalue2)$/){
                $order = "$1";
        }else{
                $order = "nfvalue";

diff --git a/root/src/members/addintel.tt2 b/root/src/members/addintel.tt2
index a77cc1b9dac95838606eaaf9a72457a351755d2e..6edf74a589651d794ecb4e7b0138cc6d5eee48c9 100644 (file)
--- a/root/src/members/addintel.tt2
+++ b/root/src/members/addintel.tt2
@@ -1,5 +1,5 @@
 [% META title = 'Add intel and scans' %]
-[% IF scans.size > 0 %]
+[% IF scans.size %]
 <div class="leftinfo">
 <h3>Added the following scans:</h3>
        [% FOR s IN scans %]
@@ -9,7 +9,7 @@
 </div>
 [% END %]
 
-[% IF intel.size > 0 %]
+[% IF intel.size %]
 <div class="leftinfo">
 <h3>Added the following intel:</h3>
        [% FOR i IN intel %]

diff --git a/scripts/fetchdumps.pl b/scripts/fetchdumps.pl
index 71f4e7e4835d4dd6d1ec20576e33e6a94c555239..2579f38532688463e9b3a7a4ad07f0c6da32f7eb 100755 (executable)
--- a/scripts/fetchdumps.pl
+++ b/scripts/fetchdumps.pl
@@ -56,6 +56,7 @@ if ($updated){
        `/var/www/ndawn/scripts/parsegalaxies.pl $updated`;
        `/var/www/ndawn/scripts/ndrank.pl`;
        $dbh->do(q{UPDATE misc SET value = ? WHERE id = 'TICK'}, undef, $updated);
+       local $dbh->{Warn} = 0;
        $dbh->do(q{VACUUM ANALYZE});
 }