global_vars and <TMPL_VAR NAME=PAGE> instead of hardcoded page values

diff --git a/index.pl b/index.pl
index ecb27a21cb7d38cdcbd384c4677d8a75156de78b..f9a534539ba86c8d1272a8feb00be22db666af47 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -34,7 +34,7 @@ our $DBH = undef;
 our $USER = $ENV{'REMOTE_USER'};
 my $error;
 
-our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl');
+our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl', global_vars => 1);
 
 for my $file ("db.pl","include.pl"){
        unless (my $return = do $file){
@@ -79,7 +79,8 @@ if ($XML){
        $ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl");
        $ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl");
 }else{
-       $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl");
+       $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl", global_vars => 1);
+       $ND::BODY->param(PAGE => $page);
 }
 
 

diff --git a/templates/addintel.tmpl b/templates/addintel.tmpl
index 2082a7fae1316aaf45334526686b4aa2fa51c793..b6e004cd3214bae569b9cd6d7befd4a7c61054d3 100644 (file)
--- a/templates/addintel.tmpl
+++ b/templates/addintel.tmpl
@@ -7,7 +7,7 @@
                <p>Paste <b>scan urls</b> and intel from <b>gal status</b> here</p>
                <textarea rows="20" cols="50" name="intel"></textarea>
                <input type="hidden" name="cmd" value="submit"/>
-               <input type="hidden" name="page" value="addintel"/>
+               <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
                <br/>Tick:<input type="text" name="tick" value="<TMPL_VAR NAME=Tick>"/>
                <input type="submit" value="Submit"/>
        </fieldset></form>
@@ -17,6 +17,6 @@
        <p>Write other messages to intel dept here (sms numbers, relay channels, bots etc) (<b>NOT gal status</b>):</p>
        <textarea rows="20" cols="50" name="intel"></textarea>
        <input type="hidden" name="cmd" value="submit_message"/>
-       <input type="hidden" name="page" value="addintel"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <br/><input type="submit" value="Submit"/>
 </fieldset></form>

diff --git a/templates/alliances.tmpl b/templates/alliances.tmpl
index b090cf07436d3fe8d73b08aa0efac8a2386fea6f..a7cd793f0620a2569bac13af8773d1f0c2f81e9c 100644 (file)
--- a/templates/alliances.tmpl
+++ b/templates/alliances.tmpl
@@ -1,7 +1,7 @@
 <TMPL_VAR NAME=Error>
 <TMPL_IF Alliance>
 <form action="/index.pl" method="post"><fieldset> <legend>Alliances: </legend>
-       <input type="hidden" name="page" value="alliances"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <input type="hidden" name="cmd" value="change"/>
        <input type="hidden" name="alliance" value="<TMPL_VAR NAME=Id>"/>
 <div class="leftinfo">
@@ -24,15 +24,15 @@
 <div class="leftinfo">
 <table>
        <tr>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=coords">Coords</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=coords">Coords</a></th>
                <th>Nick</th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=hit_us">Hit us</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=hit_us">Hit us</a></th>
                <th>Planet</th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=race">Race</a></th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=size">Size (rank)</a></th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=score">Score (rank)</a></th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=value">Value (rank)</a></th>
-               <th><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=xp">XP (rank)</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=race">Race</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=size">Size (rank)</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=score">Score (rank)</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=value">Value (rank)</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>&amp;order=xp">XP (rank)</a></th>
        </tr>
        <TMPL_LOOP Members>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
@@ -80,16 +80,16 @@
                <th>User</th>
                <th>Known members</th>
                <th>Total members</th>
-               <th><a href="index.pl?page=alliances&amp;order=score">Score</a> (<a href="index.pl?page=alliances&amp;order=kscore">known planets</a>)</th>
-               <th><a href="index.pl?page=alliances&amp;order=scavg">Avg Score</a> (<a href="index.pl?page=alliances&amp;order=kscavg">known planets</a>)</th>
-               <th><a href="index.pl?page=alliances&amp;order=size">Size</a> (<a href="index.pl?page=alliances&amp;order=ksize">known planets</a>)</th>
-               <th><a href="index.pl?page=alliances&amp;order=siavg">Avg Size</a> (<a href="index.pl?page=alliances&amp;order=ksiavg">known planets</a>)</th>
-               <th><a href="index.pl?page=alliances&amp;order=kxp">XP</a> (<a href="index.pl?page=alliances&amp;order=kxpavg">avg</a>)</th>
-               <th><a href="index.pl?page=alliances&amp;order=kvalue">Value</a> (<a href="index.pl?page=alliances&amp;order=kvalavg">avg</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=score">Score</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kscore">known planets</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=scavg">Avg Score</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kscavg">known planets</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=size">Size</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=ksize">known planets</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=siavg">Avg Size</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=ksiavg">known planets</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kxp">XP</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kxpavg">avg</a>)</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kvalue">Value</a> (<a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=kvalavg">avg</a>)</th>
        </tr>
 <TMPL_LOOP Alliances>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="index.pl?page=alliances&amp;alliance=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Name></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;alliance=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Name></a></td>
                <td><TMPL_VAR NAME=kmem></td>
                <td><TMPL_VAR NAME=members></td>
                <td><TMPL_VAR NAME=score> (<TMPL_VAR NAME=kscore>)</td>

diff --git a/templates/calls.tmpl b/templates/calls.tmpl
index b1f4f0d5b7de097e1f94d63376fb91d400e94b6a..3946024ce25862f3948347fef3a7035a27e96979 100644 (file)
--- a/templates/calls.tmpl
+++ b/templates/calls.tmpl
@@ -1,7 +1,7 @@
 <TMPL_VAR NAME=Error>
 <TMPL_IF Call>
 <form action="/index.pl" method="post"><fieldset> <legend>Call details, call# <TMPL_VAR NAME=Call></legend>
-       <input type="hidden" name="page" value="calls"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <input type="hidden" name="call" value="<TMPL_VAR NAME=Call>"/>
        <p>Current DC: <TMPL_VAR NAME=DC></p>
        <p>Member: <a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></p>
@@ -34,7 +34,7 @@
 </fieldset></form>
 <p>Attackers:</p>
 <form action="index.pl" method="post">
-       <input type="hidden" name="page" value="calls"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <input type="hidden" name="call" value="<TMPL_VAR NAME=Call>"/>
        <table>
        <tr>
@@ -72,7 +72,7 @@
        <tr><th>Call</th><th>Member (def points)</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Alliance</th><th>Attackers</th></tr>
 <TMPL_LOOP Calls>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="index.pl?page=calls&amp;call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
                <td class='<TMPL_VAR NAME=DefPrio>'><TMPL_VAR NAME=Coords> (<TMPL_VAR NAME=Defense_points>)</td>
                <td><TMPL_VAR NAME=Landing_tick></td>
                <td><TMPL_VAR NAME=Race></td>

diff --git a/templates/check.tmpl b/templates/check.tmpl
index a3b25606d8a6d839cd2a52d4cf092555b36d63d8..6dfe3d3431204726a6fedadd3473ade4b7344331 100644 (file)
--- a/templates/check.tmpl
+++ b/templates/check.tmpl
@@ -1,11 +1,11 @@
-<p><TMPL_IF Arbiter><TMPL_VAR NAME=Arbiter><TMPL_ELSE><a href="index.pl?page=check&amp;cmd=arbiter&amp;coords=<TMPL_VAR ESCAPE=URL NAME=Coords>">Do arbiter check on gal</a></TMPL_IF></p>
+<p><TMPL_IF Arbiter><TMPL_VAR NAME=Arbiter><TMPL_ELSE><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;cmd=arbiter&amp;coords=<TMPL_VAR ESCAPE=URL NAME=Coords>">Do arbiter check on gal</a></TMPL_IF></p>
 <table border="1">
        <tr><th>Coords</th><th>Planet</th><th>Race</th><th>Size (rank)</th><th>Score (rank)</th><th>Value (rank)</th>
                <th>XP (rank)</th><th>Fleet (Resouce) value</th><TMPL_IF isBC><th>Nick</th><th>Hit us</th><th>Alliance</th></TMPL_IF>
        </tr>
        <TMPL_LOOP Planets>
        <tr align="center">
-               <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Planet></td><td><TMPL_VAR NAME=Race></td><td><TMPL_VAR NAME=Size></td>
                <td><TMPL_VAR NAME=Score></td><td><TMPL_VAR NAME=Value></td><td><TMPL_VAR NAME=XP></td>
                <td><TMPL_VAR NAME=FleetValue></td><TMPL_IF isBC><td class="<TMPL_VAR NAME=PlanetStatus>"><TMPL_VAR NAME=Nick></td><td><TMPL_VAR NAME=HitUs></td>

diff --git a/templates/covop.tmpl b/templates/covop.tmpl
index aef3e6a0b043321faafdd9db346e1d04e9a7129b..a6d2b4fd59da072dc019243c71c3356b22ebaaf0 100644 (file)
--- a/templates/covop.tmpl
+++ b/templates/covop.tmpl
@@ -4,7 +4,7 @@
        </tr>
        <TMPL_LOOP Targets>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-       <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+       <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
        <td><TMPL_VAR NAME=Metal></td>
        <td><TMPL_VAR NAME=Crystal></td>
        <td><TMPL_VAR NAME=Eonium></td>
@@ -12,7 +12,7 @@
        <td><TMPL_VAR NAME=Dists></td>
        <td><TMPL_VAR NAME=MaxResHack></td>
        <td><TMPL_VAR NAME=Username> (<TMPL_VAR NAME=LastCovOp>)</td>
-       <td><a href="index.pl?page=covop<TMPL_VAR NAME=List>&amp;covop=<TMPL_VAR NAME=Target>">Did CovOp this tick</a>
+       <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE><TMPL_VAR NAME=List>&amp;covop=<TMPL_VAR NAME=Target>">Did CovOp this tick</a>
        </tr>
        </TMPL_LOOP>
 </table>

diff --git a/templates/defrequest.tmpl b/templates/defrequest.tmpl
index 78cbfd43048646a3ee381856154bbf984d4253f8..b560a4746dd462d157ac0a139cc358e8c4949679 100644 (file)
--- a/templates/defrequest.tmpl
+++ b/templates/defrequest.tmpl
@@ -5,7 +5,7 @@ channel</p></TMPL_IF>
        <p>Message to def channel (like a line from gal status):</p>
        <input type="text" name="message" value=""/>
        <input type="hidden" name="cmd" value="submit"/>
-       <input type="hidden" name="page" value="defrequest"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <br/>
        <input type="submit" value="Submit"/>
 </fieldset></form>

diff --git a/templates/editRaid.tmpl b/templates/editRaid.tmpl
index 4a656ccc43e590786377db1c304fb4d9edce89b6..46b48edb31c9e2840924462f3dfa0ff822291de2 100644 (file)
--- a/templates/editRaid.tmpl
+++ b/templates/editRaid.tmpl
@@ -1,14 +1,14 @@
 <TMPL_VAR NAME=Error>
 <form action="/index.pl" method="post">
        <fieldset> <legend><TMPL_IF Raid>Edit raid<TMPL_ELSE>New raid</TMPL_IF></legend>
-               <input type="hidden" name="page" value="editRaid"/>
+               <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
                <div class="leftinfo">
                <TMPL_IF Raid>
                        <input type="hidden" name="cmd" value="change"/>
                        <input type="hidden" name="raid" value="<TMPL_VAR NAME=Raid>"/>
-                       <p><a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Open>"><TMPL_VAR NAME=Open> raid.</a></p>
-                       <p><a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=ShowCoords>"><TMPL_VAR NAME=ShowCoordsName> coords.</a></p>
-                       <p><a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=remove">Remove raid</a></p>
+                       <p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Open>"><TMPL_VAR NAME=Open> raid.</a></p>
+                       <p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=ShowCoords>"><TMPL_VAR NAME=ShowCoordsName> coords.</a></p>
+                       <p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=remove">Remove raid</a></p>
                <TMPL_ELSE>
                        <input type="hidden" name="cmd" value="submit"/>
                </TMPL_IF>
@@ -55,12 +55,12 @@
 </form>
 <TMPL_IF Raid>
        <p>Sort by:
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=coords">Coords</a>
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=race">Race</a>
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=size">Size</a>
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=score">Score</a>
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=value">Value</a>
-               <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=xp">XP</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=coords">Coords</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=race">Race</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=size">Size</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=score">Score</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=value">Value</a>
+               <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;order=xp">XP</a>
        </p>
 <TMPL_LOOP Targets>
        <fieldset> <legend>Target: #<TMPL_VAR NAME=Id> <TMPL_VAR NAME=Coords></legend>
@@ -80,7 +80,7 @@
                </table>
        </div>
        <form action="index.pl" method="post">
-               <input type="hidden" name="page" value="editRaid"/>
+               <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
                <input type="hidden" name="target" value="<TMPL_VAR NAME=Id>"/>
                <input type="hidden" name="cmd" value="comment"/>
                <input type="hidden" name="raid" value="<TMPL_VAR NAME=Raid>"/>
@@ -90,7 +90,7 @@
                </p>
        </form>
        <div class="clear">&nbsp;</div>
-       <p><a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;removeTarget=<TMPL_VAR NAME=Id>">Remove</a></p>
+       <p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;removeTarget=<TMPL_VAR NAME=Id>">Remove</a></p>
        </fieldset>
 </TMPL_LOOP>
 </TMPL_IF>

diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 7233ff204b683f72c471a8f9002bff95ddc926c6..902c9b48def84845a316919eae9d36eb0ef55386 100644 (file)
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -2,17 +2,17 @@
 <form action="index.pl" method="post"><p>
        <input type="text" name="coords" value="<TMPL_VAR NAME=Coords>"/>
        <input type="submit" value="Check"/>
-       <input type="hidden" name="page" value="intel"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        </p>
 </form>
-<p><a href="index.pl?page=intel<TMPL_IF Coords>&amp;coords=<TMPL_VAR NAME=Coords></TMPL_IF>&amp;show=all">Show all ticks</a></p>
+<p><a href="index.pl?page=<TMPL_VAR NAME=PAGE><TMPL_IF Coords>&amp;coords=<TMPL_VAR NAME=Coords></TMPL_IF>&amp;show=all">Show all ticks</a></p>
 
 <TMPL_IF CoordList>
 <table>
        <tr><th>Coords</th><th>Alliance</th></tr>
        <TMPL_LOOP CoordList>
        <tr>
-               <td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Alliance></td>
        </tr>
        </TMPL_LOOP>
@@ -24,7 +24,7 @@
        <input type="hidden" name="coords" value="<TMPL_VAR NAME=Coords>"/>
        <input type="hidden" name="planet" value="<TMPL_VAR NAME=Planet>"/>
        <input type="hidden" name="cmd" value="change"/>
-       <input type="hidden" name="page" value="intel"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <table>
                <tr>
                        <th></th>
@@ -68,7 +68,7 @@
        </tr>
 <TMPL_LOOP ChannelUsers>
        <tr>
-               <td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Alliance></td><td><TMPL_VAR NAME=Nick></td><td><TMPL_VAR NAME=Channel></td>
        </tr>
 </TMPL_LOOP>
@@ -87,7 +87,7 @@
        <TMPL_LOOP Intel>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <TMPL_IF Origin>
-       <td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
+       <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        <td><TMPL_VAR NAME=OAlliance></td>
        </TMPL_IF>
        <td class="<TMPL_VAR NAME=MissionClass>"><TMPL_VAR NAME=Mission></td>
@@ -95,7 +95,7 @@
        <td align="center"><TMPL_VAR NAME=ETA></td>
        <td><TMPL_VAR NAME=Amount></td>
        <TMPL_IF Target>
-       <td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
+       <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
        <td><TMPL_VAR NAME=TAlliance></td>
        </TMPL_IF>
        <td><TMPL_VAR NAME=Ingal></td>
@@ -117,7 +117,7 @@
                <td><TMPL_VAR NAME=Username></td>
                <td><TMPL_VAR NAME=Report_date></td>
                <td><TMPL_VAR NAME=Message></td>
-               <td><a href="index.pl?page=intel&amp;handle=<TMPL_VAR NAME=Id>">remove</a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;handle=<TMPL_VAR NAME=Id>">remove</a></td>
        </tr>
        </TMPL_LOOP>
 </table>
@@ -126,6 +126,6 @@
        <p>Paste a list of coords here</p>
        <textarea rows="25" cols="80" name="coords"></textarea>
        <input type="hidden" name="cmd" value="coords"/>
-       <input type="hidden" name="page" value="intel"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <br/><input type="submit" value="Submit"/>
 </fieldset></form>

diff --git a/templates/launchConfirmation.tmpl b/templates/launchConfirmation.tmpl
index 2fc5eadc02df4f069cdc536a0d2085813666e155..1d5a4a2830bba3eb76fa650e78c392840bd5c12b 100644 (file)
--- a/templates/launchConfirmation.tmpl
+++ b/templates/launchConfirmation.tmpl
@@ -16,7 +16,7 @@
        <p>Paste all (ctrl+a should be ok, but try with just single mission if you get an error, save the ctrl+a output and contact harv) information from <b>missions page</b> here (NOT from news page, and not overview, nor gal status). It's ok to paste when prelaunched, as long as you're sure you won't change your plans.</p>
        <textarea rows="25" cols="80" name="mission"></textarea>
        <input type="hidden" name="cmd" value="submit"/>
-       <input type="hidden" name="page" value="launchConfirmation"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <br/>
        <input type="submit" value="Submit"/>
 </fieldset></form>

diff --git a/templates/main.tmpl b/templates/main.tmpl
index 5ba2dc72859c5f0f8c5f9716f818705623f6bfa1..36eaaae74403e9c947a5bc58feee29795b5a6cc7 100644 (file)
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -22,7 +22,7 @@
        <li>XP: <TMPL_VAR NAME=PlanetXP></li>   
        <TMPL_ELSE>
                <TMPL_IF isMEMBER>
-               <form action="index.pl?page=main" method="post">
+               <form action="index.pl?page=<TMPL_VAR NAME=PAGE>" method="post">
                        <p>We need your planet's coordinates: 
                        <input type="text" name="planet" value=""/>
                        <input type="submit" value="Submit"/>
@@ -50,16 +50,18 @@
        </p>
 </fieldset>
 </form>
-<form action="/index.pl?page=main.pl" method="post">
+<form action="/index.pl" method="post">
 <fieldset> <legend>Fleet</legend>
        <p>Paste your total fleet from ships section on overview here (do it daily to see the menus):</p>
        <textarea rows="15" cols="50" name="fleet"></textarea>
        <input type="hidden" name="cmd" value="fleet"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <br/><input type="submit" value="Submit"/>
 </fieldset>
 </form>
-<form action="/index.pl?page=main" method="post">
+<form action="/index.pl" method="post">
 <fieldset> <legend>Change password</legend>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <p>Old password: 
        <input type="password" name="oldpass" value=""/>
        New password: 

diff --git a/templates/memberIntel.tmpl b/templates/memberIntel.tmpl
index b6a3c57bc5214f98bd50941797df910b3429ee6e..b3cea942a6177c2379a34653785fb4b80966ca45 100644 (file)
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -1,5 +1,5 @@
 <TMPL_VAR NAME=Error>
-<p><a href="index.pl?page=memberIntel&amp;show=all">Show all ticks</a></p>
+<p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;show=all">Show all ticks</a></p>
 <TMPL_LOOP IntelLists>
 <TMPL_IF Message><p><TMPL_VAR NAME=Message></p></TMPL_IF>
 <table>

diff --git a/templates/points.tmpl b/templates/points.tmpl
index 2441baf41109a864cd0cd3d28f06185b6aaba5b5..b45635ca8b3f7290302301529a1db0986ccc40d9 100644 (file)
--- a/templates/points.tmpl
+++ b/templates/points.tmpl
@@ -1,12 +1,12 @@
 <table>
        <tr>
        <th>User</th>
-       <th><a href="index.pl?page=points&amp;type=total">Total</a></th>
-       <th><a href="index.pl?page=points&amp;type=defense">Defenses</a></th>
-       <th><a href="index.pl?page=points&amp;type=attack">Attacks</a></th>
-       <th><a href="index.pl?page=points&amp;type=scan">Scans</a></th>
-       <th><a href="index.pl?page=points&amp;type=humor">Humor</a></th>
-       <th><a href="index.pl?page=points&amp;type=rank">ND Rank</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=total">Total</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=defense">Defenses</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=attack">Attacks</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=scan">Scans</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=humor">Humor</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;type=rank">ND Rank</a></th>
        </tr>
        <TMPL_LOOP Members>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">

diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index 3fd7ac57458d37da7d06164c055a2f0e05d924f2..6bbb87bf22139ded3a13346f84708114c3dd8133 100644 (file)
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -1,5 +1,5 @@
 <TMPL_LOOP Raids>
-       <p><a href="index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>"><TMPL_VAR NAME=Raid></a>
+       <p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>"><TMPL_VAR NAME=Raid></a>
        <TMPL_IF isBC>
                <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>">Edit</a>
                <a href="index.pl?page=editRaid&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=close">Close raid.</a>
@@ -34,9 +34,9 @@
 <form action="index.pl" method="post">
        <p>
                <input type="button" value="Update claims"
-                       onclick = "update('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
+                       onclick = "update('index.pl?page=<TMPL_VAR NAME=PAGE>&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
                <input type="button" value="Update target list"
-                       onclick = "listTargets('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
+                       onclick = "listTargets('index.pl?page=<TMPL_VAR NAME=PAGE>&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
        </p>
 </form>
 </TMPL_IF>
@@ -73,12 +73,12 @@
        <TMPL_IF Ajax>
        <TMPL_LOOP Claims>
      <input type="button" value="Claim wave <TMPL_VAR NAME=Wave>"
-        onclick = "claim('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
+        onclick = "claim('index.pl?page=<TMPL_VAR NAME=PAGE>&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
        </TMPL_LOOP>
        <TMPL_ELSE>
        <TMPL_LOOP Claims>
-       <a class="<TMPL_VAR NAME=Command>" href="/index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Command>&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Command> wave <TMPL_VAR NAME=Wave><TMPL_IF Claimers> (<TMPL_VAR NAME=Claimers>)</TMPL_IF></a>
-       <TMPL_IF Owner><a href="/index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;target=<TMPL_VAR NAME=Target>&amp;cmd=set&amp;joinable=<TMPL_IF Joinable>FALSE<TMPL_ELSE>TRUE</TMPL_IF>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_IF Joinable>N<TMPL_ELSE>J</TMPL_IF></a></TMPL_IF>
+       <a class="<TMPL_VAR NAME=Command>" href="/index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Command>&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Command> wave <TMPL_VAR NAME=Wave><TMPL_IF Claimers> (<TMPL_VAR NAME=Claimers>)</TMPL_IF></a>
+       <TMPL_IF Owner><a href="/index.pl?page=<TMPL_VAR NAME=PAGE>&amp;raid=<TMPL_VAR NAME=Raid>&amp;target=<TMPL_VAR NAME=Target>&amp;cmd=set&amp;joinable=<TMPL_IF Joinable>FALSE<TMPL_ELSE>TRUE</TMPL_IF>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_IF Joinable>N<TMPL_ELSE>J</TMPL_IF></a></TMPL_IF>
        </TMPL_LOOP>
        </TMPL_IF>
        </span>
@@ -89,7 +89,7 @@
 </TMPL_LOOP>
 <TMPL_IF Ajax>
        <script type="text/javascript">
-       update('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>');
+       update('index.pl?page=<TMPL_VAR NAME=PAGE>&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>');
        </script>
 </TMPL_IF>
 

diff --git a/templates/resources.tmpl b/templates/resources.tmpl
index 5010c658b352467aa4fab0076a1cd8d3ac376f3a..2030dad179bcae4f14afa810b1bc7903bf766d27 100644 (file)
--- a/templates/resources.tmpl
+++ b/templates/resources.tmpl
@@ -2,13 +2,13 @@
 <table>
        <tr>
                <th>Name</th><th>Relationship</th><th>Members (in res calc)</th>
-               <th><a href="index.pl?page=resources&amp;order=score">Score</a></th>
-               <th><a href="index.pl?page=resources&amp;order=size">Size</a></th>
-               <th><a href="index.pl?page=resources&amp;order=resources">Resources</a></th>
-               <th><a href="index.pl?page=resources&amp;order=respplanet">Resources / Planet</a></th>
-               <th><a href="index.pl?page=resources&amp;order=nscore">Res score (gain)</a>[1]</th>
-               <th><a href="index.pl?page=resources&amp;order=nscore2">Avg res score (gain)</a>[2]</th>
-               <th><a href="index.pl?page=resources&amp;order=nscore3">Estimated score</a>[3]</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=score">Score</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=size">Size</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=resources">Resources</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=respplanet">Resources / Planet</a></th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=nscore">Res score (gain)</a>[1]</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=nscore2">Avg res score (gain)</a>[2]</th>
+               <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;order=nscore3">Estimated score</a>[3]</th>
        </tr>
 <TMPL_LOOP Alliances>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">

diff --git a/templates/top100.tmpl b/templates/top100.tmpl
index 20f73034f5dd9e0275cfd0ce39380a64d38da02b..d07be51f48897a39b4de6f4d9465dfe28fa471f3 100644 (file)
--- a/templates/top100.tmpl
+++ b/templates/top100.tmpl
@@ -1,20 +1,20 @@
-<p><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
-       <a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
+<p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
+       <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
 <table>
        <tr><th>Coords</th><th>Planet</th><th>Race</th>
-       <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size (rank)</a></th>
-       <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score (rank)</a></th>
-       <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value (rank)</a></th>
-       <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP (rank)</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size (rank)</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score (rank)</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value (rank)</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP (rank)</a></th>
        <TMPL_IF isHC>
        <th>Nick</th>
-       <th><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=hit_us">Hit us</a></th>
+       <th><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=Offset>&amp;order=hit_us">Hit us</a></th>
        <th>Alliance</th>
        </TMPL_IF>
        </tr>
        <TMPL_LOOP Planets>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-       <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+       <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
        <td><TMPL_VAR NAME=Planet></td>
        <td><TMPL_VAR NAME=Race></td>
        <td><TMPL_VAR NAME=Size></td>
@@ -22,12 +22,12 @@
        <td><TMPL_VAR NAME=Value></td>
        <td><TMPL_VAR NAME=XP></td>
        <TMPL_IF isHC>
-       <td class="<TMPL_VAR NAME=PlanetStatus>"><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick></a></td>
+       <td class="<TMPL_VAR NAME=PlanetStatus>"><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick></a></td>
        <td><TMPL_VAR NAME=HitUs></td>
        <td class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance></td>
        </TMPL_IF>
        </tr>
        </TMPL_LOOP>
 </table>
-<p><a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
-       <a href="index.pl?page=top100&amp;offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
+<p><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
+       <a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>

diff --git a/templates/users.tmpl b/templates/users.tmpl
index e63f4df119b130b3d4e3f1d150064de8acddc162..8565c8a150bd5f8c48bef391d234abc6b4829180 100644 (file)
--- a/templates/users.tmpl
+++ b/templates/users.tmpl
@@ -1,7 +1,7 @@
 <TMPL_VAR NAME=Error>
 <TMPL_IF User>
 <form action="/index.pl" method="post"><fieldset> <legend>User details</legend>
-       <input type="hidden" name="page" value="users"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <input type="hidden" name="cmd" value="change"/>
        <input type="hidden" name="user" value="<TMPL_VAR NAME=User>"/>
        <table>
@@ -65,7 +65,7 @@
        <tr><th>User</th></tr>
 <TMPL_LOOP Users>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="index.pl?page=users&amp;user=<TMPL_VAR NAME=Uid>"><TMPL_VAR NAME=Username></a></td>
+               <td><a href="index.pl?page=<TMPL_VAR NAME=PAGE>&amp;user=<TMPL_VAR NAME=Uid>"><TMPL_VAR NAME=Username></a></td>
        </tr>
 </TMPL_LOOP>
 </table>