summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-03-12 03:45:45 +0000
committerBill Marquette <billm@pfsense.org>2005-03-12 03:45:45 +0000
commitb9e255dde13525cc0e18a7a95f82d395613be1af (patch)
tree8c644d9a7cfd3470eeaacfc3eeb6ae40483105d7 /usr
parente95c754fbc2a3eec0fd2c1bc5e3d357cecdaa8d4 (diff)
downloadpfsense-b9e255dde13525cc0e18a7a95f82d395613be1af.zip
pfsense-b9e255dde13525cc0e18a7a95f82d395613be1af.tar.gz
Remove some code duplication
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/interfaces_lan.php23
-rwxr-xr-xusr/local/www/interfaces_opt.php23
-rwxr-xr-xusr/local/www/ip_helper.js19
3 files changed, 29 insertions, 36 deletions
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index b43e575..e133da2 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -100,31 +100,18 @@ if ($_POST) {
<title><?=gentitle("Interfaces: LAN");?></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link href="gui.css" rel="stylesheet" type="text/css">
+
+<script type="text/javascript" language="javascript" src="ip_helper.js">
+</script>
+
<script language="JavaScript">
<!--
-function gen_bits(ipaddr) {
- if (ipaddr.search(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) != -1) {
- var adr = ipaddr.split(/\./);
- if (adr[0] > 255 || adr[1] > 255 || adr[2] > 255 || adr[3] > 255)
- return "";
- if (adr[0] == 0 && adr[1] == 0 && adr[2] == 0 && adr[3] == 0)
- return "";
-
- if (adr[0] <= 127)
- return "8";
- else if (adr[0] <= 191)
- return "16";
- else
- return "24";
- }
- else
- return "";
-}
function ipaddr_change() {
document.iform.subnet.value = gen_bits(document.iform.ipaddr.value);
}
// -->
</script>
+
</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index ae03380..4626051 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -153,6 +153,10 @@ if ($_POST) {
<title><?=gentitle("Interfaces: Optional $index (" . htmlspecialchars($optcfg['descr']) . ")");?></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link href="gui.css" rel="stylesheet" type="text/css">
+
+<script type="text/javascript" language="javascript" src="ip_helper.js">
+</script>
+
<script language="JavaScript">
<!--
function enable_change(enable_over) {
@@ -161,29 +165,12 @@ function enable_change(enable_over) {
document.iform.ipaddr.disabled = endis;
document.iform.subnet.disabled = endis;
}
-function gen_bits(ipaddr) {
- if (ipaddr.search(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) != -1) {
- var adr = ipaddr.split(/\./);
- if (adr[0] > 255 || adr[1] > 255 || adr[2] > 255 || adr[3] > 255)
- return 0;
- if (adr[0] == 0 && adr[1] == 0 && adr[2] == 0 && adr[3] == 0)
- return 0;
-
- if (adr[0] <= 127)
- return 23;
- else if (adr[0] <= 191)
- return 15;
- else
- return 7;
- }
- else
- return 0;
-}
function ipaddr_change() {
document.iform.subnet.selectedIndex = gen_bits(document.iform.ipaddr.value);
}
//-->
</script>
+
</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
diff --git a/usr/local/www/ip_helper.js b/usr/local/www/ip_helper.js
new file mode 100755
index 0000000..29e892f
--- /dev/null
+++ b/usr/local/www/ip_helper.js
@@ -0,0 +1,19 @@
+function gen_bits(ipaddr) {
+ if (ipaddr.search(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) != -1) {
+ var adr = ipaddr.split(/\./);
+ if (adr[0] > 255 || adr[1] > 255 || adr[2] > 255 || adr[3] > 255)
+ return 0;
+ if (adr[0] == 0 && adr[1] == 0 && adr[2] == 0 && adr[3] == 0)
+ return 0;
+
+ if (adr[0] <= 127)
+ return 23;
+ else if (adr[0] <= 191)
+ return 15;
+ else
+ return 7;
+ }
+ else
+ return 0;
+}
+
OpenPOWER on IntegriCloud