X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=4608240644ad7cb0f212f6671f41641e0ce98aec;hp=6421b001b6f3a8eabc69f4347f60c2a4328aed79;hb=48758dc8fcccd3046f2a6876aea75829da301a55;hpb=da77e07d9a4ac17a25796a0b897a03f4853ba341

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 6421b00..4608240 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -32,19 +32,21 @@ NDWeb::Controller::Root - Root Controller for NDWeb
 
 sub index : Local Path Args(0) {
 	my ( $self, $c ) = @_;
+
+	$c->visit('/wiki/main');
 }
 
 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){
-		my $gi = Geo::IP->new(GEOIP_STANDARD);
+		my $gi = Geo::IP->new("/usr/share/GeoIP/GeoIP.dat");
 		my $country = $gi->country_code_by_addr($c->req->address) || '??';
 
 		my $remember = 0;
@@ -59,8 +61,10 @@ sub login : Local {
 		$log->execute($c->user->id,$c->req->address
 			,$country,$c->sessionid,$remember);
 
-		$c->res->redirect($c->req->referer);
+		$c->forward('redirect');
 		return;
+	} elsif ($c->req->method eq 'POST'){
+		$c->res->status(400);
 	}
 }
 
@@ -71,6 +75,44 @@ sub logout : Local {
 	$c->res->redirect($c->uri_for('index'));
 }
 
+my %clickatellstatus = (
+	"001", "Message unknown. The delivering network did not recognise the message type or content.",
+	"002", "Message queued. The message could not be delivered and has been queued for attempted redelivery.",
+	"003", "Delivered. Delivered to the network or gateway (delivered to the recipient).",
+	"004", "Received by recipient. Confirmation of receipt on the handset of the recipient.",
+	"005", "Error with message. There was an error with the message, probably caused by the content of the message itself.",
+	"006", "User cancelled message delivery. Client cancelled the message by setting the validity period, or the message was terminated by an internal mechanism.",
+	"007", "Error delivering message An error occurred delivering the message to the handset.",
+	"008", " OK. Message received by gateway.",
+	"009", "Routing error. The routing gateway or network has had an error routing the message.",
+	"010", "Message expired. Message has expired at the network due to the handset being off, or out of reach.",
+	"011", "Message queued for later delivery. Message has been queued at the Clickatell gateway for delivery at a later time (delayed delivery).",
+	"012", "Out of credit. The message cannot be delivered due to a lack of funds in your account. Please re-purchase credits."
+);
+
+
+sub smsconfirm : Local {
+	my ($self, $c) = @_;
+	my $dbh = $c->model;
+
+	$c->stash(template => 'default.tt2');
+
+	return unless $c->req->param('apiMsgId');
+
+	my $sms = $dbh->prepare(q{
+UPDATE sms SET status = $2, cost = $3
+	,time = TIMESTAMP WITH TIME ZONE 'epoch' + $4 * INTERVAL '1 second'
+WHERE msgid = $1
+		});
+
+	$sms->execute($c->req->param('apiMsgId')
+		,$clickatellstatus{$c->req->param('status')}
+		,$c->req->param('charge')
+		,$c->req->param('timestamp'));
+
+}
+
+
 sub begin : Private {
 	my ($self, $c) = @_;
 
@@ -92,7 +134,7 @@ sub listTargets : Private {
 FROM raid_claims c
 	JOIN raid_targets t ON c.target = t.id
 	JOIN raids r ON t.raid = r.id
-	JOIN current_planet_stats p ON t.planet = p.id
+	JOIN current_planet_stats p USING (pid)
 WHERE c.uid = $1 AND r.tick+c.wave > tick() AND r.open AND not r.removed
 ORDER BY r.tick+c.wave,x,y,z});
 	$query->execute($c->user->id) or die $dbh->errstr;
@@ -107,8 +149,8 @@ ORDER BY r.tick+c.wave,x,y,z});
 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)});
+	push @alliances,{aid => '', alliance => ''};
+	my $query = $c->model->prepare(q{SELECT aid,alliance FROM alliances ORDER BY LOWER(alliance)});
 	$query->execute;
 	while (my $ally = $query->fetchrow_hashref){
 		push @alliances,$ally;
@@ -116,12 +158,18 @@ 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));
@@ -133,13 +181,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->stash->{template} = 'access_denied.tt2';
+	$c->res->status(403);
 
 }
 
@@ -152,28 +205,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 (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 && $c->res->status == 200){
+	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 pid = ? 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,
@@ -182,12 +243,20 @@ sub end : ActionClass('RenderView') {
 			newposts => $newposts,
 			unreadposts => $unread
 		});
-		$c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/)
-			&& (!$c->check_user_roles(qw/member_menu/)
-				|| ($c->user->planet && (($c->stash->{TICK} - $fleetupdate < 24)
-					|| $c->check_user_roles(qw/no_fleet_update/)))),
+		$c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/);
 		$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