cleanup sort_sites() calls after plc_sorts.php removal.

diff --git a/planetlab/persons/register.php b/planetlab/persons/register.php
index d06b62c..dbdf7b4 100644 (file)
--- a/planetlab/persons/register.php
+++ b/planetlab/persons/register.php
@@ -194,9 +194,6 @@ $adm->GetRoles();
 
 list($sites, $roles) = $adm->commit();
 
-// Alphabetize sites by name
-sort_sites($sites);
-
 // Prepend invalid site to beginning of list to force user to select a site
 $sites = array_merge(array(array('site_id' => -1, 'name' => 'Select a site', 'enabled' => TRUE)), $sites);
 

diff --git a/planetlab/pub/sites.php b/planetlab/pub/sites.php
index 6b46290..5d5a821 100644 (file)
--- a/planetlab/pub/sites.php
+++ b/planetlab/pub/sites.php
@@ -27,7 +27,6 @@ include 'plc_header.php';
 
 // All defined sites
 $sites = $adm->GetSites(array('is_public' => TRUE), array('name', 'url'));
-sort_sites($sites);
 
 foreach ($sites as $site) {
   $name = htmlspecialchars($site['name']);

diff --git a/planetlab/sites/switch_site.php b/planetlab/sites/switch_site.php
index 0ade10a..b1678ba 100644 (file)
--- a/planetlab/sites/switch_site.php
+++ b/planetlab/sites/switch_site.php
@@ -45,8 +45,6 @@ else
   $site_info= $api->GetSites( $_person['site_ids'], array( "site_id", "name" ) );
 
 
-sort_sites( $site_info );
-
 // start form
 echo "<from method=post action='switch_site.php?id=$site_id'>\n";
 echo "<h2>Switch Site</h2>\n";

diff --git a/planetlab/slices/slice_add.php b/planetlab/slices/slice_add.php
index 5baa8ba..e691ea3 100644 (file)
--- a/planetlab/slices/slice_add.php
+++ b/planetlab/slices/slice_add.php
@@ -10,6 +10,11 @@ global $plc, $api;
 // Common functions
 require_once 'plc_functions.php';
   
+// Print header
+require_once 'plc_drupal.php';
+include 'plc_header.php';
+
+
 // find person roles
 $_person= $plc->person;
 $_roles= $_person['role_ids'];
@@ -127,7 +132,6 @@ if( count( $_person['site_ids'] ) > 1 || in_array( 10, $_roles ) ) {
 
   echo "<tr><th>Site: </th><td><select onchange='update(this[selectedIndex].text)' name='site_id'>\n";
 
-  sort_sites( $site_info );
   foreach( $site_info as $site ) {
     echo "<option value=". $site['site_id'];
     if( $site['site_id'] == $_person['site_ids'][0] )