[Publicdnsadmin-cvs] [CVS] Module publicdnsadmin: Change committed

[Alexander M. <key...@us...>]

CVSROOT    : /cvsroot/publicdnsadmin
Module     : publicdnsadmin
Commit time: 2003-07-16 15:04:28 UTC

Modified files:
     docs/CHANGELOG docs/TODO lib/header.php

Added files:
     ns1stats.php ns2stats.php

Removed files:
     nsstats.php

Log message:

Author: Alexander Maassen <out...@ke...>
Log message: Updated ns statistics

---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.19 publicdnsadmin/docs/CHANGELOG:1.20
--- publicdnsadmin/docs/CHANGELOG:1.19	Wed Jul 16 07:36:51 2003
+++ publicdnsadmin/docs/CHANGELOG	Wed Jul 16 08:04:18 2003
@@ -38,3 +38,6 @@
 						- Added a list of all required whois servers you might need.
 						  Import docs/whoissrv.<dbtype>.sql into your database.
 						  (NOTE: Upgraders first import docs/whois.update.<dbtype>.sql !!)
+						- Updated ns stats, splitted them into two files (ns1stats/ns2stats).
+						  This was needed to make the changes to support subpages in the stats
+						  Remaining problem is the 'Return to Main Page' link.
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.8 publicdnsadmin/docs/TODO:1.9
--- publicdnsadmin/docs/TODO:1.8	Wed Jul 16 07:36:51 2003
+++ publicdnsadmin/docs/TODO	Wed Jul 16 08:04:18 2003
@@ -1,5 +1,4 @@
 - Some sort of maintenence news system (displayed on the main login page).
-- Improve nsstats.php.
 - Add URL/HWINFO/MBOXFW/RP record type support.
 - Syntax check records for validity to make it more fool proof.
 
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.11 publicdnsadmin/lib/header.php:1.12
--- publicdnsadmin/lib/header.php:1.11	Wed Jul 16 04:51:30 2003
+++ publicdnsadmin/lib/header.php	Wed Jul 16 08:04:18 2003
@@ -7,7 +7,7 @@
    Distributed under the GPL license, see LICENSE for
    more information
 
-   $Id: header.php,v 1.11 2003/07/16 11:51:30 key2peace Exp $
+   $Id: header.php,v 1.12 2003/07/16 15:04:18 key2peace Exp $
 */
 ?>
 
@@ -37,8 +37,8 @@
 
     <?php if ($_SESSION["_UID"]) { ?><br>&middot; <a href="edit_self.php" class="menu">Settings</a><br><?php } ?>
 
-    <?php if (userHasAccess($_SESSION["_UID"], "users")) { ?><br>&middot; <a href="nsstats.php?serv=1" class="menu">NS1 stats</a><br><?php } ?>
-    <?php if (userHasAccess($_SESSION["_UID"], "users")) { ?>&middot; <a href="nsstats.php?serv=2" class="menu">NS2 stats</a><br><?php } ?>
+    <?php if (userHasAccess($_SESSION["_UID"], "users")) { ?><br>&middot; <a href="ns1stats.php" class="menu">NS1 stats</a><br><?php } ?>
+    <?php if (userHasAccess($_SESSION["_UID"], "users")) { ?>&middot; <a href="ns2stats.php" class="menu">NS2 stats</a><br><?php } ?>
 
     <br>&middot; <a href="logout.php" class="menu">Log out</a><br>
     <?php } else { ?>
Index: publicdnsadmin/ns1stats.php
diff -u /dev/null publicdnsadmin/ns1stats.php:1.1
--- /dev/null	Wed Jul 16 08:04:28 2003
+++ publicdnsadmin/ns1stats.php	Wed Jul 16 08:04:17 2003
@@ -0,0 +1,23 @@
+<?
+/*
+   Public DNS Administator
+   Originally Written by Trond Arve Nordheim <tr...@no...>
+   Modified By Neil Spierling <sir...@si...>
+
+   Distributed under the GPL license, see LICENSE for
+   more information
+
+   $Id:
+*/
+require("lib/prepend.php");
+include("lib/header.php");
+
+if (userHasAccess($_SESSION["_UID"], "users")) {
+  $query = $_SERVER["QUERY_STRING"];
+  include("http://$ns1user:$ns1pass@$ns1addy:$ns1port/?$query");
+} else {
+  displayNoAccess();
+}
+echo "</table>";
+include("lib/footer.php");
+?>
Index: publicdnsadmin/ns2stats.php
diff -u /dev/null publicdnsadmin/ns2stats.php:1.1
--- /dev/null	Wed Jul 16 08:04:28 2003
+++ publicdnsadmin/ns2stats.php	Wed Jul 16 08:04:17 2003
@@ -0,0 +1,23 @@
+<?
+/*
+   Public DNS Administator
+   Originally Written by Trond Arve Nordheim <tr...@no...>
+   Modified By Neil Spierling <sir...@si...>
+
+   Distributed under the GPL license, see LICENSE for
+   more information
+
+   $Id:
+*/
+require("lib/prepend.php");
+include("lib/header.php");
+
+if (userHasAccess($_SESSION["_UID"], "users")) {
+  $query = $_SERVER["QUERY_STRING"];
+  include("http://$ns2user:$ns2pass@$ns2addy:$ns2port/?$query");
+} else {
+  displayNoAccess();
+}
+echo "</table>";
+include("lib/footer.php");
+?>
Index: publicdnsadmin/nsstats.php
diff -u publicdnsadmin/nsstats.php:1.1.1.1 publicdnsadmin/nsstats.php:removed
--- publicdnsadmin/nsstats.php:1.1.1.1	Wed Apr 16 00:19:05 2003
+++ publicdnsadmin/nsstats.php	Wed Jul 16 08:04:28 2003
@@ -1,26 +0,0 @@
-<?
-/*
-   Public DNS Administator
-   Originally Written by Trond Arve Nordheim <tr...@no...>
-   Modified By Neil Spierling <sir...@si...>
-
-   Distributed under the GPL license, see LICENSE for
-   more information
-
-   $Id:
-*/
-require("lib/prepend.php");
-include("lib/header.php");
-
-if (userHasAccess($_SESSION["_UID"], "users")) {
-  if ($serv == 1) {
-    include("http://$ns1user:$ns1pass@$ns1addy:$ns1port/");
-  } else {
-    include("http://$ns2user:$ns2pass@$ns2addy:$ns2port/");
-  }
-} else {
-  displayNoAccess();
-}
-echo "</table>";
-include("lib/footer.php");
-?>
----------------------- End of diff -----------------------