X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=52bcb4c0f2a251304b6e7da4cebfb7e16e9b092e;hb=07d0555058636b2b6ebb8c6bd757f9dfde072dba;hp=c4d2e2974038f541854d907d5ef7bae19bcf32a0;hpb=23e133163ef06e0afc2000152df31c966f4929b2;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index c4d2e29..52bcb4c 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -34,7 +34,7 @@ sub index : Path : Args(0) {
 	$c->stash(u => $dbh->selectrow_hashref(q{SELECT pid AS planet,defense_points
 			,attack_points,scan_points,humor_points
 			, (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
-			, sms,rank,hostmask,call_if_needed,sms_note,defprio
+			, rank,defprio
 		FROM users_defprio WHERE uid = ?
 			},undef,$c->user->id)
 	);
@@ -83,17 +83,6 @@ SELECT array_agg(gid) FROM groupmembers WHERE gid IN ('x','y','z') AND uid = $1
 
 }
 
-sub posthostupdate : Local {
-	my ( $self, $c ) = @_;
-	my $dbh = $c->model;
-
-	my $hostname = html_escape $c->req->param('hostname');
-	$dbh->do(q{UPDATE users SET hostmask = ? WHERE uid = ?
-		},undef, $hostname, $c->user->id);
-
-	$c->res->redirect($c->uri_for(''));
-}
-
 sub postattackgroups : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
@@ -111,20 +100,6 @@ sub postattackgroups : Local {
 	$c->res->redirect($c->uri_for(''));
 }
 
-sub postsmsupdate : Local {
-	my ( $self, $c ) = @_;
-	my $dbh = $c->model;
-
-	my $callme = $c->req->param('callme') || 0;
-	my $sms = html_escape $c->req->param('sms');
-	my $smsnote = $c->req->param('smsnote');
-	$dbh->do(q{
-UPDATE users SET sms = $1, call_if_needed =  $2, sms_note = $3 WHERE uid = $4
-		},undef, $sms, $callme, $smsnote, $c->user->id);
-
-	$c->res->redirect($c->uri_for(''));
-}
-
 sub postowncoords : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
@@ -271,7 +246,7 @@ sub stats : Local {
 	my $limit = 'LIMIT 10';
 	$limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
 
-	my ($races) = $dbh->selectrow_array(q{SELECT enum_range(null::race)::text[]});
+	my ($races) = $dbh->selectrow_array(q{SELECT array_agg(race ORDER BY race_id) FROM races WHERE race_id >= 0});
 	$c->stash(races => $races);
 	my $query = $dbh->prepare(q{
 SELECT nick
@@ -750,7 +725,7 @@ sub member_fleets {
 		,NULL AS recalled, mission
 	FROM fleets f
 	WHERE pid = $2 AND tick <= tick() AND tick >= tick() -  24
-		AND name IN ('Main','Advanced Unit') AND mission = 'Full fleet'
+		AND name IN ('Main', 'Advanced Unit', 'Military') AND mission = 'Full fleet'
 	ORDER BY mission,name,tick DESC, fid DESC
 ) UNION (
 	SELECT fid,name,landing_tick AS tick, eta, amount