From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Wed, 15 Jul 2009 14:56:57 +0000 (+0000)
Subject: use node_id provided by the caller.
X-Git-Tag: nodeconfig-4.3-5~8
X-Git-Url: http://git.onelab.eu/?p=nodeconfig.git;a=commitdiff_plain;h=eab5c80e5494cafaf990fbf9a81664153f2da036

use node_id provided by the caller.
---

diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php
index df466b5..cb602c1 100755
--- a/PlanetLabConf/keys.php
+++ b/PlanetLabConf/keys.php
@@ -47,17 +47,10 @@ if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) {
   }
 }
 
-if (isset($_REQUEST['site_admin'])) {
-  // Look up the node
-  if ($__PLC_API_VERSION==4.2)
-    $interfaces = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR']));
-  else
-    $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR']));
-  if (!empty($interfaces)) {
-    $nodes = $adm->GetNodes(array($interfaces[0]['node_id']));
-    if (!empty($nodes)) {
-      $node = $nodes[0];
-    }
+if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) {
+  $nodes = $adm->GetNodes(array(intval($_REQUEST['node_id'])));
+  if (!empty($nodes)) {
+    $node = $nodes[0];
   }
   if (isset($node)) {
     // Look up the site