From e30001cf1904c47885781f068261f895108fd00b Mon Sep 17 00:00:00 2001
From: Matthew Grooms <mgrooms@pfsense.org>
Date: Tue, 9 Sep 2008 06:55:37 +0000
Subject: Cleanup the tab format of the system user/group/server management
 pages. The edges were square instead of rounded like most pfSense pages. Also
 make sure tabs and cancel buttons are present in the add privilege and add
 certificate pages.

---
 usr/local/www/system_authservers.php | 568 ++++++++++++++++++-----------------
 1 file changed, 285 insertions(+), 283 deletions(-)

(limited to 'usr/local/www/system_authservers.php')

diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 40687cc..12d9564 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -339,7 +339,7 @@ function radius_srvcschange(){
 ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr>
-		<td class="tabnavtbl">
+		<td>
 		<?php
 			$tab_array = array();
 			$tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
@@ -351,301 +351,303 @@ function radius_srvcschange(){
 		</td>
 	</tr>
 	<tr>
-		<td class="tabcont">
-
-			<?php if ($act == "new" || $act == "edit" || $input_errors): ?>
-
-			<form action="system_authservers.php" method="post" name="iform" id="iform">
-				<table width="100%" border="0" cellpadding="6" cellspacing="0">
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
-						<td width="78%" class="vtable">
-							<input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td>
-						<td width="78%" class="vtable">
-							<?php if (!isset($id)): ?>
-							<select name='type' id='type' class="formselect" onchange='server_typechange()'>
-							<?php
-								foreach ($auth_server_types as $typename => $typedesc ):
-									$selected = "";
-									if ($pconfig['type'] == $typename)
-										$selected = "selected";
-							?>
-								<option value="<?=$typename;?>" <?=$selected;?>><?=$typedesc;?></option>
-							<?php endforeach; ?>
-							</select>
-							<?php else: ?>
-							<strong><?=$auth_server_types[$pconfig['type']];?></strong>
-							<input name='type' type='hidden' id='type' value="<?=htmlspecialchars($pconfig['type']);?>"/>
-							<?php endif; ?>
-						</td>
-					</tr>
-				</table>
-
-				<table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap">
-					<tr>
-						<td colspan="2" class="list" height="12"></td>
-					</tr>
-					<tr>
-						<td colspan="2" valign="top" class="listtopic">LDAP Server Settings</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td>
-						<td width="78%" class="vtable">
-							<input name="ldap_host" type="text" class="formfld unknown" id="ldap_host" size="20" value="<?=htmlspecialchars($pconfig['ldap_host']);?>"/>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Port value");?></td>
-						<td width="78%" class="vtable">
-							<input name="ldap_port" type="text" class="formfld unknown" id="ldap_port" size="5" value="<?=htmlspecialchars($pconfig['ldap_port']);?>"/>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Transport");?></td>
-						<td width="78%" class="vtable">
-							<select name='ldap_urltype' id='ldap_urltype' class="formselect" onchange='ldap_urlchange()'>
-							<?php
-								foreach ($ldap_urltypes as $urltype => $urlport):
-									$selected = "";
-									if ($pconfig['ldap_urltype'] == $urltype)
-										$selected = "selected";
-							?>
-								<option value="<?=$urltype;?>" <?=$selected;?>><?=$urltype;?></option>
-							<?php endforeach; ?>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol version");?></td>
-						<td width="78%" class="vtable">
-							<select name='ldap_protver' id='ldap_protver' class="formselect">
-							<?php
-								foreach ($ldap_protvers as $version):
-									$selected = "";
-									if ($pconfig['ldap_protver'] == $version)
-										$selected = "selected";
-							?>
-								<option value="<?=$version;?>" <?=$selected;?>><?=$version;?></option>
-							<?php endforeach; ?>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Search scope");?></td>
-						<td width="78%" class="vtable">
-							<table border="0" cellspacing="0" cellpadding="2">
-								<tr>
-									<td>Level: &nbsp;</td>
-									<td>
-										<select name='ldap_scope' id='ldap_scope' class="formselect">
-										<?php
-											foreach ($ldap_scopes as $scopename => $scopedesc):
-												$selected = "";
-												if ($pconfig['ldap_scope'] == $scopename)
-													$selected = "selected";
-										?>
-											<option value="<?=$scopename;?>" <?=$selected;?>><?=$scopedesc;?></option>
-										<?php endforeach; ?>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<td>Base DN: &nbsp;</td>
-									<td>
-										<input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/>
-									</td>
-								</tr>
-							</table>
-
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Bind credentials");?></td>
-						<td width="78%" class="vtable">
-							<table border="0" cellspacing="0" cellpadding="2">
-								<tr>
-									<td>
-										<input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked"; ?> onClick="ldap_bindchange()">
-									</td>
-									<td>
-										Use anonymous binds to resolve distinguished names
-									</td>
-								</tr>
-							</table>
-							<table border="0" cellspacing="0" cellpadding="2" id="ldap_bind">
-								<tr>
-									<td colspan="2"></td>
-								</tr>
-								<tr>
-									<td>User DN: &nbsp;</td>
-									<td>
-										<input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/>
-									</td>
-								</tr>
-								<tr>
-									<td>Password: &nbsp;</td>
-									<td>
-										<input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<?php if (!isset($id)): ?>
+		<td id="mainarea">
+			<div class="tabcont">
+
+				<?php if ($act == "new" || $act == "edit" || $input_errors): ?>
+
+				<form action="system_authservers.php" method="post" name="iform" id="iform">
+					<table width="100%" border="0" cellpadding="6" cellspacing="0">
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
+							<td width="78%" class="vtable">
+								<input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td>
+							<td width="78%" class="vtable">
+								<?php if (!isset($id)): ?>
+								<select name='type' id='type' class="formselect" onchange='server_typechange()'>
+								<?php
+									foreach ($auth_server_types as $typename => $typedesc ):
+										$selected = "";
+										if ($pconfig['type'] == $typename)
+											$selected = "selected";
+								?>
+									<option value="<?=$typename;?>" <?=$selected;?>><?=$typedesc;?></option>
+								<?php endforeach; ?>
+								</select>
+								<?php else: ?>
+								<strong><?=$auth_server_types[$pconfig['type']];?></strong>
+								<input name='type' type='hidden' id='type' value="<?=htmlspecialchars($pconfig['type']);?>"/>
+								<?php endif; ?>
+							</td>
+						</tr>
+					</table>
+
+					<table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap">
+						<tr>
+							<td colspan="2" class="list" height="12"></td>
+						</tr>
+						<tr>
+							<td colspan="2" valign="top" class="listtopic">LDAP Server Settings</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td>
+							<td width="78%" class="vtable">
+								<input name="ldap_host" type="text" class="formfld unknown" id="ldap_host" size="20" value="<?=htmlspecialchars($pconfig['ldap_host']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Port value");?></td>
+							<td width="78%" class="vtable">
+								<input name="ldap_port" type="text" class="formfld unknown" id="ldap_port" size="5" value="<?=htmlspecialchars($pconfig['ldap_port']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Transport");?></td>
+							<td width="78%" class="vtable">
+								<select name='ldap_urltype' id='ldap_urltype' class="formselect" onchange='ldap_urlchange()'>
+								<?php
+									foreach ($ldap_urltypes as $urltype => $urlport):
+										$selected = "";
+										if ($pconfig['ldap_urltype'] == $urltype)
+											$selected = "selected";
+								?>
+									<option value="<?=$urltype;?>" <?=$selected;?>><?=$urltype;?></option>
+								<?php endforeach; ?>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol version");?></td>
+							<td width="78%" class="vtable">
+								<select name='ldap_protver' id='ldap_protver' class="formselect">
+								<?php
+									foreach ($ldap_protvers as $version):
+										$selected = "";
+										if ($pconfig['ldap_protver'] == $version)
+											$selected = "selected";
+								?>
+									<option value="<?=$version;?>" <?=$selected;?>><?=$version;?></option>
+								<?php endforeach; ?>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Search scope");?></td>
+							<td width="78%" class="vtable">
+								<table border="0" cellspacing="0" cellpadding="2">
+									<tr>
+										<td>Level: &nbsp;</td>
+										<td>
+											<select name='ldap_scope' id='ldap_scope' class="formselect">
+											<?php
+												foreach ($ldap_scopes as $scopename => $scopedesc):
+													$selected = "";
+													if ($pconfig['ldap_scope'] == $scopename)
+														$selected = "selected";
+											?>
+												<option value="<?=$scopename;?>" <?=$selected;?>><?=$scopedesc;?></option>
+											<?php endforeach; ?>
+											</select>
+										</td>
+									</tr>
+									<tr>
+										<td>Base DN: &nbsp;</td>
+										<td>
+											<input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/>
+										</td>
+									</tr>
+								</table>
+
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("Bind credentials");?></td>
+							<td width="78%" class="vtable">
+								<table border="0" cellspacing="0" cellpadding="2">
+									<tr>
+										<td>
+											<input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked"; ?> onClick="ldap_bindchange()">
+										</td>
+										<td>
+											Use anonymous binds to resolve distinguished names
+										</td>
+									</tr>
+								</table>
+								<table border="0" cellspacing="0" cellpadding="2" id="ldap_bind">
+									<tr>
+										<td colspan="2"></td>
+									</tr>
+									<tr>
+										<td>User DN: &nbsp;</td>
+										<td>
+											<input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/>
+										</td>
+									</tr>
+									<tr>
+										<td>Password: &nbsp;</td>
+										<td>
+											<input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<?php if (!isset($id)): ?>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("Initial Template");?></td>
+							<td width="78%" class="vtable">
+								<select name='ldap_tmpltype' id='ldap_tmpltype' class="formselect" onchange='ldap_tmplchange()'>
+								<?php
+									foreach ($ldap_templates as $tmplname => $tmpldata):
+										$selected = "";
+										if ($pconfig['ldap_template'] == $tmplname)
+											$selected = "selected";
+								?>
+									<option value="<?=$tmplname;?>" <?=$selected;?>><?=$tmpldata['desc'];?></option>
+								<?php endforeach; ?>
+								</select>
+							</td>
+						</tr>
+						<?php endif; ?>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("User naming attribute");?></td>
+							<td width="78%" class="vtable">
+								<input name="ldap_attr_user" type="text" class="formfld unknown" id="ldap_attr_user" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_user']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("Group naming attribute");?></td>
+							<td width="78%" class="vtable">
+								<input name="ldap_attr_group" type="text" class="formfld unknown" id="ldap_attr_group" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_group']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("Group member attribute");?></td>
+							<td width="78%" class="vtable">
+								<input name="ldap_attr_member" type="text" class="formfld unknown" id="ldap_attr_member" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_member']);?>"/>
+							</td>
+						</tr>
+					</table>
+
+					<table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius">
+						<tr>
+							<td colspan="2" class="list" height="12"></td>
+						</tr>
+						<tr>
+							<td colspan="2" valign="top" class="listtopic">Radius Server Settings</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td>
+							<td width="78%" class="vtable">
+								<input name="radius_host" type="text" class="formfld unknown" id="radius_host" size="20" value="<?=htmlspecialchars($pconfig['radius_host']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Secret");?></td>
+							<td width="78%" class="vtable">
+								<input name="radius_secret" type="password" class="formfld pwd" id="radius_secret" size="20" value="<?=htmlspecialchars($pconfig['radius_secret']);?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Services offered");?></td>
+							<td width="78%" class="vtable">
+								<select name='radius_srvcs' id='radius_srvcs' class="formselect" onchange='radius_srvcschange()'>
+								<?php
+									foreach ($radius_srvcs as $srvcname => $srvcdesc):
+										$selected = "";
+										if ($pconfig['radius_srvcs'] == $srvcname)
+											$selected = "selected";
+								?>
+									<option value="<?=$srvcname;?>" <?=$selected;?>><?=$srvcdesc;?></option>
+								<?php endforeach; ?>
+								</select>
+							</td>
+						</tr>
+						<tr id="radius_auth">
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication port value");?></td>
+							<td width="78%" class="vtable">
+								<input name="radius_auth_port" type="text" class="formfld unknown" id="radius_auth_port" size="5" value="<?=htmlspecialchars($pconfig['radius_auth_port']);?>"/>
+							</td>
+						</tr>
+						<tr id="radius_acct">
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Accounting port value");?></td>
+							<td width="78%" class="vtable">
+								<input name="radius_acct_port" type="text" class="formfld unknown" id="radius_acct_port" size="5" value="<?=htmlspecialchars($pconfig['radius_acct_port']);?>"/>
+							</td>
+						</tr>
+					</table>
+
+					<table width="100%" border="0" cellpadding="6" cellspacing="0">
+						<tr>
+							<td width="22%" valign="top">&nbsp;</td>
+							<td width="78%">
+								<input id="submit" name="save" type="submit" class="formbtn" value="Save" />
+								<?php if (isset($id) && $a_server[$id]): ?>
+								<input name="id" type="hidden" value="<?=$id;?>" />
+								<?php endif;?>
+							</td>
+						</tr>
+					</table>
+				</form>
+
+				<?php else: ?>
+
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Initial Template");?></td>
-						<td width="78%" class="vtable">
-							<select name='ldap_tmpltype' id='ldap_tmpltype' class="formselect" onchange='ldap_tmplchange()'>
-							<?php
-								foreach ($ldap_templates as $tmplname => $tmpldata):
-									$selected = "";
-									if ($pconfig['ldap_template'] == $tmplname)
-										$selected = "selected";
-							?>
-								<option value="<?=$tmplname;?>" <?=$selected;?>><?=$tmpldata['desc'];?></option>
-							<?php endforeach; ?>
-							</select>
-						</td>
+						<td width="25%" class="listhdrr">Server Name</td>
+						<td width="25%" class="listhdrr">Type</td>
+						<td width="35%" class="listhdrr">Host Name</td>
+						<td width="10%" class="list"></td>
 					</tr>
