X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FForum.pm;h=76a7e62438611ff9990735d4d304f79e0eaaf8f5;hb=707131893fa280d8964883b821636de7022fecd0;hp=c9626b30381e3120a5e962c44ecb53b2cbcb2fda;hpb=b8985d0163efd6e9af29dcca7a7689183286c7e7;p=ndwebbie.git

diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm
index c9626b3..76a7e62 100644
--- a/ND/Web/Pages/Forum.pm
+++ b/ND/Web/Pages/Forum.pm
@@ -25,23 +25,22 @@ 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);
 
@@ -72,22 +71,22 @@ 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,ft.fbid,fb.board,fb.fcid
+	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,ft.fbid,fb.board,fb.fcid});
+		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')){
-		if(param('cmd') eq 'Submit'){
+		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 ($thread && $thread->{post}){
+			if (param('cmd') eq 'Submit' and $thread && $thread->{post}){
 				addForumPost($DBH,$thread,$ND::UID,param('message'));
 			}
 			$DBH->commit or $ND::ERROR .= p($DBH->errstr);
@@ -105,6 +104,20 @@ sub render {
 			}
 			$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});
@@ -115,17 +128,23 @@ 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,
+		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);
@@ -185,9 +204,6 @@ sub render {
 			my @categories;
 			while (my $category = $categories->fetchrow_hashref){
 				$boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
-				if ($category->{id} == $board->{fcid}){
-					$BODY->param(Category => $category->{category});
-				}
 
 				my @boards;
 				while (my $b = $boards->fetchrow_hashref){
@@ -201,6 +217,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);