X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FForum.pm;h=b18bc350c8ddb08044395c922377f5b02ba402de;hb=c6a6e6dbab0ca435e6aeeb94e7c7329585b7b4f1;hp=4aa72fec7ece06206f5e95516bbc1045c8f6c790;hpb=83a572a26245ad849be8983a818ae586f29a56c2;p=ndwebbie.git

diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm
index 4aa72fe..b18bc35 100644
--- a/ND/Web/Pages/Forum.pm
+++ b/ND/Web/Pages/Forum.pm
@@ -23,34 +23,34 @@ 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};
+use base qw/ND::Web::XMLPage/;
+
+$ND::Web::Page::PAGES{forum} = __PACKAGE__;
 
 sub parse {
-	my ($uri) = @_;
-	if ($uri =~ m{^/.*/allUnread}){
+	my $self = shift;
+	if ($self->{URI} =~ m{^/.*/allUnread}){
 		param('allUnread',1);
 	}
 }
 
-sub process {
-
-}
-
-sub render {
-	my ($DBH,$BODY) = @_;
-
-	$ND::TEMPLATE->param(TITLE => 'Forum');
+sub render_body {
+	my $self = shift;
+	my ($BODY) = @_;
+	$self->{TITLE} = 'Forum';
+	my $DBH = $self->{DBH};
 
 	$DBH->do(q{UPDATE users SET last_forum_visit = NOW() WHERE uid = $1},undef,$ND::UID) or $ND::ERROR .= p($DBH->errstr);
 
 	my $board;
 	if(param('b')){
-		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post
+		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,36 +71,87 @@ sub render {
 	}
 
 	my $thread;
-	my $findThread = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post
+	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);
 	}
 
-	if (defined param('cmd') && param('cmd') eq 'Submit'){
-		$DBH->begin_work;
-		if ($board && $board->{post}){
-			$thread = addForumThread $DBH,$board,$ND::UID,param('subject');
+	if (defined param('cmd')){
+		if(param('cmd') eq 'Submit' or param('cmd') eq 'Preview'){
+			$DBH->begin_work;
+			if ($board && $board->{post}){
+				$thread = addForumThread $DBH,$board,$ND::UID,param('subject');
+			}
+			if (param('cmd') eq 'Submit' and $thread && $thread->{post}){
+				addForumPost($DBH,$thread,$ND::UID,param('message'));
+				$self->{RETURN} = 'REDIRECT';
+				$self->{REDIR_LOCATION} = "/forum?t=$thread->{id}#NewPosts";
+			}
+			$DBH->commit or $ND::ERROR .= p($DBH->errstr);
+			return if $self->{RETURN};
 		}
-		if ($thread && $thread->{post}){
-			addForumPost($DBH,$thread,$ND::UID,param('message'));
+		if(param('cmd') eq 'Move' && $board->{moderate}){
+			$DBH->begin_work;
+			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);
+					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);
+			}
 		}
-		$DBH->commit or $ND::ERROR .= p($DBH->errstr);
 	}
 
 	my $categories = $DBH->prepare(q{SELECT fcid AS id,category FROM forum_categories ORDER BY fcid});
-	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 $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post
+		FROM forum_boards fb NATURAL JOIN forum_access fa
+		WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
+		WHERE uid = $2))
+		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,
+		min(fp.time)::date as posting_date, 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);
@@ -109,17 +160,11 @@ sub render {
 		$BODY->param(Date => $time);
 		$categories->execute or $ND::ERROR .= p($DBH->errstr);
 		my @categories;
-		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post
-			FROM forum_boards fb NATURAL JOIN forum_access fa
-			WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
-			WHERE uid = $2))
-			GROUP BY fb.fbid,fb.board
-			ORDER BY fb.fbid
-			});
 		while (my $category = $categories->fetchrow_hashref){
 			$boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
 			my @boards;
 			while (my $board = $boards->fetchrow_hashref){
+				next if $board->{id} < 0;
 				$threads->execute($board->{id},$ND::UID,1) or $ND::ERROR .= p($DBH->errstr);
 				my $i = 0;
 				my @threads;
@@ -139,9 +184,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);
@@ -154,10 +203,33 @@ sub render {
 		}
 		$BODY->param(Threads => \@threads);
 
+		if ($board->{moderate}){
+			$categories->execute or $ND::ERROR .= p($DBH->errstr);
+			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});
+					delete $b->{post};
+					push @boards,$b;
+				}
+				$category->{Boards} = \@boards;
+				delete $category->{id};
+				push @categories,$category if @boards;
+			}
+			$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);
+
+	}elsif($self->{URI} =~ m{^/.*/search/(.*)}){ #List threads in this board
 	}else{ #List boards
 		$BODY->param(Overview => 1);
 		$categories->execute or $ND::ERROR .= p($DBH->errstr);
-		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board,count(NULLIF(COALESCE(fp.fpid::boolean,FALSE) AND COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread
+		my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board,count(NULLIF(COALESCE(fp.fpid::boolean,FALSE) AND COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,date_trunc('seconds',max(fp.time)::timestamp) as last_post
 			FROM forum_boards fb LEFT OUTER JOIN (forum_threads ft JOIN forum_posts fp USING (ftid)) ON fb.fbid = ft.fbid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 			WHERE fb.fcid = $1 AND 
 			fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($2)))