X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FInclude.pm;h=421d81ea044e47f3149b0a4d1c24787235cc0113;hb=69d91e596ce4b8249d12aa6158e4ef37f2b76c29;hp=81f5a8db8fcbe73a84aa222fefca7f15fcd5991b;hpb=86fb846b1b46198bd134e83b5c0488b5b8731ec2;p=ndwebbie.git

diff --git a/ND/Include.pm b/ND/Include.pm
index 81f5a8d..421d81e 100644
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -25,7 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/min max log_message intel_log unread_query/;
+our @EXPORT = qw/min max parseValue prettyValue log_message intel_log unread_query/;
 
 sub min {
     my ($x,$y) = @_;
@@ -37,6 +37,30 @@ 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(
@@ -53,7 +77,7 @@ sub intel_log {
 
 sub unread_query {
 	return $ND::DBH->prepare_cached(q{
-			SELECT count(*) AS unread
+			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