git://git.onelab.eu / www-register-wizard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 882f60e)
more tweaks for reservable nodes, and other bugfixes
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Aug 2010 08:36:53 +0000 (08:36 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Aug 2010 08:36:53 +0000 (08:36 +0000)
application/controllers/register.php patch | blob | history
application/views/stage4_node_confirm.php patch | blob | history

diff --git a/application/controllers/register.php b/application/controllers/register.php
index 4e15529..f2c6c0c 100644 (file)
--- a/application/controllers/register.php
+++ b/application/controllers/register.php
@@ -37,18 +37,18 @@ class Register extends Controller {
                $this->validation->set_error_delimiters('<span class="error">', '</span>');
 
                $rules['model']         = "trim|required";
                $this->validation->set_error_delimiters('<span class="error">', '</span>');
 
                $rules['model']         = "trim|required";
-               $rules['hostname']  = "trim|required";
+               $rules['hostname']      = "trim|required";
                $rules['ip']            = "trim|required|valid_ip";
                $rules['ip']            = "trim|required|valid_ip";
-               $rules['username']  = "trim";
-               $rules['password']  = "trim|required";
+               $rules['username']      = "trim";
+               $rules['password']      = "trim|required";
                $rules['notes']         = "trim";
                $this->validation->set_rules($rules);
 
                $rules['notes']         = "trim";
                $this->validation->set_rules($rules);
 
-               $fields['model']  = "Model";
-               $fields['hostname']  = "Hostname";
+               $fields['model']        = "Model";
+               $fields['hostname']     = "Hostname";
                $fields['ip']           = "IP Address";
                $fields['ip']           = "IP Address";
-               $fields['username']  = "Username";
-               $fields['password']  = "Password";
+               $fields['username']     = "Username";
+               $fields['password']     = "Password";
                $this->validation->set_fields($fields);
 
                $person = new Person($plc->person);
                $this->validation->set_fields($fields);
 
                $person = new Person($plc->person);
@@ -75,12 +75,12 @@ class Register extends Controller {
                /* add pcu, get pcu info */
                $site_id = intval( $_REQUEST['site_id'] );
                $fields= array( 'protocol'=>    '',
                /* add pcu, get pcu info */
                $site_id = intval( $_REQUEST['site_id'] );
                $fields= array( 'protocol'=>    '',
-                                               'model'=>               $_REQUEST['model'], 
-                                               'hostname'=>    $this->validation->hostname,
-                                               'ip'=>                  $this->validation->ip,
-                                               'username'=>    $this->validation->username, 
-                                               'password'=>    $this->validation->password, 
-                                               'notes'=>               $_REQUEST['notes'], );
+                               'model'=>       $_REQUEST['model'], 
+                               'hostname'=>    $this->validation->hostname,
+                               'ip'=>          $this->validation->ip,
+                               'username'=>    $this->validation->username, 
+                               'password'=>    $this->validation->password, 
+                               'notes'=>       $_REQUEST['notes'], );
                $pcu_id= $api->AddPCU( $site_id, $fields );
 
                if( $pcu_id == 0 ) {
                $pcu_id= $api->AddPCU( $site_id, $fields );
 
                if( $pcu_id == 0 ) {
@@ -118,7 +118,7 @@ class Register extends Controller {
                // get sites depending on role and sites associated.
                if( $person->isAdmin() ) {
                        $site_info= $api->GetSites(array('peer_id' => NULL,'-SORT'=>'name'), 
                // get sites depending on role and sites associated.
                if( $person->isAdmin() ) {
                        $site_info= $api->GetSites(array('peer_id' => NULL,'-SORT'=>'name'), 
-                                                                               array( "name", "site_id", "login_base" ) );
+                                                  array( "name", "site_id", "login_base" ) );
                } else {
                        $site_info= $api->GetSites( $person->getSites(), array( "name", "site_id", "login_base" ) );
                }
                } else {
                        $site_info= $api->GetSites( $person->getSites(), array( "name", "site_id", "login_base" ) );
                }
@@ -188,12 +188,12 @@ class Register extends Controller {
                /* add pcu, get pcu info */
                $pcu_id = intval($this->validation->pcu_id);
                $fields= array( 'protocol'=>    '',
                /* add pcu, get pcu info */
                $pcu_id = intval($this->validation->pcu_id);
                $fields= array( 'protocol'=>    '',
-                                               'model'=>               $_REQUEST['model'], 
-                                               'hostname'=>    $this->validation->hostname,
-                                               'ip'=>                  $this->validation->ip,
-                                               'username'=>    $this->validation->username, 
-                                               'password'=>    $this->validation->password, 
-                                               'notes'=>               $_REQUEST['notes'], );
+                               'model'=>       $_REQUEST['model'], 
+                               'hostname'=>    $this->validation->hostname,
+                               'ip'=>          $this->validation->ip,
+                               'username'=>    $this->validation->username, 
+                               'password'=>    $this->validation->password, 
+                               'notes'=>       $_REQUEST['notes'], );
                $ret = $api->UpdatePCU( $pcu_id, $fields );
 
                if( $ret != 1 ) {
                $ret = $api->UpdatePCU( $pcu_id, $fields );
 
                if( $ret != 1 ) {
@@ -244,29 +244,29 @@ class Register extends Controller {
                $data['site_id'] = intval($site_id);
 
                if ( isset($_REQUEST['pcu_proceed']) ) {
                $data['site_id'] = intval($site_id);
 
                if ( isset($_REQUEST['pcu_proceed']) ) {
-                       $rules['hostname']  = "";
+                       $rules['hostname']      = "";
                        $rules['node_type']     = 'regular';
                        $rules['model']         = "";
                        $rules['method']        = "dhcp";
                        $rules['ip']            = "";
                        $rules['node_type']     = 'regular';
                        $rules['model']         = "";
                        $rules['method']        = "dhcp";
                        $rules['ip']            = "";
-                       $rules['netmask']  = "";
-                       $rules['network']  = "";
-                       $rules['gateway']  = "";
-                       $rules['broadcast']  = "";
-                       $rules['dns1']  = "";
-                       $rules['dns2']  = "";
+                       $rules['netmask']       = "";
+                       $rules['network']       = "";
+                       $rules['gateway']       = "";
+                       $rules['broadcast']     = "";
+                       $rules['dns1']          = "";
+                       $rules['dns2']          = "";
                        $this->validation->set_rules($rules);
                        $this->validation->set_rules($rules);
-                       $fields['hostname']  = "Hostname";
+                       $fields['hostname']     = "Hostname";
                        $fields['node_type']    = "Node Type";
                        $fields['model']        = "Model";
                        $fields['method']       = "Method";
                        $fields['ip']           = "IP Address";
                        $fields['node_type']    = "Node Type";
                        $fields['model']        = "Model";
                        $fields['method']       = "Method";
                        $fields['ip']           = "IP Address";
-                       $fields['netmask']              = "Netmask Address";
-                       $fields['network']              = "Network Address";
-                       $fields['gateway']              = "Gateway Address";
+                       $fields['netmask']      = "Netmask Address";
+                       $fields['network']      = "Network Address";
+                       $fields['gateway']      = "Gateway Address";
                        $fields['broadcast']    = "Broadcast Address";
                        $fields['broadcast']    = "Broadcast Address";
-                       $fields['dns1']                 = "Primary DNS Address";
-                       $fields['dns2']                 = "Secondary DNS Address";
+                       $fields['dns1']         = "Primary DNS Address";
+                       $fields['dns2']         = "Secondary DNS Address";
                        $this->validation->set_fields($fields);
 
                        $result = $this->validation->run();
                        $this->validation->set_fields($fields);
 
                        $result = $this->validation->run();
@@ -275,7 +275,8 @@ class Register extends Controller {
                        $this->disp_errors = False;
                        print $this->validation->error_string . "<br>";
                } else {
                        $this->disp_errors = False;
                        print $this->validation->error_string . "<br>";
                } else {
-                       $rules['hostname']  = "trim|required";
+                       $rules['hostname']      = "trim|required";
+                       $rules['node_type']     = "required";
                        $rules['model']         = "trim|required";
                        $rules['method']        = "required";
                        $rules['ip']            = "trim|required|valid_ip";
                        $rules['model']         = "trim|required";
                        $rules['method']        = "required";
                        $rules['ip']            = "trim|required|valid_ip";
@@ -297,16 +298,17 @@ class Register extends Controller {
                        }
                        $this->validation->set_rules($rules);
 
                        }
                        $this->validation->set_rules($rules);
 
-                       $fields['hostname']  = "Hostname";
+                       $fields['hostname']     = "Hostname";
+                       $fields['node_type']    = "Node Type";
                        $fields['model']        = "Model";
                        $fields['method']       = "Method";
                        $fields['ip']           = "IP Address";
                        $fields['model']        = "Model";
                        $fields['method']       = "Method";
                        $fields['ip']           = "IP Address";
-                       $fields['netmask']              = "Netmask Address";
-                       $fields['network']              = "Network Address";
-                       $fields['gateway']              = "Gateway Address";
+                       $fields['netmask']      = "Netmask Address";
+                       $fields['network']      = "Network Address";
+                       $fields['gateway']      = "Gateway Address";
                        $fields['broadcast']    = "Broadcast Address";
                        $fields['broadcast']    = "Broadcast Address";
-                       $fields['dns1']                 = "Primary DNS Address";
-                       $fields['dns2']                 = "Secondary DNS Address";
+                       $fields['dns1']         = "Primary DNS Address";
+                       $fields['dns2']         = "Secondary DNS Address";
                        $this->validation->set_fields($fields);
 
                        if ($this->validation->run() == TRUE)
                        $this->validation->set_fields($fields);
 
                        if ($this->validation->run() == TRUE)
@@ -328,7 +330,7 @@ class Register extends Controller {
                global $api, $plc;
                $hostname = trim($_REQUEST['hostname']);
                $node_type = trim($_REQUEST['node_type']);
                global $api, $plc;
                $hostname = trim($_REQUEST['hostname']);
                $node_type = trim($_REQUEST['node_type']);
-               $model= trim($_REQUEST['model']);
+               $model = trim($_REQUEST['model']);
                $method = trim($_REQUEST['method']);
                $ip = trim($_REQUEST['ip']);
                if ( $method == 'static' )
                $method = trim($_REQUEST['method']);
                $ip = trim($_REQUEST['ip']);
                if ( $method == 'static' )
@@ -357,10 +359,9 @@ class Register extends Controller {
                        }
                }
 
                        }
                }
 
-               if( !isset($errors) || count($errors) == 0 )
-               {
+               if( !isset($errors) || count($errors) == 0 ) {
                        // add new node and its network
                        // add new node and its network
-                 $optional_vals= array( 'hostname'=>$hostname, 'node_type'=>$node_type, 'model'=>$model );
+                       $optional_vals= array( 'hostname'=>$hostname, 'node_type'=>$node_type, 'model'=>$model );
 
                        $site_id= $data['site_id'];
                        // Try to get node in case this is from an error:
 
                        $site_id= $data['site_id'];
                        // Try to get node in case this is from an error:
@@ -424,8 +425,6 @@ class Register extends Controller {
                    $data['error'] = $errors[0];
                        return 0;
                }
                    $data['error'] = $errors[0];
                        return 0;
                }
-
-
                
        }
 
                
        }
 
@@ -543,10 +542,10 @@ class Register extends Controller {
                $fields['netmask']      = "Netmask Address";
                $fields['network']      = "Network Address";
                $fields['gateway']      = "Gateway Address";
                $fields['netmask']      = "Netmask Address";
                $fields['network']      = "Network Address";
                $fields['gateway']      = "Gateway Address";
-               $fields['broadcast']= "Broadcast Address";
+               $fields['broadcast']    = "Broadcast Address";
                $fields['dns1']         = "Primary DNS Address";
                $fields['dns2']         = "Secondary DNS Address";
                $fields['dns1']         = "Primary DNS Address";
                $fields['dns2']         = "Secondary DNS Address";
-               $fields['node_id']  = "NODE id";
+               $fields['node_id']      = "NODE id";
                $this->validation->set_fields($fields);
 
                $data = array();
                $this->validation->set_fields($fields);
 
                $data = array();
@@ -574,12 +573,12 @@ class Register extends Controller {
                        $this->disp_errors = False;
                        print $this->validation->error_string . "<br>";
                } else {
                        $this->disp_errors = False;
                        print $this->validation->error_string . "<br>";
                } else {
-                       $rules['hostname']  = "trim|required";
+                       $rules['hostname']      = "trim|required";
+                       $rules['node_type']     = 'required';
                        $rules['model']         = "trim|required";
                        $rules['method']        = "required";
                        $rules['ip']            = "trim|required|valid_ip";
                        $rules['model']         = "trim|required";
                        $rules['method']        = "required";
                        $rules['ip']            = "trim|required|valid_ip";
-                       if ( isset ($_REQUEST['method']) && $_REQUEST['method'] == 'static' )
-                       {
+                       if ( isset ($_REQUEST['method']) && $_REQUEST['method'] == 'static' ) {
                                $rules['netmask']  = "trim|valid_ip";
                                $rules['network']  = "trim|valid_ip";
                                $rules['gateway']  = "trim|valid_ip";
                                $rules['netmask']  = "trim|valid_ip";
                                $rules['network']  = "trim|valid_ip";
                                $rules['gateway']  = "trim|valid_ip";
@@ -606,8 +605,7 @@ class Register extends Controller {
                }
                $data['node_id'] = intval($this->validation->node_id);
                $data['stage'] = 4;
                }
                $data['node_id'] = intval($this->validation->node_id);
                $data['stage'] = 4;
-               if ( $this->checknodeid($data['node_id']) )
-               {
+               if ( $this->checknodeid($data['node_id']) ) {
                        $data = $this->get_stage4_data($person, $data);
                        $this->load->view('header', $data);
                        $this->load->view('debug', $data);
                        $data = $this->get_stage4_data($person, $data);
                        $this->load->view('header', $data);
                        $this->load->view('debug', $data);
@@ -623,8 +621,8 @@ class Register extends Controller {
                # TODO: RECODE To update values instead of adding them...
                global $api, $plc;
                $hostname = trim($_REQUEST['hostname']);
                # TODO: RECODE To update values instead of adding them...
                global $api, $plc;
                $hostname = trim($_REQUEST['hostname']);
-               $model = trim($_REQUEST['model']);
                $node_type = trim($_REQUEST['node_type']);
                $node_type = trim($_REQUEST['node_type']);
+               $model = trim($_REQUEST['model']);
                $node_id = intval($this->validation->node_id);
                $optional_vals = array('hostname' => $hostname, 'model' => $model, 'node_type' => $node_type );
                $ret = $api->UpdateNode( $node_id, $optional_vals);
                $node_id = intval($this->validation->node_id);
                $optional_vals = array('hostname' => $hostname, 'model' => $model, 'node_type' => $node_type );
                $ret = $api->UpdateNode( $node_id, $optional_vals);
@@ -634,8 +632,7 @@ class Register extends Controller {
                }
 
                $api_node_list = $api->GetNodes($node_id);
                }
 
                $api_node_list = $api->GetNodes($node_id);
-               if ( count($api_node_list) > 0 )
-               {
+               if ( count($api_node_list) > 0 ) {
                        $node_obj = new Node($api_node_list[0], True);
                } else {
                        print "broken!!!";
                        $node_obj = new Node($api_node_list[0], True);
                } else {
                        print "broken!!!";
@@ -657,11 +654,11 @@ class Register extends Controller {
 
                // used to generate error strings for static fields only
                $static_fields= array();
 
                // used to generate error strings for static fields only
                $static_fields= array();
-               $static_fields['netmask']= "Netmask address";
-               $static_fields['network']= "Network address";
-               $static_fields['gateway']= "Gateway address";
-               $static_fields['broadcast']= "Broadcast address";
-               $static_fields['dns1']= "Primary DNS address";
+               $static_fields['netmask']       = "Netmask address";
+               $static_fields['network']       = "Network address";
+               $static_fields['gateway']       = "Gateway address";
+               $static_fields['broadcast']     = "Broadcast address";
+               $static_fields['dns1']          = "Primary DNS address";
 
                if ( $method == 'static' )
                {
 
                if ( $method == 'static' )
                {
@@ -705,7 +702,7 @@ class Register extends Controller {
 
                        if ( count($optional_vals) > 0 )
                        {
 
                        if ( count($optional_vals) > 0 )
                        {
-                               print_r($optional_vals);
+                         // print_r($optional_vals);
                                $ret = $api->UpdateInterface( $node_obj->interface_id, $optional_vals);
                                if( $ret <= 0 ) {
                                        $data['error'] = $api->error();
                                $ret = $api->UpdateInterface( $node_obj->interface_id, $optional_vals);
                                if( $ret <= 0 ) {
                                        $data['error'] = $api->error();
diff --git a/application/views/stage4_node_confirm.php b/application/views/stage4_node_confirm.php
index 35c7dd3..fecf5fd 100644 (file)
--- a/application/views/stage4_node_confirm.php
+++ b/application/views/stage4_node_confirm.php
@@ -1,4 +1,6 @@
 <?php
 <?php
+require_once 'plc_functions.php';
+
 if( isset($errors) && count($errors) > 0 )
 {
   print( "<p><strong>The following errors occured:</strong>" );
 if( isset($errors) && count($errors) > 0 )
 {
   print( "<p><strong>The following errors occured:</strong>" );
@@ -15,6 +17,7 @@ function initNodeTypeFields() {
   var regular=document.getElementById("regular_checked");
   var reservable=document.getElementById("reservable_checked");
   if ( regular.checked || reservable.checked) return;
   var regular=document.getElementById("regular_checked");
   var reservable=document.getElementById("reservable_checked");
   if ( regular.checked || reservable.checked) return;
+  window.console.log('initNodeTypeFields is setting regular mode');
   regular.checked=true;
 }
 function updateMethodFields() {
   regular.checked=true;
 }
 function updateMethodFields() {
@@ -56,13 +59,13 @@ next stage.  Otherwise, please Update the information as appropriate.
                        </table>
        </form>
 </div>
                        </table>
        </form>
 </div>
+
 <br>
 <div class="plroundedupdate">
 <?= form_open("register/stage4_confirmnode/$pcu_id/$site_id/$node_id", array('name'=>'fm', 'method'=>'post')) ?>
                <table border=0 cellpadding=3>
                        <tbody>
 <br>
 <div class="plroundedupdate">
 <?= form_open("register/stage4_confirmnode/$pcu_id/$site_id/$node_id", array('name'=>'fm', 'method'=>'post')) ?>
                <table border=0 cellpadding=3>
                        <tbody>
-               <tr><td colspan='2'>
-               </td></tr>
+               <tr><td colspan='2'> </td></tr>
                <?php if ( !empty($site) ) 
                        { ?>
                                        <tr><th>Site: </th><td> <?= $site['name'] ?> </td>
                <?php if ( !empty($site) ) 
                        { ?>
                                        <tr><th>Site: </th><td> <?= $site['name'] ?> </td>
@@ -79,9 +82,9 @@ next stage.  Otherwise, please Update the information as appropriate.
                                        <th valign='top' width="200">Node Type</th>
                                        <td>
                                                <input type="radio" name="node_type" value="regular" id="regular_checked"
                                        <th valign='top' width="200">Node Type</th>
                                        <td>
                                                <input type="radio" name="node_type" value="regular" id="regular_checked"
-                                               <?= ( $this->validation->node_type == 'regular' ? "checked" : "" ) ?>>regular 
+                                               <?= ( $node->node_type == 'regular' ? "checked" : "" ) ?>>regular 
                                                <input type="radio" name="node_type" value="reservable" id="reservable_checked"
                                                <input type="radio" name="node_type" value="reservable" id="reservable_checked"
-                                               <?= ( $this->validation->node_type == 'reservable' ? "checked" : "" ) ?>>reservable 
+                                               <?= ( $node->node_type == 'reservable' ? "checked" : "" ) ?>>reservable 
                                        </td>
                                </tr>
                                <tr>
                                        </td>
                                </tr>
                                <tr>
@@ -97,9 +100,9 @@ next stage.  Otherwise, please Update the information as appropriate.
                                        <th valign='top' width="200">Addressing Method</th>
                                        <td>
                                                <input type="radio" name="method" value="dhcp" id="dhcp_checked" onChange='updateMethodFields()'
                                        <th valign='top' width="200">Addressing Method</th>
                                        <td>
                                                <input type="radio" name="method" value="dhcp" id="dhcp_checked" onChange='updateMethodFields()'
-                                               <?= ( $this->validation->method == 'dhcp' ? "checked" : "" ) ?>>DHCP 
+                                               <?= ( $node->method == 'dhcp' ? "checked" : "" ) ?>>DHCP 
                                                <input type="radio" name="method" value="static" id='static_checked' onChange='updateMethodFields()'
                                                <input type="radio" name="method" value="static" id='static_checked' onChange='updateMethodFields()'
-                                               <?= ( $this->validation->method == 'static' ? "checked" : "" ) ?>>Static 
+                                               <?= ( $node->method == 'static' ? "checked" : "" ) ?>>Static 
                                        </td>
                                </tr>
                                <tr>
                                        </td>
                                </tr>
                                <tr>
www-register-wizard