small fix

[ndwebbie.git] / ND.pm

diff --git a/ND.pm b/ND.pm
index 0f21c894420079e2d766d61bff1c5454e27bf4e5..404c8795648e042764cc2c28443b56a476e85981 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -31,7 +31,6 @@ use Fcntl 'O_RDONLY';
 use strict;
 use warnings FATAL => 'all';
 
-tie our @PAGES, 'Tie::File', "/var/www/ndawn/code/pages", mode => O_RDONLY or die $!;
 
 sub handler {
        local $ND::r = shift;
@@ -49,23 +48,24 @@ sub handler {
        if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){
                $ND::PAGE = $1 unless $1 eq 'index' and $3 eq 'pl';
        }
+       $ND::PAGE = '' unless defined $ND::PAGE;
        page();
        return Apache2::Const::OK;
 }
 
 sub page {
        our $DBH = ND::DB::DB();
-       our $USER = $ENV{'REMOTE_USER'};
        my $error = '';
 
        chdir '/var/www/ndawn/code';
 
        our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl', global_vars => 1, cache => 1);
 
-       our ($UID,$PLANET) = $DBH->selectrow_array('SELECT uid,planet FROM users WHERE username = ?'
+       our ($UID,$PLANET,$USER) = $DBH->selectrow_array('SELECT uid,planet,username FROM users WHERE username ILIKE ?'
                ,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 = ?');
@@ -81,7 +81,8 @@ sub page {
 
        our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 
-       $ND::PAGE = 'main' unless grep { /^$ND::PAGE$/ } @PAGES;
+       tie my @pages, 'Tie::File', "/var/www/ndawn/code/pages", mode => O_RDONLY, memory => 0 or die $!;
+       $ND::PAGE = 'main' unless grep { /^$ND::PAGE$/ } @pages;
 
        our $XML = 0;
        $XML = 1 if param('xml') and $ND::PAGE =~ /^(raids)$/;
@@ -107,6 +108,7 @@ sub page {
        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());
@@ -128,6 +130,7 @@ sub page {
        print $output;
 
 
+       $DBH->rollback;
        $DBH->disconnect;
        $DBH = undef;
        $UID = undef;