X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FInclude.pm;h=992f978d9b28ff733bff43d06b2db0aebeafe732;hb=eafb5ef101dfc9cf22655a532073e8b71a036a67;hp=5df59fc2c110ed5cd5f09718c5a9ba487a8c12e5;hpb=ba0d22272efc046f7feaf07ebf190fa9ec6474c7;p=ndwebbie.git

diff --git a/ND/Include.pm b/ND/Include.pm
index 5df59fc..992f978 100644
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -19,55 +19,13 @@
 
 package ND::Include;
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 use CGI qw{:standard};
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel isTech parseMarkup min max listTargets
-	alliances intelquery generateClaimXml/;
-
-sub isMember {
-	return exists $ND::GROUPS{Members} || isTech();
-}
-
-sub isHC {
-	return exists $ND::GROUPS{HC} || isTech();
-}
-
-sub isDC {
-	return exists $ND::GROUPS{DC} || isTech();
-}
-
-sub isBC {
-	return exists $ND::GROUPS{BC} || isTech();
-}
-
-sub isOfficer {
-	return exists $ND::GROUPS{Officers} || isTech();
-}
-
-sub isScanner {
-	return exists $ND::GROUPS{Scanners} || isTech();
-}
-
-sub isIntel {
-	return exists $ND::GROUPS{Intel} || isTech();
-}
-
-sub isTech {
-	return exists $ND::GROUPS{Tech};
-}
-
-sub parseMarkup {
-	my ($text) = @_;
-
-	$text =~ s{\n}{\n<br/>}g;
-	$text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>}gi;
-	return $text;
-}
-
+our @EXPORT = qw/min max parseValue prettyValue log_message intel_log unread_query pa_xp/;
 
 sub min {
     my ($x,$y) = @_;
@@ -79,121 +37,66 @@ sub max {
     return ($x < $y ? $y : $x);
 }
 
-sub listTargets {
-	my $query = $ND::DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
-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
-WHERE c.uid = ? AND r.tick+c.wave > ? AND r.open AND not r.removed
-ORDER BY r.tick+c.wave,x,y,z});
-	$query->execute($ND::UID,$ND::TICK);
-	my @targets;
-	while (my $target = $query->fetchrow_hashref){
-		my $coords = "Target $target->{id}";
-		$coords = $target->{coords} if $target->{released_coords};
-		push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
-			, Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}
-			, AJAX => $ND::AJAX, JoinName => $target->{joinable} ? 'N' : 'J'
-			, Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'};
+
+sub parseValue {
+	if (defined $_[0] && $_[0] =~ /^(-?\d+(?:\.\d+)?)([khMG])?$/){
+		return $1 unless defined $2;
+		return $1*100 if $2 eq 'h';
+		return $1*1000 if $2 eq 'k';
+		return $1*1000000 if $2 eq 'M';
+		return $1*1000000000 if $2 eq 'G';
 	}
-	my $template = HTML::Template->new(filename => "templates/targetlist.tmpl", cache => 1);
-	$template->param(Targets => \@targets);
-	return $template->output;
+	return $_[0];
 }
 
-sub alliances {
-	my ($alliance) = @_;
-	my @alliances;
-	$alliance = -1 unless defined $alliance;
-	push @alliances,{Id => -1, Name => '&nbsp;', Selected => not $alliance};
-	my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name});
-	$query->execute;	
-	while (my $ally = $query->fetchrow_hashref){
-		push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance == $ally->{id}};
+sub prettyValue {
+	my ($value,$decimals) = @_;
+	my $unit = '';
+	my @units = ('k','M','G','T');
+	for (my $i = 0; $value >= 1000;$i++){
+		$value /= 1000;
+		$unit = $units[$i];
+	}
+	unless (defined $decimals){
+		$decimals = '.0';
+		$decimals = '.1' if $value < 100 && $unit;
+		$decimals = '.2' if $value < 10 && $unit;
 	}
-	return @alliances;
+
+	return sprintf('%'.$decimals.'f%s', $value,$unit);
 }
 
