From d105cce2ebb700b7deeec727fe1c792242d35677 Mon Sep 17 00:00:00 2001
From: Jonathon Duerig <duerig@flux.utah.edu>
Date: Tue, 3 Apr 2018 14:03:49 -0600
Subject: [PATCH] Export CalculateWirelessStatus to AJAX frontend

---
 www/aptui/frontpage.ajax    |  9 +++++++++
 www/aptui/instance_defs.php | 14 +++++---------
 www/aptui/server-ajax.php   |  4 +++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/www/aptui/frontpage.ajax b/www/aptui/frontpage.ajax
index e9af2b90b..53bb9f860 100644
--- a/www/aptui/frontpage.ajax
+++ b/www/aptui/frontpage.ajax
@@ -39,6 +39,15 @@ function Do_GetHealthStatus()
     SPITAJAX_RESPONSE($status);
 }
 
+# Fetch wireless health status.
+# Can be done without logging in (for front page status).
+function Do_GetWirelessStatus()
+{
+    $status     = array();
+    CalculateWirelessStatus($status);
+    SPITAJAX_RESPONSE($status);
+}
+
 # Local Variables:
 # mode:php
 # End:
diff --git a/www/aptui/instance_defs.php b/www/aptui/instance_defs.php
index 4a5932b00..18160ac4b 100644
--- a/www/aptui/instance_defs.php
+++ b/www/aptui/instance_defs.php
@@ -1097,15 +1097,13 @@ function CalculateAggregateStatus(&$amlist, &$fedlist, &$status,
     }
 }
 
-function CalculateWirelessStatus() {
-    $result = array();
-
+function CalculateWirelessStatus(&$result) {
     $query_result =
         DBQueryFatal( "SELECT COUNT(DISTINCT w.node_id1) AS c FROM wires AS w " .
 		      "LEFT OUTER JOIN reserved AS r1 ON " .
 		      "w.node_id1=r1.node_id LEFT OUTER JOIN reserved AS r2 " .
 		      "ON w.node_id2=r2.node_id WHERE w.node_id1 LIKE 'nuc%' " .
-		      "AND w.node_id2 LIKE 'ue%' AND w.external_wire IS NULL" .
+		      "AND w.node_id2 LIKE 'ue%' AND w.external_wire IS NULL " .
 		      "OR w.external_wire=''" );
     $row = mysql_fetch_array( $query_result );
     $radiated1 = $row[ 'c' ];
@@ -1115,7 +1113,7 @@ function CalculateWirelessStatus() {
 		      "LEFT OUTER JOIN reserved AS r1 ON " .
 		      "w.node_id1=r1.node_id LEFT OUTER JOIN reserved AS r2 " .
 		      "ON w.node_id2=r2.node_id WHERE w.node_id2 LIKE 'nuc%' " .
-		      "AND w.node_id1 LIKE 'ue%' AND w.external_wire IS NULL" .
+		      "AND w.node_id1 LIKE 'ue%' AND w.external_wire IS NULL " .
 		      "OR w.external_wire=''" );
     $row = mysql_fetch_array( $query_result );
     $radiated2 = $row[ 'c' ];
@@ -1138,10 +1136,8 @@ function CalculateWirelessStatus() {
     $row = mysql_fetch_array( $query_result );
     $controlled2 = $row[ 'c' ];
 
-    return array(
-        "radiated" => $radiated1 + $radiated2;
-        "controlled" => $controlled1 + $controlled2;
-    );
+    $result["radiated"] = $radiated1 + $radiated2;
+    $result["controlled"] = $controlled1 + $controlled2;
 }
     
 function SpitAggregateStatus($extended = false) {
diff --git a/www/aptui/server-ajax.php b/www/aptui/server-ajax.php
index eee3935f2..c9ed9bc17 100644
--- a/www/aptui/server-ajax.php
+++ b/www/aptui/server-ajax.php
@@ -411,7 +411,9 @@ $routing = array("geni-login" =>
 			array("file"    => "frontpage.ajax",
 			      "guest"   => true,
 			      "methods" => array("GetHealthStatus" =>
-						    "Do_GetHealthStatus")),
+						    "Do_GetHealthStatus",
+						 "GetWirelessStatus" =>
+						    "Do_GetWirelessStatus")),
 
 );
 
-- 
GitLab