X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fsites%2Fsite.php;h=eb2f291c257c2476ceb5ded5e265fea22bd93d35;hb=589a8865c3cc774f2456d460008a45b09cc60cf9;hp=0398f088989e15d5e4f8e00a83360a8fd283a8bb;hpb=cc980b8224b32832478303f446ba1200203a410e;p=plewww.git

diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php
index 0398f08..eb2f291 100644
--- a/planetlab/sites/site.php
+++ b/planetlab/sites/site.php
@@ -38,7 +38,7 @@ if (empty($sites)) {
 
 $site=$sites[0];
 // var names to api return
-$sitename= htmlentities($site['name']);
+$sitename= htmlentities(utf8_decode($site['name']));
 $abbreviated_name= htmlentities($site['abbreviated_name']);
 $site_url= $site['url'];
 $login_base= $site['login_base'];
@@ -48,6 +48,7 @@ $max_slivers= $site['max_slivers'];
 $max_slices= $site['max_slices'];
 
 $enabled = $site['enabled'];
+$ext_consortium_id = $site ['ext_consortium_id'];
 
 // get peer 
 $peer_id= $site['peer_id'];
@@ -69,25 +70,30 @@ $api->begin();
 // gets address info
 $api->GetAddresses( $address_ids );
 
-// gets pcu info
-// GetPCUs is not accessible to the 'user' role
-//$api->GetPCUs( $pcu_ids );
-
 // gets node info
-$api->GetNodes( $node_ids, array( "node_id", "hostname", "boot_state" ) );
+$api->GetNodes( $node_ids, array( "node_id", "hostname", "boot_state", "pcu_ids", "ports" ) );
 
 // gets person info
 $api->GetPersons( $person_ids, array( "role_ids", "person_id", "first_name", "last_name", "email", "enabled" , "slice_ids") );
 
 $api->GetSlices ( $slice_ids, array ("slice_id", "name", "instantiation", "node_ids", "person_ids" ) );
 
-//list( $addresses, $pcus, $nodes, $persons, $slices )= $api->commit();
-list( $addresses, $nodes, $persons, $slices )= $api->commit();
+////////////////////
+// PCU stuff - not too sure why, but GetPCUs is not exposed to the 'user' role
+$display_pcus = (plc_is_admin() || plc_is_pi() || plc_is_tech());
+if ($display_pcus) 
+  $api->GetPCUs ($pcu_ids, array ('hostname', 'pcu_id' ));
+
+// get results
+if ($display_pcus)
+  list( $addresses, $nodes, $persons, $slices, $pcus )= $api->commit();
+else
+  list( $addresses, $nodes, $persons, $slices )= $api->commit();
   
 $techs = array();
 $pis = array();
 $disabled_persons = array();
-foreach( $persons as $person ) {
+if ($persons) foreach( $persons as $person ) {
   $role_ids= $person['role_ids'];
 
   if ( in_array( '20', $role_ids ))	$pis[] = $person;
@@ -107,6 +113,8 @@ drupal_set_title("Details for site " . $sitename);
   
 $tabs=array();
 
+$tabs []= tab_mysite();
+
 // available actions
 if ( $is_site_admin)
   $tabs['Expire slices'] = array('url'=>l_actions(),
@@ -143,28 +151,40 @@ plekit_linetabs($tabs);
 // show gray background on foreign objects : start a <div> with proper class
 $peers->block_start ($peer_id);
 
-if ( $local_peer && ( ! $enabled ) )
-  plc_warning ("This site is not enabled - Please visit " . 
-	       href (l_sites_pending(),"this page") . 
-	       " to review pending applications.");
+// sanity checks
+if ( $local_peer ) {
+  // pending site
+  global $PENDING_CONSORTIUM_ID;
+  if ( $ext_consortium_id === $PENDING_CONSORTIUM_ID) {
+    if ( ! $enabled ) 
+      plc_warning ("This site is under pending registration - Please visit " . 
+		   href (l_sites_pending(),"this page") . 
+		   " to review pending applications.");
+    else 
+      plc_warning ("This site is pending but is also enabled - something is wrong. You should fix the issue with plcsh");
+  } else {
+    if ( ! $enabled) 
+      plc_warning ("This site is disabled.");
+  }
+}
 
 $can_update=(plc_is_admin ()  && $local_peer) || ( plc_in_site($site_id) && plc_is_pi());
 
 
 $toggle = new PlekitToggle ('site',"Details",
-			    array('visible'=>get_arg('show_details',true),
+			    array('visible'=>get_arg('show_details'),
 				  'bubble'=>'Display and modify details for that site'));
 $toggle->start();
 
 $details = new PlekitDetails($can_update);
 
-if ( ! $site['is_public']) 
-  plc_warning("This site is not public!");
-
-$details->form_start(l_actions(),array('action'=>'update-site','site_id'=>$site_id));
+$f = $details->form_start(l_actions(),array('action'=>'update-site','site_id'=>$site_id));
 
 $details->start();
 
+if ( ! $site['is_public']) 
+  $details->tr(plc_warning_html("This site is not public!"));
+
 $details->th_td("Full name",$sitename,'name',array('width'=>50));
 $details->th_td("Abbreviated name",$abbreviated_name,'abbreviated_name',array('width'=>15));
 $details->th_td("URL",$site_url,'url',array('width'=>40));
@@ -180,6 +200,18 @@ if (plc_is_admin())
   $details->th_td("Max slices",$max_slices,'max_slices');
 else
   $details->th_td("Max slices",$max_slices);
+if (plc_is_admin())
+{
+  $selectors=array(array('display'=>"False",'value'=>'0'), 
+  				   array('display'=>"True",'value'=>'1'));
+  $selectors[intval($enabled)]['selected'] = 'selected';
+
+  $enable_select = $f->select_html ("enabled", $selectors);
+
+  $details->th_td("Enabled",$enable_select,'enabled', array('input_type' => 'select', 'value'=>$enabled));
+} else
+  $details->th_td("Enabled",$enabled);
+
 $details->tr_submit("submit","Update Site");
 
 if ( ! $local_peer) {
@@ -194,7 +226,6 @@ $toggle->end();
 if ( $local_peer ) {
 
   //////////////////// nodes
-  // xxx missing : would need to add columns on attached PCU name and port if avail
   $nb_boot = 0;
   if ($nodes) foreach ($nodes as $node) if ($node['boot_state'] == 'boot') $nb_boot ++;
 
@@ -206,23 +237,59 @@ if ( $local_peer ) {
   $nodes_title .= href(l_nodes_site($site_id)," (See as nodes)");
 
   $toggle=new PlekitToggle ('nodes',$nodes_title,
-			    array('visible'=>get_arg('show_nodes',false)));
+			    array('visible'=>get_arg('show_nodes')));
   $toggle->start();
 
   $headers=array();
-  $headers['hostname']='string';
+  $sort_column = '0';
+  if ($display_pcus) { $headers['PCU']='string'; $sort_column = '1' ; }
+  $headers['hostname']='string'; 
   $headers['state']='string';
 
-  $table = new PlekitTable ('nodes',$headers,'0',array('search_area'=>false,
-						    'notes_area'=>false,
-						    'pagesize_area'=>false));
+  $table = new PlekitTable ('nodes',$headers,$sort_column,array('search_area'=>false,
+								'notes_area'=>false,
+								'pagesize_area'=>false));
+  // hash pcus on pcu_id
+  if ($display_pcus) {
+    global $pcu_hash;
+    $pcu_hash= array();
+    if ($pcus) foreach ($pcus as $pcu) $pcu_hash[$pcu['pcu_id']]=$pcu;
+  }
+  // search the pcu, return the string to display and mark the pcu as displayed
+  //  function display_and_mark ($pcu_hash,$pcu_ids,$ports) {
+  function display_and_mark ($pcu_ids,$ports) {
+    global $pcu_hash;
+    if (empty($pcu_ids)) return plc_warning_html('None');
+    $pcu_id=$pcu_ids[0];
+    if (empty($ports)) return plc_error_html('???');
+    $port=$ports[0];
+    $pcu=$pcu_hash[$pcu_id];
+    $display= l_pcu_href($pcu_id, $pcu['hostname'] . ' : ' . $port);
+    $pcu_hash[$pcu_id]['displayed']=true;
+    return $display;
+  }
+
   $table->start();
   foreach ($nodes as $node) {
     $table->row_start();
+    if ($display_pcus) {
+      //      $table->cell(display_and_mark($pcu_hash,$node['pcu_ids'],$node['ports']));
+      $table->cell(display_and_mark($node['pcu_ids'],$node['ports']));
+    }
     $table->cell (l_node_obj($node));
     $table->cell ($node['boot_state']);
     $table->row_end();
   }
+  // show undisplayed PCU's if any
+  if ($display_pcus) 
+    if ($pcu_hash) foreach ($pcu_hash as $id=>$pcu) {
+	if (!$pcu['displayed']) {
+	  $table->row_start();
+	  $table->cell($pcu['hostname']); $table->cell(''); $table->cell('');
+	  $table->row_end();
+	}
+      }
+    
   $table->tfoot_start();
   $table->row_start();
   $button=new PlekitFormButton (l_node_add(),"node_add","Add node","POST");
@@ -243,7 +310,7 @@ if ( $local_peer ) {
   $persons_title .= href(l_persons_site($site_id)," (See as users)");
 
   $toggle=new PlekitToggle ('persons',$persons_title,
-			    array('visible'=>get_arg('show_persons',false)));
+			    array('visible'=>get_arg('show_persons')));
   $toggle->start();
 
   $headers = array ();
@@ -253,8 +320,9 @@ if ( $local_peer ) {
   $headers['User']='string';
   $headers["Tech"]='string';
   if ($has_disabled_persons) $headers["Disabled"]='string';
+  $notes=array('S = slices');
   $table=new PlekitTable('persons',$headers,'1r-3r-0',array('search_area'=>false,
-							    'notes_area'=>false,
+							    'notes'=>$notes,
 							    'pagesize_area'=>false));
   $table->start();
   if ($persons) foreach ($persons as $person) {
@@ -280,7 +348,7 @@ if ( $local_peer ) {
   $slices_title .= href(l_slices_site($site_id)," (See as slices)");
   
   $toggle=new PlekitToggle ('slices',$slices_title,
-			    array('visible'=>get_arg('show_slices',false)));
+			    array('visible'=>get_arg('show_slices')));
   $toggle->start();
 
   $headers = array ();
@@ -288,9 +356,9 @@ if ( $local_peer ) {
   $headers ['I'] = 'string';
   $headers ['N']='int';
   $headers ['U']='int';
-  $notes=array('I column shows instantiation type',
-	       'N column shows number of nodes',
-	       'U column shows number of users');
+  $notes=array('I = instantiation type',
+	       'N = number of nodes',
+	       'U = number of users');
   $table=new PlekitTable ('slices',$headers,0,array('search_area'=>false,
 						    'pagesize_area'=>false,
 						    'notes'=>$notes));
@@ -314,9 +382,70 @@ if ( $local_peer ) {
   $table->end();
   $toggle->end();
 
+  $form=new PlekitForm (l_actions(), array('site_id'=>$site_id));
+  $form->start();
+  //////////////////////////////////////////////////////////// Tags
+  // tags section
+  // already inside a if ( $local_peer )...
+  
+  $tags=$api->GetSiteTags (array('site_id'=>$site_id));
+  function get_tagname ($tag) { return $tag['tagname'];}
+  // xxx looks like tech-only see an error here, 
+  // might be that GetSiteTags 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 site',
+				    '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("site_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('site_tag_ids[]',$tag['site_tag_id']));
+      $table->row_end();
+    }
+  
+  if ($is_site_pi || $is_site_admin) {
+    $table->tfoot_start();
+
+    // remove tag 
+    $table->row_start();
+    $table->cell($form->submit_html("delete-site-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 site/* category    
+    $all_tags= $api->GetTagTypes( array ("category"=>"site*","-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-site","Set Tag"),array('columns'=>2,'align'=>'left'));
+    $table->row_end();
+  }
+  
+  $table->end();
+  $toggle->end();
+  $form->end();
+
   //////////////////// Addresses
   $toggle=new PlekitToggle ('addresses',"Addresses",
-			    array('visible'=>get_arg('show_addresses',false)));
+			    array('visible'=>get_arg('show_addresses')));
   $toggle->start();
   if ( ! $addresses) {
     print "<p class='addresses'>No known address for this site</p>";