From e8b88c192ac9a54ca2310d955677ad4b8be9c68e Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Mon, 11 Dec 2006 18:05:05 +0000
Subject: [PATCH] some more

---
 index.pl | 21 ++++++++++++---------
 main.pl  |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/index.pl b/index.pl
index 6827638..bfb7a73 100755
--- a/index.pl
+++ b/index.pl
@@ -25,6 +25,7 @@ use DBI;
 use DBD::Pg qw(:pg_types);
 use strict;
 
+
 my $cgi = new CGI;
 
 chdir $ENV{'DOCUMENT_ROOT'};
@@ -37,7 +38,7 @@ our $TICK = undef;
 
 $ND::TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
 
-for my $file ("db.pl"){
+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;
@@ -54,15 +55,17 @@ my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL
 $query->execute($UID);
 
 our $ATTACKER = 0;
-our @GROUPS = ();
+undef our %GROUPS;
 while (my ($name,$attack,$gid) = $query->fetchrow()){
-	push @GROUPS,{name => $name, gid => $gid};
+	$GROUPS{$name} = $gid;
 	$ATTACKER = 1 if $attack;
 }
 
-
 $TEMPLATE->param(Tick => $TICK);
-$TEMPLATE->param(isMember => 1);
+$TEMPLATE->param(isMember => isMember());
+$TEMPLATE->param(isHC => isHC());
+$TEMPLATE->param(isDC => isDC());
+$TEMPLATE->param(isBC => isBC());
 $TEMPLATE->param(isAttacker => $ATTACKER);
 
 
@@ -75,9 +78,9 @@ if (param('page') =~ /^(main)$/){
 $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl");
 
 unless (my $return = do "${page}.pl"){
-	print "couldn't parse $page: $@" if $@;
-	print "couldn't do $page: $!"    unless defined $return;
-	print "couldn't run $page"       unless $return;
+	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;
 }
 
 print header;
@@ -91,7 +94,7 @@ $UID = undef;
 $PLANET = undef;
 $TEMPLATE = undef;
 $TICK = undef;
-@GROUPS = undef;
+%GROUPS = undef;
 $ND::BODY = undef;
 
 exit;
diff --git a/main.pl b/main.pl
index 249fe43..3917873 100644
--- a/main.pl
+++ b/main.pl
@@ -24,9 +24,9 @@ $ND::TEMPLATE->param(TITLE => 'Main Page');
 our $BODY;
 
 $BODY->param(Username => 'harv');
-$BODY->param(isMEMBER => 1);
-$BODY->param(isHC => 1);
-my @groups = map {name => $_->{name}}, @ND::GROUPS;
+$BODY->param(isMember => isMember());
+$BODY->param(isHC => isHC());
+my @groups = map {name => $_}, sort keys %ND::GROUPS;
 $BODY->param(Groups => \@groups);
 
 
-- 
2.39.2