X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=682448cee4365eb59f578c067dc7bfe665f81afd;hb=15e271f8e65bfc35d311f9b9cad581e3a1c70def;hp=9bf0dd5faa64da1611df2dd56e03a6cec91d6de6;hpb=57f880656c4486f68583058121a5bcb3b316199c;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 9bf0dd5..682448c 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,45 @@ NDWeb::Controller::Root - Root Controller for NDWeb
 
 sub index : Local Path Args(0) {
 	my ( $self, $c ) = @_;
+
+	$c->res->redirect($c->uri_for('/wiki'));
 }
 
 sub default : Path {
 	my ( $self, $c ) = @_;
-	$c->res->body( 'Page not found' );
 	$c->response->status(404);
 }
 
 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);
+
+		my $ref = $c->req->referer;
+		$ref =~ s/^http:/https:/ unless $c->debug;
+		$c->res->redirect($ref);
 		return;
 	}
-
-	$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'));
 }
 
@@ -101,15 +119,22 @@ sub listAlliances : Private {
 	$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){
@@ -123,9 +148,6 @@ sub auto : Private {
 sub access_denied : Private {
 	my ($self, $c, $action) = @_;
 
-	$c->log->debug('moo' . $action);
-
-	# Set the error message
 	$c->stash->{template} = 'access_denied.tt2';
 
 }
@@ -141,6 +163,16 @@ sub end : ActionClass('RenderView') {
 
 	my $dbh = $c ->model;
 
+	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->clear_errors;
+		}elsif ($c->error->[0] =~ m/Missing roles: /){
+			$c->stash->{template} = 'access_denied.tt2';
+			$c->clear_errors;
+		}
+	}
+
 	if ($c->user_exists && $c->res->status == 200){
 		my $fleetupdate = 0;
 		if ($c->check_user_roles(qw/member_menu/)){
@@ -150,7 +182,8 @@ sub end : ActionClass('RenderView') {
 			$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,