-					<?php endif; ?>
-					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("User naming attribute");?></td>
-						<td width="78%" class="vtable">
-							<input name="ldap_attr_user" type="text" class="formfld unknown" id="ldap_attr_user" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_user']);?>"/>
+					<?php
+						$i = 0;
+						foreach($a_server as $server):
+							$name = htmlspecialchars($server['name']);
+							$type = htmlspecialchars($auth_server_types[$server['type']]);
+							$host = htmlspecialchars($server['host']);
+					?>
+					<tr ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'">
+						<td class="listlr"><?=$name?>&nbsp;</td>
+						<td class="listr"><?=$type;?>&nbsp;</td>
+						<td class="listr"><?=$host;?>&nbsp;</td>
+						<td valign="middle" nowrap class="list">
+							<a href="system_authservers.php?act=edit&id=<?=$i;?>">
+								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit server" alt="edit server" width="17" height="17" border="0" />
+							</a>
+							&nbsp;
+							<a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')">
+								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete server" alt="delete server" width="17" height="17" border="0" />
+							</a>
 						</td>
 					</tr>
+					<?php
+							$i++;
+						endforeach;
+					?>
 					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Group naming attribute");?></td>
-						<td width="78%" class="vtable">
-							<input name="ldap_attr_group" type="text" class="formfld unknown" id="ldap_attr_group" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_group']);?>"/>
+						<td class="list" colspan="3"></td>
+						<td class="list">
+							<a href="system_authservers.php?act=new">
+								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add server" alt="add server" width="17" height="17" border="0" />
+							</a>
 						</td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Group member attribute");?></td>
