redirects

[plewww.git] / planetlab / sites / site.php

diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php
index 67a6783..c4d64dc 100644 (file)
--- a/planetlab/sites/site.php
+++ b/planetlab/sites/site.php
@@ -92,15 +92,15 @@ foreach( $persons as $person ) {
   
 }
 
-// fetches peers and initialize hash peer_id->peer
 drupal_set_title("Details for site " . $sitename);
+$local_peer = ! $peer_id;
   
 // extra privileges to admins, and pi on this site
 $privileges = plc_is_admin () || ( plc_in_site($site_id) && plc_is_pi());
   
 $tabs=array();
 // available actions
-if ( ! $peer_id  && $privileges ) {
+if ( $local_peer  && $privileges ) {
   
   $tabs['Update']=array('url'=>l_site_update($site_id),
                        'bubble'=>"Update details of $sitename");
@@ -151,23 +151,7 @@ plc_details_line("Latitude",$site_lat);
 plc_details_line("Longitude",$site_long);
 plc_details_line("Peer",$peers->peer_link($peer_id));
 
-if ( ! $peer_id ) {
-
-  // Addresses
-  if ($addresses) {
-    plc_details_space_line();
-    plc_details_line("Addresses","");
-    foreach ($addresses as $address) {
-      plc_details_line(plc_vertical_table($address['address_types']),
-                      plc_vertical_table(array($address['line1'],
-                                               $address['line2'],
-                                               $address['line3'],
-                                               $address['city'],
-                                               $address['state'],
-                                               $address['postalcode'],
-                                               $address['country'])));
-    }
-  }
+if ( $local_peer ) {
 
   // Nodes
   plc_details_space_line();
@@ -179,6 +163,7 @@ if ( ! $peer_id ) {
   $nodes_text= plc_vertical_table(array_map ("n_link",$nodes));
   plc_details_line ("hostnames",$nodes_text);
                   
+
   // Users
   plc_details_space_line();
   $user_text = count($person_ids) . " total / " .
@@ -195,6 +180,7 @@ if ( ! $peer_id ) {
   $tech_text = plc_vertical_table (array_map ("p_link",$techs));
   plc_details_line("techs's",$tech_text);
 
+
   // Slices
   plc_details_space_line();
   // summary on # slices
@@ -205,6 +191,22 @@ if ( ! $peer_id ) {
      plc_details_line($slice['instantiation'],l_slice_text($slice));
 
 
+  // Addresses
+  if ($addresses) {
+    plc_details_space_line();
+    plc_details_line("Addresses","");
+    foreach ($addresses as $address) {
+      plc_details_line(plc_vertical_table($address['address_types']),
+                      plc_vertical_table(array($address['line1'],
+                                               $address['line2'],
+                                               $address['line3'],
+                                               $address['city'],
+                                               $address['state'],
+                                               $address['postalcode'],
+                                               $address['country'])));
+    }
+  }
+
  }
 
 plc_details_end();