X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FForum.pm;h=cbeb747083524a5240cb457af4c3867629b4b55c;hb=031327dbddb9665e0d5003dbc65d6956da9ea8b1;hp=8eca745423053ee6332f147d8c9df52f00a5cc7e;hpb=b1e161e396d3c759403c6e3cbd8da1be7fe84715;p=ndwebbie.git

diff --git a/ND/Web/Forum.pm b/ND/Web/Forum.pm
index 8eca745..cbeb747 100644
--- a/ND/Web/Forum.pm
+++ b/ND/Web/Forum.pm
@@ -25,8 +25,7 @@ use HTML::Template;
 use ND::Web::Include;
 require Exporter;
 
-our @ISA = qw/Exporter/;
-
+our @ISA = qw/Exporter/; 
 our @EXPORT = qw/viewForumThread addForumPost addForumThread markThreadAsRead/;
 
 sub viewForumThread {
@@ -34,12 +33,11 @@ sub viewForumThread {
 
 	my $template = HTML::Template->new(filename => "templates/viewthread.tmpl", global_vars => 1, cache => 1);
 
-	$template->param(Subject => $thread->{subject});
 	$template->param(Id => $thread->{id});
 	$template->param(Post => $thread->{post});
 
-	my $posts = $ND::DBH->prepare(q{SELECT u.username,date_trunc('minute',fp.time::timestamp) AS time,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread
-FROM forum_threads ft JOIN forum_posts fp USING (ftid) JOIN users u USING (uid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
+	my $posts = $ND::DBH->prepare(q{SELECT u.username,date_trunc('seconds',fp.time::timestamp) AS time,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread
+FROM forum_threads ft JOIN forum_posts fp USING (ftid) JOIN users u ON u.uid = fp.uid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 WHERE ft.ftid = $1
 ORDER BY fp.time ASC
 });
@@ -54,6 +52,17 @@ ORDER BY fp.time ASC
 		$post->{message} = parseMarkup($post->{message});
 		push @posts,$post;
 	}
+
+	if (defined param('cmd') && param('cmd') eq 'Preview'){
+		my $text = parseMarkup(escapeHTML(param('message')));
+		$text .= p b $@ if $@;
+		push @posts,{message => $text, unread => 1, username => 'PREVIEW', Time => 'Not submitted yet', NewPosts => $old ? 1 : 0};
+
+		$text = escapeHTML param('message');
+		$text =~ s/\x{3}\d\d?//g; #mirc color TODO: possibly match until \x{0F} and change to [color] block
+		$text =~ s/[^\x{9}\x{A}\x{D}\x{20}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]//g;
+		$template->param(Message => $text);
+	}
 	$template->param(Posts => \@posts);
 
 	markThreadAsRead($thread->{id});