-sub intelquery {
-	my ($columns,$where) = @_;
-	return qq{
-SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
-FROM (intel i NATURAL JOIN users u)
-	JOIN current_planet_stats t ON i.target = t.id
-	JOIN current_planet_stats o ON i.sender = o.id
-WHERE $where 
-GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick
-ORDER BY i.tick DESC, i.mission};
+
+sub log_message {
+	my ($uid, $message) = @_;
+	my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
+		(SELECT ftid FROM users WHERE uid = $1),$1,$2)});
+	$log->execute($uid,$message) or $ND::ERROR .= p($ND::DBH->errstr);
 }
 
+sub intel_log {
+	my ($uid,$planet, $message) = @_;
+	my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
+		(SELECT ftid FROM planets WHERE id = $3),$1,$2)});
+	$log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
+}
 
-sub generateClaimXml {
-	my ($raid, $from, $target) = @_;
+sub pa_xp {
+	my ($roids,$ascore,$avalue,$tscore,$tvalue) = @_;
+	my $bravery = (max(0,min(2,$tscore/$ascore)-0.6)) * (min(2,$tvalue/$avalue)-0.4);
+	return int(max($roids * 10 * $bravery,0))
 
-	my ($timestamp) = $ND::DBH->selectrow_array("SELECT MAX(modified)::timestamp AS modified FROM raid_targets");
-	$ND::BODY->param(Timestamp => $timestamp);
-	if ($target){
-		$target = "r.id = $target";
-		$_ = listTargets();
-		$ND::BODY->param(TargetList => $_);
-	}else{
-		$target = "r.raid = $raid->{id}";
-	}
+}
 
-	if ($from){
-		$from = "AND modified > '$from'";
-	}else{
-		$from = '';
-	}
-	my $targets = $ND::DBH->prepare(qq{SELECT r.id,r.planet FROM raid_targets r WHERE $target $from});
-	$targets->execute or print p($ND::DBH->errstr);
-	my $claims =  $ND::DBH->prepare(qq{ SELECT username,joinable,launched FROM raid_claims
-		NATURAL JOIN users WHERE target = ? AND wave = ?});
-	my @targets;
-	while (my $target = $targets->fetchrow_hashref){
-		my %target;
-		$target{Id} = $target->{id};
-		$target{Coords} = $target->{id};
-		my @waves;
-		for (my $i = 1; $i <= $raid->{waves}; $i++){
-			my %wave;
-			$wave{Id} = $i;
-			$claims->execute($target->{id},$i);
-			my $joinable = 0;
-			my $claimers;
-			if ($claims->rows != 0){
-				my $owner = 0;
-				my @claimers;
-				while (my $claim = $claims->fetchrow_hashref){
-					$owner = 1 if ($ND::USER eq $claim->{username});
-					$joinable = 1 if ($claim->{joinable});
-					$claim->{username} .= '*' if ($claim->{launched});
-					push @claimers,$claim->{username};
-				}
-				$claimers = join '/', @claimers;
-				if ($owner){
-					$wave{Command} = 'Unclaim';
-					if ($raid->{released_coords}){
-						$target{Coords} = $ND::DBH->selectrow_array('SELECT coords(x,y,z) FROM current_planet_stats WHERE id = ?',undef,$target->{planet});
-					}
-				}elsif ($joinable){
-					$wave{Command} = 'Join';
-				}else{
-					$wave{Command} = 'none';
-				}
-			}else{
-				#if (!isset($planet) || ($target->value/$planet->value > 0.4 || $target->score/$planet->score > 0.4))
-				$wave{Command} = 'Claim';
-			}
-			$wave{Claimers} = $claimers;
-			$wave{Joinable} = $joinable;
-			push @waves,\%wave;
-		}
-		$target{Waves} = \@waves;
-		push @targets,\%target;
-	}
-	$ND::BODY->param(Targets => \@targets);
+sub unread_query {
+	return $ND::DBH->prepare_cached(q{
+			SELECT count(*) AS unread, count(NULLIF(fp.time > $2,FALSE)) AS new
+FROM forum_boards fb NATURAL JOIN forum_threads ft 
+	JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
+		(SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
+WHERE (ftv.time IS NULL OR fp.time > ftv.time) AND fbid > 0 AND
+	fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
+		});
 }
 
 1;