X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=index.pl;h=3937831a738e81695fbfe29e681184ee0d442956;hb=e9f12b8d4ba3651c8e78094d84cd825afb816794;hp=061cbfa089e6e417b4f3c7a1e35e563380034da1;hpb=e63c14e793686ca3d8a47df6866134c21a77e4b7;p=ndwebbie.git

diff --git a/index.pl b/index.pl
index 061cbfa..3937831 100755
--- a/index.pl
+++ b/index.pl
@@ -31,25 +31,22 @@ 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'};
 
-$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,19 +63,19 @@ 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)$/){
 	$page = $1;
 }
 
 our $XML = 0;
 $XML = 1 if param('xml') and $page =~ /^(raids)$/;
 
+my $type = 'text/html';
 if ($XML){
-	print header(-type=>'text/xml');
+	$type = 'text/xml';
 	$ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl");
 	$ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl");
 }else{
-	print header;
 	$ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl");
 }
 
@@ -104,12 +101,15 @@ unless ($XML){
 
 }
 $ND::TEMPLATE->param(BODY => $ND::BODY->output);
-print $TEMPLATE->output;
+my $output = $TEMPLATE->output;
+print header(-type=> $type, -charset => 'utf-8', -Content_Length => length $output);
+print $output;
 
 
 $DBH->disconnect;
 $DBH = undef;
 $UID = undef;
+$USER = undef;
 $PLANET = undef;
 $TEMPLATE = undef;
 $TICK = undef;