more fatal warnings and other cleanup

[ndwebbie.git] / ND.pm

diff --git a/ND.pm b/ND.pm
index d62a7ea89537bc94d3f6f16c3af452c9624ba26a..cfa73e511dc8c08302357f9ea86b42df8aa6ebcd 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -56,7 +56,7 @@ sub handler {
 sub page {
        our $DBH = ND::DB::DB();
        our $USER = $ENV{'REMOTE_USER'};
-       my $error;# = $ND::r->param('page');
+       my $error = '';
 
        chdir '/var/www/ndawn/code';
 
@@ -66,6 +66,7 @@ sub page {
                ,undef,$ENV{'REMOTE_USER'});
 
        our ($TICK) = $DBH->selectrow_array('SELECT tick()',undef);
+       $TICK = 0 unless defined TICK;
 
 
        my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL JOIN groups WHERE uid = ?');
@@ -98,16 +99,16 @@ sub page {
                $ND::BODY->param(PAGE => $ND::PAGE);
        }
 
-
        unless (my $return = do "$ND::PAGE.pl"){
-               $error .= "<p><b>couldn't parse $ND::page: $@</b></p>" if $@;
-               $error .= "<p><b>couldn't do $ND::page: $!</b></p>"    unless defined $return;
-               $error .= "<p><b>couldn't run $ND::page</b></p>"       unless $return;
+               $error .= "<p><b>couldn't parse $ND::PAGE: $@</b></p>" if $@;
+               $error .= "<p><b>couldn't do $ND::PAGE: $!</b></p>"    unless defined $return && defined $!;
+               $error .= "<p><b>couldn't run $ND::PAGE</b></p>"       unless $return;
        }
 
        unless ($XML){
                my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID);
 
+               $fleetupdate = 0 unless defined $fleetupdate;
 
                $TEMPLATE->param(Tick => $TICK);
                $TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember());
@@ -120,9 +121,9 @@ sub page {
                        $ND::TEMPLATE->param(Targets => listTargets());
                }
                $TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
-               $TEMPLATE->param(Error => $error);
 
        }
+       $TEMPLATE->param(Error => $error);
        $ND::TEMPLATE->param(BODY => $ND::BODY->output);
        my $output = $TEMPLATE->output;
        print header(-type=> $type, -charset => 'utf-8', -Content_Length => length $output);