X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FForum.pm;h=5951be73071350adc42d03afdbcf4a4726330bc2;hb=f091970c5fb3cb60583c1d00aaef3b00191feacb;hp=76ac472a4afe5383c793d49bcf7e49e74cff822d;hpb=b3d60946973fc4d48b32c2447522f0bba02087d3;p=ndwebbie.git

diff --git a/NDWeb/Pages/Forum.pm b/NDWeb/Pages/Forum.pm
index 76ac472..5951be7 100644
--- a/NDWeb/Pages/Forum.pm
+++ b/NDWeb/Pages/Forum.pm
@@ -32,7 +32,10 @@ $NDWeb::Page::PAGES{forum} = __PACKAGE__;
 sub parse {
 	my $self = shift;
 	if ($self->{URI} =~ m{^/.*/allUnread}){
-		param('allUnread',1);
+		$self->{allUnread} = 1;
+	}elsif ($self->{URI} =~ m{^/.*/search(?:/(.*))?}){
+		bless $self, 'NDWeb::Pages::Forum::Search';
+		$self->{PAGE} = 'forum/search';
 	}
 }
 
@@ -155,7 +158,7 @@ sub render_body {
 			,undef,$thread->{fcid}) or $ND::ERROR .= p($DBH->errstr);
 		$BODY->param(Category =>  $category);
 
-	}elsif(defined param('allUnread')){ #List threads in this board
+	}elsif(defined $self->{allUnread}){ #List threads in this board
 		$BODY->param(AllUnread => 1);
 		$BODY->param(Id => $board->{id});
 		my ($time) = $DBH->selectrow_array('SELECT now()::timestamp',undef);
@@ -220,8 +223,6 @@ sub render_body {
 		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);