X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=e95198a8898fbc709b1a595fe9b87f6b85834531;hb=03830799201db0b0f28e9c494fdd1b5b5143749c;hp=8539d1e5256df0199a78331d009fd86ea5051514;hpb=3fbdd3816ab065ed3ac2b5f77e7617b2c09ea00c;p=ndwebbie.git diff --git a/ND.pm b/ND.pm index 8539d1e..e95198a 100755 --- a/ND.pm +++ b/ND.pm @@ -49,6 +49,9 @@ sub handler { if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){ $ND::PAGE = $1 unless $1 eq 'index' and $3 eq 'pl'; } + if ($ENV{REQUEST_URI} =~ m{^.*/(\w+)$}){ + param($1,1); + } $ND::PAGE = '' unless defined $ND::PAGE; page(); return Apache2::Const::OK; @@ -58,7 +61,7 @@ sub page { our $DBH = ND::DB::DB(); $DBH->do(q{SET timezone = 'GMT'}); - our $ERROR = ''; + our $ERROR; chdir '/var/www/ndawn/code'; @@ -96,7 +99,7 @@ sub page { $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.xml.tmpl", cache => 1); }else{ $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.tmpl", global_vars => 1, cache => 1); - $ND::BODY->param(PAGE => $ND::PAGE); + $ND::BODY->param(PAGE => '/'.$ND::PAGE); } unless (my $return = do "$ND::PAGE.pl"){ @@ -115,7 +118,7 @@ sub page { FROM forum_boards fb NATURAL JOIN forum_threads ft JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid -WHERE ftv.time IS NULL OR fp.time > ftv.time AND +WHERE (ftv.time IS NULL OR fp.time > ftv.time) AND fbid > 0 AND fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1))) },undef,$UID) or $ERROR .= p($DBH->errstr);