Commit eac75f21 authored by Rossiani Wijaya's avatar Rossiani Wijaya Committed by Aparup Banerjee
Browse files

MDL-34553 accessibility compliance for authentication: Add forform input text and select tag

parent aa414527
...@@ -94,9 +94,9 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -94,9 +94,9 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_hostname_key', 'auth_cas') ?>:</td> <td align="right"><label for="hostname"><?php print_string('auth_cas_hostname_key', 'auth_cas') ?>: </label></td>
<td> <td>
<input name="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" /> <input name="hostname" id="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" />
<?php if (isset($err['hostname'])) { echo $OUTPUT->error_text($err['hostname']); } ?> <?php if (isset($err['hostname'])) { echo $OUTPUT->error_text($err['hostname']); } ?>
</td> </td>
<td> <td>
...@@ -105,10 +105,10 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -105,10 +105,10 @@ $yesno = array( get_string('no'), get_string('yes') );
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"> <td align="right">
<?php print_string('auth_cas_baseuri_key', 'auth_cas') ?>: <label for="baseuri"><?php print_string('auth_cas_baseuri_key', 'auth_cas') ?>: </label>
</td> </td>
<td> <td>
<input name="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" /> <input name="baseuri" id="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" />
<?php if (isset($err['baseuri'])) { echo $OUTPUT->error_text($err['baseuri']); } ?> <?php if (isset($err['baseuri'])) { echo $OUTPUT->error_text($err['baseuri']); } ?>
</td> </td>
<td> <td>
...@@ -117,10 +117,10 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -117,10 +117,10 @@ $yesno = array( get_string('no'), get_string('yes') );
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"> <td align="right">
<?php print_string('auth_cas_port_key', 'auth_cas') ?>: <label for="port"><?php print_string('auth_cas_port_key', 'auth_cas') ?>: </label>
</td> </td>
<td> <td>
<input name="port" type="text" size="30" value="<?php echo $config->port ?>" /> <input name="port" id="port" type="text" size="30" value="<?php echo $config->port ?>" />
<?php if (isset($err['port'])) { echo $OUTPUT->error_text($err['port']); } ?> <?php if (isset($err['port'])) { echo $OUTPUT->error_text($err['port']); } ?>
</td> </td>
<td> <td>
...@@ -129,7 +129,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -129,7 +129,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"> <td align="right">
<?php print_string('auth_cas_casversion', 'auth_cas') ?>: <?php echo html_writer::label(get_string('auth_cas_casversion', 'auth_cas'), 'menucasversion'); ?>:
</td> </td>
<td> <td>
<?php <?php
...@@ -145,7 +145,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -145,7 +145,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_language_key', 'auth_cas') ?>:</td> <td align="right"><?php echo html_writer::label(get_string('auth_cas_language_key', 'auth_cas'), 'menulanguage'); ?>:</td>
<td> <td>
<?php echo html_writer::select($CASLANGUAGES, 'language', $config->language, false); ?> <?php echo html_writer::select($CASLANGUAGES, 'language', $config->language, false); ?>
</td> </td>
...@@ -155,7 +155,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -155,7 +155,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"> <td align="right">
<?php print_string('auth_cas_proxycas_key', 'auth_cas') ?>: <?php echo html_writer::label(get_string('auth_cas_proxycas_key', 'auth_cas'), 'menuproxycas'); ?>:
</td> </td>
<td> <td>
<?php echo html_writer::select($yesno, 'proxycas', $config->proxycas, false); ?> <?php echo html_writer::select($yesno, 'proxycas', $config->proxycas, false); ?>
...@@ -165,7 +165,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -165,7 +165,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_logoutcas_key', 'auth_cas') ?>:</td> <td align="right"><?php echo html_writer::label(get_string('auth_cas_logoutcas_key', 'auth_cas'), 'menulogoutcas'); ?>:</td>
<td> <td>
<?php echo html_writer::select($yesno, 'logoutcas', $config->logoutcas, false); ?> <?php echo html_writer::select($yesno, 'logoutcas', $config->logoutcas, false); ?>
</td> </td>
...@@ -174,7 +174,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -174,7 +174,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_multiauth_key', 'auth_cas') ?>:</td> <td align="right"><?php echo html_writer::label(get_string('auth_cas_multiauth_key', 'auth_cas'), 'menumultiauth'); ?>:</td>
<td> <td>
<?php echo html_writer::select($yesno, 'multiauth', $config->multiauth, false); ?> <?php echo html_writer::select($yesno, 'multiauth', $config->multiauth, false); ?>
</td> </td>
...@@ -183,7 +183,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -183,7 +183,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_certificate_check_key', 'auth_cas') ?>:</td> <td align="right"><?php echo html_writer::label(get_string('auth_cas_certificate_check_key', 'auth_cas'), 'menucertificate_check'); ?>:</td>
<td> <td>
<?php echo html_writer::select($yesno, 'certificate_check', $config->certificate_check, false); ?> <?php echo html_writer::select($yesno, 'certificate_check', $config->certificate_check, false); ?>
</td> </td>
...@@ -192,7 +192,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -192,7 +192,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_cas_certificate_path_key', 'auth_cas') ?>:</td> <td align="right"><label for="certificate_path"><?php print_string('auth_cas_certificate_path_key', 'auth_cas') ?>: </label></td>
<td> <td>
<input name="certificate_path" id="certificate_path" type="text" size="30" value="<?php echo $config->certificate_path ?>" /> <input name="certificate_path" id="certificate_path" type="text" size="30" value="<?php echo $config->certificate_path ?>" />
<?php if (isset($err['certificate_path'])) echo $OUTPUT->error_text($err['certificate_path']); ?> <?php if (isset($err['certificate_path'])) echo $OUTPUT->error_text($err['certificate_path']); ?>
...@@ -219,7 +219,7 @@ $yesno = array( get_string('no'), get_string('yes') ); ...@@ -219,7 +219,7 @@ $yesno = array( get_string('no'), get_string('yes') );
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><label for="menuversion"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label></td> <td align="right"><label for="menuldap_version"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label></td>
<td> <td>
<?php <?php
$versions = array(); $versions = array();
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("auth_fchost_key", "auth_fc") ?>:</td> <td align="right"><label for="host"><?php print_string("auth_fchost_key", "auth_fc") ?>:</label></td>
<td> <td>
<input name="host" type="text" size="30" value="<?php echo $config->host?>" /> <input name="host" id="host" type="text" size="30" value="<?php echo $config->host?>" />
<?php if (isset($err["host"])) echo $OUTPUT->error_text($err["host"]); ?> <?php if (isset($err["host"])) echo $OUTPUT->error_text($err["host"]); ?>
</td> </td>
<td> <td>
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("auth_fcfppport_key", "auth_fc") ?>:</td> <td align="right"><label for="fppport"><?php print_string("auth_fcfppport_key", "auth_fc") ?>: </label></td>
<td> <td>
<input name="fppport" type="text" size="30" value="<?php echo $config->fppport?>" /> <input name="fppport" id="fppport" type="text" size="30" value="<?php echo $config->fppport?>" />
<?php if (isset($err["fppport"])) echo $OUTPUT->error_text($err["host"]); ?> <?php if (isset($err["fppport"])) echo $OUTPUT->error_text($err["host"]); ?>
</td> </td>
<td> <td>
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("auth_fcuserid_key", "auth_fc") ?>:</td> <td align="right"><label for="userid"><?php print_string("auth_fcuserid_key", "auth_fc") ?>:</label></td>
<td> <td>
<input name="userid" type="text" size="30" maxlength="15" value="<?php echo $config->userid?>" /> <input name="userid" id="userid" type="text" size="30" maxlength="15" value="<?php echo $config->userid?>" />
<?php if (isset($err["userid"])) echo $OUTPUT->error_text($err["userid"]); ?> <?php if (isset($err["userid"])) echo $OUTPUT->error_text($err["userid"]); ?>
</td> </td>
<td> <td>
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
</td> </td>
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("auth_fcpasswd_key", "auth_fc") ?>:</td> <td align="right"><label for="passwd"><?php print_string("auth_fcpasswd_key", "auth_fc") ?>:</label></td>
<td> <td>
<input name="passwd" type="password" size="30" maxlength="12" value="<?php echo $config->passwd?>" /> <input name="passwd" id="passwd" type="password" size="30" maxlength="12" value="<?php echo $config->passwd?>" />
<?php if (isset($err["passwd"])) echo $OUTPUT->error_text($err["passwd"]); ?> <?php if (isset($err["passwd"])) echo $OUTPUT->error_text($err["passwd"]); ?>
</td> </td>
<td> <td>
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("auth_fccreators_key", "auth_fc") ?>:</td> <td align="right"><label for="creators"><?php print_string("auth_fccreators_key", "auth_fc") ?>: </label></td>
<td> <td>
<input name="creators" type="text" size="30" value="<?php echo $config->creators?>" /> <input name="creators" id="creators" type="text" size="30" value="<?php echo $config->creators?>" />
<?php if (isset($err["creators"])) echo $OUTPUT->error_text($err["creators"]); ?> <?php if (isset($err["creators"])) echo $OUTPUT->error_text($err["creators"]); ?>
</td> </td>
<td> <td>
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_fcchangepasswordurl', 'auth_fc') ?>: </td> <td align="right"><label for="changepasswordurl"><?php print_string('auth_fcchangepasswordurl', 'auth_fc') ?>: </label></td>
<td> <td>
<input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" /> <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
<?php <?php
if (isset($err['changepasswordurl'])) { if (isset($err['changepasswordurl'])) {
......
...@@ -18,9 +18,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -18,9 +18,9 @@ if (!isset($config->changepasswordurl)) {
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_imaphost_key', 'auth_imap') ?>: </td> <td align="right"><label for="host"><?php print_string('auth_imaphost_key', 'auth_imap') ?>: </label></td>
<td> <td>
<input name="host" type="text" size="30" value="<?php echo $config->host ?>" /> <input name="host" id="host" type="text" size="30" value="<?php echo $config->host ?>" />
<?php <?php
if (isset($err['host'])) { if (isset($err['host'])) {
...@@ -40,7 +40,7 @@ if (!isset($config->changepasswordurl)) { ...@@ -40,7 +40,7 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_imaptype_key', 'auth_imap') ?>: </td> <td align="right"><?php echo html_writer::label(get_string('auth_imaptype_key', 'auth_imap'), 'menutype'); ?>: </td>
<td> <td>
<?php <?php
...@@ -56,9 +56,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -56,9 +56,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_imapport_key', 'auth_imap') ?>: </td> <td align="right"><label for="port"><?php print_string('auth_imapport_key', 'auth_imap') ?>: </label></td>
<td> <td>
<input name="port" type="text" size="6" value="<?php echo $config->port ?>" /> <input name="port" id="port" type="text" size="6" value="<?php echo $config->port ?>" />
<?php <?php
if (isset($err['port'])) { if (isset($err['port'])) {
...@@ -71,9 +71,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -71,9 +71,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_imapchangepasswordurl_key', 'auth_imap') ?>: </td> <td align="right"><label for="changepasswordurl"><?php print_string('auth_imapchangepasswordurl_key', 'auth_imap') ?>: </label></td>
<td> <td>
<input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" /> <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
<?php <?php
if (isset($err['changepasswordurl'])) { if (isset($err['changepasswordurl'])) {
......
...@@ -118,7 +118,7 @@ $yesno = array(get_string('no'), get_string('yes')); ...@@ -118,7 +118,7 @@ $yesno = array(get_string('no'), get_string('yes'));
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"> <td align="right">
<label for="menuversion"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label> <label for="menuldap_version"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label>
</td> </td>
<td> <td>
<?php <?php
......
...@@ -22,9 +22,9 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' ...@@ -22,9 +22,9 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
<table cellspacing="0" cellpadding="5"> <table cellspacing="0" cellpadding="5">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('rpc_negotiation_timeout', 'auth_mnet'); ?>: </td> <td align="right"><label for="rpc_negotiation_timeout"><?php print_string('rpc_negotiation_timeout', 'auth_mnet'); ?>: </label></td>
<td> <td>
<input name="rpc_negotiation_timeout" type="text" size="5" value="<?php echo $config->rpc_negotiation_timeout ?>" /> <input name="rpc_negotiation_timeout" id="rpc_negotiation_timeout" type="text" size="5" value="<?php echo $config->rpc_negotiation_timeout ?>" />
<?php <?php
if (isset($err['rpc_negotiation_timeout'])) { if (isset($err['rpc_negotiation_timeout'])) {
...@@ -45,7 +45,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' ...@@ -45,7 +45,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
<?php /* <?php /*
See MDL-21327 for why this is commented out See MDL-21327 for why this is commented out
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auto_add_remote_users', 'auth_mnet'); ?>: </td> <td align="right"><?php echo html_writer::label(get_string('auto_add_remote_users', 'auth_mnet'), 'menuauto_add_remote_users'); ?>: </td>
<td> <td>
<?php <?php
......
...@@ -15,9 +15,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -15,9 +15,9 @@ if (!isset($config->changepasswordurl)) {
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_nntphost_key', 'auth_nntp') ?>: </td> <td align="right"><label for="host"><?php print_string('auth_nntphost_key', 'auth_nntp') ?>: </label></td>
<td> <td>
<input name="host" type="text" size="30" value="<?php echo $config->host ?>" /> <input name="host" id="host" type="text" size="30" value="<?php echo $config->host ?>" />
<?php <?php
if (isset($err["host"])) { if (isset($err["host"])) {
...@@ -37,9 +37,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -37,9 +37,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_nntpport_key', 'auth_nntp') ?>: </td> <td align="right"><label for="port"><?php print_string('auth_nntpport_key', 'auth_nntp') ?>: </label></td>
<td> <td>
<input name="port" type="text" size="6" value="<?php echo $config->port ?>" /> <input name="port" id="port" type="text" size="6" value="<?php echo $config->port ?>" />
<?php <?php
if (isset($err["port"])) { if (isset($err["port"])) {
...@@ -52,9 +52,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -52,9 +52,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_nntpchangepasswordurl_key', 'auth_nntp') ?>: </td> <td align="right"><label for="changepasswordurl"><?php print_string('auth_nntpchangepasswordurl_key', 'auth_nntp') ?>: </label></td>
<td> <td>
<input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" /> <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
<?php <?php
if (isset($err['changepasswordurl'])) { if (isset($err['changepasswordurl'])) {
......
...@@ -21,9 +21,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -21,9 +21,9 @@ if (!isset($config->changepasswordurl)) {
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_pop3host_key', 'auth_pop3') ?>: </td> <td align="right"><label for="host"><?php print_string('auth_pop3host_key', 'auth_pop3') ?>: </label></td>
<td> <td>
<input name="host" type="text" size="30" value="<?php echo $config->host ?>" /> <input name="host" id="host" type="text" size="30" value="<?php echo $config->host ?>" />
<?php <?php
if (isset($err['host'])) { if (isset($err['host'])) {
...@@ -43,7 +43,7 @@ if (!isset($config->changepasswordurl)) { ...@@ -43,7 +43,7 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_pop3type_key', 'auth_pop3') ?>: </td> <td align="right"><?php echo html_writer::label(get_string('auth_pop3type_key', 'auth_pop3'), 'menutype'); ?>: </td>
<td> <td>
<?php <?php
...@@ -59,9 +59,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -59,9 +59,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_pop3port_key', 'auth_pop3') ?>: </td> <td align="right"><label for="port"><?php print_string('auth_pop3port_key', 'auth_pop3') ?>: </label></td>
<td> <td>
<input name="port" type="text" size="6" value="<?php echo $config->port ?>" /> <input name="port" id="port" type="text" size="6" value="<?php echo $config->port ?>" />
<?php <?php
if (isset($err['port'])) { if (isset($err['port'])) {
...@@ -74,9 +74,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -74,9 +74,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string('auth_pop3mailbox_key', 'auth_pop3') ?>: </td> <td align="right"><label for="mailbox"><?php print_string('auth_pop3mailbox_key', 'auth_pop3') ?>: </label></td>
<td> <td>
<input name="mailbox" type="text" size="6" value="<?php echo $config->mailbox ?>" /> <input name="mailbox" id="mailbox" type="text" size="6" value="<?php echo $config->mailbox ?>" />
<?php <?php
if (isset($err['mailbox'])) { if (isset($err['mailbox'])) {
...@@ -89,9 +89,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -89,9 +89,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_pop3changepasswordurl_key', 'auth_pop3') ?>: </td> <td align="right"><label for="changepasswordurl"><?php print_string('auth_pop3changepasswordurl_key', 'auth_pop3') ?>: </label></td>
<td> <td>
<input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" /> <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
<?php <?php
if (isset($err['changepasswordurl'])) { if (isset($err['changepasswordurl'])) {
......
...@@ -30,9 +30,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -30,9 +30,9 @@ if (!isset($config->changepasswordurl)) {
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_radiushost_key', 'auth_radius') ?>: </td> <td align="right"><label for="host"><?php print_string('auth_radiushost_key', 'auth_radius') ?>: </label></td>
<td> <td>
<input name="host" type="text" size="30" value="<?php echo $config->host ?>" /> <input name="host" id="host" type="text" size="30" value="<?php echo $config->host ?>" />
<?php <?php
if (isset($err['host'])) { if (isset($err['host'])) {
...@@ -45,9 +45,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -45,9 +45,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_radiusnasport_key', 'auth_radius') ?>: </td> <td align="right"><label for="nasport"><?php print_string('auth_radiusnasport_key', 'auth_radius') ?>: </label></td>
<td> <td>
<input name="nasport" type="text" size="6" value="<?php echo $config->nasport ?>" /> <input name="nasport" id="nasport" type="text" size="6" value="<?php echo $config->nasport ?>" />
<?php <?php
if (isset($err['nasport'])) { if (isset($err['nasport'])) {
...@@ -60,7 +60,7 @@ if (!isset($config->changepasswordurl)) { ...@@ -60,7 +60,7 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top" > <tr valign="top" >
<td align="right"><?php print_string('auth_radiustype_key', 'auth_radius') ?>: </td> <td align="right"><?php echo html_writer::label(get_string('auth_radiustype_key', 'auth_radius'), 'menuradiustype'); ?>: </td>
<td> <td>
<?php <?php
...@@ -82,9 +82,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -82,9 +82,9 @@ if (!isset($config->changepasswordurl)) {
<tr valign="top" > <tr valign="top" >
<td align="right"><?php print_string('auth_radiussecret_key', 'auth_radius') ?>: </td> <td align="right"><label for="secret"><?php print_string('auth_radiussecret_key', 'auth_radius') ?>: </label></td>
<td> <td>
<input name="secret" type="text" size="6" value="<?php echo $config->secret ?>" /> <input name="secret" id="secret" type="text" size="6" value="<?php echo $config->secret ?>" />
<?php <?php
if (isset($err['secret'])) { if (isset($err['secret'])) {
...@@ -97,9 +97,9 @@ if (!isset($config->changepasswordurl)) { ...@@ -97,9 +97,9 @@ if (!isset($config->changepasswordurl)) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string('auth_radiuschangepasswordurl_key', 'auth_radius') ?>: </td> <td align="right"><label for="changepasswordurl"><?php print_string('auth_radiuschangepasswordurl_key', 'auth_radius') ?>: </label></td>
<td> <td>
<input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" /> <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
<?php <?php
if (isset($err['changepasswordurl'])) { if (isset($err['changepasswordurl'])) {
......
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
<table cellspacing="0" cellpadding="5" border="0"> <table cellspacing="0" cellpadding="5" border="0">
<tr valign="top" class="required"> <tr valign="top" class="required">
<td align="right"><?php print_string("username") ?>:</td> <td align="right"><label for="user_attribute"><?php print_string("username") ?>: </label></td>
<td> <td>
<input name="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute ?>" /> <input id="user_attribute" name="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute ?>" />
</td> </td>
<td><?php print_string("auth_shib_username_description", "auth_shibboleth") ?></td> <td><?php print_string("auth_shib_username_description", "auth_shibboleth") ?></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right"><?php print_string("auth_shib_convert_data", "auth_shibboleth") ?>:</td> <td align="right"><label for="convert_data"><?php print_string("auth_shib_convert_data", "auth_shibboleth") ?>: </label></td>
<td> <td>
<input name="convert_data" type="text" size="30" value="<?php echo $config->convert_data?>" /> <input name="convert_data" id="convert_data" type="text" size="30" value="<?php echo $config->convert_data?>" />
<?php <?php
if ($config->convert_data and $config->convert_data != '' and !is_readable($config->convert_data)) { if ($config->convert_data and $config->convert_data != '' and !is_readable($config->convert_data)) {
...@@ -82,9 +82,9 @@ urn:mace:organization2:providerID, Example Organization 2, /Shibboleth.sso/WAYF/ ...@@ -82,9 +82,9 @@ urn:mace:organization2:providerID, Example Organization 2, /Shibboleth.sso/WAYF/
</tr> </tr>
<tr valign="top"> <tr valign="top">