fatal warnings

diff --git a/alliances.pl b/alliances.pl
index 66ecfd68789dac710c85596b6b507692691cbc34..4cfa2d51f46ea61e884a8665a2953a064153f851 100644 (file)
--- a/alliances.pl
+++ b/alliances.pl
@@ -18,6 +18,8 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 use POSIX;
 our $BODY;
 our $DBH;
@@ -98,7 +100,7 @@ ORDER BY $order});
        $query->execute($alliance->{id},$alliance->{id},$alliance->{id},$alliance->{id}) or $error .= $DBH->errstr;
 
        my @intel;
-       my $i = 0;
+       $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
                        $intel->{missionclass} = 'ingal';

diff --git a/calls.pl b/calls.pl
index ce708fc0df83aa37c90a9c33988111e3bb2bd815..8aab04a63540aaa10a071b0ea2a604888fd59ca5 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -18,6 +18,8 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 use POSIX;
 our $BODY;
 our $DBH;
@@ -160,7 +162,7 @@ WHERE i.call = ?
 ORDER BY p.x,p.y,p.z});
        $attackers->execute($call->{id});
        my @attackers;
-       my $i = 0;
+       $i = 0;
        while(my $attacker = $attackers->fetchrow_hashref){
                $i++;
                $attacker->{ODD} = $i % 2;

diff --git a/intel.pl b/intel.pl
index 90498c29dd5307b56cfe8af6e2779956f59f3153..5db6f9bdbe1ef9a7fffca368b4fb2324ffb64034 100644 (file)
--- a/intel.pl
+++ b/intel.pl
@@ -18,6 +18,8 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 use POSIX;
 our $BODY;
 our $DBH;
@@ -135,7 +137,7 @@ if ($planet){
        my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin',"t.id = ? $showticks"));
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
        my @intellists;
-       my @intel;
+       my @incomings;
        my $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
@@ -145,14 +147,14 @@ if ($planet){
                }
                $i++;
                $intel->{ODD} = $i % 2;
-               push @intel,$intel;
+               push @incomings,$intel;
        }
-       push @intellists,{Message => 'Incoming fleets', Intel => \@intel, Origin => 1};
+       push @intellists,{Message => 'Incoming fleets', Intel => \@incomings, Origin => 1};
 
-       my $query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
+       $query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
-       my @intel;
-       my $i = 0;
+       my @outgoings;
+       $i = 0;
        while (my $intel = $query->fetchrow_hashref){
                if ($intel->{ingal}){
                        $intel->{missionclass} = 'ingal';
@@ -161,9 +163,9 @@ if ($planet){
                }
                $i++;
                $intel->{ODD} = $i % 2;
-               push @intel,$intel;
+               push @outgoings,$intel;
        }
-       push @intellists,{Message => 'Outgoing Fleets', Intel => \@intel, Target => 1};
+       push @intellists,{Message => 'Outgoing Fleets', Intel => \@outgoings, Target => 1};
 
        $BODY->param(IntelLIsts => \@intellists);
 

diff --git a/templates/alliances.tmpl b/templates/alliances.tmpl
index a7e67dd81e068aff2f4922668d6d7809c7ab68c8..42e3dedff4cda38fa89185d24568e088d7e11350 100644 (file)
--- a/templates/alliances.tmpl
+++ b/templates/alliances.tmpl
@@ -59,8 +59,8 @@
        </tr>
        <TMPL_LOOP Intel>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-       <td><a href="intel?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        <td><TMPL_VAR NAME=OAlliance></td>
+       <td><a href="intel?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        <td class="<TMPL_VAR NAME=MissionClass>"><TMPL_VAR NAME=Mission></td>
        <td align="center"><TMPL_VAR NAME=landingtick></td>
        <td align="center"><TMPL_VAR NAME=ETA></td>

diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 3fc6d40a42928f7d6f1059ca13e0e84cd5542c6b..288b1e146df4c3d1dca857616dc9a539d88521fa 100644 (file)
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -87,8 +87,8 @@
        <TMPL_LOOP Intel>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <TMPL_IF Origin>
-       <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        <td><TMPL_VAR NAME=OAlliance></td>
+       <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        </TMPL_IF>
        <td class="<TMPL_VAR NAME=MissionClass>"><TMPL_VAR NAME=Mission></td>
        <td align="center"><TMPL_VAR NAME=landingtick></td>