nicer table in check

[ndwebbie.git] / index.pl

diff --git a/index.pl b/index.pl
index 31beaf5ce486f3a2159fb571bf263ea700825ea0..c0ab40fde76d2dffdf92943ec947832f18ed214b 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 #**************************************************************************
 #   Copyright (C) 2006 by Michael Andreen <harvATruinDOTnu>               *
 #                                                                         *
@@ -23,18 +23,26 @@ use CGI qw/:standard/;
 use HTML::Template;
 use DBI;
 use DBD::Pg qw(:pg_types);
+#use Apache2::Request;
 use strict;
 
-
-my $cgi = new CGI;
-
-chdir $ENV{'DOCUMENT_ROOT'};
+local $ND::DBH;
+local $ND::USER;
+local $ND::UID;
+local $ND::PLANET;
+local $ND::TEMPLATE;
+local $ND::BODY;
+local $ND::TICK;
 
 our $DBH = undef;
 our $USER = $ENV{'REMOTE_USER'};
-my $error;
+my $error;# = $ND::r->param('page');
 
-our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
+if ($ENV{'DOCUMENT_ROOT'} =~ m{((\w|/)+)}){
+       chdir $1;
+}
+
+our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl', global_vars => 1, cache => 1);
 
 for my $file ("db.pl","include.pl"){
        unless (my $return = do $file){
@@ -64,20 +72,23 @@ while (my ($name,$attack,$gid) = $query->fetchrow()){
 our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 
 my $page = 'main';
-if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls|intel|users|alliances|memberIntel|resources)$/){
+if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls|intel|users|alliances|memberIntel|resources|planetNaps)$/){
        $page = $1;
 }
 
 our $XML = 0;
 $XML = 1 if param('xml') and $page =~ /^(raids)$/;
 
+our $AJAX = 1;
+
 my $type = 'text/html';
 if ($XML){
        $type = 'text/xml';
-       $ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl");
-       $ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl");
+       $ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl", cache => 1);
+       $ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl", cache => 1);
 }else{
-       $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl");
+       $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl", global_vars => 1, cache => 1);
+       $ND::BODY->param(PAGE => $page);
 }
 
 
@@ -96,6 +107,7 @@ unless ($XML){
        $TEMPLATE->param(isHC => isHC());
        $TEMPLATE->param(isDC => isDC());
        $TEMPLATE->param(isBC => isBC());
+       $TEMPLATE->param(isIntel => isBC());
        $TEMPLATE->param(isAttacker => $ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET)));
        if ($ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))){
                $ND::TEMPLATE->param(Targets => listTargets());
@@ -117,7 +129,7 @@ $USER = undef;
 $PLANET = undef;
 $TEMPLATE = undef;
 $TICK = undef;
-%GROUPS = undef;
+undef %GROUPS;
 $ND::BODY = undef;
 
-exit;
+1;