X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=e95198a8898fbc709b1a595fe9b87f6b85834531;hb=5c44ea5af4277f139fffa052304349bc5b6d644c;hp=7d9c8c08b2677cbc27e4ae5e64fe47e6cc3ab849;hpb=98378b594064426cdbc06b30a58553195d8cf8ec;p=ndwebbie.git

diff --git a/ND.pm b/ND.pm
index 7d9c8c0..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';
 
@@ -81,9 +84,6 @@ sub page {
 		$ATTACKER = 1 if $attack;
 	}
 
-
-	our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
-
 	tie my @pages, 'Tie::File', "/var/www/ndawn/code/pages", mode => O_RDONLY, memory => 0 or die $!;
 	$ND::PAGE = 'main' unless grep { /^$ND::PAGE$/ } @pages;
 
@@ -99,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"){
@@ -118,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);