fixed: show no slices when user has no slices

[plewww.git] / planetlab / sites / register.php

diff --git a/planetlab/sites/register.php b/planetlab/sites/register.php
index b9ac957..56d2f7b 100644 (file)
--- a/planetlab/sites/register.php
+++ b/planetlab/sites/register.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 //
 // Site registration and verification form. 
 //
@@ -16,7 +15,9 @@ require_once 'plc_drupal.php';
 drupal_set_title('New Site Registration');
 include 'plc_header.php';
 
-include 'site_form.php';
+require_once 'site_form.php';
+require_once 'details.php';
+require_once 'nifty.php';
 
 $verbose = FALSE;
 
@@ -32,6 +33,11 @@ $pi=$input['pi'];
 $tech=$input['tech'];
 $address=$input['address'];
 
+# allow address to be left out
+function non_empty_address ($address) {
+  return !empty($address['line1']);
+}
+
 if (! $empty_form ) {
   // Look for missing/blank entries
   $error = form_check_required ($site_form, $input);
@@ -60,10 +66,12 @@ if (! $empty_form ) {
     
     // creating the site
     $site['enabled']=FALSE;
+    global $PENDING_CONSORTIUM_ID;
+    $site['ext_consortium_id']=$PENDING_CONSORTIUM_ID;
     $site_id=$adm->AddSite($site);
     $api_error .= $adm->error();
     if (empty($api_error)) {
-      $verboses [] = "Site created as disabled";
+      $verboses [] = "Site created as disabled, with ext_consortium_id=".$PENDING_CONSORTIUM_ID;
     } else {
       $error .= $api_error;
     }
@@ -91,12 +99,14 @@ EOF;
     $messages [] = "Please send a message to " . PLC_MAIL_SUPPORT_ADDRESS . " if this request is not instructed within a few days.";
 
   // creating address
-    $adm->AddSiteAddress($site_id,$address);
-    $api_error = $adm->error();
-    if (empty($api_error)) {
-      $verboses [] = "Address created";
-    } else {
-      $error .= $api_error;
+    if (non_empty_address($address)) {
+      $adm->AddSiteAddress($site_id,$address);
+      $api_error = $adm->error();
+      if (empty($api_error)) {
+       $verboses [] = "Address created";
+      } else {
+       $error .= $api_error;
+      }
     }
 
     // creating PI
@@ -133,6 +143,11 @@ EOF;
       // creating TECH
       $known_tech = $adm->GetPersons(array("email"=>$tech['email'],
                                           "peer_id"=>NULL),array("person_id"));
+      // jan-2013 with improvements in plcapi-5.1-6 about managing persons and tags,
+      // AddPerson has gone more picky and we need to remove some fields
+      // that no longer are silently ignored by AddPerson
+      $user_role_required=$tech['user-role'];
+      unset($tech['user-role']);
       if ($known_tech) {
        $messages [] = " Note: Tech was already known";
        $tech_id=$known_tech[0]['person_id'];
@@ -152,7 +167,7 @@ EOF;
       if ($adm->AddRoleToPerson('tech',$tech_id)) {
        $verboses [] = $tech['email'] . " granted Tech role";
       }
-      if ( ($tech['user-role']) && $adm->AddRoleToPerson('user',$tech_id) ) {
+      if ( $user_role_required && $adm->AddRoleToPerson('user',$tech_id) ) {
        $verboses [] = $tech['email'] . " granted User role";
       }
     }
@@ -195,23 +210,32 @@ print <<<EOF
 
 <form action="$self" method="post">
 
-<table border="0" width="100%" cellspacing="0" cellpadding="3">
 EOF;
 
+$nifty=new PlekitNifty ('register','site-register','medium');
+$nifty->start();
+$details = new PlekitDetails(TRUE);
+$details -> start();
+
+$register_button='<input type="submit" name="op" value="Register"  class="form-submit" />';
+
 // Do not allow resubmits
 if (empty($site['site_id'])) {
-  print '<tr><td colspan=2 align=center><input type="submit" name="op" value="Register"  class="form-submit" /></td></tr>';
+  $details->tr($register_button,'center');
 }
 
-form_render_table2 ($site_form, $input, ! $empty_form);
+form_render_details ($details, $site_form, $input, ! $empty_form);
 
 // Do not allow resubmits
 if (empty($site['site_id'])) {
-  print '<tr><td colspan=2> &nbsp; </td></tr>';
-  print '<tr><td colspan=2 align=center><input type="submit" name="op" value="Register"  class="form-submit" /></td></tr>';
+  // some space
+  $details->space();
+  $details->tr($register_button,'center');
 }
 
-print "</table></form></div>";
+$details -> end();
+$nifty->end();
+print "</form></div>";
 
 include 'plc_footer.php';