Project

General

Profile

« Previous | Next » 

Revision ee1fb205

Added by Jim Pingle over 12 years ago

Add description to additional DHCP pools. Implements #2733

View differences:

usr/local/www/services_dhcp.php
163 163
		if (!is_array($dhcpdconf['staticmap']))
164 164
			$dhcpdconf['staticmap'] = array();
165 165
		$a_maps = &$dhcpdconf['staticmap'];
166
	} else {
167
		// Options that exist only in pools
168
		$pconfig['descr'] = $dhcpdconf['descr'];
166 169
	}
167 170

  
168 171
	// Options that can be global or per-pool.
......
401 404
				mwexec("/bin/rm -rf /var/dhcpd/var/db/*");
402 405
			$dhcpdconf['failover_peerip'] = $_POST['failover_peerip'];
403 406
			$dhcpdconf['dhcpleaseinlocaltime'] = $_POST['dhcpleaseinlocaltime'];
407
		} else {
408
			// Options that exist only in pools
409
			$dhcpdconf['descr'] = $_POST['descr'];
404 410
		}
405 411

  
406 412
		// Options that can be global or per-pool.
......
547 553
			enable_over = true;
548 554
		<?php endif; ?>
549 555
		endis = !(document.iform.enable.checked || enable_over);
556
		<?php if (is_numeric($pool) || ($act == "newpool")): ?>
557
			document.iform.descr.disabled = endis;
558
		<?php endif; ?>
550 559
		document.iform.range_from.disabled = endis;
551 560
		document.iform.range_to.disabled = endis;
552 561
		document.iform.wins1.disabled = endis;
......
690 699
				<strong><?=gettext("Deny unknown clients");?></strong><br>
691 700
				<?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?></td>
692 701
			</tr>
702
			<?php if (is_numeric($pool) || ($act == "newpool")): ?>
703
				<tr>
704
				<td width="22%" valign="top" class="vncell"><?=gettext("Pool Description");?></td>
705
				<td width="78%" class="vtable">
706
					<input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>">
707
				</td>
708
				</tr>
709
			<?php endif; ?>
693 710
			<tr>
694 711
			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet");?></td>
695 712
			<td width="78%" class="vtable">
......
761 778
				<?php echo gettext("If you need additional pools of addresses inside of this subnet outside the above Range, they may be specified here."); ?>
762 779
				<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
763 780
				<tr>
764
					<td width="45%" class="listhdrr"><?=gettext("Pool Start");?></td>
765
					<td width="45%" class="listhdrr"><?=gettext("Pool End");?></td>
781
					<td width="35%" class="listhdrr"><?=gettext("Pool Start");?></td>
782
					<td width="35%" class="listhdrr"><?=gettext("Pool End");?></td>
783
					<td width="20%" class="listhdrr"><?=gettext("Description");?></td>
766 784
					<td width="10%" class="list">
767 785
					<table border="0" cellspacing="0" cellpadding="1">
768 786
					<tr>
......
782 800
				<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&pool=<?=$i;?>';">
783 801
					<?=htmlspecialchars($poolent['range']['to']);?>&nbsp;
784 802
				</td>
803
				<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&pool=<?=$i;?>';">
804
					<?=htmlspecialchars($poolent['descr']);?>&nbsp;
805
				</td>
785 806
				<td valign="middle" nowrap class="list">
786 807
					<table border="0" cellspacing="0" cellpadding="1">
787 808
					<tr>
......
795 816
				<?php $i++; endforeach; ?>
796 817
				<?php endif; ?>
797 818
				<tr>
798
				<td class="list" colspan="2"></td>
819
				<td class="list" colspan="3"></td>
799 820
				<td class="list">
800 821
					<table border="0" cellspacing="0" cellpadding="1">
801 822
					<tr>

Also available in: Unified diff