Skip to content

Commit

Permalink
MDL-19795 Upgraded calls to link_to_popup_window()
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasconnault committed Aug 20, 2009
1 parent 61867c8 commit 4644e09
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions enrol/database/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
$assignableroles = array('' => get_string('default')) + $assignableroles;

echo $OUTPUT->select(html_select::make($assignableroles, 'enrol_db_defaultcourseroleid', $frm->enrol_db_defaultcourseroleid, false));
if (isset($err['enrol_db_defaultcourseroleid'])) formerr($err['enrol_db_defaultcourseroleid']);
if (isset($err['enrol_db_defaultcourseroleid'])) echo $OUTPUT->error_text($err['enrol_db_defaultcourseroleid']);
?>
</td>
<td>
Expand All @@ -181,7 +181,7 @@
<td>
<?php
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_autocreate", $frm->enrol_db_autocreate, false));
if (isset($err["enrol_db_autocreate"])) formerr($err["enrol_db_autocreate"]);
if (isset($err["enrol_db_autocreate"])) echo $OUTPUT->error_text($err["enrol_db_autocreate"]);
?>
</td>
<td>
Expand All @@ -199,7 +199,7 @@
echo $OUTPUT->select(html_select::make($displaylist, "enrol_db_category", $frm->enrol_db_category, false));

