diff options
| author | Colin Fleming <cj_fleming@sky.com> | 2013-04-08 20:25:52 +0100 |
|---|---|---|
| committer | Colin Fleming <cj_fleming@sky.com> | 2013-04-08 20:25:52 +0100 |
| commit | 0f3a8925b3cce2c82fd6848e430dd64a90d7837d (patch) | |
| tree | cec3995de055e290efc367f51d804f8b74801c8c /usr/local/www/system_authservers.php | |
| parent | 4fd2fed2ad6672c3be771146048bee61317f3197 (diff) | |
| download | pfsense-0f3a8925b3cce2c82fd6848e430dd64a90d7837d.zip pfsense-0f3a8925b3cce2c82fd6848e430dd64a90d7837d.tar.gz | |
Tidy up "system_authservers.php" XHTML
Add CDATA sections to SCRIPT tags
Update HTML boolean operators
Close INPUT tags
Move TFOOT between THEAD and TBODY, this is a "quirk" of HTML
Deprecate the ampersand in ANCHOR tags
Add missing closing HTML tag
Diffstat (limited to 'usr/local/www/system_authservers.php')
| -rw-r--r-- | usr/local/www/system_authservers.php | 95 |
1 files changed, 48 insertions, 47 deletions
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index 6290a88..5d2183c 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -300,7 +300,7 @@ include("head.inc"); <body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> <script type="text/javascript"> -<!-- +//<![CDATA[ function server_typechange(typ) { @@ -417,7 +417,7 @@ function select_clicked() { if (oWin==null || typeof(oWin)=="undefined") alert("<?=gettext('Popup blocker detected. Action aborted.');?>"); } -//--> +//]]> </script> <?php if ($input_errors) @@ -425,7 +425,7 @@ function select_clicked() { if ($savemsg) print_info_box($savemsg); ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="auth servers"> <tr> <td> <?php @@ -445,7 +445,7 @@ function select_clicked() { <?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"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> <td width="78%" class="vtable"> @@ -466,7 +466,7 @@ function select_clicked() { foreach ($auth_server_types as $typename => $typedesc ): $selected = ""; if ($pconfig['type'] == $typename) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$typename;?>" <?=$selected;?>><?=$typedesc;?></option> <?php endforeach; ?> @@ -479,7 +479,7 @@ function select_clicked() { </tr> </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap" style="display:none"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap" style="display:none" summary=""> <tr> <td colspan="2" class="list" height="12"></td> </tr> @@ -506,7 +506,7 @@ function select_clicked() { foreach ($ldap_urltypes as $urltype => $urlport): $selected = ""; if ($pconfig['ldap_urltype'] == $urltype) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$urltype;?>" <?=$selected;?>><?=$urltype;?></option> <?php endforeach; ?> @@ -522,7 +522,7 @@ function select_clicked() { foreach ($a_ca as $ca): $selected = ""; if ($pconfig['ldap_caref'] == $ca['refid']) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$ca['refid'];?>" <?=$selected;?>><?=$ca['descr'];?></option> <?php endforeach; ?> @@ -542,7 +542,7 @@ function select_clicked() { foreach ($ldap_protvers as $version): $selected = ""; if ($pconfig['ldap_protver'] == $version) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$version;?>" <?=$selected;?>><?=$version;?></option> <?php endforeach; ?> @@ -552,7 +552,7 @@ function select_clicked() { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Search scope");?></td> <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> + <table border="0" cellspacing="0" cellpadding="2" summary="search scope"> <tr> <td><?=gettext("Level:");?> </td> <td> @@ -561,7 +561,7 @@ function select_clicked() { foreach ($ldap_scopes as $scopename => $scopedesc): $selected = ""; if ($pconfig['ldap_scope'] == $scopename) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$scopename;?>" <?=$selected;?>><?=$scopedesc;?></option> <?php endforeach; ?> @@ -581,12 +581,12 @@ function select_clicked() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication containers");?></td> <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> + <table border="0" cellspacing="0" cellpadding="2" summary="auth containers"> <tr> <td><?=gettext("Containers:");?> </td> <td> - <input id="ldapauthcontainers" name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/> - <input type="button" onClick="select_clicked();" value="<?=gettext("Select");?>"> + <input name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/> + <input type="button" onclick="select_clicked();" value="<?=gettext("Select");?>" /> <br /><?=gettext("Note: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.");?> <br /><?=gettext("Example: CN=Users;DC=example");?> <br /><?=gettext("Example: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com ");?> @@ -598,10 +598,10 @@ function select_clicked() { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Extended Query");?></td> <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> + <table border="0" cellspacing="0" cellpadding="2" summary="query"> <tr> <td> - <input name="ldap_extended_enabled" type="checkbox" id="ldap_extended_enabled" value="no" <?php if ($pconfig['ldap_extended_enabled']) echo "checked"; ?> > + <input name="ldap_extended_enabled" type="checkbox" id="ldap_extended_enabled" value="no" <?php if ($pconfig['ldap_extended_enabled']) echo "checked=\"checked\""; ?> /> </td> <td> @@ -615,17 +615,17 @@ function select_clicked() { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Bind credentials");?></td> <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> + <table border="0" cellspacing="0" cellpadding="2" summary="bind credentials"> <tr> <td> - <input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked"; ?> onClick="ldap_bindchange()"> + <input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked=\"checked\""; ?> onclick="ldap_bindchange()" /> </td> <td> <?=gettext("Use anonymous binds to resolve distinguished names");?> </td> </tr> </table> - <table border="0" cellspacing="0" cellpadding="2" id="ldap_bind"> + <table border="0" cellspacing="0" cellpadding="2" id="ldap_bind" summary="bind"> <tr> <td colspan="2"></td> </tr> @@ -653,7 +653,7 @@ function select_clicked() { foreach ($ldap_templates as $tmplname => $tmpldata): $selected = ""; if ($pconfig['ldap_template'] == $tmplname) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$tmplname;?>" <?=$selected;?>><?=$tmpldata['desc'];?></option> <?php endforeach; ?> @@ -681,7 +681,7 @@ function select_clicked() { </tr> </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius" style="display:none"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius" style="display:none" summary=""> <tr> <td colspan="2" class="list" height="12"></td> </tr> @@ -708,7 +708,7 @@ function select_clicked() { foreach ($radius_srvcs as $srvcname => $srvcdesc): $selected = ""; if ($pconfig['radius_srvcs'] == $srvcname) - $selected = "selected"; + $selected = "selected=\"selected\""; ?> <option value="<?=$srvcname;?>" <?=$selected;?>><?=$srvcdesc;?></option> <?php endforeach; ?> @@ -738,7 +738,7 @@ function select_clicked() { </tr> </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary=""> <tr> <td width="22%" valign="top"> </td> <td width="78%"> @@ -753,7 +753,7 @@ function select_clicked() { <?php else: ?> - <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary=""> <thead> <tr> <th width="25%" class="listhdrr"><?=gettext("Server Name");?></th> @@ -762,6 +762,23 @@ function select_clicked() { <th width="10%" class="list"></th> </tr> </thead> + <tfoot> + <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="<?=gettext("add server");?>" alt="<?=gettext("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> + </tfoot> <tbody> <?php $i = 0; @@ -770,17 +787,17 @@ function select_clicked() { $type = htmlspecialchars($auth_server_types[$server['type']]); $host = htmlspecialchars($server['host']); ?> - <tr <?php if ($i < (count($a_server) - 1)): ?> ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'" <?php endif; ?>> + <tr <?php if ($i < (count($a_server) - 1)): ?> ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'" <?php endif; ?>> <td class="listlr"><?=$name?> </td> <td class="listr"><?=$type;?> </td> <td class="listr"><?=$host;?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" class="list nowrap"> <?php if ($i < (count($a_server) - 1)): ?> - <a href="system_authservers.php?act=edit&id=<?=$i;?>"> + <a href="system_authservers.php?act=edit&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit server");?>" alt="<?=gettext("edit server");?>" width="17" height="17" border="0" /> </a> - <a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')"> + <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="<?=gettext("delete server");?>" alt="<?=gettext("delete server");?>" width="17" height="17" border="0" /> </a> <?php endif; ?> @@ -790,23 +807,6 @@ function select_clicked() { $i++; endforeach; ?> </tbody> - <tfoot> - <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="<?=gettext("add server");?>" alt="<?=gettext("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> - </tfoot> </table> <?php endif; ?> @@ -817,7 +817,7 @@ function select_clicked() { </table> <?php include("fend.inc"); ?> <script type="text/javascript"> -<!-- +//<![CDATA[ server_typechange('<?=htmlspecialchars($pconfig['type']);?>'); <?php if (!isset($id) || $pconfig['type'] == "ldap"): ?> ldap_bindchange(); @@ -830,6 +830,7 @@ ldap_tmplchange(); <?php if (!isset($id) || $pconfig['type'] == "radius"): ?> radius_srvcschange(); <?php endif; ?> -//--> +//]]> </script> </body> +</html> |
