X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=df700f937cc56e603822e66bff77dd33fd7ca2cc;hb=fcd1ee7b280d01a082b3a868a56145f970251f5d;hp=16f0e8cb8719db5ddd900f35d8613f83ddc806fc;hpb=80ad5ca3ad49aa9cc029fe3baaff513e422ef499;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 16f0e8c..df700f9 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -5,6 +5,8 @@ use warnings;
 use parent 'Catalyst::Controller';
 
 use ND::Include;
+use Geo::IP;
+
 
 #
 # Sets the actions in this controller to be registered with no prefix
@@ -30,29 +32,46 @@ NDWeb::Controller::Root - Root Controller for NDWeb
 
 sub index : Local Path Args(0) {
 	my ( $self, $c ) = @_;
+
+	$c->visit('/wiki/index');
 }
 
 sub default : Path {
 	my ( $self, $c ) = @_;
-	$c->res->body( 'Page not found' );
-	$c->response->status(404);
+	$c->stash(template => 'default.tt2');
+	$c->response->status(410);
 }
 
 sub login : Local {
 	my ($self, $c) = @_;
+
 	if ($c->login){
-		$c->res->redirect($c->uri_for('index'));
+		my $gi = Geo::IP->new(GEOIP_STANDARD);
+		my $country = $gi->country_code_by_addr($c->req->address) || '??';
+
+		my $remember = 0;
+		if ($c->req->param('remember')){
+			$c->session_time_to_live( 604800 ); # expire in one week.
+			$remember = 1;
+		}
+		my $log = $c->model->prepare(q{INSERT INTO session_log
+			(uid,time,ip,country,session,remember)
+			VALUES ($1,NOW(),$2,$3,$4,$5)
+		});
+		$log->execute($c->user->id,$c->req->address
+			,$country,$c->sessionid,$remember);
+
+		$c->forward('redirect');
 		return;
+	} elsif ($c->req->method eq 'POST'){
+		$c->res->status(400);
 	}
-
-	$c->stash(error => 'Bad password');
-	$c->stash(template => 'index.tt2');
-	$c->forward('index');
 }
 
 sub logout : Local {
 	my ($self, $c) = @_;
 	$c->logout;
+	$c->delete_session("logout");
 	$c->res->redirect($c->uri_for('index'));
 }
 
@@ -89,15 +108,34 @@ ORDER BY r.tick+c.wave,x,y,z});
 	$c->stash(claimedtargets => \@targets);
 }
 
+sub listAlliances : Private {
+	my ($self, $c) = @_;
+	my @alliances;
+	push @alliances,{id => -1, name => ''};
+	my $query = $c->model->prepare(q{SELECT id,name FROM alliances ORDER BY LOWER(name)});
+	$query->execute;
+	while (my $ally = $query->fetchrow_hashref){
+		push @alliances,$ally;
+	}
+	$c->stash(alliances => \@alliances);
+}
+
+sub sslurl {
+	return $_[0];
+}
+
 sub auto : Private {
 	my ($self, $c) = @_;
 	my $dbh = $c ->model;
 
 	$c->stash(dbh => $dbh);
 
+	$c->stash(sslurl => \&sslurl);
+
 	$dbh->do(q{SET timezone = 'GMT'});
 
 	$c->stash(TICK =>$dbh->selectrow_array('SELECT tick()',undef));
+	$c->stash(STICK =>$dbh->selectrow_array('SELECT max(tick) FROM planet_stats',undef));
 	$c->stash->{game}->{tick} = $c->stash->{TICK};
 
 	if ($c->user_exists){
@@ -105,16 +143,18 @@ sub auto : Private {
 	}else{
 		$c->stash(UID => -4);
 	}
+}
 
+sub redirect : Private {
+	my ($self, $c) = @_;
+	$c->res->redirect($c->uri_for('/'.$c->session->{referrer}));
 }
 
 sub access_denied : Private {
 	my ($self, $c, $action) = @_;
 
-	$c->log->debug('moo' . $action);
-
-	# Set the error message
 	$c->stash->{template} = 'access_denied.tt2';
+	$c->res->status(403);
 
 }
 
@@ -127,18 +167,36 @@ Attempt to render a view, if needed.
 sub end : ActionClass('RenderView') {
 	my ($self, $c) = @_;
 
+	if ($c->res->status >= 300 && $c->res->status <= 400 ){
+		return;
+	}
+
 	my $dbh = $c ->model;
 
-	if ($c->user_exists && $c->res->status == 200){
+	if (scalar @{ $c->error } ){
+		if ($c->error->[0] =~ m/Can't call method "id" on an undefined value at/){
+			$c->stash->{template} = 'access_denied.tt2';
+			$c->res->status(403);
+			$c->clear_errors;
+		}elsif ($c->error->[0] =~ m/Missing roles: /){
+			$c->stash->{template} = 'access_denied.tt2';
+			$c->res->status(403);
+			$c->clear_errors;
+		}
+	}
+
+	if ($c->user_exists){
 		my $fleetupdate = 0;
 		if ($c->check_user_roles(qw/member_menu/)){
-			$fleetupdate = $dbh->selectrow_array(q{SELECT tick FROM fleets WHERE sender = ?
-				AND mission = 'Full fleet' AND tick > tick() - 24
+			$fleetupdate = $dbh->selectrow_array(q{
+SELECT tick FROM fleets WHERE planet = ? AND tick > tick() - 24
+AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
 				},undef,$c->user->planet);
 			$fleetupdate = 0 unless defined $fleetupdate;
 		}
 
-		my ($unread,$newposts) = $dbh->selectrow_array(unread_query,undef,$c->user->id) or die $dbh->errstr;
+		my ($unread,$newposts) = $dbh->selectrow_array(q{SELECT * FROM unread_posts($1)}
+			,undef,$c->user->id);
 
 		$c->stash(user => {
 			id => $c->user->id,
@@ -153,6 +211,17 @@ sub end : ActionClass('RenderView') {
 					|| $c->check_user_roles(qw/no_fleet_update/)))),
 		$c->forward('listTargets');
 	}
+	my $birthdays = $dbh->prepare(q{SELECT username
+			,date_part('year',age(birthday)) AS age
+			FROM users WHERE birthday IS NOT NULL
+				AND mmdd(birthday) = mmdd(CURRENT_DATE)
+		});
+	$birthdays->execute;
+	$c->stash(birthdays => $birthdays->fetchall_arrayref({}));
+
+	if ($c->res->status == 200 || $c->req->method eq 'GET'){
+		$c->session->{referrer} = $c->req->path;
+	}
 }
 
 =head1 AUTHOR