diff options
| author | Ermal <eri@pfsense.org> | 2010-11-10 19:40:56 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-11-10 19:40:56 +0000 |
| commit | fa11243673d97addd1af1c08117a03462253acce (patch) | |
| tree | 4acf4c476ad72cba975da9c3464b32a275fa234f | |
| parent | b06d7ebb1d1d6468b180ddf24376c3f1063de625 (diff) | |
| download | pfsense-fa11243673d97addd1af1c08117a03462253acce.zip pfsense-fa11243673d97addd1af1c08117a03462253acce.tar.gz | |
Use php calls rather than forking to shell.
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index d251ff2..6bd1671 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -149,22 +149,13 @@ function get_tmp_file() { ******/ function get_dns_servers() { $dns_servers = array(); - $dns = `cat /etc/resolv.conf`; - $dns_s = split("\n", $dns); + $dns_s = file("/etc/resolv.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); foreach($dns_s as $dns) { $matches = ""; if (preg_match("/nameserver (.*)/", $dns, $matches)) $dns_servers[] = $matches[1]; } - $dns_server_master = array(); - $lastseen = ""; - foreach($dns_servers as $t) { - if($t <> $lastseen) - if($t <> "") - $dns_server_master[] = $t; - $lastseen = $t; - } - return $dns_server_master; + return array_unique($dns_servers); } /****f* pfsense-utils/enable_hardware_offloading @@ -2116,4 +2107,4 @@ function get_country_name($country_code) { return ""; } -?>
\ No newline at end of file +?> |
