diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-01-08 05:07:48 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-01-08 05:07:48 +0000 |
commit | 21ab1cde16f65e515225bf2dfae9287e0c29c939 (patch) | |
tree | 050a767e7a2f3844544de268cf4231dfba99aae2 /usr | |
parent | ab73789e0cff744979c1703259098e6f89285a14 (diff) | |
download | pfsense-21ab1cde16f65e515225bf2dfae9287e0c29c939.zip pfsense-21ab1cde16f65e515225bf2dfae9287e0c29c939.tar.gz |
remove /31 from interface IP assignment screens since a /31 subnet has 0 usable IP addresses. simpify all 1-32 loops by using the same code as much as possible.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 22 | ||||
-rwxr-xr-x | usr/local/www/interfaces.php | 14 | ||||
-rwxr-xr-x | usr/local/www/interfaces_lan.php | 14 | ||||
-rwxr-xr-x | usr/local/www/interfaces_opt.php | 13 | ||||
-rwxr-xr-x | usr/local/www/interfaces_wan.php | 14 |
5 files changed, 60 insertions, 17 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 4eaba1b..f826dd9 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -608,9 +608,13 @@ function dst_rep_change() { <td><input name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>"> / <select name="srcmask" class="formfld" id="srcmask"> - <?php for ($i = 32; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['srcmask']) echo "selected"; ?>><?=$i;?></option> - <?php endfor; ?> + <?php + for ($i = 32; $i > 0; $i--) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + ?> </select> </td> </tr> @@ -694,9 +698,15 @@ function dst_rep_change() { <td><input name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>"> / <select name="dstmask" class="formfld" id="dstmask";> - <?php for ($i = 32; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['dstmask']) echo "selected"; ?>><?=$i;?></option> - <?php endfor; ?> + <?php + for ($i = 32; $i > 0; $i--) { + if($i <> 31) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + } + ?> </select> </td> </tr> diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index fb08f17..7e8e174 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -461,16 +461,28 @@ function type_change(enable_change,enable_change_pptp) { <td class="vtable"> <input name="ipaddr" type="text" class="formfld" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>"> / <select name="subnet" class="formfld" id="subnet"> + <?php + for ($i = 32; $i > 0; $i--) { + if($i <> 31) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + } + ?> <?php + /* if (isset($wancfg['ispointtopoint'])) $snmax = 32; else $snmax = 31; for ($i = $snmax; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>> + <?php if(i$ <> 31) ?><option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>><?php end if; ?> <?=$i;?> </option> <?php endfor; ?> + */ + ?> </select></td> </tr><?php if (isset($wancfg['ispointtopoint'])): ?> <tr> diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index e15fa3d..cb38e46 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -143,11 +143,15 @@ function ipaddr_change() { <input name="ipaddr" type="text" class="formfld" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>" onchange="ipaddr_change()"> / <select name="subnet" class="formfld" id="subnet"> - <?php for ($i = 32; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>> - <?=$i;?> - </option> - <?php endfor; ?> + <?php + for ($i = 32; $i > 0; $i--) { + if($i <> 31) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + } + ?> </select></td> </tr> <?php /* Wireless interface? */ diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index c2f4226..4b80cc4 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -243,10 +243,15 @@ function ipaddr_change() { <input name="ipaddr" type="text" class="formfld" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>" onchange="ipaddr_change()"> / <select name="subnet" class="formfld" id="subnet"> - <?php for ($i = 32; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>><?=$i;?></option> - <?php endfor; ?> - </select> + <?php + for ($i = 32; $i > 0; $i--) { + if($i <> 31) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + } + ?> </select> </td> </tr> <?php /* Wireless interface? */ diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index fb08f17..7e8e174 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -461,16 +461,28 @@ function type_change(enable_change,enable_change_pptp) { <td class="vtable"> <input name="ipaddr" type="text" class="formfld" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>"> / <select name="subnet" class="formfld" id="subnet"> + <?php + for ($i = 32; $i > 0; $i--) { + if($i <> 31) { + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected"; + echo ">" . $i . "</option>"; + } + } + ?> <?php + /* if (isset($wancfg['ispointtopoint'])) $snmax = 32; else $snmax = 31; for ($i = $snmax; $i > 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>> + <?php if(i$ <> 31) ?><option value="<?=$i;?>" <?php if ($i == $pconfig['subnet']) echo "selected"; ?>><?php end if; ?> <?=$i;?> </option> <?php endfor; ?> + */ + ?> </select></td> </tr><?php if (isset($wancfg['ispointtopoint'])): ?> <tr> |