filter out not enabled users in slice page

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index 046cfe8..eb826ee 100644 (file)
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -269,7 +269,7 @@ $persons=$api->GetPersons(array('person_id'=>$slice['person_ids']));
 // just propose to add everyone else, 
 // as regular persons can see only a fraction of the db anyway
 $potential_persons=
 // just propose to add everyone else, 
 // as regular persons can see only a fraction of the db anyway
 $potential_persons=

-  $api->GetPersons(array('~person_id'=>$slice['person_ids'],'peer_id'=>NULL),
+  $api->GetPersons(array('~person_id'=>$slice['person_ids'],'peer_id'=>NULL,'enabled'=>true),

                   $person_columns);
 $count=count($persons);
 
                   $person_columns);
 $count=count($persons);
 

diff --git a/planetlab/slices/slice_add.php b/planetlab/slices/slice_add.php
index 6a056b1..dba762c 100644 (file)
--- a/planetlab/slices/slice_add.php
+++ b/planetlab/slices/slice_add.php
@@ -129,7 +129,9 @@ if ( ! $_POST['name'])
 
 // propose to add all 'reachable' persons 
 $site_person_ids=$site['person_ids'];
 
 // propose to add all 'reachable' persons 
 $site_person_ids=$site['person_ids'];

-$persons=$api->GetPersons($site_person_ids,array('email','enabled','first_name','last_name','person_id'));
+$persons_filter=array("person_id"=>$site_person_ids,
+                      "enabled"=>true);
+$persons=$api->GetPersons($persons_filter,array('email','enabled','first_name','last_name','person_id'));

 
 drupal_set_title('Create slice in site "' . $sitename . '"');
 
 
 drupal_set_title('Create slice in site "' . $sitename . '"');