X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=index.pl;h=537f46fed29ab15cd2f93772da02c22d66f60c7a;hb=cdd543f418350bf065d586dee2f544536a2a1c6f;hp=11789fa70378bfd883ab1e16ec3edf2394f42351;hpb=5e38dff0cf8667720f7ae7f89302e0246ecf5624;p=ndwebbie.git

diff --git a/index.pl b/index.pl
index 11789fa..537f46f 100755
--- a/index.pl
+++ b/index.pl
@@ -32,6 +32,7 @@ chdir $ENV{'DOCUMENT_ROOT'};
 
 our $DBH = undef;
 our $USER = $ENV{'REMOTE_USER'};
+my $error;
 
 our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
 
@@ -63,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|editRaid|calls|intel|users)$/){
+if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls|intel|users|alliances|memberIntel|resources)$/){
 	$page = $1;
 }
 
@@ -81,9 +82,9 @@ 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){
@@ -95,11 +96,13 @@ 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());
 	}
 	$TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
+	$TEMPLATE->param(Error => $error);
 
 }
 $ND::TEMPLATE->param(BODY => $ND::BODY->output);