X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FForum.pm;h=a0cb01ac4369b824446d8f8883d4527c9408396b;hb=3b0d1d881162c5bcc1a18e8a43c807cc1fe52bc3;hp=bf7dc3ca8f11b76788ef52aa4cc8bbc2b4e72582;hpb=0fd1ff08781f7be2e32d33a4130de91151f5d461;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Forum.pm b/lib/NDWeb/Controller/Forum.pm
index bf7dc3c..a0cb01a 100644
--- a/lib/NDWeb/Controller/Forum.pm
+++ b/lib/NDWeb/Controller/Forum.pm
@@ -73,7 +73,8 @@ FROM forum_categories fc
 	JOIN users u ON u.uid = ft.uid
 	LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1)
 		ftv ON ftv.ftid = ft.ftid
-WHERE COALESCE(ft.mtime > ftv.time,TRUE)
+WHERE ft.mtime > NOW() - '50 days'::interval
+	AND COALESCE(ft.mtime > ftv.time,TRUE)
 	AND ft.ftid IN (SELECT ftid FROM forum_posts WHERE ftid = ft.ftid)
 	AND ((fbid > 0 AND
 			fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1))))
@@ -328,7 +329,8 @@ sub moveThreads : Local {
 	my ( $self, $c, $board ) = @_;
 	my $dbh = $c->model;
 
-	$c->forward('findBoard',[$c->req->param('board')]);
+	my $b = $c->req->param('board');
+	$c->forward('findBoard',[$b]);
 	my $toboard = $c->stash->{board};
 	unless ($toboard->{moderate}){
 		$c->acl_access_denied('test',$c->action,'No moderator access for target board.')
@@ -380,10 +382,11 @@ sub insertThread : Private {
 	my ( $self, $c, $board ) = @_;
 	my $dbh = $c->model;
 
+	my $subject = html_escape($c->req->param('subject'));
 	my $insert = $dbh->prepare(q{INSERT INTO forum_threads (ftid,fbid,subject,uid)
 		VALUES(DEFAULT,$1,$2,$3) RETURNING (ftid);
 		});
-	$insert->execute($board,html_escape($c->req->param('subject')),$c->stash->{UID});
+	$insert->execute($board,$subject,$c->stash->{UID});
 	$c->stash(thread => $insert->fetchrow);
 	$insert->finish;
 }
@@ -548,21 +551,23 @@ sub findBoard : Private {
 
 sub previewPost : Private {
 	my ( $self, $c) = @_;
+	my $message = html_escape $c->req->param('message');
 	push @{$c->stash->{posts}}, {
 		unread => 1,
 		username => 'PREVIEW',
-		message => parseMarkup(html_escape $c->req->param('message')),
+		message => parseMarkup($message),
 	};
-	$c->stash(previewMessage => html_escape $c->req->param('message'));
+	$c->stash(previewMessage => $message);
 }
 
 sub insertPost : Private {
 	my ( $self, $c, $thread ) = @_;
 	my $dbh = $c->model;
 
+	my $message = html_escape($c->req->param('message'));
 	my $insert = $dbh->prepare(q{INSERT INTO forum_posts (ftid,message,uid)
 		VALUES($1,$2,$3)});
-	$insert->execute($thread,html_escape($c->req->param('message')),$c->stash->{UID});
+	$insert->execute($thread,$message,$c->stash->{UID});
 }
 
 sub listModeratorBoards : Private {