oops, now it shows calls properly

[ndwebbie.git] / NDWeb / Pages / Forum.pm

diff --git a/NDWeb/Pages/Forum.pm b/NDWeb/Pages/Forum.pm
index 55cbe9615481a4ca5ffe35c84ba6fb47e80bd5c7..76ac472a4afe5383c793d49bcf7e49e74cff822d 100644 (file)
--- a/NDWeb/Pages/Forum.pm
+++ b/NDWeb/Pages/Forum.pm
@@ -17,17 +17,17 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::Forum;
+package NDWeb::Pages::Forum;
 use strict;
 use warnings;
-use ND::Web::Forum;
+use NDWeb::Forum;
 use CGI qw/:standard/;
-use ND::Web::Include;
+use NDWeb::Include;
 use ND::Include;
 
-use base qw/ND::Web::XMLPage/;
+use base qw/NDWeb::XMLPage/;
 
-$ND::Web::Page::PAGES{forum} = __PACKAGE__;
+$NDWeb::Page::PAGES{forum} = __PACKAGE__;
 
 sub parse {
        my $self = shift;
@@ -168,16 +168,13 @@ sub render_body {
                        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;
                                while (my $thread = $threads->fetchrow_hashref){
-                                       $i++;
-                                       $thread->{Odd} = $i % 2;
                                        push @threads,$thread;
                                }
                                $board->{Threads} = \@threads;
                                delete $board->{post};
-                               push @boards,$board if $i > 0;
+                               push @boards,$board if $threads->rows > 0;
                        }
                        $category->{Boards} = \@boards;
                        delete $category->{id};
@@ -196,11 +193,8 @@ sub render_body {
                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);
-               my $i = 0;
                my @threads;
                while (my $thread = $threads->fetchrow_hashref){
-                       $i++;
-                       $thread->{Odd} = $i % 2;
                        push @threads,$thread;
                }
                $BODY->param(Threads => \@threads);
@@ -241,15 +235,12 @@ sub render_body {
                while (my $category = $categories->fetchrow_hashref){
                        $boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
                        my @boards;
-                       my $i = 0;
                        while (my $board = $boards->fetchrow_hashref){
-                               $i++;
-                               $board->{Odd} = $i % 2;
                                push @boards,$board;
                        }
                        $category->{Boards} = \@boards;
                        delete $category->{id};
-                       push @categories,$category if $i > 0;
+                       push @categories,$category if $boards->rows > 0;
                }
                $BODY->param(Categories => \@categories);