X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FForum.pm;h=17ef00b5ce20fe76c7edd30e0edbe0d9ce3ea1bd;hb=31e4eaf3a4a406789d63f2c5d81c366091164404;hp=c8aa1205b075de0013c162de33393e585244cbe6;hpb=6b4d571dc3d488f7679f3d287d2900293d175d2d;p=ndwebbie.git

diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm
index c8aa120..17ef00b 100644
--- a/ND/Web/Pages/Forum.pm
+++ b/ND/Web/Pages/Forum.pm
@@ -23,6 +23,7 @@ use warnings;
 use ND::Web::Forum;
 use CGI qw/:standard/;
 use ND::Web::Include;
+use ND::Include;
 
 $ND::PAGES{forum} = {parse => \&parse, process => \&process, render=> \&render};
 
@@ -46,11 +47,11 @@ sub render {
 
 	my $board;
 	if(param('b')){
-		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate
+		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate,fb.fcid
 			FROM forum_boards fb NATURAL JOIN forum_access fa
 			WHERE fb.fbid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
 			WHERE uid = $2))
-			GROUP BY fb.fbid,fb.board});
+			GROUP BY fb.fbid,fb.board,fb.fcid});
 		$board = $DBH->selectrow_hashref($boards,undef,param('b'),$ND::UID) or $ND::ERROR .= p($DBH->errstr);
 	}
 	if (param('markAsRead')){
@@ -71,11 +72,11 @@ sub render {
 	}
 
 	my $thread;
-	my $findThread = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate
+	my $findThread = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate,ft.fbid,fb.board,fb.fcid,ft.sticky
 		FROM forum_boards fb NATURAL JOIN forum_access fa NATURAL JOIN forum_threads ft
 		WHERE ft.ftid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
 		WHERE uid = $2))
-		GROUP BY ft.ftid,ft.subject});
+		GROUP BY ft.ftid,ft.subject,ft.fbid,fb.board,fb.fcid,ft.sticky});
 	if(param('t')){
 		$thread = $DBH->selectrow_hashref($findThread,undef,param('t'),$ND::UID) or $ND::ERROR .= p($DBH->errstr);
 	}
@@ -96,11 +97,28 @@ sub render {
 			my $moveThread = $DBH->prepare(q{UPDATE forum_threads SET fbid = $1 WHERE ftid = $2 AND fbid = $3});
 			for my $param (param()){
 				if ($param =~ /t:(\d+)/){
-					$moveThread->execute(param('board'),$1,$board->{id}) or $ND::ERROR .= p($DBH->errstr)
+					$moveThread->execute(param('board'),$1,$board->{id}) or $ND::ERROR .= p($DBH->errstr);
+					if ($moveThread->rows > 0){
+						log_message $ND::UID, qq{Moved thread: $1 to board: }.param('board');
+					}
 				}
 			}
 			$DBH->commit or $ND::ERROR .= p($DBH->errstr);
 		}
+		if($thread && param('cmd') eq 'Sticky' && $thread->{moderate}){
+			if ($DBH->do(q{UPDATE forum_threads SET sticky = TRUE WHERE ftid = ?}, undef,$thread->{id})){
+				$thread->{sticky} = 1;
+			}else{
+				$ND::ERROR .= p($DBH->errstr);
+			}
+		}
+		if($thread && param('cmd') eq 'Unsticky' && $thread->{moderate}){
+			if ($DBH->do(q{UPDATE forum_threads SET sticky = FALSE WHERE ftid = ?}, undef,$thread->{id})){
+				$thread->{sticky} = 0;
+			}else{
+				$ND::ERROR .= p($DBH->errstr);
+			}
+		}
 	}
 
 	my $categories = $DBH->prepare(q{SELECT fcid AS id,category FROM forum_categories ORDER BY fcid});
@@ -111,15 +129,24 @@ sub render {
 		GROUP BY fb.fbid,fb.board
 		ORDER BY fb.fbid
 			});
-	my $threads = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject,count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts, date_trunc('seconds',max(fp.time)::timestamp) as last_post
+	my $threads = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject,count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts, date_trunc('seconds',max(fp.time)::timestamp) as last_post, ft.sticky
 		FROM forum_threads ft JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 		WHERE ft.fbid = $1
-		GROUP BY ft.ftid, ft.subject
+		GROUP BY ft.ftid, ft.subject,ft.sticky
 		HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= $3
-		ORDER BY last_post DESC});
+		ORDER BY sticky DESC,last_post DESC});
 
 	if ($thread){ #Display the thread
+		$BODY->param(Title =>  $thread->{subject});
+		$BODY->param(FBID =>  $thread->{fbid});
+		$BODY->param(Board =>  $thread->{board});
+		$BODY->param(FTID =>  $thread->{id});
+		$BODY->param(Moderate =>  $thread->{moderate});
+		$BODY->param(Sticky =>  $thread->{sticky} ? 'Unsticky' : 'Sticky');
 		$BODY->param(Thread => viewForumThread $thread);
+		my ($category) = $DBH->selectrow_array(q{SELECT category FROM forum_categories WHERE fcid = $1}
+			,undef,$thread->{fcid}) or $ND::ERROR .= p($DBH->errstr);
+		$BODY->param(Category =>  $category);
 
 	}elsif(defined param('allUnread')){ #List threads in this board
 		$BODY->param(AllUnread => 1);
@@ -151,10 +178,13 @@ sub render {
 		$BODY->param(Categories => \@categories);
 
 	}elsif($board){ #List threads in this board
-		$BODY->param(Board => $board->{board});
+		$BODY->param(ViewBoard => 1);
+		$BODY->param(Title => $board->{board});
 		$BODY->param(Post => $board->{post});
 		$BODY->param(Moderate => $board->{moderate});
 		$BODY->param(Id => $board->{id});
+		$BODY->param(FBID => $board->{id});
+		$BODY->param(Board => $board->{board});
 		my ($time) = $DBH->selectrow_array('SELECT now()::timestamp',undef);
 		$BODY->param(Date => $time);
 		$threads->execute($board->{id},$ND::UID,0) or $ND::ERROR .= p($DBH->errstr);
@@ -172,6 +202,7 @@ sub render {
 			my @categories;
 			while (my $category = $categories->fetchrow_hashref){
 				$boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
+
 				my @boards;
 				while (my $b = $boards->fetchrow_hashref){
 					next if (not $b->{post} or $b->{id} == $board->{id});
@@ -184,6 +215,9 @@ sub render {
 			}
 			$BODY->param(Categories => \@categories);
 		}
+		my ($category) = $DBH->selectrow_array(q{SELECT category FROM forum_categories WHERE fcid = $1}
+			,undef,$board->{fcid}) or $ND::ERROR .= p($DBH->errstr);
+		$BODY->param(Category =>  $category);
 
 	}else{ #List boards
 		$BODY->param(Overview => 1);