-						<td width="78%" class="vtable">
-							<input name="ldap_attr_member" type="text" class="formfld unknown" id="ldap_attr_member" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_member']);?>"/>
+						<td colspan="3">
+							<p>
+								<?=gettext("Additional authentication servers can be added here.");?>
+							</p>
 						</td>
 					</tr>
 				</table>
 
-				<table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius">
-					<tr>
-						<td colspan="2" class="list" height="12"></td>
-					</tr>
-					<tr>
-						<td colspan="2" valign="top" class="listtopic">Radius Server Settings</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td>
-						<td width="78%" class="vtable">
-							<input name="radius_host" type="text" class="formfld unknown" id="radius_host" size="20" value="<?=htmlspecialchars($pconfig['radius_host']);?>"/>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Secret");?></td>
-						<td width="78%" class="vtable">
-							<input name="radius_secret" type="password" class="formfld pwd" id="radius_secret" size="20" value="<?=htmlspecialchars($pconfig['radius_secret']);?>"/>
-						</td>
-					</tr>
-					<tr>
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Services offered");?></td>
-						<td width="78%" class="vtable">
-							<select name='radius_srvcs' id='radius_srvcs' class="formselect" onchange='radius_srvcschange()'>
-							<?php
-								foreach ($radius_srvcs as $srvcname => $srvcdesc):
-									$selected = "";
-									if ($pconfig['radius_srvcs'] == $srvcname)
-										$selected = "selected";
-							?>
-								<option value="<?=$srvcname;?>" <?=$selected;?>><?=$srvcdesc;?></option>
-							<?php endforeach; ?>
-							</select>
-						</td>
-					</tr>
-					<tr id="radius_auth">
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication port value");?></td>
-						<td width="78%" class="vtable">
-							<input name="radius_auth_port" type="text" class="formfld unknown" id="radius_auth_port" size="5" value="<?=htmlspecialchars($pconfig['radius_auth_port']);?>"/>
-						</td>
-					</tr>
-					<tr id="radius_acct">
-						<td width="22%" valign="top" class="vncellreq"><?=gettext("Accounting port value");?></td>
-						<td width="78%" class="vtable">
-							<input name="radius_acct_port" type="text" class="formfld unknown" id="radius_acct_port" size="5" value="<?=htmlspecialchars($pconfig['radius_acct_port']);?>"/>
-						</td>
-					</tr>
-				</table>
-
-				<table width="100%" border="0" cellpadding="6" cellspacing="0">
-					<tr>
-						<td width="22%" valign="top">&nbsp;</td>
-						<td width="78%">
-							<input id="submit" name="save" type="submit" class="formbtn" value="Save" />
-							<?php if (isset($id) && $a_server[$id]): ?>
-							<input name="id" type="hidden" value="<?=$id;?>" />
-							<?php endif;?>
-						</td>
-					</tr>
-				</table>
-			</form>
-
-			<?php else: ?>
-
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td width="25%" class="listhdrr">Server Name</td>
-					<td width="25%" class="listhdrr">Type</td>
-					<td width="35%" class="listhdrr">Host Name</td>
-					<td width="10%" class="list"></td>
-				</tr>
-				<?php
-					$i = 0;
-					foreach($a_server as $server):
-						$name = htmlspecialchars($server['name']);
-						$type = htmlspecialchars($auth_server_types[$server['type']]);
-						$host = htmlspecialchars($server['host']);
-				?>
-				<tr ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'">
-					<td class="listlr"><?=$name?>&nbsp;</td>
-					<td class="listr"><?=$type;?>&nbsp;</td>
-					<td class="listr"><?=$host;?>&nbsp;</td>
-					<td valign="middle" nowrap class="list">
-						<a href="system_authservers.php?act=edit&id=<?=$i;?>">
-							<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit server" alt="edit server" width="17" height="17" border="0" />
-						</a>
-						&nbsp;
-						<a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')">
-							<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete server" alt="delete server" width="17" height="17" border="0" />
-						</a>
-					</td>
-				</tr>
-				<?php
-						$i++;
-					endforeach;
-				?>
-				<tr>
-					<td class="list" colspan="3"></td>
-					<td class="list">
-						<a href="system_authservers.php?act=new">
-							<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add server" alt="add server" width="17" height="17" border="0" />
-						</a>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						<p>
-							<?=gettext("Additional authentication servers can be added here.");?>
-						</p>
-					</td>
-				</tr>
-			</table>
-
-			<?php endif; ?>
+				<?php endif; ?>
 
+			</div>
 		</td>
 	</tr>
 </table>
-- 
cgit v1.1