From 254599d1112e4db39309f89e2e223976797fb0d0 Mon Sep 17 00:00:00 2001
From: Kirk Webb <kwebb@cs.utah.edu>
Date: Fri, 6 May 2016 09:57:26 -0600
Subject: [PATCH] More changes for PhantomNet GENI login missed in the last
 commit.

---
 www/aptui/js/common.js    | 2 +-
 www/aptui/js/login.js     | 2 +-
 www/aptui/quickvm_sup.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/aptui/js/common.js b/www/aptui/js/common.js
index fb11c6458..af094d93e 100644
--- a/www/aptui/js/common.js
+++ b/www/aptui/js/common.js
@@ -94,7 +94,7 @@ window.APT_OPTIONS.initialize = function (sup)
 	$('#loginbutton').click(function (event) {
 	    event.preventDefault();
 	    sup.ShowModal('#quickvm_login_modal');
-	    if (window.ISCLOUD) {
+	    if (window.ISCLOUD || window.ISPNET) {
 		console.info("Loading geni auth code");
 		sup.InitGeniLogin(embedded);
 		require([geniauth], function() {
diff --git a/www/aptui/js/login.js b/www/aptui/js/login.js
index 58b35a3f1..893d457b5 100644
--- a/www/aptui/js/login.js
+++ b/www/aptui/js/login.js
@@ -14,7 +14,7 @@ function (_, sup, waitwaitString)
 	// We share code with the modal version of login, and the
 	// handler for the button is installed in initialize().
 	// See comment there.
-	if (window.ISCLOUD) {
+	if (window.ISCLOUD || window.ISPNET) {
 	    sup.InitGeniLogin(embedded);
 	}
 	window.APT_OPTIONS.initialize(sup);
diff --git a/www/aptui/quickvm_sup.php b/www/aptui/quickvm_sup.php
index 130c8c947..39f8d9813 100644
--- a/www/aptui/quickvm_sup.php
+++ b/www/aptui/quickvm_sup.php
@@ -508,7 +508,7 @@ function SpitVerifyModal($id, $label)
 function SpitLoginModal($id)
 {
     global $PORTAL_PASSWORD_HELP;
-    global $APTTITLE, $ISCLOUD;
+    global $APTTITLE, $ISCLOUD, $ISPNET;
     $referrer = CleanString($_SERVER['REQUEST_URI']);
 ?>
     <!-- This is the login modal -->
@@ -547,7 +547,7 @@ function SpitLoginModal($id)
              <div class='form-group'>
                <div class='col-sm-offset-2 col-sm-10'>
 <?php
-    if ($ISCLOUD) {
+    if ($ISCLOUD || $ISPNET) {
 	?>
                  <button class='btn btn-info btn-sm pull-left' disabled
 		    type='button'
-- 
GitLab