summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-07-16 21:35:51 +0545
committerPhil Davis <phil.davis@inf.org>2015-07-16 21:35:51 +0545
commit8235e7304e97a750e1a48926c69e65b4836cbffa (patch)
tree88eb8e502ed35929da26f8ea2f52b548db733cab /usr/local/www
parent72b2811532f0fe2ce9a2325cd0c105de00e2bef3 (diff)
downloadpfsense-8235e7304e97a750e1a48926c69e65b4836cbffa.zip
pfsense-8235e7304e97a750e1a48926c69e65b4836cbffa.tar.gz
Restrict serial ports glob to cua followed by alpha
Improve this a little more to match only alpha after /dev/cua (/dev/cuau for example)
Diffstat (limited to 'usr/local/www')
-rw-r--r--usr/local/www/interfaces_ppps_edit.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index 7781025..2a7eaf9 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -491,11 +491,11 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
}
// $serialports = pfSense_get_modem_devices();
// Match files in /dev starting with "cua" then:
- // ? = any single character e.g. like "cuau"
+ // [a-zA-Z] = any single alpha character e.g. like "cuau"
// [0-9] = a digit from 0 to 9
// stuff in {} = the various possible digit and dot combinations to allow an optional 2nd digit, dot, followed by 1 or 2 optional digits
- // This supports up to 100 devices (0 to 99), e.g. cuau0 cuau1 ... cuau10 cuau11 ... cuau99 and also possibilities like cuau1.1 cuau1.11 cuau11.1 cuau11.11
- $serialports = glob("/dev/cua?[0-9]{,.[0-9],.[0-9][0-9],[0-9],[0-9].[0-9],[0-9].[0-9][0-9]}", GLOB_BRACE);
+ // This supports up to 100 device numbers (0 to 99), e.g. cuau0 cuau1 ... cuau10 cuau11 ... cuau99 and also possibilities like cuau1.1 cuau1.11 cuau11.1 cuau11.11
+ $serialports = glob("/dev/cua[a-zA-Z][0-9]{,.[0-9],.[0-9][0-9],[0-9],[0-9].[0-9],[0-9].[0-9][0-9]}", GLOB_BRACE);
$serport_count = 0;
foreach ($serialports as $port) {
$serport_count++;
OpenPOWER on IntegriCloud