X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fperson.php;h=5a2a9db0197dfae826874d57c9a0254bd6ac9898;hb=c8018d22c82d04e53e7b409ffca4c39368d00088;hp=fc0dec484355997d7128f31d07f9a1cb7e8d3bca;hpb=d62287e9ac129aaf23f45624c2e694759c852a50;p=plewww.git

diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php
old mode 100644
new mode 100755
index fc0dec4..5a2a9db
--- a/planetlab/persons/person.php
+++ b/planetlab/persons/person.php
@@ -1,7 +1,5 @@
 <?php
 
-// $Id$
-
 // Require login
 require_once 'plc_login.php';
 
@@ -32,7 +30,10 @@ if ( ! $person_id ) {
 
 ////////////////////
 // Get all columns as we focus on only one entry
-$persons= $api->GetPersons( array($person_id));
+// we need to mention them explicitly because we want hrn that is a tag..
+$columns=array('enabled','first_name','last_name','email','url','phone','title','bio','peer_id',
+	       'role_ids','roles','site_ids','slice_ids','key_ids','hrn');
+$persons= $api->GetPersons( array($person_id), $columns);
 
 if (empty($persons)) {
   drupal_set_message ("Person " . $person_id . " not found");
@@ -57,10 +58,15 @@ $roles= $person['roles'];
 $site_ids= $person['site_ids'];
 $slice_ids= $person['slice_ids'];
 $key_ids= $person['key_ids'];
+$hrn=$person['hrn'];
 
 // gets more data from API calls
 $site_columns=array( "site_id", "name", "login_base" );
-$sites= $api->GetSites( $site_ids, $site_columns);
+if ($site_ids) {
+	$sites= $api->GetSites( $site_ids, $site_columns);
+} else {
+	$sites = array();
+}
 $slices= $api->GetSlices( $slice_ids, array( "slice_id", "name" ) );
 $keys= $api->GetKeys( $key_ids );
 
@@ -78,7 +84,7 @@ $tabs=array();
 
 // enable / disable
 // become
-if (plc_is_admin() && ! $is_my_account && $local_peer) 
+if (plc_is_admin() && ! $is_my_account && $local_peer && $enabled) 
   $tabs['Become'] = array('method'=>'POST',
 			  'url'=>l_actions(),
 			  'values'=>array('action'=>'become-person',
@@ -86,7 +92,7 @@ if (plc_is_admin() && ! $is_my_account && $local_peer)
 			  'bubble'=>"Become $first_name $last_name",
 			  'confirm'=>"Are you sure you want to become $first_name $last_name");
     
-if ($local_peer && $privileges) 
+if ($local_peer && $privileges && ! $is_my_account) 
   if ($enabled) 
     $tabs['Disable'] = array ('method'=>'POST',
 			      'url'=>l_actions(),
@@ -103,7 +109,7 @@ if ($local_peer && $privileges)
 			     'confirm'=>"Are you sure you want to enable $first_name $last_name");
 
 // delete
-if ($local_peer && $privileges && $local_peer) 
+if ($local_peer && $privileges && $local_peer && ! $is_my_account) 
   $tabs['Delete'] = array ('method'=>'POST',
 			   'url'=>l_actions(),
 			   'values'=> array ('person_id'=>$person_id,
@@ -131,7 +137,7 @@ $can_update = (plc_is_admin() && $local_peer) || $is_my_account;
 
 $toggle = new PlekitToggle ('person',"Details",
 			    array('bubble'=>'Display and modify details for that account',
-				  'visible'=>get_arg('show_details',true)));
+				  'visible'=>get_arg('show_details')));
 $toggle->start();
 
 $details = new PlekitDetails($can_update);
@@ -141,10 +147,12 @@ $details->form_start(l_actions(),array("action"=>"update-person",
 $details->start();
 
 
-$details->th_td("Title",$title,"title",array('width'=>5));
+$details->th_td("Title",$title,"title",array('width'=>10));
 $details->th_td("First Name",$first_name,"first_name");
 $details->th_td("Last Name",$last_name,"last_name");
-$details->th_td(href("mailto:$email","Email"),$email,"email");
+$details->th_td(href("mailto:$email","Email"),$email,"email",array("width"=>30));
+if ($hrn) $details->th_td("SFA hrn",$hrn);
+else $details->tr("SFA hrn not set","center");
 $details->th_td("Phone",$phone,"phone");
 $details->th_td("URL",$url,"url",array('width'=>40));
 $details->th_td("Bio",$bio,"bio",array('input_type'=>'textarea','height'=>4));
@@ -171,7 +179,7 @@ $toggle->end();
 if ($local_peer) {
   $slices_title=count_english_warning($slices,'slice');
   $toggle=new PlekitToggle ('slices',$slices_title,
-			    array('visible'=>get_arg('show_slices',false)));
+			    array('visible'=>get_arg('show_slices')));
   $toggle->start();
   
   if( ! $slices) {
@@ -207,7 +215,7 @@ $form->start();
 //////////////////// keys
 if ($local_peer) {
   $keys_title = count_english_warning($keys,'key');
-  $toggle=new PlekitToggle ('keys',$keys_title,array('visible'=>get_arg('show_keys',false)));
+  $toggle=new PlekitToggle ('keys',$keys_title,array('visible'=>get_arg('show_keys')));
   $toggle->start();
 		
   $can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) );
@@ -259,7 +267,7 @@ if ($local_peer) {
 if ($local_peer) {
   $sites_title = count_english_warning($sites,'site');
   $toggle=new PlekitToggle('sites',$sites_title,
-			   array('visible'=>get_arg('show_sites',false)));
+			   array('visible'=>get_arg('show_sites')));
   $toggle->start();
   
   if (empty( $sites ) ) {
@@ -294,32 +302,39 @@ if ($local_peer) {
       $table->row_end();
     }
 
-    $table->row_start();
-
-    // get list of local sites that the person is not in
-    function get_site_id ($site) { return $site['site_id'];}
-    $person_site_ids=array_map("get_site_id",$sites);
-    $relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids), $site_columns);
-    // xxx cannot use onchange=submit() - would need to somehow pass action name 
-    function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); }
-    $selectors = array_map ("site_selector",$relevant_sites);
-    $table->cell ($form->select_html("site_id",$selectors,array('label'=>"Choose a site to add")).
-		  $form->submit_html("add-person-to-site","Add in site"),
-		  array('hfill'=>true,'align'=>'right'));
-    $table->row_end();
+    if (plc_is_admin()) 
+    {
+        // NOTE: only admins can add users to different sites.
+        $table->row_start();
+        // get list of local sites that the person is not in
+        function get_site_id ($site) { return $site['site_id'];}
+        $person_site_ids=array_map("get_site_id",$sites);
+	if ($person_site_ids) {
+		$relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids, '-SORT'=>'name'), $site_columns);
+	} else {
+		$relevant_sites= $api->GetSites( array("peer_id"=>NULL, '-SORT'=>'name'), $site_columns);
+	}
+	// xxx cannot use onchange=submit() - would need to somehow pass action name 
+        function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); }
+        $selectors = array_map ("site_selector",$relevant_sites);
+        $table->cell ($form->select_html("site_id",$selectors,array('label'=>"Choose a site to add")).
+              $form->submit_html("add-person-to-site","Add in site"),
+              array('hfill'=>true,'align'=>'right'));
+        $table->row_end();
+    }
   }
   $table->end();
   $toggle->end();
  }
 //////////////////// roles
 if ($local_peer) {
-  $toggle=new PlekitToggle ('roles','Roles',array('visible'=>get_arg('show_roles',false)));
+  $toggle=new PlekitToggle ('roles',count_english($roles,"role"),array('visible'=>get_arg('show_roles')));
   $toggle->start();
 
   if (! $roles) plc_warning ("This user has no role !");
 
-  $can_manage_roles= ($local_peer && plc_is_admin());
-  $table_options=array("search_area"=>false,"notes_area"=>false);
+  $is_pi_of_the_site = ( plc_in_site($site_ids[0]) && plc_is_pi() );
+  $can_manage_roles= ( ($local_peer && plc_is_admin()) || $is_pi_of_the_site );
 
   $headers=array("Role"=>"string");
   if ($can_manage_roles) $headers [plc_delete_icon()]="none";
@@ -343,6 +358,8 @@ if ($local_peer) {
 
   // footers : the remove and add buttons
   if ($can_manage_roles) {
+
+    // remove
     $table->tfoot_start();
     if ($roles) {
       $table->row_start();
@@ -351,18 +368,89 @@ if ($local_peer) {
       $table->row_end();
     }
 
+    // add
+    // compute the roles that can be added
+    if (plc_is_admin()) 
+      // all roles, except 'node' that does not make sense for a person
+      $exclude_role_ids=array(50);
+    else
+    // all roles except admin and pi, and node to avoid confusing people
+      $exclude_role_ids=array(10,20,50);
+    $possible_roles = roles_except($api->GetRoles(),$exclude_role_ids);
+    $roles_to_add = roles_except ($possible_roles,$role_ids);
+    if ( $roles_to_add ) {
+      $selectors=$form->role_selectors($roles_to_add);
+      $table->row_start();
+      $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role"));
+      // add a role : the button
+      $add_role_right_area=$form->submit_html("add-role-to-person","Add role");
+      $table->cell ($add_role_left_area . $add_role_right_area,
+		    array('hfill'=>true,'align'=>'right'));
+      $table->row_end();
+    }
+  }
+  $table->end();
+  $toggle->end();
+ }
+
+//////////////////////////////////////////////////////////// Tags
+// tags section
+if ($local_peer) {
+  $tags=$api->GetPersonTags (array('person_id'=>$person_id));
+  function get_tagname ($tag) { return $tag['tagname'];}
+  // xxx looks like tech-only see an error here, 
+  // might be that GetPersonTags is not accessible or something
+  $tagnames = array_map ("get_tagname",$tags);
+  
+  $toggle = new PlekitToggle ('tags',count_english($tags,'tag'),
+			      array('bubble'=>'Inspect and set tags on that person',
+				    'visible'=>get_arg('show_tags')));
+  $toggle->start();
+
+  $headers=array("Name"=>"string",
+		 "Value"=>"string",
+		 );
+  if (plc_is_admin()) $headers[plc_delete_icon()]="none";
+  
+  $table_options=array("notes_area"=>false,"pagesize_area"=>false,"search_width"=>10);
+  $table=new PlekitTable("person_tags",$headers,0,$table_options);
+  $table->start();
+  if ($tags) foreach ($tags as $tag) {
+      $table->row_start();
+      $table->cell(l_tag_obj($tag));
+      $table->cell($tag['value']);
+      // the remove checkbox
+      if (plc_is_admin()) $table->cell ($form->checkbox_html('person_tag_ids[]',$tag['person_tag_id']));
+      $table->row_end();
+    }
+  
+  if ($privileges) {
+    $table->tfoot_start();
+
+    // remove tag 
     $table->row_start();
-    $selectors=$form->role_selectors_excluding($api,$role_ids);
-    $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role"));
-    // add a role : the button
-    $add_role_right_area=$form->submit_html("add-role-to-person","Add role");
-    $table->cell ($add_role_left_area . $add_role_right_area,
-		  array('hfill'=>true,'align'=>'right'));
+    $table->cell($form->submit_html("delete-person-tags","Remove Tags"),
+		 // use the whole columns and right adjust
+		 array('hfill'=>true,'align'=>'right'));
+    $table->row_end();
+
+    // set tag area
+    $table->row_start();
+    // get list of tag names in the person/* category    
+    $all_tags= $api->GetTagTypes( array ("category"=>"person*","-SORT"=>"tagname"), array("tagname","tag_type_id"));
+    // xxx cannot use onchange=submit() - would need to somehow pass action name 
+    function tag_selector ($tag) { return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']); }
+    $selector=array_map("tag_selector",$all_tags);
+    $table->cell($form->select_html("tag_type_id",$selector,array('label'=>"Choose")));
+    $table->cell($form->text_html("value","",array('width'=>8)));
+    $table->cell($form->submit_html("set-tag-on-person","Set Tag"),array('columns'=>2,'align'=>'left'));
     $table->row_end();
   }
+  
   $table->end();
   $toggle->end();
- }
+
+}
 
 //////////////////////////////
 $form->end();