From 495e3cee2d36378473e7dc0119a33f03c73aabef Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Mon, 12 Apr 2004 17:05:56 +0000
Subject: [PATCH] Add a "wireless" link from the Node Status page.

Remove isadmin() restriction from floormap pages; at some point I
assume we make the floormaps publically available.

Make MEB the default argument to the floormap page until such time
that we need something fancier.

Add a link to the wireless tutorial I am currently throwing up onto
paper.
---
 www/floormap.php3         | 18 +++++++++++-------
 www/floormap_aux.php3     |  3 ---
 www/nodecontrol_list.php3 |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/www/floormap.php3 b/www/floormap.php3
index 3b51a429a..c9e4fe5c2 100755
--- a/www/floormap.php3
+++ b/www/floormap.php3
@@ -17,19 +17,17 @@ PAGEHEADER("Wireless Node Map");
 $uid = GETLOGIN();
 LOGGEDINORDIE($uid);
 $isadmin = ISADMIN($uid);
-if (! $isadmin) {
-    USERERROR("You do not have permission to view this page!", 1);
-}
 
 # Careful with this local variable
 unset($prefix);
 
 #
-# Verify page arguments.
+# Verify page arguments. For now, just default to MEB since thats the only
+# place we have wireless nodes!
 # 
 if (!isset($building) ||
     strcmp($building, "") == 0) {
-    PAGEARGERROR("Must provide a building and an optional floor!");
+    $building = "MEB";
 }
 # Sanitize for the shell.
 if (!preg_match("/^[-\w]+$/", $building)) {
@@ -93,9 +91,14 @@ if (! readfile("${prefix}.map")) {
     TBERROR("Could not read ${prefix}.map", 1);
 }
 
+echo "<font size=+1>For more info on using wireless nodes, see the
+     <a href='tutorial/docwrapper.php3?docname=wireless.html'>
+     wireless tutorial.</a></font><br><br>\n";
+
 # And the img ...
 echo "<center>
-      <table class=nogrid align=center border=0 cellpadding=6 cellspacing=0>
+      <table class=nogrid align=center border=0 vpsace=5
+             cellpadding=6 cellspacing=0>
       <tr>
          <td align=right>Free</td>
          <td align=left><img src='/autostatus-icons/greenball.gif' alt=Free>
@@ -112,10 +115,11 @@ echo "<center>
           </td>
       </tr>
       </table>
-      <br><br>
+      Click on the dots below to see information about the node
       <img src=\"floormap_aux.php3?prefix=$uniqueid\" usemap=\"#floormap\">
       </center>\n";
 
+
 #
 # Standard Testbed Footer
 # 
diff --git a/www/floormap_aux.php3 b/www/floormap_aux.php3
index 6f524a9ad..c76654165 100755
--- a/www/floormap_aux.php3
+++ b/www/floormap_aux.php3
@@ -17,9 +17,6 @@ include("defs.php3");
 $uid = GETLOGIN();
 LOGGEDINORDIE($uid);
 $isadmin = ISADMIN($uid);
-if (! $isadmin) {
-    USERERROR("You do not have permission to view this page!", 1);
-}
 
 #
 # Verify arguments.
diff --git a/www/nodecontrol_list.php3 b/www/nodecontrol_list.php3
index f0c6d01ac..9560ffeb9 100644
--- a/www/nodecontrol_list.php3
+++ b/www/nodecontrol_list.php3
@@ -31,6 +31,7 @@ $isadmin = ISADMIN($uid);
 
 echo "<b>Show: <a href='nodecontrol_list.php3?showtype=summary'>summary</a>,
                <a href='nodecontrol_list.php3?showtype=pcs'>pcs</a>,
+               <a href='floormap.php3?building=MEB'>wireless</a>,
                <a href='nodecontrol_list.php3?showtype=widearea'>widearea</a>";
 
 if ($isadmin) {
-- 
GitLab