Project

General

Profile

« Previous | Next » 

Revision 829322b3

Added by Christian McDonald over 2 years ago

Rector some direct config gets with complex paths.

View differences:

src/usr/local/www/services_dhcpv6.php
127 127 
if (!empty(config_get_path("dhcpdv6/{$if}"))) {
128 128 
	/* DHCPv6 */
129 129 
	if (is_array($config['dhcpdv6'][$if]['range'])) {
130 
		$pconfig['range_from'] = $config['dhcpdv6'][$if]['range']['from'];
131 
		$pconfig['range_to'] = $config['dhcpdv6'][$if]['range']['to'];
130 
		$pconfig['range_from'] = config_get_path("dhcpdv6/{$if}/range/from");
131 
		$pconfig['range_to'] = config_get_path("dhcpdv6/{$if}/range/to");
132 132 
	}
133 133 
	if (is_array($config['dhcpdv6'][$if]['prefixrange'])) {
134 
		$pconfig['prefixrange_from'] = $config['dhcpdv6'][$if]['prefixrange']['from'];
135 
		$pconfig['prefixrange_to'] = $config['dhcpdv6'][$if]['prefixrange']['to'];
136 
		$pconfig['prefixrange_length'] = $config['dhcpdv6'][$if]['prefixrange']['prefixlength'];
134 
		$pconfig['prefixrange_from'] = config_get_path("dhcpdv6/{$if}/prefixrange/from");
135 
		$pconfig['prefixrange_to'] = config_get_path("dhcpdv6/{$if}/prefixrange/to");
136 
		$pconfig['prefixrange_length'] = config_get_path("dhcpdv6/{$if}/prefixrange/prefixlength");
137 137 
	}
138 
	$pconfig['deftime'] = $config['dhcpdv6'][$if]['defaultleasetime'];
139 
	$pconfig['maxtime'] = $config['dhcpdv6'][$if]['maxleasetime'];
140 
	$pconfig['domain'] = $config['dhcpdv6'][$if]['domain'];
141 
	$pconfig['domainsearchlist'] = $config['dhcpdv6'][$if]['domainsearchlist'];
142 
	list($pconfig['wins1'], $pconfig['wins2']) = $config['dhcpdv6'][$if]['winsserver'];
143 
	list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = $config['dhcpdv6'][$if]['dnsserver'];
138 
	$pconfig['deftime'] = config_get_path("dhcpdv6/{$if}/defaultleasetime");
139 
	$pconfig['maxtime'] = config_get_path("dhcpdv6/{$if}/maxleasetime");
140 
	$pconfig['domain'] = config_get_path("dhcpdv6/{$if}/domain");
141 
	$pconfig['domainsearchlist'] = config_get_path("dhcpdv6/{$if}/domainsearchlist");
142 
	list($pconfig['wins1'], $pconfig['wins2']) = config_get_path("dhcpdv6/{$if}/winsserver");
143 
	list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = config_get_path("dhcpdv6/{$if}/dnsserver");
144 144 
	$pconfig['dhcp6c-dns'] = ($config['dhcpdv6'][$if]['dhcp6c-dns'] != 'disabled') ? "enabled" : "disabled";
145 145 
	$pconfig['enable'] = isset($config['dhcpdv6'][$if]['enable']);
146 
	$pconfig['ddnsdomain'] = $config['dhcpdv6'][$if]['ddnsdomain'];
147 
	$pconfig['ddnsdomainprimary'] = $config['dhcpdv6'][$if]['ddnsdomainprimary'];
148 
	$pconfig['ddnsdomainsecondary'] = $config['dhcpdv6'][$if]['ddnsdomainsecondary'];
149 
	$pconfig['ddnsdomainkeyname'] = $config['dhcpdv6'][$if]['ddnsdomainkeyname'];
150 
	$pconfig['ddnsdomainkeyalgorithm'] = $config['dhcpdv6'][$if]['ddnsdomainkeyalgorithm'];
151 
	$pconfig['ddnsdomainkey'] = $config['dhcpdv6'][$if]['ddnsdomainkey'];
146 
	$pconfig['ddnsdomain'] = config_get_path("dhcpdv6/{$if}/ddnsdomain");
147 
	$pconfig['ddnsdomainprimary'] = config_get_path("dhcpdv6/{$if}/ddnsdomainprimary");
148 
	$pconfig['ddnsdomainsecondary'] = config_get_path("dhcpdv6/{$if}/ddnsdomainsecondary");
149 
	$pconfig['ddnsdomainkeyname'] = config_get_path("dhcpdv6/{$if}/ddnsdomainkeyname");
150 
	$pconfig['ddnsdomainkeyalgorithm'] = config_get_path("dhcpdv6/{$if}/ddnsdomainkeyalgorithm");
151 
	$pconfig['ddnsdomainkey'] = config_get_path("dhcpdv6/{$if}/ddnsdomainkey");
152 152 
	$pconfig['ddnsupdate'] = isset($config['dhcpdv6'][$if]['ddnsupdate']);
153 153 
	$pconfig['ddnsforcehostname'] = isset($config['dhcpdv6'][$if]['ddnsforcehostname']);
154 154 
	$pconfig['ddnsreverse'] = isset($config['dhcpdv6'][$if]['ddnsreverse']);
155 
	$pconfig['ddnsclientupdates'] = $config['dhcpdv6'][$if]['ddnsclientupdates'];
156 
	list($pconfig['ntp1'], $pconfig['ntp2'], $pconfig['ntp3'] ) = $config['dhcpdv6'][$if]['ntpserver'];
157 
	$pconfig['tftp'] = $config['dhcpdv6'][$if]['tftp'];
158 
	$pconfig['ldap'] = $config['dhcpdv6'][$if]['ldap'];
155 
	$pconfig['ddnsclientupdates'] = config_get_path("dhcpdv6/{$if}/ddnsclientupdates");
156 
	list($pconfig['ntp1'], $pconfig['ntp2'], $pconfig['ntp3'] ) = config_get_path("dhcpdv6/{$if}/ntpserver");
157 
	$pconfig['tftp'] = config_get_path("dhcpdv6/{$if}/tftp");
158 
	$pconfig['ldap'] = config_get_path("dhcpdv6/{$if}/ldap");
159 159 
	$pconfig['netboot'] = isset($config['dhcpdv6'][$if]['netboot']);
160 
	$pconfig['bootfile_url'] = $config['dhcpdv6'][$if]['bootfile_url'];
161 
	$pconfig['netmask'] = $config['dhcpdv6'][$if]['netmask'];
162 
	$pconfig['numberoptions'] = $config['dhcpdv6'][$if]['numberoptions'];
163 
	$pconfig['dhcpv6leaseinlocaltime'] = $config['dhcpdv6'][$if]['dhcpv6leaseinlocaltime'];
160 
	$pconfig['bootfile_url'] = config_get_path("dhcpdv6/{$if}/bootfile_url");
161 
	$pconfig['netmask'] = config_get_path("dhcpdv6/{$if}/netmask");
162 
	$pconfig['numberoptions'] = config_get_path("dhcpdv6/{$if}/numberoptions");
163 
	$pconfig['dhcpv6leaseinlocaltime'] = config_get_path("dhcpdv6/{$if}/dhcpv6leaseinlocaltime");
164 164 
	if (!is_array($config['dhcpdv6'][$if]['staticmap'])) {
165 165 
		$config['dhcpdv6'][$if]['staticmap'] = array();
166 166 
	}
......
548 548 
$i = 0;
549 549 

  		




  550
  550
  
    
foreach ($iflist as $ifent => $ifname) {


  		




  551
  
  
    
	$oc = $config['interfaces'][$ifent];


  		




  
  551
  
    
	$oc = config_get_path("interfaces/{$ifent}");


  		




  552
  552
  
    
	$valid_if_ipaddrv6 = (bool) ($oc['ipaddrv6'] == 'track6' ||


  		




  553
  553
  
    
	    (is_ipaddrv6($oc['ipaddrv6']) &&


  		




  554
  554
  
    
	    !is_linklocal($oc['ipaddrv6'])));


  		












Also available in:  Unified diff