X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fperson.php;h=ea948f95f54c87dc045ccf8dce54fe3ed751b5fd;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=832a540337fbbbd5da8250c018172bdc62965105;hpb=34d41a3846da0721bc27d94ffe69ec4ee2cf9dec;p=plewww.git diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php index 832a540..ea948f9 100644 --- a/planetlab/persons/person.php +++ b/planetlab/persons/person.php @@ -1,7 +1,5 @@ '/db/persons/update.php', - 'values'=>array('id'=>$person_id), - 'bubble'=>"Update $first_name $last_name"); - // enable / disable -if ($local_peer && $privileges) +// become +if (plc_is_admin() && ! $is_my_account && $local_peer && $enabled) + $tabs['Become'] = array('method'=>'POST', + 'url'=>l_actions(), + 'values'=>array('action'=>'become-person', + 'person_id'=>$person_id), + 'bubble'=>"Become $first_name $last_name", + 'confirm'=>"Are you sure you want to become $first_name $last_name"); + +if ($local_peer && $privileges && ! $is_my_account) if ($enabled) $tabs['Disable'] = array ('method'=>'POST', 'url'=>l_actions(), @@ -96,17 +100,8 @@ if ($local_peer && $privileges) 'bubble'=>"Enable $first_name $last_name", 'confirm'=>"Are you sure you want to enable $first_name $last_name"); -// become -if (plc_is_admin() && ! $is_my_account) - $tabs['Become'] = array('method'=>'POST', - 'url'=>l_actions(), - 'values'=>array('action'=>'become-person', - 'person_id'=>$person_id), - 'bubble'=>"Become $first_name $last_name", - 'confirm'=>"Are you sure you want to su $first_name $last_name"); - // delete -if ($local_peer && $privileges) +if ($local_peer && $privileges && $local_peer && ! $is_my_account) $tabs['Delete'] = array ('method'=>'POST', 'url'=>l_actions(), 'values'=> array ('person_id'=>$person_id, @@ -120,210 +115,277 @@ if ( $privileges) 'bubble'=>"Events about $first_name $last_name", 'image'=>'/planetlab/icons/event.png','height'=>18); -// Back button -$tabs['All Users'] = array ('url'=>l_persons(), - 'bubble'=>'Back to the Users page'); - -plc_tabs($tabs); +plekit_linetabs($tabs); $peers->block_start ($peer_id); if ($local_peer && $privileges && ! $enabled ) drupal_set_message ("$first_name $last_name is not enabled yet, you can enable her/him with the 'Enable' button below"); -$enabled_text="Enabled"; -if ( ! $enabled ) $enabled_text = plc_warning_text("Disabled"); - -plc_details_start(); -plc_details_line("Enabled",$enabled_text); -plc_details_line("First Name",$first_name); -plc_details_line("Last Name",$last_name); -plc_details_line("Email",href("mailto:$email",$email)); -plc_details_line("URL",$url); -plc_details_line("Phone",$phone); -plc_details_line("Title",$title); -plc_details_line("Bio",wordwrap($bio,50,"
")); -plc_details_line("Peer",$peers->peer_link($peer_id)); -plc_details_end(); +$enabled_label="Yes"; +if ( ! $enabled ) $enabled_label = plc_warning_html("Disabled"); + +$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'))); +$toggle->start(); + +$details = new PlekitDetails($can_update); + +$details->form_start(l_actions(),array("action"=>"update-person", + "person_id"=>$person_id)); +$details->start(); + + +$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",array("width"=>30)); +$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)); + +// xxx need to check that this is working +if ($can_update) { + $details->th_td("Password","","password1",array('input_type'=>'password')); + $details->th_td("Repeat","","password2",array('input_type'=>'password')); + $details->tr_submit("submit","Update Account"); + $details->space(); + } + +$details->th_td("Enabled",$enabled_label); +if ( ! $local_peer ) { + $details->th_td("Peer",$peers->peer_link($peer_id)); + $details->space(); + } + +$details->end(); +$details->form_end(); +$toggle->end(); //////////////////// slices -plc_section('Slices'); - -if( ! $slices) { - plc_warning ("User has no slice"); - } else { - $headers=array('Slice name'=>'string'); - $reasonable_page=5; - $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page); - if (count ($slices) <= $reasonable_page) { - $table_options['search_area']=false; - $table_options['pagesize_area']=false; - } - plc_table_start("person_slices",$headers,1,$table_options); - - foreach( $slices as $slice ) { - $slice_name= $slice['name']; - $slice_id= $slice['slice_id']; - plc_table_row_start(); - plc_table_cell(l_slice_t($slice_id,$slice_name)); - plc_table_row_end(); +if ($local_peer) { + $slices_title=count_english_warning($slices,'slice'); + $toggle=new PlekitToggle ('slices',$slices_title, + array('visible'=>get_arg('show_slices'))); + $toggle->start(); + + if( ! $slices) { + plc_warning ("User has no slice"); + } else { + $headers=array('Slice name'=>'string'); + $reasonable_page=5; + $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page); + if (count ($slices) <= $reasonable_page) { + $table_options['search_area']=false; + $table_options['pagesize_area']=false; + } + $table=new PlekitTable ("person_slices",$headers,1,$table_options); + $table->start(); + + foreach( $slices as $slice ) { + $slice_name= $slice['name']; + $slice_id= $slice['slice_id']; + $table->row_start(); + $table->cell(l_slice_t($slice_id,$slice_name)); + $table->row_end(); + } + $table->end(); } - plc_table_end("person_slices"); + $toggle->end(); } +//////////////////////////////////////// // we don't set 'action', but use the submit button name instead -plc_form_start(l_actions(), array("person_id"=>$person_id,)); +$form=new PlekitForm(l_actions(), array("person_id"=>$person_id)); +$form->start(); //////////////////// keys -plc_section ("Keys"); +if ($local_peer) { + $keys_title = count_english_warning($keys,'key'); + $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) ); -if ( empty( $key_ids ) ) { - plc_warning("This user has no known key"); - } - -// headers -$headers=array("Type"=>"string", - "Key"=>"string"); -if ($can_manage_keys) $headers['Remove']="none"; -// table overall options -$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); -plc_table_start("person_keys",$headers,"1",$table_options); + $can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) ); + if ( empty( $key_ids ) ) { + plc_warning("This user has no known key"); + } + + $headers=array("Type"=>"string", + "Key"=>"string"); + if ($can_manage_keys) $headers[plc_delete_icon()]="none"; + // table overall options + $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); + $table=new PlekitTable("person_keys",$headers,"1",$table_options); + $table->start(); -if ($keys) foreach ($keys as $key) { - $key_id=$key['key_id']; - plc_table_row_start(); - plc_table_cell ($key['key_type']); - plc_table_cell(wordwrap( $key['key'], 60, "
\n", 1 )); - if ($can_manage_keys) - plc_table_cell (plc_form_checkbox_text('key_ids[]',$key_id)); - plc_table_row_end(); -} -// the footer area is used for displaying key-management buttons -$footers=array(); -// add the 'remove keys' button and key upload areas as the table footer -if ($can_manage_keys) { - $remove_keys_area=plc_form_submit_text ("delete-keys","Remove keys"); - $upload_key_left_area= plc_form_label_text("key","Upload new key") . plc_form_file_text("key",60); - $upload_key_right_area=plc_form_submit_text("upload-key","Upload key"); - // no need to remove if there's no key - if ($keys) - $footers[]=" $remove_keys_area "; - // upload a new key - $footers []=" $upload_key_left_area ". - " $upload_key_right_area "; -} - -plc_table_end("person_keys",array("footers"=>$footers)); + if ($keys) foreach ($keys as $key) { + $key_id=$key['key_id']; + $table->row_start(); + $table->cell ($key['key_type']); + $table->cell(wordwrap( $key['key'], 60, "
\n", 1 )); + if ($can_manage_keys) + $table->cell ($form->checkbox_html('key_ids[]',$key_id)); + $table->row_end(); + } + // the footer area is used for displaying key-management buttons + // add the 'remove keys' button and key upload areas as the table footer + if ($can_manage_keys) { + $table->tfoot_start(); + // no need to remove if there's no key + if ($keys) { + $table->row_start(); + $table->cell($form->submit_html ("delete-keys","Remove keys"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + $table->row_start(); + $table->cell($form->label_html("key","Upload new key") + . $form->file_html("key","upload",array('size'=>60)) + . $form->submit_html("upload-key","Upload key"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + + $table->end(); + $toggle->end(); + } //////////////////// sites -plc_section('Sites'); +if ($local_peer) { + $sites_title = count_english_warning($sites,'site'); + $toggle=new PlekitToggle('sites',$sites_title, + array('visible'=>get_arg('show_sites'))); + $toggle->start(); -// sites -if (empty( $sites ) ) { - plc_warning('This user is not affiliated with a site !!'); - } -$can_manage_sites = $local_peer && plc_is_admin() || $is_my_account; -$headers=array(); -$headers['Login_base']="string"; -$headers['Name']="string"; -if ($can_manage_sites) - $headers['Remove']="string"; -$table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false); -plc_table_start ("person_sites",$headers,0,$table_options); -foreach( $sites as $site ) { - $site_name= $site['name']; - $site_id= $site['site_id']; - $login_base=$site['login_base']; - plc_table_row_start(); - plc_table_cell ($login_base); - plc_table_cell (l_site_t($site_id,$site_name)); - if ($can_manage_sites) - plc_table_cell (plc_form_checkbox_text('site_ids[]',$site_id)); - plc_table_row_end (); -} -// footers : the remove and add buttons -$footers=array(); -if ($can_manage_sites) { - // remove selected sites - $remove_sites_area = plc_form_submit_text("remove-person-from-sites","Remove Sites"); - - // add a site : the button - $add_site_right_area=plc_form_submit_text("add-person-to-site","Add in site"); - // 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 - $selector=array(); - foreach ($relevant_sites as $site) - $selector[]= array('display'=>$site['name'],"value"=>$site['site_id']); - $add_site_left_area=plc_form_select_text("site_id",$selector,"Choose a site to add"); - $add_site_area = $add_site_left_area . $add_site_right_area; - if ($sites) - $footers[]=plc_table_td_text ($remove_sites_area,3,"right"); - // add a new site - $footers []= plc_table_td_text ($add_site_right_area,3,"right"); + if (empty( $sites ) ) { + plc_warning('This user is not affiliated with a site !!'); + } + $can_manage_sites = $local_peer && plc_is_admin() || $is_my_account; + $headers=array(); + $headers['Login_base']="string"; + $headers['Name']="string"; + if ($can_manage_sites) $headers[plc_delete_icon()]="none"; + $table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false); + $table=new PlekitTable ("person_sites",$headers,0,$table_options); + $table->start(); + foreach( $sites as $site ) { + $site_name= $site['name']; + $site_id= $site['site_id']; + $login_base=$site['login_base']; + $table->row_start(); + $table->cell ($login_base); + $table->cell (l_site_t($site_id,$site_name)); + if ($can_manage_sites) + $table->cell ($form->checkbox_html('site_ids[]',$site_id)); + $table->row_end (); + } + if ($can_manage_sites) { + $table->tfoot_start(); + + if ($sites) { + $table->row_start(); + $table->cell($form->submit_html("remove-person-from-sites","Remove Sites"), + 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); + $relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids, '-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(); } -plc_table_end("person_sites",array("footers"=>$footers)); - //////////////////// roles -plc_section("Roles"); -if (! $roles) plc_warning ("This user has no role !"); +if ($local_peer) { + $toggle=new PlekitToggle ('roles',count_english($roles,"role"),array('visible'=>get_arg('show_roles'))); + $toggle->start(); -$can_manage_roles= ($local_peer && plc_is_admin()); -$table_options=array("search_area"=>false,"notes_area"=>false); + if (! $roles) plc_warning ("This user has no role !"); -$headers=array("Role"=>"none"); -if ($can_manage_roles) $headers ["Remove"]="none"; + $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 ); -$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); -plc_table_start("person_roles",$headers,0,$table_options); - -// construct array of role objs -$role_objs=array(); -for ($n=0; $n$role_ids[$n], 'name'=>$roles[$n]); - } + $headers=array("Role"=>"string"); + if ($can_manage_roles) $headers [plc_delete_icon()]="none"; -if ($role_objs) foreach ($role_objs as $role_obj) { - plc_table_row_start(); - plc_table_cell($role_obj['name']); - if ($can_manage_roles) plc_table_cell (plc_form_checkbox_text('role_ids[]',$role_obj['role_id'])); - plc_table_row_end(); - } + $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); + $table=new PlekitTable("person_roles",$headers,0,$table_options); + $table->start(); + + // construct array of role objs + $role_objs=array(); + for ($n=0; $n$role_ids[$n], 'name'=>$roles[$n]); + } -// footers : the remove and add buttons -$footers=array(); -if ($can_manage_roles) { - // remove selected roles - $remove_roles_area = plc_form_submit_text("remove-roles-from-person","Remove Roles"); - - // add a role : the button - $add_role_right_area=plc_form_submit_text("add-role-to-person","Add role"); - // get list of local roles that the person has not yet - // xxx this does not work because GetRoles does not support filters - $relevant_roles = $api->GetRoles( array("~role_id"=>$role_ids)); - - $selector=array(); - foreach ($relevant_roles as $role) - $selector[]= array('display'=>$role['name'],"value"=>$role['role_id']); - $add_role_left_area=plc_form_select_text("role_id",$selector,"Choose a role to add"); - $add_role_area = $add_role_left_area . $add_role_right_area; - if ($roles) - $footers[]=" $remove_roles_area "; - // add a new role - $footers[]=" $add_role_area "; + if ($role_objs) foreach ($role_objs as $role_obj) { + $table->row_start(); + $table->cell($role_obj['name']); + if ($can_manage_roles) $table->cell ($form->checkbox_html('role_ids[]',$role_obj['role_id'])); + $table->row_end(); + } + + // footers : the remove and add buttons + if ($can_manage_roles) { + + // remove + $table->tfoot_start(); + if ($roles) { + $table->row_start(); + $table->cell($form->submit_html("remove-roles-from-person","Remove Roles"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + + // add + // compute the roles that can be added + if (plc_is_admin()) + // all roles + $exclude_role_ids=array(); + else + // all roles except admin and pi + $exclude_role_ids=array(10,20); + $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(); } -plc_table_end("person_roles",array("footers"=>$footers)); ////////////////////////////// -plc_form_end(); +$form->end(); $peers->block_end($peer_id); +//plekit_linetabs ($tabs,"bottom"); + // Print footer include 'plc_footer.php'; - ?>