X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=application%2Fcontrollers%2Fregister.php;h=03342516711d9e9c3132d72a52596d9051e850d7;hb=4923ce531861d4bd53aafb0f55e3808da01c518b;hp=847eefe3caf5d05da9f00d308ac7c90d7c334951;hpb=8fd1bf7b6562424a96b42bf9ad50ce851acd7cab;p=www-register-wizard.git diff --git a/application/controllers/register.php b/application/controllers/register.php index 847eefe..0334251 100644 --- a/application/controllers/register.php +++ b/application/controllers/register.php @@ -55,7 +55,7 @@ class Register extends Controller { $data = array(); if ($this->validation->run() == TRUE) { - if ($this->validation->model != "none-selected" ) + if ($this->validation->model != "none-selected" ) { /* b/c the submit is valid, it doesn't matter if pcu_register is set */ $this->pcu_id = $this->add_pcu($data); @@ -421,7 +421,12 @@ class Register extends Controller { { global $api, $plc; $plc_node_list = $api->GetNodes(array('site_id' => intval($site_id) )); - return PlcObject::constructList('Node', $plc_node_list); + $ret = array(); + foreach ($plc_node_list as $plc_node) + { + $ret[] = new Node($plc_node, True); + } + return $ret; } function getsite($site_id) @@ -598,7 +603,7 @@ class Register extends Controller { $api_node_list = $api->GetNodes($node_id); if ( count($api_node_list) > 0 ) { - $node_obj = new Node($api_node_list[0]); + $node_obj = new Node($api_node_list[0], True); } else { print "broken!!!"; exit (1); @@ -711,7 +716,7 @@ class Register extends Controller { $plc_node_list = $api->GetNodes(array('node_id' => intval($node_id) )); if ( count($plc_node_list) > 0 ) { - return new Node($plc_node_list[0]); + return new Node($plc_node_list[0], True); } else { return NULL; }