Fixed: FS#2118 - IP addresses dont get loaded into list of openvz container...

tbrehm

2012-06-06 d03323d167435f14e65b20475ce4d6e257c7ce43

 interface/web/vm/openvz_vm_edit.php

@@ -104,10 +104,10 @@
         $records = $app->db->queryAllRecords($sql);
         $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
         $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>';
         $tmp_data_record = $app->tform->getDataRecord($this->id);
         //$tmp_data_record = $app->tform->getDataRecord($this->id);
         if(is_array($records)) {
            foreach( $records as $rec) {
               $selected = @($rec["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
               $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
               $client_select .= "<option value='$rec[groupid]' $selected>$rec[name]</option>\r\n";
            }
         }
@@ -135,10 +135,10 @@
         $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
         $clients = $app->db->queryAllRecords($sql);
         $client_select = "<option value='0'></option>";
         $tmp_data_record = $app->tform->getDataRecord($this->id);
         //$tmp_data_record = $app->tform->getDataRecord($this->id);
         if(is_array($clients)) {
            foreach( $clients as $client) {
               $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
               $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
               $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
            }
         }
@@ -157,6 +157,27 @@

      }
      
      //* Fill the IPv4 select field with the IP addresses that are allowed for this client
      //$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
      if(isset($this->dataRecord["server_id"])) {
         $vm_server_id = intval($this->dataRecord["server_id"]);
      } else {
         $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 ORDER BY server_name LIMIT 0,1');
         $vm_server_id = $tmp['server_id'];
      }
      $sql = "SELECT ip_address FROM openvz_ip WHERE reserved = 'n' AND (vm_id = 0 or vm_id = '".$this->id."') AND server_id = ".$vm_server_id." ORDER BY ip_address";
      $ips = $app->db->queryAllRecords($sql);
      $ip_select = "";
      if(is_array($ips)) {
         foreach( $ips as $ip) {
            $selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
            $ip_select .= "<option value='$ip[ip_address]' $selected>$ip[ip_address]</option>\r\n";
         }
      }
      $app->tpl->setVar("ip_address",$ip_select);
      unset($tmp);
      unset($ips);
		
      if($this->id > 0) {
         //* we are editing a existing record
         $app->tpl->setVar("edit_disabled", 1);