?>
<?php if (isset($err["enrol_db_category"])) formerr($err["enrol_db_category"]); ?>
<?php if (isset($err["enrol_db_category"])) echo $OUTPUT->error_text($err["enrol_db_category"]); ?>
</td><td>
<?php print_string("category","enrol_database") ?>
</td>
Expand All @@ -209,7 +209,7 @@
<td align="right">enrol_db_template:</td>
<td>
<input name="enrol_db_template" type="text" size="30" value="<?php echo $frm->enrol_db_template?>" />
<?php if (isset($err["enrol_db_template"])) formerr($err["enrol_db_template"]); ?>
<?php if (isset($err["enrol_db_template"])) echo $OUTPUT->error_text($err["enrol_db_template"]); ?>
</td><td>
<?php print_string("template","enrol_database") ?>
</td>
Expand All @@ -227,7 +227,7 @@
<?php
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_ignorehiddencourse", $frm->enrol_db_ignorehiddencourse, false));
if (isset($err['enrol_db_ignorehiddencourse'])) {
formerr($err['enrol_db_ignorehiddencourse']);
echo $OUTPUT->error_text($err['enrol_db_ignorehiddencourse']);
}
?>
</td>
Expand All @@ -242,7 +242,7 @@
<?php
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_disableunenrol", $frm->enrol_db_disableunenrol, false));
if (isset($err['enrol_db_disableunenrol'])) {
formerr($err['enrol_db_disableunenrol']);
echo $OUTPUT->error_text($err['enrol_db_disableunenrol']);
}
?>
</td>
Expand Down
34 changes: 17 additions & 17 deletions enrol/ldap/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_host_url:</td>
<td>
<input name="enrol_ldap_host_url" type="text" size="30" value="<?php echo $frm->enrol_ldap_host_url?>" />
<?php if (isset($err["enrol_ldap_host_url"])) formerr($err["enrol_ldap_host_url"]); ?>
<?php if (isset($err["enrol_ldap_host_url"])) echo $OUTPUT->error_text($err["enrol_ldap_host_url"]); ?>
</td>
<td>
<?php print_string("enrol_ldap_host_url","enrol_ldap") ?>
Expand All @@ -109,7 +109,7 @@ <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
$versions[2] = "2";
$versions[3] = "3";
echo $OUTPUT->select(html_select::make($versions, "enrol_ldap_version", $frm->enrol_ldap_version, false));
if (isset($err["enrol_ldap_version"])) formerr($err["enrol_ldap_version"]);
if (isset($err["enrol_ldap_version"])) echo $OUTPUT->error_text($err["enrol_ldap_version"]);
?>
</td>
<td>
Expand All @@ -121,7 +121,7 @@ <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_bind_dn:</td>
<td>
<input name="enrol_ldap_bind_dn" type="text" size="30" value="<?php echo $frm->enrol_ldap_bind_dn?>" />
<?php if (isset($err["enrol_ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
<?php if (isset($err["enrol_ldap_bind_dn"])) echo $OUTPUT->error_text($err["ldap_bind_dn"]); ?>
</td><td>
<?php print_string("enrol_ldap_bind_dn","enrol_ldap") ?>
</td>
Expand All @@ -131,7 +131,7 @@ <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
<td align="right">ldap_bind_pw:</td>
<td>
<input name="enrol_ldap_bind_pw" type="password" size="30" value="<?php echo $frm->enrol_ldap_bind_pw?>" />
<?php if (isset($err["enrol_ldap_bind_pw"])) formerr($err["enrol_ldap_bind_pw"]); ?>
<?php if (isset($err["enrol_ldap_bind_pw"])) echo $OUTPUT->error_text($err["enrol_ldap_bind_pw"]); ?>
</td><td>
<?php print_string("enrol_ldap_bind_pw","enrol_ldap") ?>
</td>
Expand All @@ -146,7 +146,7 @@ <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
$choices["1"] = get_string("yes");
echo $OUTPUT->select(html_select::make ($choices, "enrol_ldap_search_sub", $frm->enrol_ldap_search_sub, false));
?>
<?php if (isset($err["enrol_ldap_search_sub"])) formerr($err["enrol_ldap_search_sub"]); ?>
<?php if (isset($err["enrol_ldap_search_sub"])) echo $OUTPUT->error_text($err["enrol_ldap_search_sub"]); ?>
</td><td>
<?php print_string("enrol_ldap_search_sub","enrol_ldap") ?>
</td>
Expand All @@ -162,7 +162,7 @@ <h4><?php print_string("enrol_ldap_student_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_student_contexts:</td>
<td>
<input name="enrol_ldap_student_contexts" type="text" SIZE="30 "value="<?php echo $frm->enrol_ldap_student_contexts?>" />
<?php if (isset($err["enrol_ldap_student_contexts"])) formerr($err["enrol_ldap_student_contexts"]); ?>
<?php if (isset($err["enrol_ldap_student_contexts"])) echo $OUTPUT->error_text($err["enrol_ldap_student_contexts"]); ?>
</td>
<td>
<?php print_string("enrol_ldap_student_contexts","enrol_ldap") ?>
Expand All @@ -172,7 +172,7 @@ <h4><?php print_string("enrol_ldap_student_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_student_memberattribute:</td>
<td>
<input name="enrol_ldap_student_memberattribute" type="text" size="30" value="<?php echo $frm->enrol_ldap_student_memberattribute?>" />
<?php if (isset($err["enrol_ldap_student_memberattribute"])) formerr($err["enrol_ldap_student_memberattribute"]); ?>
<?php if (isset($err["enrol_ldap_student_memberattribute"])) echo $OUTPUT->error_text($err["enrol_ldap_student_memberattribute"]); ?>
</td><td>
<?php print_string("enrol_ldap_student_memberattribute","enrol_ldap") ?>
</td>
Expand All @@ -187,7 +187,7 @@ <h4><?php print_string("enrol_ldap_teacher_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_teacher_contexts:</td>
<td>
<input name="enrol_ldap_teacher_contexts" type="text" SIZE="30 "value="<?php echo $frm->enrol_ldap_teacher_contexts?>" />
<?php if (isset($err["enrol_ldap_teacher_contexts"])) formerr($err["enrol_ldap_teacher_contexts"]); ?>
<?php if (isset($err["enrol_ldap_teacher_contexts"])) echo $OUTPUT->error_text($err["enrol_ldap_teacher_contexts"]); ?>
</td>
<td>
<?php print_string("enrol_ldap_teacher_contexts","enrol_ldap") ?>
Expand All @@ -197,7 +197,7 @@ <h4><?php print_string("enrol_ldap_teacher_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_teacher_memberattribute:</td>
<td>
<input name="enrol_ldap_teacher_memberattribute" type="text" size="30" value="<?php echo $frm->enrol_ldap_teacher_memberattribute?>" />
<?php if (isset($err["enrol_ldap_teacher_memberattribute"])) formerr($err["enrol_ldap_teacher_memberattribute"]); ?>
<?php if (isset($err["enrol_ldap_teacher_memberattribute"])) echo $OUTPUT->error_text($err["enrol_ldap_teacher_memberattribute"]); ?>
</td><td>
<?php print_string("enrol_ldap_teacher_memberattribute","enrol_ldap") ?>
</td>
Expand Down Expand Up @@ -237,7 +237,7 @@ <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_objectclass:</td>
<td>
<input name="enrol_ldap_objectclass" type="text" size="30" value="<?php echo $frm->enrol_ldap_objectclass?>"/>
<?php if (isset($err["enrol_ldap_objectclass"])) formerr($err["enrol_ldap_objectclass"]); ?>
<?php if (isset($err["enrol_ldap_objectclass"])) echo $OUTPUT->error_text($err["enrol_ldap_objectclass"]); ?>
</td>
<td>
<?php print_string("enrol_ldap_objectclass","enrol_ldap") ?>
Expand All @@ -247,7 +247,7 @@ <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_course_idnumber:</td>
<td>
<input name="enrol_ldap_course_idnumber" type="text" size="30" value="<?php echo $frm->enrol_ldap_course_idnumber?>"/>
<?php if (isset($err["enrol_ldap_course_idnumber"])) formerr($err["enrol_ldap_course_idnumber"]); ?>
<?php if (isset($err["enrol_ldap_course_idnumber"])) echo $OUTPUT->error_text($err["enrol_ldap_course_idnumber"]); ?>
<div style="text-align:right;margin-left:auto;margin-right:0">
<?php print_string("enrol_ldap_updatelocal", "enrol_ldap") ?>
<select name="enrol_ldap_course_idnumber_updatelocal">
Expand All @@ -271,7 +271,7 @@ <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_course_shortname:</td>
<td>
<input name="enrol_ldap_course_shortname" type="text" size="30" value="<?php echo $frm->enrol_ldap_course_shortname?>"/>
<?php if (isset($err["enrol_ldap_course_shortname"])) formerr($err["enrol_ldap_course_shortname"]); ?>
<?php if (isset($err["enrol_ldap_course_shortname"])) echo $OUTPUT->error_text($err["enrol_ldap_course_shortname"]); ?>
<div style="text-align:right;margin-left:auto;margin-right:0">
<?php print_string("enrol_ldap_updatelocal", "enrol_ldap") ?>
<select name="enrol_ldap_course_shortname_updatelocal">
Expand All @@ -296,7 +296,7 @@ <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_course_fullname:</td>
<td>
<input name="enrol_ldap_course_fullname" type="text" size="30" value="<?php echo $frm->enrol_ldap_course_fullname ?>"/>
<?php if (isset($err["enrol_ldap_course_fullname"])) formerr($err["enrol_ldap_course_fullname"]); ?>
<?php if (isset($err["enrol_ldap_course_fullname"])) echo $OUTPUT->error_text($err["enrol_ldap_course_fullname"]); ?>
<div style="text-align:right;margin-left:auto;margin-right:0">
<?php print_string("enrol_ldap_updatelocal", "enrol_ldap") ?>
<select name="enrol_ldap_course_fullname_updatelocal">
Expand All @@ -321,7 +321,7 @@ <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
<td align="right">enrol_ldap_course_summary:</td>
<td>
<input name="enrol_ldap_course_summary" type="text" size="30" value="<?php echo $frm->enrol_ldap_course_summary?>"/>
<?php if (isset($err["enrol_ldap_course_summary"])) formerr($err["enrol_ldap_course_summary"]); ?>
<?php if (isset($err["enrol_ldap_course_summary"])) echo $OUTPUT->error_text($err["enrol_ldap_course_summary"]); ?>
<div style="text-align:right;margin-left:auto;margin-right:0">
<?php print_string("enrol_ldap_updatelocal", "enrol_ldap") ?>
<select name="enrol_ldap_course_summary_updatelocal">
Expand Down Expand Up @@ -352,7 +352,7 @@ <h4><?php print_string("enrol_ldap_autocreation_settings", "enrol_ldap") ?> </h4
<td>
<?php
echo $OUTPUT->select(html_select::make(array('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, false));
if (isset($err["enrol_ldap_autocreate"])) formerr($err["enrol_ldap_autocreate"]);
if (isset($err["enrol_ldap_autocreate"])) echo $OUTPUT->error_text($err["enrol_ldap_autocreate"]);
?>
</td>
<td>
Expand All @@ -369,7 +369,7 @@ <h4><?php print_string("enrol_ldap_autocreation_settings", "enrol_ldap") ?> </h4
echo $OUTPUT->select(html_select::make($displaylist, "enrol_ldap_category", $frm->enrol_ldap_category, false));

?>
<?php if (isset($err["enrol_ldap_category"])) formerr($err["enrol_ldap_category"]); ?>
<?php if (isset($err["enrol_ldap_category"])) echo $OUTPUT->error_text($err["enrol_ldap_category"]); ?>
</td><td>
<?php print_string("enrol_ldap_category","enrol_ldap") ?>
</td>
Expand All @@ -379,7 +379,7 @@ <h4><?php print_string("enrol_ldap_autocreation_settings", "enrol_ldap") ?> </h4
<td align="right">enrol_ldap_template:</td>
<td>
<input name="enrol_ldap_template" type="text" size="30" value="<?php echo $frm->enrol_ldap_template?>" />
<?php if (isset($err["enrol_ldap_template"])) formerr($err["enrol_ldap_template"]); ?>
<?php if (isset($err["enrol_ldap_template"])) echo $OUTPUT->error_text($err["enrol_ldap_template"]); ?>
</td><td>
<?php print_string("enrol_ldap_template","enrol_ldap") ?>
</td>
Expand Down
2 changes: 1 addition & 1 deletion enrol/manual/enrol.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
?>
</p>

<p align="center"><?php if (! empty($this->errormsg)) {formerr($this->errormsg);} ?></p>
<p align="center"><?php if (! empty($this->errormsg)) {echo $OUTPUT->error_text($this->errormsg);} ?></p>


<form method="post" action="enrol.php">
Expand Down

0 comments on commit 4644e09

Please sign in to comment.