X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FMain.pm;h=b1c0b2694de5932c57e953c4157620a612121dc4;hb=256609e2df07f5dd40a33ace6163d2b72a269246;hp=29f7c51addbf29a9cd9234ebb007cf1fd2f4331d;hpb=06830a05ebd5541e52f8ca4e421286c1313420c7;p=ndwebbie.git

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index 29f7c51..b1c0b26 100644
--- a/ND/Web/Pages/Main.pm
+++ b/ND/Web/Pages/Main.pm
@@ -24,18 +24,15 @@ use CGI qw/:standard/;
 use ND::Include;
 use ND::Web::Include;
 
-$ND::PAGES{main} = {parse => \&parse, process => \&process, render=> \&render};
+our @ISA = qw/ND::Web::XMLPage/;
 
-sub parse {
-}
-
-sub process {
-
-}
+$ND::Web::Page::PAGES{main} = 'ND::Web::Pages::Main';
 
-sub render {
-	my ($DBH,$BODY) = @_;
-	$ND::TEMPLATE->param(TITLE => 'Main Page');
+sub render_body {
+	my $self = shift;
+	my ($BODY) = @_;
+	$self->{TITLE} = 'Main Page';
+	my $DBH = $self->{DBH};
 
 	my $error;
 
@@ -46,7 +43,7 @@ sub render {
 			my ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 			unless ($id){
 				my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,'Full fleet',0,0,0,0)});
-				$insert->execute($ND::UID,$ND::PLANET);
+				$insert->execute($ND::UID,$self->{PLANET});
 				($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 			}
 			my $delete = $DBH->prepare("DELETE FROM fleet_ships WHERE fleet = ?");
@@ -92,7 +89,7 @@ sub render {
 	if (param('sms')){ my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
 		$query->execute(escapeHTML(param('sms')),$ND::UID);
 	}
-	if (isMember() && !$ND::PLANET && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
+	if ($self->isMember() && !$self->{PLANET} && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
 		my $query = $DBH->prepare(q{
 			UPDATE users SET planet = 
 			(SELECT id from current_planet_stats where x = ? AND y = ? AND z = ?)
@@ -107,10 +104,10 @@ sub render {
 	my ($motd) = $DBH->selectrow_array("SELECT value FROM misc WHERE id='MOTD'");
 
 	$BODY->param(MOTD => parseMarkup($motd));
-	$BODY->param(Username => $ND::USER);
-	$BODY->param(isMember => isMember());
-	$BODY->param(isHC => isHC());
-	my @groups = map {name => $_}, sort keys %ND::GROUPS;
+	$BODY->param(Username => $self->{USER});
+	$BODY->param(isMember => $self->isMember());
+	$BODY->param(isHC => $self->isHC());
+	my @groups = map {name => $_}, sort keys %{$self->{GROUPS}};
 	$BODY->param(Groups => \@groups);
 
 
@@ -118,7 +115,7 @@ sub render {
 
 	my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank) = $DBH->selectrow_array($query,undef,$ND::UID);
 
-	$ND::PLANET = $planet unless $ND::PLANET;
+	$self->{PLANET} = $planet unless $self->{PLANET};
 
 	$BODY->param(NDRank => $rank);
 	$BODY->param(DefensePoints => $defense_points);
@@ -150,7 +147,7 @@ GROUP BY f.fleet,f.id, x,y,z, mission, landing_tick,back
 ORDER BY f.fleet
 		});
 
-	$query->execute($ND::UID,$ND::TICK) or $error .= '<p>'.$DBH->errstr.'</p>';
+	$query->execute($ND::UID,$self->{TICK}) or $error .= '<p>'.$DBH->errstr.'</p>';
 	my @fleets;
 	my $i = 0;
 	while (my $fleet = $query->fetchrow_hashref){