diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
| commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
| tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /usr/local/www/diag_dhcp_leases.php | |
| parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
| parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
| download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'usr/local/www/diag_dhcp_leases.php')
| -rwxr-xr-x | usr/local/www/diag_dhcp_leases.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index 1496685..58e8351 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -328,7 +328,7 @@ foreach ($leases as $data) { } else { $fspans = $fspane = ""; } - $lip = ip2long($data['ip']); + $lip = ip2ulong($data['ip']); if ($data['act'] == "static") { foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { if(is_array($dhcpifconf['staticmap'])) { @@ -345,7 +345,7 @@ foreach ($leases as $data) { } } else { foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if (($lip >= ip2long($dhcpifconf['range']['from'])) && ($lip <= ip2long($dhcpifconf['range']['to']))) { + if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) { $data['if'] = $dhcpif; break; } |
