X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=index.pl;h=c0ab40fde76d2dffdf92943ec947832f18ed214b;hb=2786d1732fb6a4f729db332b49766e0f86e574be;hp=a78dff374b50b103745d6fd5069ac0bf8b2dc6d1;hpb=2bd98fbbe41b817e4c9172215b2d226429120fdb;p=ndwebbie.git

diff --git a/index.pl b/index.pl
index a78dff3..c0ab40f 100755
--- 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,33 +23,39 @@ 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 $UID = undef;
-our $PLANET = undef;
-our $TEMPLATE = undef;
-our $TICK = undef;
+our $USER = $ENV{'REMOTE_USER'};
+my $error;# = $ND::r->param('page');
+
+if ($ENV{'DOCUMENT_ROOT'} =~ m{((\w|/)+)}){
+	chdir $1;
+}
 
-$ND::TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
+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){
-		warn "couldn't parse $file: $@" if $@;
-		warn "couldn't do $file: $!"    unless defined $return;
-		warn "couldn't run $file"       unless $return;
+		print "couldn't parse $file: $@" if $@;
+		print "couldn't do $file: $!"    unless defined $return;
+		print "couldn't run $file"       unless $return;
 	}
 }
 
-($UID,$PLANET) = $DBH->selectrow_array('SELECT uid,planet FROM users WHERE username = ?'
+our ($UID,$PLANET) = $DBH->selectrow_array('SELECT uid,planet FROM users WHERE username = ?'
 	,undef,$ENV{'REMOTE_USER'});
 
-($TICK) = $DBH->selectrow_array('SELECT tick()',undef);
+our ($TICK) = $DBH->selectrow_array('SELECT tick()',undef);
 
 
 my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL JOIN groups WHERE uid = ?');
@@ -66,41 +72,48 @@ 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)$/){
+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);
 }
 
 
 unless (my $return = do "${page}.pl"){
-	print "<p><b>couldn't parse $page: $@</b></p>" if $@;
-	print "<p><b>couldn't do $page: $!</b></p>"    unless defined $return;
-	print "<p><b>couldn't run $page</b></p>"       unless $return;
+	$error .= "<p><b>couldn't parse $page: $@</b></p>" if $@;
+	$error .= "<p><b>couldn't do $page: $!</b></p>"    unless defined $return;
+	$error .= "<p><b>couldn't run $page</b></p>"       unless $return;
 }
 
 unless ($XML){
 	my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID);
 
+
 	$TEMPLATE->param(Tick => $TICK);
 	$TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember());
 	$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());
 	}
+	$TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
+	$TEMPLATE->param(Error => $error);
 
 }
 $ND::TEMPLATE->param(BODY => $ND::BODY->output);
@@ -112,10 +125,11 @@ print $output;
 $DBH->disconnect;
 $DBH = undef;
 $UID = undef;
+$USER = undef;
 $PLANET = undef;
 $TEMPLATE = undef;
 $TICK = undef;
-%GROUPS = undef;
+undef %GROUPS;
 $ND::BODY = undef;
 
-exit;
+1;