keep the explicit setting of memory_limit only in 3 pages

[plewww.git] / planetlab / slices / slices.php

diff --git a/planetlab/slices/slices.php b/planetlab/slices/slices.php
index 7747b01..2b10bc9 100644 (file)
--- a/planetlab/slices/slices.php
+++ b/planetlab/slices/slices.php
@@ -23,8 +23,6 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-ini_set('memory_limit','48M');
-
 // -------------------- 
 // recognized URL arguments
 $peerscope=$_GET['peerscope'];
@@ -35,6 +33,13 @@ $person_id=intval($_GET['person_id']);
 // --- decoration
 $title="Slices";
 $tabs=array();
+
+if (plc_is_admin()) {
+    $tabs []= tab_slices();
+}
+if (plc_is_user()) {
+    $tabs []= tab_slices_person();
+}
 $tabs []= tab_slices_mysite();
 if (plc_is_admin()) $tabs []= tab_slices_local();
 
@@ -69,12 +74,13 @@ if ($site_id) {
 }
 
 if ($person_id) {
-  $persons=$api->GetPersons(array('person_id'=>$person_id,array('email','person_id','slice_ids')));
-  $person=$persons[0];
-  $title .= t_person($person);
-  $tabs .= tab_person($person);
-  $slice_filter['slice_id']=$person['slice_ids'];
- }
+    // fetch the person's slice_ids
+    $persons = $api->GetPersons(array('person_id'=>$person_id),array('person_id','email','slice_ids'));
+    $person=$persons[0];
+    $slice_ids['slice_id']=$person['slice_ids'];
+    $title .= t_person($person);
+    $slice_filter['slice_id']=$person['slice_ids'];
+}
 
 // go
 $slices=$api->GetSlices($slice_filter,$slice_columns);
@@ -106,7 +112,7 @@ if ( ! $slices ) {
   
 $nifty=new PlekitNifty ('','objects-list','big');
 $nifty->start();
-$headers["I"]="int";
+if (plc_is_admin()) $headers["I"]="int";
 $headers["Peer"]="string";
 $headers["Name"]="string";
 $headers["Users"]="string";
@@ -115,7 +121,10 @@ $headers["N"]="int";
 $headers["Exp. d/m/y"]="date-dmy";
 
 # initial sort on hostnames
-$table=new PlekitTable ("slices",$headers,2,
+if (plc_is_admin()) $slices_sort_column = 3;
+else $slices_sort_column = 2;
+    
+$table=new PlekitTable ("slices",$headers,$slices_sort_column,
                        array('search_width'=>20));
 $table->start();
 
@@ -128,9 +137,9 @@ foreach ($slices as $slice) {
   $expires= date( "d/m/Y", $slice['expires'] );
 
   $table->row_start();
-  $table->cell (l_slice_t($slice_id,$slice_id));
+  if (plc_is_admin()) $table->cell (l_slice_t($slice_id,$slice_id));
   $peers->cell($table,$peer_id);
-  $table->cell (l_slice_obj($slice));
+  $table->cell (href(l_slice_nodes($slice_id),$slice['name']));
   $table->cell ($users);
   $table->cell(href(l_persons_slice($slice_id),count($slice['person_ids'])));
   $table->cell (href(l_nodes_slice($slice_id),count($slice['node_ids'])));