X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=404c8795648e042764cc2c28443b56a476e85981;hb=d40637f048a03d16cc7d43bca6fddaf721251346;hp=c2bb6c0dc3ea39989602a4add5e6de8fee143e45;hpb=b0f108eb4600f42fe3391acbe86381ce0c2d4681;p=ndwebbie.git

diff --git a/ND.pm b/ND.pm
index c2bb6c0..404c879 100755
--- a/ND.pm
+++ b/ND.pm
@@ -26,9 +26,12 @@ use DBD::Pg qw(:pg_types);
 use Apache2::Request;
 use ND::Include;
 use ND::DB;
+use Tie::File;
+use Fcntl 'O_RDONLY';
 use strict;
 use warnings FATAL => 'all';
 
+
 sub handler {
 	local $ND::r = shift;
 	local $ND::req = Apache2::Request->new($ND::r, POST_MAX => "1M");
@@ -45,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;# = $ND::r->param('page');
+	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 = ?');
@@ -77,13 +81,11 @@ sub page {
 
 	our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 
-	my $page = 'main';
-	if ($ND::PAGE =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls|intel|users|alliances|memberIntel|resources|planetNaps)$/){
-		$page = $1;
-	}
+	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 $page =~ /^(raids)$/;
+	$XML = 1 if param('xml') and $ND::PAGE =~ /^(raids)$/;
 
 	our $AJAX = 1;
 
@@ -91,22 +93,22 @@ sub page {
 	if ($XML){
 		$type = 'text/xml';
 		$ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl", cache => 1);
-		$ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl", cache => 1);
+		$ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.xml.tmpl", cache => 1);
 	}else{
-		$ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl", global_vars => 1, cache => 1);
-		$ND::BODY->param(PAGE => $page);
+		$ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.tmpl", global_vars => 1, cache => 1);
+		$ND::BODY->param(PAGE => $ND::PAGE);
 	}
 
-
-	unless (my $return = do "${page}.pl"){
-		$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 (my $return = do "$ND::PAGE.pl"){
+		$error .= "<p><b>couldn't parse $ND::PAGE: $@</b></p>" if $@;
+		$error .= "<p><b>couldn't do $ND::PAGE: $!</b></p>"    unless defined $return && defined $!;
+		$error .= "<p><b>couldn't run $ND::PAGE</b></p>"       unless $return;
 	}
 
 	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());
@@ -119,15 +121,16 @@ sub page {
 			$ND::TEMPLATE->param(Targets => listTargets());
 		}
 		$TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
-		$TEMPLATE->param(Error => $error);
 
 	}
+	$TEMPLATE->param(Error => $error);
 	$ND::TEMPLATE->param(BODY => $ND::BODY->output);
 	my $output = $TEMPLATE->output;
 	print header(-type=> $type, -charset => 'utf-8', -Content_Length => length $output);
 	print $output;
 
 
+	$DBH->rollback;
 	$DBH->disconnect;
 	$DBH = undef;
 	$UID = undef;