checkpoint

diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index 671dca2..b973971 100644 (file)
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -2,277 +2,50 @@
 
 // $Id$
 
-function plc_person_link ($person_id) {
-  if ( empty ($person_id)) {
-    return "";
-  } else {
-    return '<a href="/db/persons/index.php?id=' . $person_id . '">' . $person_id . '</a>';
-  }
-  }
-
-function plc_node_link ($node_id) {
-  if ( empty ($node_id)) {
-    return "";
-  } else {
-    return '<a href="/db/nodes/index.php?id=' . $node_id . '">' . $node_id . '</a>';
-  }
-  }
-
-// pagination function
-function paginate( $fn_array, $table_id, $caption, $limit, $main_field, $other_func= NULL, $fid= NULL ) {
-  // get vars from call adjust them
-  $dir= strtolower( $caption );
-  $echo= "";
-
-  $link_page= 'index.php';
-
-  // check for page number
-  if( empty( $_GET['page'] ) )
-    $page= 1;
-  else
-    $page= $_GET['page'];
-
-  // reorder array_chunk
-  foreach( $fn_array as $arr1 ) {
-    unset( $arr2 );
-    
-    foreach( $arr1 as $key => $val ) {
-//      if( substr( $key, -3 ) == "_id" )
-      if ( $key == $table_id  ) {
-        $id[$key]= $val;
-      } else {
-        $data[$key]= $val;
-      }
-    }
-    
-    foreach( $id as $key => $val )
-      $arr2[$key]= $val;
-
-    foreach( $data as $key => $val )
-      $arr2[$key]= $val;
-
-    $as_array[]= $arr2;
-  }
-
-  $totalrows= count( $as_array );
-
-  // if array has no rows display msg
-  if( $totalrows == 0 )
-    return "Nothing to display";
-
-  // set key and break up data struct
-  $newkey= $page - 1;  
-  $newarray= array_chunk( $as_array, $limit );
-
-  // start table output
-  $echo.= "<table class='list_set' border=0 cellpadding=2>\n";
-
-  // if there is a caption add it to table
-  if( $caption )
-    $echo.= "<caption class='list_set'>$caption</caption>\n";
-
-  $echo.= "<thead><tr class='list_set'>";
-
-  // go through keys of one array row for table headers
-  foreach( $newarray[$newkey][0] as $key => $val ) {
-//    if( substr( $key, -3 ) != "_id" )
-    if ( $key != $table_id && $key != 'peer_id' )
-      $echo.= "<th class='list_set'>". ucfirst( $key ) ."</th>";
-  }
-
-  if( $other_func == 'slivers' )
-    $echo.= "<th>Slivers</th>";
-
-  $echo.= "</tr></thead><tbody>\n";
-
-  // go through array row by row to output table rows
-  foreach( $newarray[$newkey] as $assoc ) {
-
-    $extraclass="";
-    if ($assoc['peer_id']) {
-      $extraclass="plc-foreign";
-    }
-    
-
-    $echo.= "<tr class='list_set'>";
-
-    foreach( $assoc as $key => $val ) {
-      // do not rely on keys order
-      $id = $assoc[$table_id];
-//      if( substr( $key, -3 ) == "_id" )
-      if ($key == $table_id) {
-//     $id= $val;
-       continue;
-      } elseif( $key == $main_field ) {
-        $echo.= "<td class='list_set $extraclass'><a href='/db/$dir/$link_page?id=$id'>$val</a></td>";
-      } elseif ($key != 'peer_id') {
-        $echo.= "<td class='list_set $extraclass'>";
-        if( is_array( $val ) ) {
-          $count= 1;
-          $tot= count( $val );
-          foreach( $val as $k => $v ) {
-            $echo.= $v;
-            if( $count != $tot )
-              $echo.= ", ";
-            $count++;
-          }
-        }
-        else
-          $echo.= $val;
-        $echo.= "</td>";
-      }
-
-    }
-
-    if( $other_func == 'slivers' )
-      $echo.= "<td><a href='slivers.php?node=$fid&slice=$id'>view</a></td>";
-
-    $echo.= "</tr>\n";
-  }
-
-  // close table
-  $echo.= "</tbody></table>\n";
-  $echo.= "<hr />\n";
-
-  // find total number of pages
-  $numofpages = $totalrows / $limit;
-
-  // start navigation links
-  if( $numofpages > 1 ) {
-    // if page is not 1 display first and prev links
-    if( $page != 1 && $page ) {
-        $pageprev= $page - 1;
-        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=1\">FIRST</a> &nbsp; ";
-        $echo.= " <a href=\"". $_SERVER['REQUEST_URI'] ."&page=$pageprev\">PREV ".$limit."</a> &nbsp; ";
-      }
-      else
-        $echo.= "PREV ". $limit ." ";
-
-    // if less than 30 pages display all
-    // otherwise show 30 pages but put ... inbetween
-    if( $numofpages < 30 ) {
-      $npages= $numofpages;
-      $start= 1;
-    }
-    else {
-      $npages= $page + 9;
-      if( $npages > $numofpages )
-        $npages= $numofpages;
-      $start= $page - 10;
-      if( $start < 1 )
-        $start= 1;
-      if( $page != 1 )
-        $echo.= " ... ";
-    }
-
-    // display pages, no link if current page
-    for( $i= $start; $i <= $npages; $i++ ) {
-      if( $i == $page )
-        $echo.= $i ." ";
-      else
-        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=$i\">$i</a> ";
-
-    }
-
-    if( ( $totalrows % $limit ) != 0 ) {
-      $last= $numofpages + 1;
-      if( $i == $page )
-        $echo.= $i ." ";
-      else
-        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=$i\">$i</a> ";
-    }
-    else
-      $last= $numofpages;
-
-    if( $numofpages >= 30 ) {
-      if( $page != $numofpages )
-        $echo.= " ... ";
-    }
-
-    if( ( $totalrows - ($limit * $page) ) > 0 ) {
-      $pagenext= $page + 1;
-      $echo.= " &nbsp; <a href=\"". $_SERVER['REQUEST_URI'] ."&page=$pagenext\">NEXT ".$limit."</a> &nbsp; ";
-    }
-    else
-      $echo.= "NEXT ". $limit;
+// will trash this eventually
+require_once 'plc_functions_trash.php';
 
-    $echo.= " <a href=\"". $_SERVER['REQUEST_URI'] ."&page=". intval( $last ) ."\">LAST</a>\n";
-
-  }
-
-  return $echo;
-  
-}
-
-// function for getting the diff of multi dimention array
-function arr_diff( $a1, $a2 ) {
-  $diff= array();
-  foreach( $a1 as $k=>$v ) {
-    unset( $dv );
-    for( $x= 0; $x < count( $a2 ); $x++ ) {
-      if( is_int( $k ) ) {
-        if( array_search( $v, $a2 ) === false )
-          $dv=$v;
-        else if( is_array( $v ) )
-          $dv= arr_diff( $v, $a2[$x] );
-        if( $dv && !in_array( $dv, $diff ) )
-          $diff[]=$dv;
-      }
-      else {
-
-        if( !$a2[$k] )
-          $dv=$v;
-        else if(is_array($v))
-          $dv=arr_diff($v,$a2[$x]);
-        if($dv)
-          $diff[$x]=$dv;
-      }
-    }
-  }
-  return $diff;
+//////////////////////////////////////////////////////////// validation functions
+function topdomain ($hostname) {
+  $exploded=array_reverse(explode(".",$hostname));
+  return $exploded[0];
 }
 
-
-function is_valid_email_addr($email)
-{
-  if( ereg("^.+@.+\\..+$", $email) )
+function is_valid_email_addr ($email) {
+  if (ereg("^.+@.+\\..+$", $email) ) {
     return true;
-  else
+  } else {
     return false;
+  }
 }
 
-function is_valid_url($url)
-{
-  if( ereg("^(http|https)://.+\..+$", strtolower($url) ) )
+function is_valid_url ($url) {
+  if (ereg("^(http|https)://.+\..+$", strtolower($url) ) ) {
     return true;
-  else
+  } else {
     return false;
+  }
 }
 
-function is_valid_ip($ip)
-{
-  if( ereg("^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$", $ip ) )
-    {
+function is_valid_ip ($ip) {
+  if (ereg("^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$", $ip ) ) {
       // it's at least in the right format, now check to see if
       // each part is equal to less than 255
       $parts= explode( '.', $ip );
       $count= count($parts);
 
-      for( $i= 0; $i < $count; $i++ )
-       {
-         if( intval($parts[$i]) > 255 )
-           return false;
-       }
+      for( $i= 0; $i < $count; $i++ ) {
+       if( intval($parts[$i]) > 255 )
+         return false;
+      }
 
       return true;
-    }
-  else
+  } else {
     return false;
+  }
 }
 
-
-function is_valid_network_addr($network_addr,$mask)
-{
+function is_valid_network_addr($network_addr,$mask) {
   $lNetwork= ip2long($network_addr);
   $lMask= ip2long($mask);
 
@@ -290,8 +63,7 @@ function is_valid_network_addr($network_addr,$mask)
 
 // returns whether or not a network address is in the reserved space
 // in the case of a invalid network address, false will be returned.
-function is_reserved_network_addr($network_addr)
-{
+function is_reserved_network_addr($network_addr) {
   $lNetwork= ip2long($network_addr);
 
   if( $lNetwork == -1 )
@@ -303,18 +75,82 @@ function is_reserved_network_addr($network_addr)
                         array('172.16.0.0','172.31.0.0'),
                         array('192.168.0.0','192.168.255.0')
                         );
-  foreach ($reserved_ips as $r)
-    {
-      $min = ip2long($r[0]);
-      $max = ip2long($r[1]);
+  foreach ($reserved_ips as $r) {
+    $min = ip2long($r[0]);
+    $max = ip2long($r[1]);
       
-      if (($lNetwork >= $min) && ($lNetwork <= $max))
-         return true;
-    }
+    if (($lNetwork >= $min) && ($lNetwork <= $max))
+      return true;
+  }
 
   return false;
 }
 
+////////////////////////////////////////////////////////////  peerscopes
+function plc_peer_info ($api,$peerscope) {
+  switch ($_GET['peerscope']) {
+  case '':
+    $peer_filter=array();
+    $peer_label="all peers";
+    break;
+  case 'local':
+    $peer_filter=array("peer_id"=>NULL);
+    $peer_label=PLC_SHORTNAME;
+    break;
+  case 'foreign':
+    $peer_filter=array("~peer_id"=>NULL);
+    $peer_label="foreign peers";
+    break;
+  default:
+    $peer_id=intval($_GET['peerscope']);
+    $peer_filter=array("peer_id"=>$peer_id);
+    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
+    $peer_label='peer "' . $peer[0]['peername'] . '"';
+    break;
+  }
+  return array ($peer_filter,$peer_label);
+}
+
+//////////////////////////////////////////////////////////// links    
+function href ($url,$text) { return "<a href='" . $url . "'>" . $text . "</a>"; }
+
+function l_nodes () { return "/db/nodes/newindex.php"; }
+function l_node_u ($node_id) { return "/db/nodes/node.php?id=" . $node_id; }
+function l_node ($node_id) { return href (l_node_u($node_id),$node_id); }
+function l_node2 ($node_id,$text) { return href (l_node_u($node_id),$text); }
+
+function l_sites () { return "/db/sites/index.php"; }
+function l_site_u ($site_id) { return "/db/persons/index.php?id=" . $site_id; }
+function l_site ($site_id) { return href (l_site_u($site_id),$site_id); }
+function l_site2 ($site_id,$text) { return href (l_site_u($site_id),$text); }
+
+function l_slices () { return "/db/slices/index.php"; }
+function l_slice_u ($slice_id) { return "/db/persons/index.php?id=" . $slice_id; }
+function l_slice ($slice_id) { return href (l_slice_u($slice_id),$slice_id); }
+function l_slice2 ($slice_id,$text) { return href (l_slice_u($slice_id),$text); }
+
+function l_persons () { return "/db/persons/index.php"; }
+function l_person_u ($person_id) { return "/db/persons/index.php?id=" . $person_id; }
+function l_person ($person_id) { return href (l_person_u($person_id),$person_id); }
+function l_person2 ($person_id,$text) { return href (l_person_u($person_id),$text); }
+
+function l_interfaces () { return "/db/interfaces/index.php"; }
+function l_interface_u ($interface_id) { return "/db/interfaces/index.php?id=" . $interface_id; }
+function l_interface ($interface_id) { return href (l_interface_u($interface_id),$interface_id); }
+function l_interface2 ($interface_id,$text) { return href (l_interface_u($interface_id),$text); }
+
+function l_event ($type,$param,$id) { return '/db/events/index.php?type=' . $type . '&' . $param . '=' . $id; }
+
+//////////////////////////////////////////////////////////// titles
+function t_site($site) { return " on site " . $site['name'] . " (" . $site['login_base'] .")"; }
+function t_slice ($slice) { return " running slice " . $slice['name'] . " (" . $slice['slice_id'] . ")"; }
+
+//////////////////////////////////////////////////////////// nav tabs
+function tabs_node($node) { return array('Node ' . $node['hostname']=>l_node_u($node_id)); }
+function tabs_site($site) { return array('Site ' . $site['name']=>l_site_u($site_id)); }
+function tabs_slice($slice) { return array('Slice ' . $slice['name']=>l_slice_u($slice_id)); }
+
+//////////////////////////////////////////////////////////// presentation
 // builds a table from an array of strings, with the given class
 function plc_make_table ($class, $messages) {
   // pretty print the cell
@@ -329,13 +165,6 @@ function plc_make_table ($class, $messages) {
   return $formatted;
 }
 
-// shows a php variable verbatim with a heading message
-function plc_debug($message,$object) {
-  print "<br>" . $message . "<pre>";
-  print_r ($object);
-  print "</pre>";
-}
-
 // attempt to normalize the delete buttons and confirmations
 function plc_delete_button($width=15) {
   return '<span title="Delete this entry"><img width=' . $width . ' alt="Delete this entry" src="/planetlab/icons/delete.png"></span>';
@@ -354,7 +183,7 @@ function plc_delete_link_button($url,$delete_message,$width=15) {
 }
 
 function plc_event_button($type,$param,$id) {
-  return '<a href="/db/events/index.php?type=' . $type . '&' . $param . '=' . $id . '"> <span title="Related events"> <img src="/planetlab/icons/event.png" width=18></span></a>';
+  return '<a href="' . l_event($type,$param,$id) . '"> <span title="Related events"> <img src="/planetlab/icons/event.png" width=18></span></a>';
 }
 
 function plc_comon_button ($field, $value,$target="") {
@@ -367,65 +196,21 @@ function plc_comon_button ($field, $value,$target="") {
   return $result;
 }
 
-function plc_peers_option_list ($api) {
-
-    // get list of peers
-    $peers=$api->GetPeers(NULL,array('peer_id','peername'));
-    if (count($peers)==0) {
-      $predef=array(array("peer_id"=>"","peername"=>"All (no known peers)"));
-    } else {
-      $predef=array(array("peer_id"=>"","peername"=>"All peers"),
-                   array("peer_id"=>"local","peername"=>"Local only"));
-      // show a 'foreign' button only if that makes sense
-      if (count($peers) >= 2) {
-       $predef [] = array("peer_id"=>"foreign","peername"=>"Foreign peers");
-      }
-    }
-    
-    $result="";
-    foreach ($predef as $a) {
-      $peer_line = "<option value='" . $a['peer_id'] . "'>" . $a['peername'] . "</option>\n";
-      $result .= $peer_line;
-    }
-
-    if (!empty($peers)) {
-      foreach ($peers as $a) {
-       $peer_line = "<option value='" . $a['peer_id'] . "'>" . $a['peername'] . "</option>\n";
-       $result .= $peer_line;
-      }
-    }
-
-    return $result;
+////////////////////////////////////////////////////////////
+function plc_error ($text) {
+  // should use the same channel as the php errors..
+  print "<div class='plc-warning'> Error " . $text . "</div>";
 }
 
-function plc_peer_info ($api,$peerscope) {
-  switch ($_GET['peerscope']) {
-  case '':
-    $peer_filter=array();
-    $peer_label="all peers";
-    break;
-  case 'local':
-    $peer_filter=array("peer_id"=>NULL);
-    $peer_label="local peer";
-    break;
-  case 'foreign':
-    $peer_filter=array("~peer_id"=>NULL);
-    $peer_label="foreign peers";
-    break;
-  default:
-    $peer_id=intval($_GET['peerscope']);
-    $peer_filter=array("peer_id"=>$peer_id);
-    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
-    $peer_label='peer "' . $peer[0]['peername'] . '"';
-    break;
-  }
-  return array ($peer_filter,$peer_label);
-}
-    
-function topdomain ($hostname) {
-  $exploded=array_reverse(explode(".",$hostname));
-  return $exploded[0];
+function plc_warning ($text) {
+  print "<div class='plc-warning'> Warning " . $text . "</div>";
 }
 
+// shows a php variable verbatim with a heading message
+function plc_debug ($message,$object) {
+  print "<br>" . $message . "<pre>";
+  print_r ($object);
+  print "</pre>";
+}
 
 ?>

diff --git a/planetlab/includes/plc_functions_trash.php b/planetlab/includes/plc_functions_trash.php
new file mode 100644 (file)
index 0000000..3fe1200
--- /dev/null
+++ b/planetlab/includes/plc_functions_trash.php
@@ -0,0 +1,270 @@
+<?php
+
+// this will be trashed eventually
+
+function plc_person_link ($person_id) {
+  if ( empty ($person_id)) {
+    return "";
+  } else {
+    return '<a href="/db/persons/index.php?id=' . $person_id . '">' . $person_id . '</a>';
+  }
+  }
+
+function plc_node_link ($node_id) {
+  if ( empty ($node_id)) {
+    return "";
+  } else {
+    return '<a href="/db/nodes/index.php?id=' . $node_id . '">' . $node_id . '</a>';
+  }
+  }
+
+// pagination function
+function paginate( $fn_array, $table_id, $caption, $limit, $main_field, $other_func= NULL, $fid= NULL ) {
+  // get vars from call adjust them
+  $dir= strtolower( $caption );
+  $echo= "";
+
+  $link_page= 'index.php';
+
+  // check for page number
+  if( empty( $_GET['page'] ) )
+    $page= 1;
+  else
+    $page= $_GET['page'];
+
+  // reorder array_chunk
+  foreach( $fn_array as $arr1 ) {
+    unset( $arr2 );
+    
+    foreach( $arr1 as $key => $val ) {
+//      if( substr( $key, -3 ) == "_id" )
+      if ( $key == $table_id  ) {
+        $id[$key]= $val;
+      } else {
+        $data[$key]= $val;
+      }
+    }
+    
+    foreach( $id as $key => $val )
+      $arr2[$key]= $val;
+
+    foreach( $data as $key => $val )
+      $arr2[$key]= $val;
+
+    $as_array[]= $arr2;
+  }
+
+  $totalrows= count( $as_array );
+
+  // if array has no rows display msg
+  if( $totalrows == 0 )
+    return "Nothing to display";
+
+  // set key and break up data struct
+  $newkey= $page - 1;  
+  $newarray= array_chunk( $as_array, $limit );
+
+  // start table output
+  $echo.= "<table class='list_set' border=0 cellpadding=2>\n";
+
+  // if there is a caption add it to table
+  if( $caption )
+    $echo.= "<caption class='list_set'>$caption</caption>\n";
+
+  $echo.= "<thead><tr class='list_set'>";
+
+  // go through keys of one array row for table headers
+  foreach( $newarray[$newkey][0] as $key => $val ) {
+//    if( substr( $key, -3 ) != "_id" )
+    if ( $key != $table_id && $key != 'peer_id' )
+      $echo.= "<th class='list_set'>". ucfirst( $key ) ."</th>";
+  }
+
+  if( $other_func == 'slivers' )
+    $echo.= "<th>Slivers</th>";
+
+  $echo.= "</tr></thead><tbody>\n";
+
+  // go through array row by row to output table rows
+  foreach( $newarray[$newkey] as $assoc ) {
+
+    $extraclass="";
+    if ($assoc['peer_id']) {
+      $extraclass="plc-foreign";
+    }
+    
+
+    $echo.= "<tr class='list_set'>";
+
+    foreach( $assoc as $key => $val ) {
+      // do not rely on keys order
+      $id = $assoc[$table_id];
+//      if( substr( $key, -3 ) == "_id" )
+      if ($key == $table_id) {
+//     $id= $val;
+       continue;
+      } elseif( $key == $main_field ) {
+        $echo.= "<td class='list_set $extraclass'><a href='/db/$dir/$link_page?id=$id'>$val</a></td>";
+      } elseif ($key != 'peer_id') {
+        $echo.= "<td class='list_set $extraclass'>";
+        if( is_array( $val ) ) {
+          $count= 1;
+          $tot= count( $val );
+          foreach( $val as $k => $v ) {
+            $echo.= $v;
+            if( $count != $tot )
+              $echo.= ", ";
+            $count++;
+          }
+        }
+        else
+          $echo.= $val;
+        $echo.= "</td>";
+      }
+
+    }
+
+    if( $other_func == 'slivers' )
+      $echo.= "<td><a href='slivers.php?node=$fid&slice=$id'>view</a></td>";
+
+    $echo.= "</tr>\n";
+  }
+
+  // close table
+  $echo.= "</tbody></table>\n";
+  $echo.= "<hr />\n";
+
+  // find total number of pages
+  $numofpages = $totalrows / $limit;
+
+  // start navigation links
+  if( $numofpages > 1 ) {
+    // if page is not 1 display first and prev links
+    if( $page != 1 && $page ) {
+        $pageprev= $page - 1;
+        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=1\">FIRST</a> &nbsp; ";
+        $echo.= " <a href=\"". $_SERVER['REQUEST_URI'] ."&page=$pageprev\">PREV ".$limit."</a> &nbsp; ";
+      }
+      else
+        $echo.= "PREV ". $limit ." ";
+
+    // if less than 30 pages display all
+    // otherwise show 30 pages but put ... inbetween
+    if( $numofpages < 30 ) {
+      $npages= $numofpages;
+      $start= 1;
+    }
+    else {
+      $npages= $page + 9;
+      if( $npages > $numofpages )
+        $npages= $numofpages;
+      $start= $page - 10;
+      if( $start < 1 )
+        $start= 1;
+      if( $page != 1 )
+        $echo.= " ... ";
+    }
+
+    // display pages, no link if current page
+    for( $i= $start; $i <= $npages; $i++ ) {
+      if( $i == $page )
+        $echo.= $i ." ";
+      else
+        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=$i\">$i</a> ";
+
+    }
+
+    if( ( $totalrows % $limit ) != 0 ) {
+      $last= $numofpages + 1;
+      if( $i == $page )
+        $echo.= $i ." ";
+      else
+        $echo.= "<a href=\"". $_SERVER['REQUEST_URI'] ."&page=$i\">$i</a> ";
+    }
+    else
+      $last= $numofpages;
+
+    if( $numofpages >= 30 ) {
+      if( $page != $numofpages )
+        $echo.= " ... ";
+    }
+
+    if( ( $totalrows - ($limit * $page) ) > 0 ) {
+      $pagenext= $page + 1;
+      $echo.= " &nbsp; <a href=\"". $_SERVER['REQUEST_URI'] ."&page=$pagenext\">NEXT ".$limit."</a> &nbsp; ";
+    }
+    else
+      $echo.= "NEXT ". $limit;
+
+    $echo.= " <a href=\"". $_SERVER['REQUEST_URI'] ."&page=". intval( $last ) ."\">LAST</a>\n";
+
+  }
+
+  return $echo;
+  
+}
+
+
+
+function plc_peers_option_list ($api) {
+
+    // get list of peers
+    $peers=$api->GetPeers(NULL,array('peer_id','peername'));
+    if (count($peers)==0) {
+      $predef=array(array("peer_id"=>"","peername"=>"All (no known peers)"));
+    } else {
+      $predef=array(array("peer_id"=>"","peername"=>"All peers"),
+                   array("peer_id"=>"local","peername"=>"Local only"));
+      // show a 'foreign' button only if that makes sense
+      if (count($peers) >= 2) {
+       $predef [] = array("peer_id"=>"foreign","peername"=>"Foreign peers");
+      }
+    }
+    
+    $result="";
+    foreach ($predef as $a) {
+      $peer_line = "<option value='" . $a['peer_id'] . "'>" . $a['peername'] . "</option>\n";
+      $result .= $peer_line;
+    }
+
+    if (!empty($peers)) {
+      foreach ($peers as $a) {
+       $peer_line = "<option value='" . $a['peer_id'] . "'>" . $a['peername'] . "</option>\n";
+       $result .= $peer_line;
+      }
+    }
+
+    return $result;
+}
+
+
+
+// function for getting the diff of multi dimention array
+function arr_diff( $a1, $a2 ) {
+  $diff= array();
+  foreach( $a1 as $k=>$v ) {
+    unset( $dv );
+    for( $x= 0; $x < count( $a2 ); $x++ ) {
+      if( is_int( $k ) ) {
+        if( array_search( $v, $a2 ) === false )
+          $dv=$v;
+        else if( is_array( $v ) )
+          $dv= arr_diff( $v, $a2[$x] );
+        if( $dv && !in_array( $dv, $diff ) )
+          $diff[]=$dv;
+      }
+      else {
+
+        if( !$a2[$k] )
+          $dv=$v;
+        else if(is_array($v))
+          $dv=arr_diff($v,$a2[$x]);
+        if($dv)
+          $diff[$x]=$dv;
+      }
+    }
+  }
+  return $diff;
+}
+
+?>

diff --git a/planetlab/includes/plc_minitabs.php b/planetlab/includes/plc_minitabs.php
index c1dc3cf..2df465f 100644 (file)
--- a/planetlab/includes/plc_minitabs.php
+++ b/planetlab/includes/plc_minitabs.php
@@ -7,7 +7,7 @@ drupal_set_html_head('
 ');
 
 
-function plc_show_options($array) {
+function plc_tabs($array) {
   print '<div id="minitabs_container">';
   print '<ul id="miniflex">';
   foreach ($array as $name=>$url) {

diff --git a/planetlab/includes/plc_sorts.php b/planetlab/includes/plc_sorts.php
index 37fdeb5..4b30ab8 100644 (file)
--- a/planetlab/includes/plc_sorts.php
+++ b/planetlab/includes/plc_sorts.php
@@ -1,79 +1,6 @@
 <?php
 
-// $Id$
-
-// person sort on last name, first name, email
-function __cmp_persons($a, $b) {
-  $persona = $a['last_name'] . $a['first_name'] . $a['email'];
-  $personb = $b['last_name'] . $b['first_name'] . $b['email'];
-  return strcmp($persona, $personb);
-}
-
-function sort_persons(&$persons) {
-  return usort($persons, "__cmp_persons");
-}
-
-function __cmp_nodes($a, $b) {
- $as = array_reverse(explode(".", $a['hostname']));
- $bs = array_reverse(explode(".", $b['hostname']));
- foreach ($as as $key => $val) {
-   if ($val == $bs[$key]) {
-     continue;
-   }
-   return ($val < $bs[$key]) ? -1 : 1;
- }
-}
-
-function sort_nodes(&$nodes) {
-  return usort($nodes, "__cmp_nodes");
-}
-
-// node group sort on name
-function __cmp_nodegroups($a, $b) {
-       return strcasecmp($a['name'], $b['name']);
-}
-
-function sort_nodegroups(&$nodegroups) {
-       return usort($nodegroups, "__cmp_nodegroups");
-}
-
-// site sort on name
-function __cmp_sites($a, $b) {
-  return strcasecmp($a['name'], $b['name']);
-}
-
-function sort_sites(&$sites) {
-  return usort($sites, "__cmp_sites");
-}
-
-// slice sort on name
-function __cmp_slices($a, $b) {
-  return strcasecmp($a['name'], $b['name']);
-}
-
-function sort_slices(&$slices) {
-  return usort($slices, "__cmp_slices");
-}
-
-function __cmp_peers($a,$b) {
-  return strcmp($a['peername'],$b['peername']);
-}
-
-function sort_peers (&$peers) {
-  return usort ($peers, "__cmp_peers");
-}
-
-function __cmp_interface_tags($a,$b) {
-  $cat=strcmp($a['category'],$b['category']);
-  if ($cat != 0) {
-    return $cat;
-  } else {
-    return strcmp($a['name'],$b['name']);
-  }
-}
-
-function sort_interface_tags (&$interface_tags) {
-  return usort ($interface_tags,"__cmp_interface_tags");
-}
+// will trash this eventually
+require_once 'plc_sorts_trash.php';
 
 ?>

diff --git a/planetlab/includes/plc_tables.php b/planetlab/includes/plc_tables.php
index 2134769..7bdcf51 100644 (file)
--- a/planetlab/includes/plc_tables.php
+++ b/planetlab/includes/plc_tables.php
@@ -9,6 +9,11 @@ drupal_set_html_head('
 ');
 
 
+////////////////////////////////////////
+function plc_table_cell($cell) {
+  printf ('<td class="plc_table"> %s </td>',$cell);
+}
+
 ////////////////////////////////////////
 // table_id: <table>'s id tag
 // headers: an associative array "label"=>"type"