big restructure

[ndwebbie.git] / ND.pm

diff --git a/ND.pm b/ND.pm
index 8539d1e5256df0199a78331d009fd86ea5051514..dd017f3a4201c73c8a579373ace4d9446e0d1eb1 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -31,6 +31,9 @@ use Fcntl 'O_RDONLY';
 use strict;
 use warnings FATAL => 'all';
 
+chdir '/var/www/ndawn/code';
+our %PAGES;
+our $NOACCESS = HTML::Template->new(filename => 'templates/NoAccess.tmpl', global_vars => 1, cache => 1);
 
 sub handler {
        local $ND::r = shift;
@@ -49,16 +52,20 @@ sub handler {
        if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){
                $ND::PAGE = $1 unless $1 eq 'index' and $3 eq 'pl';
        }
-       $ND::PAGE = '' unless defined $ND::PAGE;
-       page();
+       $ND::PAGE = 'main' unless exists $PAGES{$ND::PAGE};
+
+       $PAGES{$ND::PAGE}->{parse}->($ENV{REQUEST_URI});
+
+       page($ND::PAGE);
        return Apache2::Const::OK;
 }
 
 sub page {
+       my ($PAGE) = @_;
        our $DBH = ND::DB::DB();
        $DBH->do(q{SET timezone = 'GMT'});
 
-       our $ERROR = '';
+       our $ERROR;
 
        chdir '/var/www/ndawn/code';
 
@@ -81,14 +88,11 @@ sub page {
                $ATTACKER = 1 if $attack;
        }
 
-       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;
-
        our $XML = 0;
-       $XML = 1 if param('xml') and $ND::PAGE =~ /^(raids)$/;
-
        our $AJAX = 1;
 
+       $PAGES{$PAGE}->{process}->();
+
        my $type = 'text/html';
        if ($XML){
                $type = 'text/xml';
@@ -96,14 +100,10 @@ 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"){
-               $ERROR .= "<p><b>couldn't parse $ND::PAGE: $@</b></p>" if $@;
-               $ERROR .= "<p><b>couldn't do $ND::PAGE: $!</b></p>"    unless defined $return && defined $!;
-               $ERROR .= "<p><b>couldn't run $ND::PAGE</b></p>"       unless $return;
-       }
+       $ND::BODY = $PAGES{$PAGE}->{render}->($DBH,$ND::BODY);
 
        unless ($XML){
                my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID);
@@ -115,7 +115,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);