Project

General

Profile

« Previous | Next » 

Revision d7fe2e7a

Added by Michael Newton over 12 years ago

properly separate accounting options from general RADIUS options
cleanup whitespace

View differences:

usr/local/www/services_captiveportal.php
728 728
			<tr>
729 729
			  <td colspan="2" class="list" height="12"></td>
730 730
			</tr>
731
			<tr>
732
				<td colspan="2" valign="top" class="optsect_t2"><?=gettext("Reauthentication"); ?></td>
733
			</tr>
734
			<tr>
735
				<td class="vncell">&nbsp;</td>
736
				<td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>>
737
			  <strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br>
738
			  <?=gettext("If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is " .
739
			  "logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately."); ?></td>
740
			</tr>
741 731
			<tr>
742 732
			  <td class="vncell" valign="top"><?=gettext("Accounting updates"); ?></td>
743 733
			  <td class="vtable">
......
750 740
			  <td colspan="2" class="list" height="12"></td>
751 741
			</tr>
752 742
			<tr>
753
				<td colspan="2" valign="top" class="optsect_t2"><?=gettext("RADIUS MAC authentication"); ?></td>
743
				<td colspan="2" valign="top" class="listtopic"><?=gettext("RADIUS options"); ?></td>
754 744
			</tr>
755 745
			<tr>
756
				<td class="vncell">&nbsp;</td>
757
				<td class="vtable">
746
				<td class="vncell"><?=gettext("Reauthentication"); ?></td>
747
				<td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>>
748
				<strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br>
749
				<?=gettext("If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is " .
750
				"logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately."); ?></td>
751
			</tr>
752
			<tr>
753
				<td class=""><?=gettext("RADIUS MAC authentication"); ?></td>
754
				<td class="">
758 755
				<input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong><?=gettext("Enable RADIUS MAC authentication"); ?></strong><br>
759 756
				<?=gettext("If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password " .
760 757
				"entered below to the RADIUS server."); ?></td>
761 758
			</tr>
762 759
			<tr>
763
				<td class="vncell"><?=gettext("Shared secret"); ?></td>
760
				<td class="vncell"><?=gettext("MAC authentication secret"); ?></td>
764 761
				<td class="vtable"><input name="radmac_secret" type="text" class="formfld unknown" id="radmac_secret" size="16" value="<?=htmlspecialchars($pconfig['radmac_secret']);?>"></td>
765 762
			</tr>
766
			<tr>
767
			  <td colspan="2" class="list" height="12"></td>
768
			</tr>
769
			<tr>
770
				<td colspan="2" valign="top" class="listtopic"><?=gettext("RADIUS options"); ?></td>
771
			</tr>
772

  
773 763
			<tr>
774 764
				<td class="vncell" valign="top"><?=gettext("RADIUS NAS IP attribute"); ?></td>
775 765
				<td class="vtable">
......
840 830
				<td class="vtable"><input name="radiusnasid" type="text" class="formfld unknown" id="radiusnasid" value="<?=htmlspecialchars($pconfig['radiusnasid']);?>"/><br/>
841 831
				<?=gettext("Specify a NAS identifier to override the default value") . " " . php_uname("n"); ?></td>
842 832
			</tr>
833
			<tr>
834
				<td class="vncell" valign="top"><?=gettext("MAC address format"); ?></td>
835
				<td class="vtable">
836
					<select name="radmac_format" id="radmac_format">
837
						<option value="default"><?php echo gettext("default"); ?></option>
838
						<?php
839
						$macformats = array("singledash","ietf","cisco","unformatted");
840
						foreach ($macformats as $macformat) {
841
							if ($pconfig['radmac_format'] == $macformat) {
842
								echo "<option selected value=\"$macformat\">",gettext($macformat),"</option>\n";
843
							} else {
844
								echo "<option value=\"$macformat\">",gettext($macformat),"</option>\n";
845
							}
846
						}
847
						?>
848
					</select></br>
849
					<?=gettext("This option changes the MAC address format used in the whole RADIUS system. Change this if you also"); ?>
850
					<?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br>
851
					<?=gettext("default:"); ?> 00:11:22:33:44:55<br>
852
					<?=gettext("singledash:"); ?> 001122-334455<br>
853
					<?=gettext("ietf:"); ?> 00-11-22-33-44-55<br>
854
					<?=gettext("cisco:"); ?> 0011.2233.4455<br>
855
					<?=gettext("unformatted:"); ?> 001122334455
856
				</td>
857
			</tr>
843 858
		</table>
844 859
	</tr>
845
    <tr>
846
        <td class="vncell" valign="top"><?=gettext("MAC address format"); ?></td>
847
        <td class="vtable">
848
        <select name="radmac_format" id="radmac_format">
849
        <option value="default"><?php echo gettext("default"); ?></option>
850
        <?php
851
        $macformats = array("singledash","ietf","cisco","unformatted");
852
        foreach ($macformats as $macformat) {
853
            if ($pconfig['radmac_format'] == $macformat)
854
                echo "<option selected value=\"$macformat\">",gettext($macformat),"</option>\n";
855
            else
856
                echo "<option value=\"$macformat\">",gettext($macformat),"</option>\n";
857
        }
858
        ?>
859
        </select></br>
860
        <?=gettext("This option changes the MAC address format used in the whole RADIUS system. Change this if you also"); ?>
861
        <?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br>
862
        <?=gettext("default:"); ?> 00:11:22:33:44:55<br>
863
        <?=gettext("singledash:"); ?> 001122-334455<br>
864
        <?=gettext("ietf:"); ?> 00-11-22-33-44-55<br>
865
        <?=gettext("cisco:"); ?> 0011.2233.4455<br>
866
        <?=gettext("unformatted:"); ?> 001122334455
867
    </tr>
868 860
	<tr>
869
      <td valign="top" class="vncell"><?=gettext("HTTPS login"); ?></td>
870
      <td class="vtable">
871
        <input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>>
872
        <strong><?=gettext("Enable HTTPS login"); ?></strong><br>
873
    <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name and certificate must also be specified below."); ?></td>
861
		<td valign="top" class="vncell"><?=gettext("HTTPS login"); ?></td>
862
		<td class="vtable">
863
			<input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>>
864
			<strong><?=gettext("Enable HTTPS login"); ?></strong><br>
865
			<?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name and certificate must also be specified below."); ?></td>
874 866
	</tr>
875 867
	<tr>
876
      <td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td>
877
      <td class="vtable">
878
        <input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br>
879
	<?php printf(gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on %s."), $g['product_name']);?> </td>
868
		<td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td>
869
		<td class="vtable">
870
			<input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br>
871
			<?php printf(gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on %s."), $g['product_name']);?> </td>
880 872
	</tr>
881 873
	<tr id="ssl_opts">
882 874
		<td width="22%" valign="top" class="vncell"><?=gettext("SSL Certificate"); ?></td>

Also available in: Unified diff