diff --git a/admin/enrol_config.php b/admin/enrol_config.php index 18d59726632..db371b33ddf 100644 --- a/admin/enrol_config.php +++ b/admin/enrol_config.php @@ -45,6 +45,7 @@ admin_externalpage_print_header($adminroot); echo "
frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">"; + echo "
"; echo "sesskey."\" />"; echo ""; @@ -60,12 +61,11 @@ $enrolment->config_form($frm); - echo "

\n"; + echo "

\n"; print_simple_box_end(); + echo "
"; echo "
"; - - admin_externalpage_print_footer($adminroot); exit; diff --git a/enrol/authorize/config_form.php b/enrol/authorize/config_form.php index 97b7c5a0a6a..b3b079e3c23 100755 --- a/enrol/authorize/config_form.php +++ b/enrol/authorize/config_form.php @@ -48,7 +48,7 @@ if (!isset($frm->acceptechecktypes)) { ?> - +
@@ -73,7 +73,7 @@ if (!isset($frm->acceptechecktypes)) { - + - + - + +
@@ -148,23 +148,27 @@ if (!isset($frm->acceptechecktypes)) { foreach ($allpaymentmethods as $key) { if ($key == AN_METHOD_CC) { print_checkbox('acceptmethods[]', AN_METHOD_CC, in_array(AN_METHOD_CC, $paymentmethodsenabled), get_string('method'.AN_METHOD_CC,'enrol_authorize')); - echo("
"); + echo("
"); + echo(""); } elseif ($key == AN_METHOD_ECHECK) { print_checkbox('acceptmethods[]', AN_METHOD_ECHECK, in_array(AN_METHOD_ECHECK, $paymentmethodsenabled), get_string('method'.AN_METHOD_ECHECK,'enrol_authorize')); - echo("
"); + echo("
"); + echo(""); } } ?>
diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php index cd89ebd86ee..1e6883d2fbc 100755 --- a/enrol/authorize/enrol.php +++ b/enrol/authorize/enrol.php @@ -414,14 +414,16 @@ class enrolment_plugin_authorize if (empty($CFG->loginhttps) and substr($CFG->wwwroot, 0, 5) !== 'https') { $a = new stdClass; $a->url = "$CFG->wwwroot/$CFG->admin/settings.php?section=httpsecurity"; - notice(get_string('adminconfighttps', 'enrol_authorize', $a)); + notify(get_string('adminconfighttps', 'enrol_authorize', $a)); + return; // notice breaks the form and xhtml later } elseif (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') { $wwwsroot = qualified_me(); $wwwsroot = str_replace('http:', 'https:', $wwwsroot); $a = new stdClass; $a->url = $wwwsroot; - notice(get_string('adminconfighttpsgo', 'enrol_authorize', $a)); + notify(get_string('adminconfighttpsgo', 'enrol_authorize', $a)); + return; // notice breaks the form and xhtml later } if (!empty($frm->an_review)) { diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index a8c93b5f107..ad428d0aa1a 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -71,7 +71,7 @@ function authorize_print_orders($courseid, $userid) popup_form($baseurl.'&status='.$status.'&course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"\n"; if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) { echo ""; - echo ""; + echo ""; echo ""; } else { @@ -82,8 +82,8 @@ function authorize_print_orders($courseid, $userid) echo ""; $searchmenu = array('id' => $authstrs->orderid, 'transid' => $authstrs->transid); echo ""; echo ""; + echo " =
"; + echo "
"; echo ""; echo ""; echo "
loginhttps: loginhttps) ? "off" : "on"); + echo (empty($CFG->loginhttps) ? "off" : "on"); $a->url = "$CFG->wwwroot/$CFG->admin/settings.php?section=httpsecurity"; echo '
'; print_string("logindesc", "enrol_authorize", $a); ?> @@ -89,24 +89,24 @@ if (!isset($frm->acceptechecktypes)) {
an_login:
an_login)) ? ''.get_string('ok').'' : ''; ?>		an_login:
an_login)) ? ''.get_string('ok').'' : ''; ?>
*
an_tran_key:
an_tran_key)) ? ''.get_string('ok').'' : ''; ?>		an_tran_key:
an_tran_key)) ? ''.get_string('ok').'' : ''; ?>
#1
an_password:
an_password)) ? ''.get_string('ok').'' : ''; ?>		an_password:
an_password)) ? ''.get_string('ok').'' : ''; ?>
#2
delete_current: delete_current)) ?>
-
$strs->search:
"; choose_from_menu($searchmenu, 'searchtype', $searchtype, ''); - echo " = "; - echo "
"; @@ -228,6 +228,7 @@ function authorize_print_order_details($orderno) } echo "
\n"; + echo "
"; echo "\n"; echo ""; @@ -540,6 +541,7 @@ function authorize_print_order_details($orderno) print_table($t2); } } + echo '
'; echo '
'; } diff --git a/enrol/database/config.html b/enrol/database/config.html index 870359df3af..ca2726c49fa 100644 --- a/enrol/database/config.html +++ b/enrol/database/config.html @@ -1,10 +1,10 @@ - +
- + - + - + - + - + - + - - + + + + - + - + - + - + - + - + - + - + - - + + - - - + + +
enrol_dbtype:
enrol_dbhost:
enrol_dbuser: @@ -49,7 +49,7 @@
enrol_dbpass: @@ -59,7 +59,7 @@
enrol_dbname: @@ -69,7 +69,7 @@
enrol_dbtable: @@ -78,10 +78,12 @@
- -
+ +
enrol_localcoursefield: @@ -91,7 +93,7 @@
enrol_localuserfield: @@ -101,7 +103,7 @@
enrol_db_localrolefield: @@ -111,7 +113,7 @@
enrol_remotecoursefield: @@ -121,7 +123,7 @@
enrol_remoteuserfield: @@ -131,7 +133,7 @@
enrol_db_remoterolefield: @@ -146,7 +148,7 @@
enrol_db_defaultcourseroleid:
enrol_db_autocreate:
enrol_db_category:
enrol_db_template:
enrol_db_template: - +
- -
+ +
diff --git a/enrol/flatfile/config.html b/enrol/flatfile/config.html index e6313da352f..ce2571019f8 100644 --- a/enrol/flatfile/config.html +++ b/enrol/flatfile/config.html @@ -1,4 +1,4 @@ - +
diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html index 7f2a8e40ff0..8a37b584538 100644 --- a/enrol/imsenterprise/config.html +++ b/enrol/imsenterprise/config.html @@ -1,10 +1,9 @@ -
enrol_flatfilelocation:
+
- + - - - - - - - get_string('ignore')) + $assignableroles; @@ -135,7 +128,6 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){ } // End loop ?> - @@ -180,8 +172,6 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){ - - @@ -206,4 +196,4 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
: @@ -19,10 +18,9 @@
: + enrol_mailadmins) echo "checked=\"true\"" ?> /> @@ -74,8 +72,6 @@
: @@ -106,11 +102,8 @@ Photo processing is deactivated until we hear from Moodle dev forum about modifi
-

