handles urls with settings

diff --git a/planetlab/includes/plc_forms.php b/planetlab/includes/plc_forms.php
index 15480dc..92de1e1 100644 (file)
--- a/planetlab/includes/plc_forms.php
+++ b/planetlab/includes/plc_forms.php
@@ -8,17 +8,19 @@ require_once 'plc_functions.php';
 // the first functions that we had were actually printing the stuff instead of returning it
 // so basically the foo (...) function should do ``print (foo_text(...))''
 
-function plc_form_hidden_text ($key,$value) {
-  return "<input type=hidden name='$key' value='$value'/>";  
-}
-function plc_form_hidden ($key,$value) { print plc_form_hidden_text($key,$value); }
-  
 // options unused so far
-function plc_form_start ($url, $values, $options=array()) {
+function plc_form_start ($full_url, $values, $options=array()) {
+  if ( ! $values ) $values = array();
+  // extract var=value settings from url if any
+  $split=split_url($full_url);
+  $url=$split['url'];
+  $url_values=$split['values'];
+  if ( $url_values ) $values=array_merge($values,$url_values);
   $method = array_key_exists('method',$options) ? $options['method'] : 'POST';
   print "<form method=$method action='$url' enctype='multipart/form-data'>";
-  foreach ($values as $key=>$value) {
-    print plc_form_hidden_text($ke,$value);
+  plc_debug('values',$values);
+  if ($values) foreach ($values as $key=>$value) {
+    print plc_form_hidden_text($key,$value);
   }
 }
 
@@ -26,6 +28,11 @@ function plc_form_end($options=array()) {
   print "</form>";
 }
 
+function plc_form_hidden_text ($key,$value) {
+  return "<input type=hidden name='$key' value='$value'/>";  
+}
+function plc_form_hidden ($key,$value) { print plc_form_hidden_text($key,$value); }
+  
 function plc_form_checkbox_text ($name,$value,$selected=false) {
   if ($selected) $xtra=" selected=selected";
   return "<input type=checkbox name='$name' value='$value'$xtra/>";
@@ -67,8 +74,13 @@ function plc_form_select_text ($name,$values,$label="") {
   return $selector;
 }
 
-function plc_form_simple_button ($url,$text,$method="POST") {
+function plc_form_simple_button ($full_url,$text,$method="POST") {
+  $split=split_url($full_url);
+  $url=$split['url'];
+  $values=$split['values'];
   $button=plc_form_submit_text("anonymous",$text);
+  if ($values) foreach ($values as $key=>$value) 
+      $button .= plc_form_hidden_text($key,$value);
   return "<form method=$method action=$url>$button</form>";
 }
 

diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index a25f747..ddfd68e 100644 (file)
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -104,6 +104,20 @@ function l_person_register()               { return "/db/persons/register.php"; }
 function l_site_register()             { return "/db/sites/register.php"; }
 function l_site_pending()              { return "/db/sites/join_request.php"; }
 
+// returns array ['url' => path, 'values' => hash (key=>value)* ]
+function split_url ($full_url) {
+  list($url,$args) = explode("?",$full_url);
+  $values=array();
+  if ($args) {
+    $pairs=explode("&",$args);
+    foreach ($pairs as $pair) {
+      list ($name,$value) = explode("=",$pair);
+      $values[$name]=$value;
+    }
+  }
+  return array("url"=>$url,"values"=>$values);
+}
+
 //////////////////////////////////////////////////////////// validation functions
 function topdomain ($hostname) {
   $exploded=array_reverse(explode(".",$hostname));

diff --git a/planetlab/includes/plc_minitabs.php b/planetlab/includes/plc_minitabs.php
index ae7c323..4920660 100644 (file)
--- a/planetlab/includes/plc_minitabs.php
+++ b/planetlab/includes/plc_minitabs.php
@@ -27,7 +27,7 @@ drupal_set_html_head('
 // (*) you need to tune the image size, which is wrong, as the image should rather be bottom-aligned 
 
 
-function plc_tabs($array) {
+function plc_tabs ($array) {
   print '<div id="minitabs-container">';
   print '<ul id="minitabs-list">';
   print "\n";
@@ -40,14 +40,21 @@ function plc_tabs($array) {
     if (is_string ($todo)) $todo=array('method'=>'GET','url'=>$todo);
     // set default method
     if ( ! $todo['method'] ) $todo['method']='GET';
+    // extract var=value settings from url if any
+    $full_url=$todo['url'];
+    $split=split_url($full_url);
+    $url=$split['url'];
+    $url_values=$split['values'];
+
     // create form
-    printf ('<form name="%s" action="%s" method="%s">',$label,$todo['url'],$todo['method']);
+    printf ('<form name="%s" action="%s" method="%s">',$label,$url,$todo['method']);
     // set values
-    if ( $todo['values'] ) {
-      foreach ($todo['values'] as $key=>$value) {
+    $values=$todo['values'];
+    if ( ! $values) $values = array();
+    if ($url_values) $values = array_merge($values,$url_values);
+    if ( $values ) foreach ($values as $key=>$value) {
        printf('<input class="minitabs-hidden" type=hidden name="%s" value="%s" />',$key,$value);
       }
-    }
     $tracer="class=minitabs-submit";
     // image and its companions 'height' 
     if ($todo['image']) {

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 096428d..85ff68d 100644 (file)
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -1,8 +1,8 @@
 <?php
 
-// $Id$
+  // $Id$
 
-// Require login
+  // Require login
 require_once 'plc_login.php';
 
 // Get session and API handles
@@ -18,6 +18,7 @@ require_once 'plc_functions.php';
 require_once 'plc_minitabs.php';
 require_once 'plc_tables.php';
 require_once 'plc_details.php';
+require_once 'plc_forms.php';
 
 // -------------------- 
 // recognized URL arguments
@@ -30,282 +31,286 @@ $nodes= $api->GetNodes( array($node_id));
 
 if (empty($nodes)) {
   drupal_set_message ("Node " . $node_id . " not found");
- } else {
-  $node=$nodes[0];
-    // node info
-  $hostname= $node['hostname'];
-  $boot_state= $node['boot_state'];
-  $site_id= $node['site_id'];
-  $model= $node['model'];
-  $version= $node['version'];
-  $node_type = $node['node_type'];
-
-  // arrays of ids of node info
-  $slice_ids= $node['slice_ids'];
-  $conf_file_ids= $node['conf_file_ids'];
-  $interface_ids= $node['interface_ids'];
-  $nodegroup_ids= $node['nodegroup_ids'];
-  $pcu_ids= $node['pcu_ids'];
-
-  // get peer
-  $peer_id= $node['peer_id'];
-
-  // gets site info
-  $sites= $api->GetSites( array( $site_id ) );
-  $site=$sites[0];
-  $site_name= $site['name'];
-  $site_node_ids= $site['node_ids'];
-
-  // hash node_id=>hostname for this site's nodes
-  $site_node_hash=array();
-  if( !empty( $site_node_ids ) ) {
-    // get site node info basics
-    $site_nodes= $api->GetNodes( $site_node_ids );
+  return;
+ }
+
+$node=$nodes[0];
+// node info
+$hostname= $node['hostname'];
+$boot_state= $node['boot_state'];
+$site_id= $node['site_id'];
+$model= $node['model'];
+$version= $node['version'];
+$node_type = $node['node_type'];
+
+// arrays of ids of node info
+$slice_ids= $node['slice_ids'];
+$conf_file_ids= $node['conf_file_ids'];
+$interface_ids= $node['interface_ids'];
+$nodegroup_ids= $node['nodegroup_ids'];
+$pcu_ids= $node['pcu_ids'];
+
+// get peer
+$peer_id= $node['peer_id'];
+
+// gets site info
+$sites= $api->GetSites( array( $site_id ) );
+$site=$sites[0];
+$site_name= $site['name'];
+$site_node_ids= $site['node_ids'];
+
+// hash node_id=>hostname for this site's nodes
+$site_node_hash=array();
+if( !empty( $site_node_ids ) ) {
+  // get site node info basics
+  $site_nodes= $api->GetNodes( $site_node_ids );
     
-    foreach( $site_nodes as $site_node ) {
-      $site_node_hash[$site_node['node_id']]= $site_node['hostname'];
-    }
+  foreach( $site_nodes as $site_node ) {
+    $site_node_hash[$site_node['node_id']]= $site_node['hostname'];
   }
+ }
   
-  // gets slice info for each slice
-  if( !empty( $slice_ids ) )
-    $slices= $api->GetSlices( $slice_ids, array( "slice_id", "name" , "peer_id" ) );
-
-  // get interface info
-  if( !empty( $interface_ids ) )
-    $interfaces= $api->GetInterfaces( $interface_ids );
-
-  // gets nodegroup info
-  if( !empty( $nodegroup_ids ) )
-    $nodegroups= $api->GetNodeGroups( $nodegroup_ids, array("groupname","tag_type_id","value"));
-
-  // xxx Thierry : remaining stuff
-  // (*) events: should display the latest events relating to that node.
-  // disabling call to GetEvents, that gets the session deleted in the DB
-  // (*) conf_files: is fetched but not displayed
-  if( !empty( $conf_file_ids ) )
-    $conf_files= $api->GetConfFiles( $conf_file_ids );
-  // (*) idem for PCUs
-  // gets pcu and port info key to both is $pcu_id
-  if( !empty( $pcu_ids ) )
-    $PCUs= $api->GetPCUs( $pcu_ids );
-
-  //////////////////// display node info
-
-  // fetches peers and initialize hash peer_id->peer
-  $peer_hash = plc_peer_global_hash ($api);
-  // show gray background on foreign objects : start a <div> with proper class
-  plc_peer_block_start ($peer_hash,$peer_id);
+// gets slice info for each slice
+if( !empty( $slice_ids ) )
+  $slices= $api->GetSlices( $slice_ids, array( "slice_id", "name" , "peer_id" ) );
+
+// get interface info
+if( !empty( $interface_ids ) )
+  $interfaces= $api->GetInterfaces( $interface_ids );
+
+// gets nodegroup info
+if( !empty( $nodegroup_ids ) )
+  $nodegroups= $api->GetNodeGroups( $nodegroup_ids, array("groupname","tag_type_id","value"));
+
+// xxx Thierry : remaining stuff
+// (*) events: should display the latest events relating to that node.
+// disabling call to GetEvents, that gets the session deleted in the DB
+// (*) conf_files: is fetched but not displayed
+if( !empty( $conf_file_ids ) )
+  $conf_files= $api->GetConfFiles( $conf_file_ids );
+// (*) idem for PCUs
+// gets pcu and port info key to both is $pcu_id
+if( !empty( $pcu_ids ) )
+  $PCUs= $api->GetPCUs( $pcu_ids );
+
+//////////////////// display node info
+
+// fetches peers and initialize hash peer_id->peer
+$peer_hash = plc_peer_global_hash ($api);
+// show gray background on foreign objects : start a <div> with proper class
+plc_peer_block_start ($peer_hash,$peer_id);
   
-  drupal_set_title("Details for node " . $hostname);
+drupal_set_title("Details for node " . $hostname);
   
-  // extra privileges to admins, and (pi||tech) on this site
-  $privileges = plc_is_admin () || ( plc_in_site($site_id) && ( plc_is_pi() || plc_is_tech()));
+// extra privileges to admins, and (pi||tech) on this site
+$privileges = plc_is_admin () || ( plc_in_site($site_id) && ( plc_is_pi() || plc_is_tech()));
   
-  $tabs=array();
-  // available actions
-  if ( ! $peer_id  && $privileges ) {
+$tabs=array();
+// available actions
+if ( ! $peer_id  && $privileges ) {
     
-    $tabs['Update'] = array ('url'=>"/db/nodes/node_actions.php",
-                            'method'=>'POST',
-                            'values'=>array('action'=>'prompt-update','node_id'=>$node_id));
-    $tabs['Delete'] = array ('url'=>"/db/nodes/node_actions.php",
-                            'method'=>'POST',
-                            'values'=>array('action'=>'delete','node_id'=>$node_id),
-                            'confirm'=>'Are you sure to delete ' . $hostname. ' ?');
-    // xxx subject to roles
-    $tabs["Add Interface"]=l_interface_add($node_id);
-    $tabs["Comon"]=l_comon("node_id",$node_id);
-    $tabs["Events"]=l_event("Node","node",$node_id);
-  }
-
-  $tabs["All nodes"]=l_nodes();
-
-  plc_tabs($tabs);
-
-  echo "<hr />";
+  $tabs['Update'] = array ('url'=>"/db/nodes/node_actions.php",
+                          'method'=>'POST',
+                          'values'=>array('action'=>'prompt-update','node_id'=>$node_id));
+  $tabs['Delete'] = array ('url'=>"/db/nodes/node_actions.php",
+                          'method'=>'POST',
+                          'values'=>array('action'=>'delete','node_id'=>$node_id),
+                          'confirm'=>'Are you sure to delete ' . $hostname. ' ?');
+  // xxx subject to roles
+  $tabs["Add Interface"]=l_interface_add($node_id);
+  $tabs["Comon"]=l_comon("node_id",$node_id);
+  $tabs["Events"]=l_event("Node","node",$node_id);
+ }
+
+$tabs["All nodes"]=l_nodes();
+
+plc_tabs($tabs);
+
+echo "<hr />";
   
-  plc_details_start ();
-  plc_details_line("Hostname",$hostname);
-  plc_details_line("Type",$node_type);
-  plc_details_line("Model",$model);
-  plc_details_line("Version",$version);
-
-  // no tool to implement this multiple-choice setting yet
-  // xxx would need at least to use the proper class, like plc_details_class() or something
-  echo "<tr><th>Boot State: </th><td>";
-  if ($peer_id) {
-    echo $boot_state;
-  } else {
-    echo "<form name='bootstate' action='/db/nodes/node_actions.php' method=post>\n";
-    echo "<input type=hidden name='node_id' value='$node_id'>\n";
-    echo "<input type=hidden name='action' value='boot-state'>\n";
-    echo "<select name='boot_state' onChange=\"submit();\">\n";
+plc_details_start ();
+plc_details_line("Hostname",$hostname);
+plc_details_line("Type",$node_type);
+plc_details_line("Model",$model);
+plc_details_line("Version",$version);
+
+// no tool to implement this multiple-choice setting yet
+// xxx would need at least to use the proper class, like plc_details_class() or something
+echo "<tr><th>Boot State: </th><td>";
+if ($peer_id) {
+  echo $boot_state;
+ } else {
+  echo "<form name='bootstate' action='/db/nodes/node_actions.php' method=post>\n";
+  echo "<input type=hidden name='node_id' value='$node_id'>\n";
+  echo "<input type=hidden name='action' value='boot-state'>\n";
+  echo "<select name='boot_state' onChange=\"submit();\">\n";
 
-    $states= array( 'boot'=>'Boot', 'dbg'=>'Debug', 'inst'=>'Install', 'rins'=>'Reinstall', 'rcnf'=>'Reconfigure', 'new'=>'New' );
+  $states= array( 'boot'=>'Boot', 'dbg'=>'Debug', 'inst'=>'Install', 'rins'=>'Reinstall', 'rcnf'=>'Reconfigure', 'new'=>'New' );
 
-    foreach( $states as $key => $val ) {
-      echo "<option value='$key'";
+  foreach( $states as $key => $val ) {
+    echo "<option value='$key'";
       
-      if( $key == $boot_state )
-       echo " selected";
+    if( $key == $boot_state )
+      echo " selected";
       
-      echo ">$val</option>\n";
+    echo ">$val</option>\n";
       
-    }
-    echo "</select></input></form>";
   }
+  echo "</select></input></form>";
+ }
+echo "</td></tr>\n";
+
+// same here for the download area
+if ( ! $peer_id  && $privileges) {
+
+  echo "<tr><th>Download </th><td>";
+  echo "<form name='download' action='/db/nodes/node_actions.php' method='post'>\n";
+  echo "<input type=hidden name='node_id' value='$node_id'></input>\n";
+  echo "<select name='action' onChange='submit();'>\n";
+  echo "<option value='' selected='selected'> Download Mode </option>\n";
+  echo "<option value='' disabled='disabled'> -- All in one images -- </option>"; 
+  echo "<option value='download-node-iso' $new_api_only> Download ISO image for $hostname</option>\n";
+  echo "<option value='download-node-usb' $new_api_only> Download USB image for $hostname</option>\n";
+  echo "<option value='' disabled='disabled'> -- Floppy + generic image -- </option>"; 
+  echo "<option value='download-node-floppy'> Download Floppy file for $hostname</option>\n";
+  echo "<option value='download-generic-iso' $new_api_only> Download generic ISO image (requires floppy) </option>\n";
+  echo "<option value='download-generic-usb' $new_api_only> Download generic USB image (requires floppy) </option>\n";
+  echo "</select></form>";
   echo "</td></tr>\n";
 
-  // same here for the download area
-  if ( ! $peer_id  && $privileges) {
-
-    echo "<tr><th>Download </th><td>";
-    echo "<form name='download' action='/db/nodes/node_actions.php' method='post'>\n";
-    echo "<input type=hidden name='node_id' value='$node_id'></input>\n";
-    echo "<select name='action' onChange='submit();'>\n";
-    echo "<option value='' selected='selected'> Download Mode </option>\n";
-    echo "<option value='' disabled='disabled'> -- All in one images -- </option>"; 
-    echo "<option value='download-node-iso' $new_api_only> Download ISO image for $hostname</option>\n";
-    echo "<option value='download-node-usb' $new_api_only> Download USB image for $hostname</option>\n";
-    echo "<option value='' disabled='disabled'> -- Floppy + generic image -- </option>"; 
-    echo "<option value='download-node-floppy'> Download Floppy file for $hostname</option>\n";
-    echo "<option value='download-generic-iso' $new_api_only> Download generic ISO image (requires floppy) </option>\n";
-    echo "<option value='download-generic-usb' $new_api_only> Download generic USB image (requires floppy) </option>\n";
-    echo "</select></form>";
-    echo "</td></tr>\n";
+ }
 
-  }
-
-  // site info and all site nodes
-  plc_details_space_line ();
-  plc_details_line("Site",l_site_t($site_id,$site_name));
+// site info and all site nodes
+plc_details_space_line ();
+plc_details_line("Site",l_site_t($site_id,$site_name));
                   
-  // build list of node links
-  $nodes_area=array();
-  foreach ($site_node_hash as $hash_node_id => $hash_hostname) {
-    $nodes_area []= l_node_t($hash_node_id,$hash_hostname);
-  }
-  plc_details_line_list ("All site nodes",$nodes_area);
+// build list of node links
+$nodes_area=array();
+foreach ($site_node_hash as $hash_node_id => $hash_hostname) {
+  $nodes_area []= l_node_t($hash_node_id,$hash_hostname);
+}
+plc_details_line_list ("All site nodes",$nodes_area);
 
-  plc_details_end ();
+plc_details_end ();
 
-  //////////////////////////////////////////////////////////// slices
-  // display slices
+//////////////////////////////////////////////////////////// slices
+// display slices
 
-  print "<hr/>\n";
-  plc_table_title ("Slices");
-  if ( ! $slices  ) {
-    echo "<p><span class='plc-warning'>This node is not associated to any slice.</span></p>\n";
-  } else {
-    $headers=array();
-    $headers['Peer']="string";
-    $headers['Name']="string";
-    $headers['Slivers']="string";
-    $table_options = array('notes_area'=>false);
-    plc_table_start ("slivers",$headers,1,$table_options);
-
-    foreach ($slices as $slice) {
-      plc_table_row_start($slice['name']);
-      plc_table_cell (plc_peer_shortname($peer_hash,$slice['peer_id']));
-      plc_table_cell (l_slice_t ($slice['slice_id'],$slice['name']));
-      plc_table_cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
-      plc_table_row_end();
-    }
-    plc_table_end("slivers");
+print "<hr/>\n";
+plc_table_title ("Slices");
+if ( ! $slices  ) {
+  echo "<p><span class='plc-warning'>This node is not associated to any slice.</span></p>\n";
+ } else {
+  $headers=array();
+  $headers['Peer']="string";
+  $headers['Name']="string";
+  $headers['Slivers']="string";
+  $table_options = array('notes_area'=>false);
+  plc_table_start ("slivers",$headers,1,$table_options);
+
+  foreach ($slices as $slice) {
+    plc_table_row_start($slice['name']);
+    plc_table_cell (plc_peer_shortname($peer_hash,$slice['peer_id']));
+    plc_table_cell (l_slice_t ($slice['slice_id'],$slice['name']));
+    plc_table_cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
+    plc_table_row_end();
   }
+  plc_table_end("slivers");
+ }
 
-  //////////////////////////////////////////////////////////// interfaces
-  if ( ! $peer_id ) {
+//////////////////////////////////////////////////////////// interfaces
+if ( ! $peer_id ) {
 
-    // display interfaces
-    if( ! $interfaces ) {
-      echo "<p><span class='plc-warning'>No interface</span>.  Please add an interface to make this a usable PLC node</p>.\n";
-    } else {
-      $headers=array();
-      if ( $privileges ) {
-       // a single symbol, marking 'p' for primary and a delete button for non-primary
-       $headers[' ']='string';
-      }
+  // display interfaces
+  if( ! $interfaces ) {
+    echo "<p><span class='plc-warning'>No interface</span>.  Please add an interface to make this a usable PLC node</p>.\n";
+  } else {
+    $headers=array();
+    if ( $privileges ) {
+      // a single symbol, marking 'p' for primary and a delete button for non-primary
+      $headers[' ']='string';
+    }
         
-      $headers["IP"]="IPAddress";
-      $headers["Method"]="string";
-      $headers["Type"]="string";
-      $headers["MAC"]="string";
-      $headers["bw limit"]="FileSize";
-
-      print "<hr/>\n";
-      plc_table_title('Interfaces');
-      $table_options=array('search_area'=>false);
-      plc_table_start("interfaces",$headers,2,$table_options);
+    $headers["IP"]="IPAddress";
+    $headers["Method"]="string";
+    $headers["Type"]="string";
+    $headers["MAC"]="string";
+    $headers["bw limit"]="FileSize";
+
+    print "<hr/>\n";
+    plc_table_title('Interfaces');
+    $table_options=array('search_area'=>false);
+    plc_table_start("interfaces",$headers,2,$table_options);
        
-      foreach ( $interfaces as $interface ) {
-       $interface_id= $interface['interface_id'];
-       $interface_ip= $interface['ip'];
-       $interface_broad= $interface['broadcast'];
-       $interface_primary= $interface['is_primary'];
-       $interface_network= $interface['network'];
-       $interface_dns1= $interface['dns1'];
-       $interface_dns2= $interface['dns2'];
-       $interface_hostname= $interface['hostname'];
-       $interface_netmaks= $interface['netmask'];
-       $interface_gatewary= $interface['gateway'];
-       $interface_mac= $interface['mac'];
-       $interface_bwlimit= $interface['bwlimit'];
-       $interface_type= $interface['type'];
-       $interface_method= $interface['method'];
-
-       plc_table_row_start($interface['ip']);
-       if ( $privileges ) {
-         if (!$interface_primary) {
-           // xxx 
-           plc_table_cell (plc_delete_link_button ('interfaces.php?id=' . $interface_id . '&delete=1&submitted=1', 
-                                                   '\\nInterface ' . $interface_ip));
-         } else {
-           plc_table_cell('p');
-         }
+    foreach ( $interfaces as $interface ) {
+      $interface_id= $interface['interface_id'];
+      $interface_ip= $interface['ip'];
+      $interface_broad= $interface['broadcast'];
+      $interface_primary= $interface['is_primary'];
+      $interface_network= $interface['network'];
+      $interface_dns1= $interface['dns1'];
+      $interface_dns2= $interface['dns2'];
+      $interface_hostname= $interface['hostname'];
+      $interface_netmaks= $interface['netmask'];
+      $interface_gatewary= $interface['gateway'];
+      $interface_mac= $interface['mac'];
+      $interface_bwlimit= $interface['bwlimit'];
+      $interface_type= $interface['type'];
+      $interface_method= $interface['method'];
+
+      plc_table_row_start($interface['ip']);
+      if ( $privileges ) {
+       if (!$interface_primary) {
+         // xxx 
+         plc_table_cell (plc_delete_link_button ('interfaces.php?id=' . $interface_id . '&delete=1&submitted=1', 
+                                                 '\\nInterface ' . $interface_ip));
+       } else {
+         plc_table_cell('p');
        }
-       plc_table_cell(l_interface_t($interface_id,$interface_ip));
-       plc_table_cell($interface_method);
-       plc_table_cell($interface_type);
-       plc_table_cell($interface_mac);
-       plc_table_cell($interface_bwlimit);
-       plc_table_row_end();
       }
-      plc_table_end("interfaces");
+      plc_table_cell(l_interface_t($interface_id,$interface_ip));
+      plc_table_cell($interface_method);
+      plc_table_cell($interface_type);
+      plc_table_cell($interface_mac);
+      plc_table_cell($interface_bwlimit);
+      plc_table_row_end();
     }
-      
+    if ($privileges) {
+      $button=plc_form_simple_button(l_interface_add($node_id),"Add interface","GET");
+      $footers=array(plc_table_td_text($button,6,"right"));
+    }
+    plc_table_end("interfaces",array("footers"=>$footers));
   }
-
-  //////////////////////////////////////////////////////////// nodegroups
-  // display node group info
-  if ( ! $nodegroups ) {
-    echo "<p><span class='plc-warning'>This node is not in any nodegroup.</span></p>\n";
-  } else {
-    $headers=array();
-    $headers['Name']="string";
-    $headers['Tag']="string";
-    $headers['Value']="string";
       
-    print "<hr/>\n";
-    plc_table_title("Nodegroups");
-    $table_options = array('search_area'=>false);
-    plc_table_start("nodegroups",$headers,0,$table_options);
-
-    foreach( $nodegroups as $nodegroup ) {
-      plc_table_row_start();
-      plc_table_cell(l_nodegroup_t($nodegroup_id,$nodegroup['groupname']));
-      $tag_types=$api->GetTagTypes(array($nodegroup['tag_type_id']));
-      plc_table_cell($tag_types[0]['tagname']);
-      plc_table_cell($nodegroup['value']);
-      plc_table_row_end();
-    }
-    plc_table_end("nodegroups");
-  }    
+ }
+
+//////////////////////////////////////////////////////////// nodegroups
+// display node group info
+print "<hr/>\n";
+plc_table_title("Nodegroups");
+if ( ! $nodegroups ) {
+  echo "<p><span class='plc-warning'>This node is not in any nodegroup.</span></p>\n";
+ } 
+$headers=array();
+$headers['Name']="string";
+$headers['Tag']="string";
+$headers['Value']="string";
+  
+$table_options = array('search_area'=>false);
+plc_table_start("nodegroups",$headers,0,$table_options);
+
+if ($nodegroups) foreach( $nodegroups as $nodegroup ) {
+  plc_table_row_start();
+  plc_table_cell(l_nodegroup_t($nodegroup_id,$nodegroup['groupname']));
+  $tag_types=$api->GetTagTypes(array($nodegroup['tag_type_id']));
+  plc_table_cell($tag_types[0]['tagname']);
+  plc_table_cell($nodegroup['value']);
+  plc_table_row_end();
+                }
+plc_table_end("nodegroups");
+////////////////////////////////////////////////////////////
+plc_peer_block_end();
 
-  ////////////////////////////////////////////////////////////
-  plc_peer_block_end();
-}
 
 // Print footer
 include 'plc_footer.php';

diff --git a/planetlab/tags/index.php b/planetlab/tags/index.php
index 8d27beb..1bc59d1 100644 (file)
--- a/planetlab/tags/index.php
+++ b/planetlab/tags/index.php
@@ -14,10 +14,13 @@ include 'plc_header.php';
 // Common functions
 require_once 'plc_functions.php';
 
+// add or update
 if ( $_GET['action'] ) {
-  include 'tag_edit.php';
+  include 'tag_form.php';
+// list all
  } else if ( ! $_GET['add'] ) {
   include 'tags.php';
+// actually set a tag on an object
  } else {
   include 'tag_set.php';
  }