--- orig/services_captiveportal.php	2012-05-30 23:22:22.000000000 +0200
+++ new/services_captiveportal.php	2012-07-09 16:43:53.000000000 +0200
@@ -309,11 +309,15 @@
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Captive portal"), true, "services_captiveportal.php");
+	$tab_array[] = array(gettext("Univnautes"), false, "pkg_edit.php?xml=univnautes.xml&id=0");
+	$tab_array[] = array(gettext("Univnautes UI"), false, "pkg_edit.php?xml=univnautes_texts.xml&id=0");
+	$tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php");
 	$tab_array[] = array(gettext("Pass-through MAC"), false, "services_captiveportal_mac.php");
-	$tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php");
+	$tab_array[] = array(gettext("Allowed IP"), false, "services_captiveportal_ip.php");
+/* UNIVNAUTES
 	$tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php");	
 	$tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php");
-	$tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php");
+UNIVNAUTES */
 	display_top_tabs($tab_array, true);
 ?>    </td></tr>
   <tr>
@@ -340,6 +344,7 @@
 		</select> <br>
 		<span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal."); ?></span></td>
 	</tr>
+	<!-- UNIVNAUTES
 	<tr>
 	  <td valign="top" class="vncell"><?=gettext("Maximum concurrent connections"); ?></td>
 	  <td class="vtable">
@@ -353,6 +358,7 @@
 "to the captive portal, but rather how many users can load the portal page or authenticate at the same time! " .
 "Possible setting allowed is: minimum 4 connections per client IP address, with a total maximum of 100 connections."); ?></td>
 	</tr>
+	UNIVNAUTES -->
 	<tr>
 	  <td valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td>
 	  <td class="vtable">
@@ -367,6 +373,7 @@
 		<?=gettext("minutes"); ?><br>
 	  <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)."); ?></td>
 	</tr>
+	<!-- UNIVNAUTES
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Pass-through credits allowed per MAC address"); ?></td>
 	  <td width="78%" class="vtable">
@@ -410,6 +417,7 @@
 <?=gettext("If you provide a URL here, clients will be redirected to that URL instead of the one they initially tried " .
 "to access after they've authenticated."); ?></td>
 	</tr>
+	UNIVNAUTES -->
 	<tr>
       <td valign="top" class="vncell"><?=gettext("Concurrent user logins"); ?></td>
       <td class="vtable">
@@ -426,6 +434,7 @@
     "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)."); ?>
     <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used."); ?></td>
 	</tr>
+	<!-- UNIVNAUTES
 	<tr>
       <td valign="top" class="vncell"><?=gettext("Pass-through MAC Auto Entry"); ?></td>
       <td class="vtable">
@@ -668,9 +677,11 @@
         <strong><?=gettext("Enable HTTPS login"); ?></strong><br>
     <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below."); ?></td>
 	  </tr>
+	UNIVNAUTES -->
 	<tr>
       <td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td>
       <td class="vtable">
+	<input name="httpslogin_enable" type="hidden" class="formfld" id="httpslogin_enable" value="yes">
         <input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br>
 	<?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>
 	  </tr>
@@ -695,6 +706,7 @@
         <br>
     <?=gettext("Paste a certificate in X.509 PEM format here."); ?></td>
           </tr>
+	<!-- UNIVNAUTES
 	<tr>
 	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Portal page contents"); ?></td>
 	  <td width="78%" class="vtable">
@@ -762,6 +774,7 @@
 		<?php endif; ?>
 <?=gettext("The contents of the HTML/PHP file that you upload here are displayed on authentication success when the logout popup is enabled."); ?></td>
 	</tr>
+	UNIVNAUTES -->
 	<tr>
 	  <td width="22%" valign="top">&nbsp;</td>
 	  <td width="78%">
