X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=keys.php;h=eab3167f5d6204019f0e29f0f843b488704adaa3;hb=f183818da199d8ffbb5eb473e15c138992aecfbb;hp=dd2e24a84020d196574503066d4c56b97412c0a9;hpb=524fd2d0ee134f86eaf1cc3aa433778327a699be;p=nodeconfig.git

diff --git a/keys.php b/keys.php
index dd2e24a..eab3167 100755
--- a/keys.php
+++ b/keys.php
@@ -13,7 +13,7 @@
 // Aaron Klingaman <alk@cs.princeton.edu>
 // Copyright (C) 2004 The Trustees of Princeton University
 //
-// $Id: keys.php,v 1.1 2006/11/06 22:02:17 mlhuang Exp $
+// $Id$
 //
 
 // Get admin API handle
@@ -43,23 +43,18 @@ if (isset($_REQUEST['site_admin'])) {
       $node = $nodes[0];
     }
   }
-  
   if (isset($node)) {
     // Look up the site
     $sites = $adm->GetSites(array($node['site_id']));
+    // Can't filter on roles so have to bruit force through entire userlist of site.
     if ($sites && $sites[0]['person_ids']) {
-      // XXX Implement API query filters
-      // $persons = $adm->GetPersons(array('person_id' => $sites[0]['person_ids'],
-      //				   'roles' => array('pi')));
-      // $persons += $adm->GetPersons(array('person_id' => $sites[0]['person_ids'],
-      //				    'roles' => array('tech')));
       $all_persons = $adm->GetPersons($sites[0]['person_ids']);
       foreach ($all_persons as $person) {
-	if (in_array('pi', $person['roles']) ||
-	    in_array('tech', $person['roles'])) {
-	  $persons[] = $person;
-	}
-      }
+	    if ((in_array('pi', $person['roles']) || in_array('tech', $person['roles'])) && 
+        $person['enabled']) {
+          $persons[] = $person; 
+        }
+	  }
     }
   }
 }
@@ -68,19 +63,21 @@ if (isset($_REQUEST['root'])) {
   $keys[] = array('key' => file_get_contents(PLC_ROOT_SSH_KEY_PUB));
 }
 
+
 if (!empty($persons)) {
   $key_ids = array();
   foreach ($persons as $person) {
-    $key_ids = $key_ids + $person['key_ids'];
+  	if ($person['key_ids']) {
+      $key_ids[] = $person['key_ids'][0];
+	}
   }
-
   if (!empty($key_ids)) {
-    $keys = $keys + $adm->GetKeys($key_ids);
+    $keys = $adm->GetKeys($key_ids);
   }
 }
 
 foreach ($keys as $key) {
-  print $key['key'];
+  print $key['key']. "\n";
 }
 
 ?>