X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=997914241086d75eb46541e06dbd2e8b20121356;hb=4a89cdfc12aa35990a428af4cf5dcceae6e2a38b;hp=b5aee8646a9466ef103fe415b69b22fa71ce5725;hpb=aa96a30bb84a90221dcd2a3b8fe823d45894d7aa;p=ndwebbie.git

diff --git a/ND.pm b/ND.pm
index b5aee86..9979142 100755
--- a/ND.pm
+++ b/ND.pm
@@ -41,7 +41,7 @@ our $NOACCESS = HTML::Template->new(filename => 'templates/NoAccess.tmpl', globa
 sub handler {
 	local $ND::r = shift;
 	local $ND::req = Apache2::Request->new($ND::r, POST_MAX => "1M");
-	local $ND::DBH;
+	local $ND::DBH = ND::DB::DB();
 	local $ND::USER;
 	local $ND::UID;
 	local $ND::PLANET;
@@ -50,6 +50,7 @@ sub handler {
 	local $ND::TICK;
 	local %ND::GROUPS;
 	local $ND::ERROR;
+	local $ND::USETEMPLATE = 1;
 	local $ND::PAGE = $ND::req->param('page');
 
 	if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){
@@ -59,13 +60,17 @@ sub handler {
 
 	$PAGES{$ND::PAGE}->{parse}->($ENV{REQUEST_URI});
 
-	page($ND::PAGE);
+	if ($ND::USETEMPLATE){
+		page($ND::DBH,$ND::PAGE);
+	}else{
+		$PAGES{$ND::PAGE}->{render}->($ND::DBH,$ENV{REQUEST_URI});
+	}
+
 	return Apache2::Const::OK;
 }
 
 sub page {
-	my ($PAGE) = @_;
-	our $DBH = ND::DB::DB();
+	my ($DBH,$PAGE) = @_;
 	$DBH->do(q{SET timezone = 'GMT'});
 
 	our $ERROR;
@@ -103,7 +108,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);
 	}
 
 	$ND::BODY = $PAGES{$PAGE}->{render}->($DBH,$ND::BODY);