diff options
author | Jim P <jim@pingle.org> | 2011-12-01 11:04:58 -0800 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2011-12-01 11:04:58 -0800 |
commit | 538ff13d095ede7c2bd1a2ccd77151d95c791064 (patch) | |
tree | 6eccd38c939aa9b85d444a25a3e87e39c29d028c /usr/local | |
parent | a9a5b9570f0c7c05e4ad98eede0978827b818185 (diff) | |
parent | a2578c27479c1afad0dfbeb6dba484adcc10473a (diff) | |
download | pfsense-538ff13d095ede7c2bd1a2ccd77151d95c791064.zip pfsense-538ff13d095ede7c2bd1a2ccd77151d95c791064.tar.gz |
Merge pull request #25 from AnthonyWrather/master
DHCP IPv4 / IPv6 next-server, filename, and root-path improvements.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/services_dhcp.php | 4 | ||||
-rwxr-xr-x | usr/local/www/services_dhcp_edit.php | 19 | ||||
-rw-r--r-- | usr/local/www/services_dhcpv6.php | 4 | ||||
-rw-r--r-- | usr/local/www/services_dhcpv6_edit.php | 17 |
4 files changed, 31 insertions, 13 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index e818738..77a20e5 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -145,7 +145,7 @@ if (is_array($config['dhcpd'][$if])){ $pconfig['tftp'] = $config['dhcpd'][$if]['tftp']; $pconfig['ldap'] = $config['dhcpd'][$if]['ldap']; $pconfig['netboot'] = isset($config['dhcpd'][$if]['netboot']); - $pconfig['nextserver'] = $config['dhcpd'][$if]['next-server']; + $pconfig['nextserver'] = $config['dhcpd'][$if]['nextserver']; $pconfig['filename'] = $config['dhcpd'][$if]['filename']; $pconfig['rootpath'] = $config['dhcpd'][$if]['rootpath']; $pconfig['failover_peerip'] = $config['dhcpd'][$if]['failover_peerip']; @@ -367,7 +367,7 @@ if ($_POST) { $config['dhcpd'][$if]['tftp'] = $_POST['tftp']; $config['dhcpd'][$if]['ldap'] = $_POST['ldap']; $config['dhcpd'][$if]['netboot'] = ($_POST['netboot']) ? true : false; - $config['dhcpd'][$if]['next-server'] = $_POST['nextserver']; + $config['dhcpd'][$if]['nextserver'] = $_POST['nextserver']; $config['dhcpd'][$if]['filename'] = $_POST['filename']; $config['dhcpd'][$if]['rootpath'] = $_POST['rootpath']; diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index 15e1fee..2869ba2 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -87,12 +87,14 @@ if (isset($id) && $a_maps[$id]) { $pconfig['mac'] = $a_maps[$id]['mac']; $pconfig['hostname'] = $a_maps[$id]['hostname']; $pconfig['ipaddr'] = $a_maps[$id]['ipaddr']; - $pconfig['netbootfile'] = $a_maps[$id]['netbootfile']; + $pconfig['filename'] = $a_maps[$id]['filename']; + $pconfig['rootpath'] = $a_maps[$id]['rootpath']; $pconfig['descr'] = $a_maps[$id]['descr']; } else { $pconfig['mac'] = $_GET['mac']; $pconfig['hostname'] = $_GET['hostname']; - $pconfig['netbootfile'] = $_GET['netbootfile']; + $pconfig['filename'] = $_GET['filename']; + $pconfig['rootpath'] = $_GET['rootpath']; $pconfig['descr'] = $_GET['descr']; } @@ -166,7 +168,8 @@ if ($_POST) { $mapent['ipaddr'] = $_POST['ipaddr']; $mapent['hostname'] = $_POST['hostname']; $mapent['descr'] = $_POST['descr']; - $mapent['netbootfile'] = $_POST['netbootfile']; + $mapent['filename'] = $_POST['filename']; + $mapent['rootpath'] = $_POST['rootpath']; if (isset($id) && $a_maps[$id]) $a_maps[$id] = $mapent; @@ -232,11 +235,17 @@ include("head.inc"); </tr> <?php if($netboot_enabled) { ?> <tr> - <td width="22%" valign="top" class="vncell">Netboot filename</td> + <td width="22%" valign="top" class="vncell">Netboot Filename</td> <td width="78%" class="vtable"> - <input name="netbootfile" type="text" class="formfld unknown" id="netbootfile" size="20" value="<?=htmlspecialchars($pconfig['netbootfile']);?>"> + <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"> <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td> </tr> + <tr> + <td width="22%" valign="top" class="vncell">Root Path</td> + <td width="78%" class="vtable"> + <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"> + <br> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td> + </tr> <?php } ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php index 267f051..42c3255 100644 --- a/usr/local/www/services_dhcpv6.php +++ b/usr/local/www/services_dhcpv6.php @@ -113,7 +113,7 @@ if (is_array($config['dhcpdv6'][$if])){ $pconfig['tftp'] = $config['dhcpdv6'][$if]['tftp']; $pconfig['ldap'] = $config['dhcpdv6'][$if]['ldap']; $pconfig['netboot'] = isset($config['dhcpdv6'][$if]['netboot']); - $pconfig['nextserver'] = $config['dhcpdv6'][$if]['next-server']; + $pconfig['nextserver'] = $config['dhcpdv6'][$if]['nextserver']; $pconfig['filename'] = $config['dhcpdv6'][$if]['filename']; $pconfig['rootpath'] = $config['dhcpdv6'][$if]['rootpath']; $pconfig['failover_peerip'] = $config['dhcpdv6'][$if]['failover_peerip']; @@ -305,7 +305,7 @@ if ($_POST) { $config['dhcpdv6'][$if]['tftp'] = $_POST['tftp']; $config['dhcpdv6'][$if]['ldap'] = $_POST['ldap']; $config['dhcpdv6'][$if]['netboot'] = ($_POST['netboot']) ? true : false; - $config['dhcpdv6'][$if]['next-server'] = $_POST['nextserver']; + $config['dhcpdv6'][$if]['nextserver'] = $_POST['nextserver']; $config['dhcpdv6'][$if]['filename'] = $_POST['filename']; $config['dhcpdv6'][$if]['rootpath'] = $_POST['rootpath']; diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php index 61f060e..e219af8 100644 --- a/usr/local/www/services_dhcpv6_edit.php +++ b/usr/local/www/services_dhcpv6_edit.php @@ -87,12 +87,14 @@ if (isset($id) && $a_maps[$id]) { $pconfig['duid'] = $a_maps[$id]['duid']; $pconfig['hostname'] = $a_maps[$id]['hostname']; $pconfig['ipaddrv6'] = $a_maps[$id]['ipaddrv6']; - $pconfig['netbootfile'] = $a_maps[$id]['netbootfile']; + $pconfig['filename'] = $a_maps[$id]['filename']; + $pconfig['rootpath'] = $a_maps[$id]['rootpath']; $pconfig['descr'] = $a_maps[$id]['descr']; } else { $pconfig['duid'] = $_GET['duid']; $pconfig['hostname'] = $_GET['hostname']; - $pconfig['netbootfile'] = $_GET['netbootfile']; + $pconfig['filename'] = $_GET['filename']; + $pconfig['rootpath'] = $a_maps[$id]['rootpath']; $pconfig['descr'] = $_GET['descr']; } @@ -148,7 +150,8 @@ if ($_POST) { $mapent['ipaddrv6'] = $_POST['ipaddrv6']; $mapent['hostname'] = $_POST['hostname']; $mapent['descr'] = $_POST['descr']; - $mapent['netbootfile'] = $_POST['netbootfile']; + $mapent['filename'] = $_POST['filename']; + $mapent['rootpath'] = $_POST['rootpath']; if (isset($id) && $a_maps[$id]) $a_maps[$id] = $mapent; @@ -211,9 +214,15 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell">Netboot filename</td> <td width="78%" class="vtable"> - <input name="netbootfile" type="text" class="formfld unknown" id="netbootfile" size="28" value="<?=htmlspecialchars($pconfig['netbootfile']);?>"> + <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>"> <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td> </tr> + <tr> + <td width="22%" valign="top" class="vncell">Root Path</td> + <td width="78%" class="vtable"> + <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"> + <br> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td> + </tr> <?php } ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> |