get_array

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

diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index 9336d86..af17711 100644 (file)
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -28,16 +28,15 @@ drupal_set_html_head('
 ');
 
 
-ini_set("memory_limit","64M");
 //error_reporting(0);
 
 // -------------------- 
 // recognized URL arguments
-$peerscope=$_GET['peerscope'];
-$pattern=$_GET['pattern'];
-$site_id=intval($_GET['site_id']);
-$slice_id=intval($_GET['slice_id']);
-$person_id=intval($_GET['person_id']);
+$peerscope = get_array($_GET, 'peerscope');
+$pattern = get_array($_GET, 'pattern');
+$site_id = intval(get_array($_GET, 'site_id'));
+$slice_id = intval(get_array($_GET, 'slice_id'));
+$person_id = intval(get_array($_GET, 'person_id'));
 
 // --- decoration
 $title="Nodes";
@@ -71,8 +70,6 @@ function node_status ($node) {
 }
 
 
-$first_time_configuration = false;
-
 if (plc_is_admin()) 
        $default_configuration = "ID:f|hostname:f|ST:f|AU:f|RES:f";
 else
@@ -104,7 +101,6 @@ foreach ($PersonTags as $ptag) {
 $nodesconf_exists = false;
 if ($column_configuration == "")
 {
-        $first_time_configuration = true;
         $column_configuration = "nodes;default";
         $nodesconf_exists = true;
 }
@@ -330,11 +326,6 @@ $info_header[$short]=array('type'=>$type,'title'=>$long, 'label'=>'?', 'header'=
 //$info_header["?"] = "none";
 $headers = array_merge($ConfigureColumns->get_headers(),$info_header);
 
-if ($first_time_configuration)
-$column_conf_visible = '1';
-else
-$column_conf_visible = '0';
-
 $layout_help='
 This tab allows you to customize the columns in the node tables,
 below. Information on the nodes comes from a variety of monitoring
@@ -347,7 +338,7 @@ href="http://trac.myslice.info">http://trac.myslice.info</a>.
 ';
 $toggle_nodes=new PlekitToggle('nodes-layout',
                                "Node table layout",
-                               array('visible'=>$column_conf_visible, 
+                               array('visible'=>NULL, 
                                     'info-text'=>$layout_help,
                                     'info-visible'=>$show_columns_message));
 $toggle_nodes->start();
@@ -373,7 +364,7 @@ $table_options = array('notes'=>$notes,
                         'configurable'=>true);
 
 # initial sort on hostnames
-$table=new PlekitTable ("nodes",$headers,3, $table_options);
+$table=new PlekitTable ("nodes",$headers,2, $table_options);
 $table->start();
 
 $peers = new Peers ($api);