get_array

[plewww.git] / planetlab / persons / persons.php

diff --git a/planetlab/persons/persons.php b/planetlab/persons/persons.php
index d4fcdfc..5f6ecd5 100644 (file)
--- a/planetlab/persons/persons.php
+++ b/planetlab/persons/persons.php
@@ -11,7 +11,7 @@ global $plc, $api;
 
 // Print header
 require_once 'plc_drupal.php';
-include 'plc_header.php'; 
+include 'plc_header.php';
 
 // Common functions
 require_once 'plc_functions.php';
@@ -20,15 +20,12 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-//fix the memory limit for this page
-ini_set("memory_limit","64M");
-
-// -------------------- 
+// --------------------
 // recognized URL arguments
-$peerscope=$_GET['peerscope'];
-$pattern=$_GET['pattern'];
-$site_id=intval($_GET['site_id']);
-$slice_id=intval($_GET['slice_id']);
+$peerscope=get_array($_GET, 'peerscope');
+$pattern=get_array($_GET, 'pattern');
+$site_id=intval(get_array($_GET, 'site_id'));
+$slice_id=intval(get_array($_GET, 'slice_id'));
 
 // --- decoration
 $title="Accounts";
@@ -55,8 +52,12 @@ function person_status ($person) {
   // check that the person has keys
   if ( count($person['key_ids']) == 0)
     $messages [] = "No Key";
+  if ( count($person['site_ids']) == 0)
+      $messages [] = "No Site";
   if ( ! $person['enabled'] ) 
     $messages[] = "Disabled";
+  if ( count ($person['roles']) == 0)
+    $messages []= "No role!";
   // for tech-only people: outline user if in a slice
   if ( ( count($person['roles'])==1 ) && 
        ( in_array('tech',$person['roles']) ) ) {
@@ -84,7 +85,7 @@ if ($pattern) {
  }
 
 // server-side selection on peerscope
-$peerscope=new PeerScope ($api,$_GET['peerscope']);
+$peerscope=new PeerScope ($api, get_array($_GET, 'peerscope'));
 $person_filter=array_merge($person_filter,$peerscope->filter());
 $title .= ' - ' . $peerscope->label();
 
@@ -110,11 +111,13 @@ if ($slice_id) {
 // go
 $persons=$api->GetPersons($person_filter,$person_columns);
 
-// build site_ids 
+// build site_ids - take all site_ids into account 
 $site_ids=array();
-if ($persons) foreach ($persons as $person) 
-               if ($person['site_ids'][0])
-                 $site_ids []= $person['site_ids'][0];
+if ($persons) foreach ($persons as $person) {
+  if ($person['site_ids']) foreach ($person['site_ids'] as $person_site_id) {
+      $site_ids []= $person_site_id;
+    }
+             }
 
 // fetch related sites
 $site_columns=array('site_id','login_base');
@@ -145,7 +148,7 @@ $headers["Peer"]="string";
 $headers["First"]="string";
 $headers["Last"]="string";
 $headers["Email"]="string";
-$headers["Site" ]= "string";
+$headers["Site(s)" ]= "string";
 $headers["R"]="string";
 $headers["S" ]= "int";
 $headers["Status"]="string";
@@ -164,9 +167,7 @@ $peers=new Peers ($api);
 foreach ($persons as $person) {
     $person_id=$person['person_id'];
     $email=$person['email'];
-    $site_id=$person['site_ids'][0];
-    $site=$site_hash[$site_id];
-    $login_base = $site['login_base'];
+    $site_ids = $person['site_ids'];
     $roles = plc_vertical_table ($person['roles']);
     $peer_id=$person['peer_id'];
 
@@ -177,7 +178,13 @@ foreach ($persons as $person) {
     $table->cell (href(l_person($person_id),$person['first_name']));
     $table->cell (href(l_person($person_id),$person['last_name']));
     $table->cell(l_person_t($person_id,$email));
-    $table->cell(l_site_t($site_id,$login_base),array('only-if'=>!$peer_id));
+    $site_links = array();
+    foreach ($site_ids as $site_id) {
+      $site=$site_hash[$site_id];
+      $login_base = $site['login_base'];
+      $site_links []= l_site_t($site_id,$login_base);
+    }
+    $table->cell(plc_vertical_table($site_links),array('only-if'=>!$peer_id));
     $table->cell($roles,array('only-if'=>!$peer_id));
     $table->cell(count($person['slice_ids']));
     $table->cell(person_status($person));