X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FInclude.pm;h=421d81ea044e47f3149b0a4d1c24787235cc0113;hb=a5ecd18d276ae1a43b92d96e2347a077a1a52427;hp=889c97d08d50343c3fc91a68fef18ad7874f4a06;hpb=610aa63899777247036fa48916e1d0ef8fefaf8c;p=ndwebbie.git

diff --git a/ND/Include.pm b/ND/Include.pm
index 889c97d..421d81e 100644
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -19,13 +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/min max log_message intel_log/;
+our @EXPORT = qw/min max parseValue prettyValue log_message intel_log unread_query/;
 
 sub min {
     my ($x,$y) = @_;
@@ -37,18 +37,53 @@ sub max {
     return ($x < $y ? $y : $x);
 }
 
+
+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';
+	}
+	return $_[0];
+}
+
+sub prettyValue {
+	my ($value) = @_;
+	my $unit = '';
+	my @units = ('k','M','G','T');
+	for (my $i = 0; $value >= 1000;$i++){
+		$value /= 1000;
+		$unit = $units[$i];
+	}
+	return sprintf('%.2f%s', $value,$unit);
+}
+
+
 sub log_message {
 	my ($uid, $message) = @_;
 	my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
-		(SELECT ftid FROM forum_threads WHERE log_uid = $1),$1,$2)});
+		(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 forum_threads WHERE planet = $3),$1,$2)});
+		(SELECT ftid FROM planets WHERE id = $3),$1,$2)});
 	$log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
 }
 
+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;