Commit cb237111 authored by Leigh Stoller's avatar Leigh Stoller

I need to remember that users coming in through the APT side

do not get to choose a cluster.
parent 03eaec1d
...@@ -605,6 +605,7 @@ function CheckStep2() ...@@ -605,6 +605,7 @@ function CheckStep2()
{ {
global $this_user; global $this_user;
global $ajax_args; global $ajax_args;
global $ISAPT, $ISCLOUD;
if (!isset($ajax_args["formfields"])) { if (!isset($ajax_args["formfields"])) {
SPITAJAX_ERROR(-1, "Missing formfields"); SPITAJAX_ERROR(-1, "Missing formfields");
...@@ -652,6 +653,10 @@ function CheckStep2() ...@@ -652,6 +653,10 @@ function CheckStep2()
} }
} }
} }
elseif ($ISAPT) {
# No choice
;
}
elseif (!isset($formfields["fully_bound"]) || elseif (!isset($formfields["fully_bound"]) ||
$formfields["fully_bound"] == "0") { $formfields["fully_bound"] == "0") {
if (!(isset($formfields["where"]) && if (!(isset($formfields["where"]) &&
...@@ -703,7 +708,7 @@ function Do_Submit() ...@@ -703,7 +708,7 @@ function Do_Submit()
{ {
global $this_user; global $this_user;
global $ajax_args; global $ajax_args;
global $TBAUTHDOMAIN; global $TBAUTHDOMAIN, $ISAPT;
if (!isset($ajax_args["formfields"])) { if (!isset($ajax_args["formfields"])) {
SPITAJAX_ERROR(1, "Missing formfields"); SPITAJAX_ERROR(1, "Missing formfields");
...@@ -747,7 +752,10 @@ function Do_Submit() ...@@ -747,7 +752,10 @@ function Do_Submit()
$sitemap = array(); $sitemap = array();
if ($this_user) { if ($this_user) {
if (isset($formfields["sites"]) && is_array($formfields["sites"])) { if ($ISAPT) {
$aggregate_urn = "urn:publicid:IDN+apt.emulab.net+authority+cm";
}
elseif (isset($formfields["sites"]) && is_array($formfields["sites"])) {
while (list($siteid, $am) = each($formfields["sites"])) { while (list($siteid, $am) = each($formfields["sites"])) {
if (array_key_exists($am, $am_array)) { if (array_key_exists($am, $am_array)) {
$sitemap[$siteid] = $am_array[$am]; $sitemap[$siteid] = $am_array[$am];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment