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

diff --git a/index.pl b/index.pl
index a78dff3..31beaf5 100755
--- a/index.pl
+++ b/index.pl
@@ -31,25 +31,23 @@ my $cgi = new CGI;
 chdir $ENV{'DOCUMENT_ROOT'};
 
 our $DBH = undef;
-our $UID = undef;
-our $PLANET = undef;
-our $TEMPLATE = undef;
-our $TICK = undef;
+our $USER = $ENV{'REMOTE_USER'};
+my $error;
 
-$ND::TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
+our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
 
 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,7 +64,7 @@ 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)$/){
 	$page = $1;
 }
 
@@ -84,14 +82,15 @@ if ($XML){
 
 
 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());
@@ -101,6 +100,8 @@ unless ($XML){
 	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,6 +113,7 @@ print $output;
 $DBH->disconnect;
 $DBH = undef;
 $UID = undef;
+$USER = undef;
 $PLANET = undef;
 $TEMPLATE = undef;
 $TICK = undef;