]> ruin.nu Git - ndwebbie.git/commitdiff
projects / ndwebbie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c0e488)
make forum/allUnread work
authorMichael Andreen <harv@ruin.nu>
Sat, 6 Jan 2007 22:12:05 +0000 (22:12 +0000)
committerMichael Andreen <harv@ruin.nu>
Sat, 6 Jan 2007 22:12:05 +0000 (22:12 +0000)
ND.pm patch | blob | history
apache-conf.conf patch | blob | history
templates/skel.tmpl patch | blob | history

diff --git a/ND.pm b/ND.pm
index 82a477ab5a60e17c064b9b829fd399d92bb22163..e95198a8898fbc709b1a595fe9b87f6b85834531 100755 (executable)
--- 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"){
diff --git a/apache-conf.conf b/apache-conf.conf
index 6d7738b5ab2a64f4fd2c8cae1ba847e7335cb856..68a4df7062385b50d8ef9197a1a2855b72890841 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -120,7 +120,7 @@
 
        PerlSwitches -T -I/var/www/ndawn/code/
        PerlRequire /var/www/ndawn/code/startup.pl
-       <Location ~ "^/\w*(.*\.(pl|php|pm))?$">
+       <Location ~ "^/[\w\\/]*(.*\.(pl|php|pm))?$">
                SetHandler perl-script
                PerlResponseHandler ND
        </Location>
diff --git a/templates/skel.tmpl b/templates/skel.tmpl
index 133ce3a56248fdd854085a4696d4e75486f1eff3..7d006720011a46b1414458551b5e7cdb653176b7 100644 (file)
--- a/templates/skel.tmpl
+++ b/templates/skel.tmpl
@@ -5,65 +5,65 @@
 <head>
        <title>NewDawn: <TMPL_VAR NAME=TITLE></title>
        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-       <link rel="stylesheet" type="text/css" href="nd.css"/>
-       <script type="text/javascript" src="raid.js"></script>
+       <link rel="stylesheet" type="text/css" href="/nd.css"/>
+       <script type="text/javascript" src="/raid.js"></script>
        <TMPL_VAR NAME=HEADER>
 </head>
 <body>
 <div id="leftbar">
        <ul class="linkbar">
-               <li><a href="main">Main page</a></li>
-               <li><a href="forum">Forum</a></li>
-               <li><a href="forum?allUnread=1">New posts <TMPL_IF UnreadPosts>(<b><TMPL_VAR NAME=UnreadPosts></b>)</TMPL_IF></a></li>
+               <li><a href="/main">Main page</a></li>
+               <li><a href="/forum">Forum</a></li>
+               <li><a href="/forum/allUnread">New posts <TMPL_IF UnreadPosts>(<b><TMPL_VAR NAME=UnreadPosts></b>)</TMPL_IF></a></li>
        </ul>   <p>Tick: <TMPL_VAR NAME=TICK></p>
        <TMPL_IF isMEMBER>
        <p>Member menu</p>
        <ul class="linkbar">
-               <li><a href="points">Top members</a></li>
-               <li><a href="addintel">Add intel/scans</a></li>
-               <li><a href="launchConfirmation">Launch confirmation</a></li>
-               <li><a href="covop">CovOp targets</a></li>
-               <li><a href="covop?list=distwhores">Distwhores</a></li>
-               <li><a href="top100">Top100 planets</a></li>
-               <li><a href="defrequest">Request defense</a></li>
+               <li><a href="/points">Top members</a></li>
+               <li><a href="/addintel">Add intel/scans</a></li>
+               <li><a href="/launchConfirmation">Launch confirmation</a></li>
+               <li><a href="/covop">CovOp targets</a></li>
+               <li><a href="/covop?list=distwhores">Distwhores</a></li>
+               <li><a href="/top100">Top100 planets</a></li>
+               <li><a href="/defrequest">Request defense</a></li>
        </ul>
        </TMPL_IF>
        <TMPL_IF isATTACKER>
        <p>Attack menu</p>
        <ul class="linkbar">
-               <li><form action="check" method="post"><p>
+               <li><form action="/check" method="post"><p>
                        <input type="hidden" name="page" value="check"/>
                        <input class="coordsinput" type="text" name="coords" value="<TMPL_VAR NAME=Coords>"/>
                        <input class="coordsbutton" type="submit" value="Check"/>
                        </p></form></li>
-               <li><a href="raids">Web raids</a></li>
+               <li><a href="/raids">Web raids</a></li>
        </ul>
        <div id="targets"><TMPL_VAR NAME=Targets></div>
        </TMPL_IF>
        <TMPL_IF isBC>
        <p>BC menu</p>
        <ul class="linkbar">
-               <li><a href="editRaid">Create raid</a></li>
+               <li><a href="/editRaid">Create raid</a></li>
        </ul>
        </TMPL_IF>
        <TMPL_IF isDC>
        <p>DC menu</p>
        <ul class="linkbar">
-               <li><a href="calls">Defense calls</a></li>
-               <li><a href="calls?show=uncovered">Not covered calls</a></li>
-               <li><a href="calls?show=covered">Covered calls</a></li>
-               <li><a href="calls?show=all">All calls</a></li>
+               <li><a href="/calls">Defense calls</a></li>
+               <li><a href="/calls?show=uncovered">Not covered calls</a></li>
+               <li><a href="/calls?show=covered">Covered calls</a></li>
+               <li><a href="/calls?show=all">All calls</a></li>
        </ul>
        </TMPL_IF>
        <TMPL_IF isHC>
        <p>HC menu</p>
        <ul class="linkbar">
-               <li><a href="users">List users</a></li>
-               <li><a href="intel">Intel</a></li>
-               <li><a href="alliances">Alliances</a></li>
-               <li><a href="memberIntel">Member Intel</a></li>
-               <li><a href="resources">Alliance resources</a></li>
-               <li><a href="planetNaps">Planet Naps</a></li>
+               <li><a href="/users">List users</a></li>
+               <li><a href="/intel">Intel</a></li>
+               <li><a href="/alliances">Alliances</a></li>
+               <li><a href="/memberIntel">Member Intel</a></li>
+               <li><a href="/resources">Alliance resources</a></li>
+               <li><a href="/planetNaps">Planet Naps</a></li>
        </ul>
        <TMPL_ELSE>
                <TMPL_IF isIntel>
The ND webbie, with scripts and database schemas