.

+

.

\ No newline at end of file diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html index 3e37f5cf4ec..968c2cf9cb5 100755 --- a/enrol/ldap/config.html +++ b/enrol/ldap/config.html @@ -85,23 +85,23 @@ if (!isset($frm->enrol_ldap_template)) { ?> - +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
enrol_ldap_host_url: - +
enrol_ldap_version: enrol_ldap_template)) {
enrol_ldap_bind_dn: - +
ldap_bind_pw: - +
ldap_search_sub: enrol_ldap_template)) {

enrol_ldap_student_contexts: - +
enrol_ldap_student_memberattribute: - + @@ -185,17 +185,17 @@ if (!isset($frm->enrol_ldap_template)) {
enrol_ldap_teacher_contexts: - +
enrol_ldap_teacher_memberattribute: - + @@ -232,58 +232,58 @@ if (!isset($frm->enrol_ldap_template)) {

enrol_ldap_objectclass: - +
enrol_ldap_course_idnumber: - + -
+

enrol_ldap_course_shortname: - + -
+

@@ -291,24 +291,24 @@ if (!isset($frm->enrol_ldap_template)) {
enrol_ldap_course_fullname: - + -
+

@@ -316,24 +316,24 @@ if (!isset($frm->enrol_ldap_template)) {
enrol_ldap_course_summary: - + -
+

@@ -358,7 +358,7 @@ if (!isset($frm->enrol_ldap_template)) {
enrol_ldap_category: enrol_ldap_template)) {
enrol_ldap_template: - + diff --git a/enrol/mnet/config.html b/enrol/mnet/config.html index d6306593b74..4737c7c1948 100644 --- a/enrol/mnet/config.html +++ b/enrol/mnet/config.html @@ -9,7 +9,7 @@ if (is_array($mnethosts)) { $servercount = count(array_keys($mnethosts)); } ?> - +
diff --git a/enrol/paypal/config.html b/enrol/paypal/config.html index 84f42d0fd26..be03a5c2312 100644 --- a/enrol/paypal/config.html +++ b/enrol/paypal/config.html @@ -1,4 +1,4 @@ -
Local courses for external users:
+
diff --git a/lang/en_utf8/enrol_imsenterprise.php b/lang/en_utf8/enrol_imsenterprise.php index 81a48b1122e..ceda243dec1 100644 --- a/lang/en_utf8/enrol_imsenterprise.php +++ b/lang/en_utf8/enrol_imsenterprise.php @@ -11,7 +11,7 @@ $string['createnewcourses'] = 'Create new (hidden) courses if not found in Moodl $string['createnewusers'] = 'Create user accounts for users not yet registered in Moodle'; $string['cronfrequency'] = 'Frequency of processing'; $string['deleteusers'] = 'Delete user accounts when specified in IMS data'; -$string['description'] = 'This method will repeatedly check for and process a specially-formatted text file in the location that you specify. The file must follow the IMS Enterprise specifications containing person, group, and membership XML elements.'; +$string['description'] = 'This method will repeatedly check for and process a specially-formatted text file in the location that you specify. The file must follow the IMS Enterprise specifications containing person, group, and membership XML elements.'; $string['doitnow'] = 'perform an IMS Enterprise import right now'; $string['enrolname'] = 'IMS Enterprise file'; $string['filelockedmail'] = 'The text file you are using for IMS-file-based enrolments ($a) can not be deleted by the cron process. This usually means the permissions are wrong on it. Please fix the permissions so that Moodle can delete the file, otherwise it might be processed repeatedly.';
enrol_cost: