MDL-8290, fix for broken plugins
authortoyomoyo <toyomoyo>
Fri, 9 Feb 2007 07:47:14 +0000 (07:47 +0000)
committertoyomoyo <toyomoyo>
Fri, 9 Feb 2007 07:47:14 +0000 (07:47 +0000)
admin/enrol_config.php
enrol/authorize/config_form.php
enrol/authorize/enrol.php
enrol/authorize/locallib.php
enrol/database/config.html
enrol/flatfile/config.html
enrol/imsenterprise/config.html
enrol/ldap/config.html
enrol/mnet/config.html
enrol/paypal/config.html
lang/en_utf8/enrol_imsenterprise.php

index 18d5972..db371b3 100644 (file)
@@ -45,6 +45,7 @@
     admin_externalpage_print_header($adminroot);
 
     echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    echo "<div>";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
     echo "<input type=\"hidden\" name=\"enrol\" value=\"".$enrol."\" />";
 
 
     $enrolment->config_form($frm);
 
-    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p></center>\n";
+    echo "<p class=\"centerpara\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p>\n";
     print_simple_box_end();
+    echo "</div>";
     echo "</form>";
 
-
-
     admin_externalpage_print_footer($adminroot);
 
     exit;
index 97b7c5a..b3b079e 100755 (executable)
@@ -48,7 +48,7 @@ if (!isset($frm->acceptechecktypes)) {
 
 ?>
 
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 
 <tr valign="top">
     <td colspan="2" align="right"><a href="../enrol/authorize/index.php"><?php print_string("paymentmanagement", "enrol_authorize") ?></a></td>
@@ -73,7 +73,7 @@ if (!isset($frm->acceptechecktypes)) {
 <tr valign="top">
     <td align="right">loginhttps:</td>
     <td><?php
-          echo (empty($CFG->loginhttps) ? "<font color=\"red\"><b>off</b></font>" : "<font color=\"green\">on</font>");
+          echo (empty($CFG->loginhttps) ? "<span style=\"color:red\"><b>off</b></span>" : "<font color=\"green\">on</font>");
           $a->url = "$CFG->wwwroot/$CFG->admin/settings.php?section=httpsecurity";
           echo '<br />'; print_string("logindesc", "enrol_authorize", $a);
         ?>
@@ -89,24 +89,24 @@ if (!isset($frm->acceptechecktypes)) {
 </tr>
 
 <tr valign="top">
-    <td align="right">an_login:<br /><?php echo (isset($mconfig->an_login)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td align="right">an_login:<br /><?php echo (isset($mconfig->an_login)) ? '<span style="color:green">'.get_string('ok').'</span>' : ''; ?></td>
     <td><?php print_string("anlogin", "enrol_authorize") ?><br /><input type="text" name="an_login" size="26" value="" /><sup>*</sup></td>
 </tr>
 
 <tr valign="top">
-    <td align="right">an_tran_key:<br /><?php echo (isset($mconfig->an_tran_key)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td align="right">an_tran_key:<br /><?php echo (isset($mconfig->an_tran_key)) ? '<span style="color:green">'.get_string('ok').'</span>' : ''; ?></td>
     <td><?php print_string("antrankey", "enrol_authorize") ?><br /><input type="text" name="an_tran_key" size="26" value="" /><sup>#1</sup></td>
 </tr>
 
 <tr valign="top">
-    <td align="right">an_password:<br /><?php echo (isset($mconfig->an_password)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td align="right">an_password:<br /><?php echo (isset($mconfig->an_password)) ? '<span style="color:green">'.get_string('ok').'</span>' : ''; ?></td>
     <td><?php print_string("anpassword", "enrol_authorize") ?><br /><input type="text" name="an_password" size="26" value="" /><sup>#2</sup></td>
 </tr>
 
 <tr valign="top">
     <td align="right">delete_current:</td>
     <td><?php print_checkbox('delete_current', '1', !empty($frm->delete_current)) ?> <br />
-        <?php print_string("deletecheck", "moodle", get_string('oldpassword')) ?><br /><hr size="1" width="100%" noshade /></td>
+        <?php print_string("deletecheck", "moodle", get_string('oldpassword')) ?><br /><hr /></td>
 </tr>
 
 <tr valign="top">
@@ -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("<blockquote>");
+            echo("<ul>"); // blockquote breaks <span> and <br> tags 
             $acceptedccs = array_keys(get_list_of_creditcards());
             $allccs = get_list_of_creditcards(true);
             foreach ($allccs as $key => $val) {
-                print_checkbox('acceptccs[]', $key, in_array($key, $acceptedccs), $val); echo "<br />\n";
+                echo "<li>";
+                print_checkbox('acceptccs[]', $key, in_array($key, $acceptedccs), $val);
+                echo "</li>";
             }
-            echo("</blockquote>");
+            echo("</ul>");
         }
         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("<blockquote>");
+            echo("<ul>"); // blockquote breaks <span> and <br> tags 
             $echecktypesenabled = get_list_of_bank_account_types();
             $allechecktypes = get_list_of_bank_account_types(true);
             foreach ($allechecktypes as $key) {
-                print_checkbox('acceptechecktypes[]', $key, in_array($key, $echecktypesenabled), get_string('echeck'.strtolower($key),'enrol_authorize')); echo "<br />\n";
+                echo "<li>";
+                print_checkbox('acceptechecktypes[]', $key, in_array($key, $echecktypesenabled), get_string('echeck'.strtolower($key),'enrol_authorize'));
+                echo "</li>";
             }
-            echo("</blockquote>");
+            echo("</ul>");
         }
     }
     ?><br /></td>
index cd89ebd..1e6883d 100755 (executable)
@@ -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)) {
index a8c93b5..ad428d0 100644 (file)
@@ -71,7 +71,7 @@ function authorize_print_orders($courseid, $userid)
         popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"</td>\n";
         if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) {
             echo "<form method='get' action='uploadcsv.php'>";
-            echo "<td rowspan=2 align='right' valign='middle' width='50%'><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."' /></td>";
+            echo "<td rowspan=2 align='right' valign='middle' width='50%'><fieldset class=\"invisiblefieldset\"><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."' /></fieldset></td>";
             echo "</form>";
         }
         else {
@@ -82,8 +82,8 @@ function authorize_print_orders($courseid, $userid)
         echo "<tr><td>$strs->search: </td>"; $searchmenu = array('id' => $authstrs->orderid, 'transid' => $authstrs->transid);
         echo "<form method='POST' action='index.php' autocomplete='off'>";
         echo "<td colspan=3>"; choose_from_menu($searchmenu, 'searchtype', $searchtype, '');
-        echo " = <input type='text' size='14' name='idortransid' value='' /> ";
-        echo "<input type='submit' value='$strs->search' /></td>";
+        echo " = <fieldset class=\"invisiblefieldset\"><input type='text' size='14' name='idortransid' value='' /> ";
+        echo "<input type='submit' value='$strs->search' /></fieldset></td>";
         echo "</form>";
         echo "</tr>";
         echo "</table>";
@@ -228,6 +228,7 @@ function authorize_print_order_details($orderno)
     }
 
     echo "<form action=\"index.php\" method=\"post\">\n";
+    echo "<div>";
     echo "<input type=\"hidden\" name=\"order\" value=\"$orderno\" />\n";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"" . sesskey() . "\" />";
 
@@ -540,6 +541,7 @@ function authorize_print_order_details($orderno)
             print_table($t2);
         }
     }
+    echo '</div>';
     echo '</form>';
 }
 
index 870359d..ca2726c 100644 (file)
@@ -1,10 +1,10 @@
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 <tr>
 <th colspan="2" scope="col">
     <?php print_string("server_settings", "enrol_database") ?>
 </th>
 </tr>
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbtype:</td>
     <td>
     <?php  
@@ -24,7 +24,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbhost:</td>
     <td>
     <?php 
@@ -39,7 +39,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbuser:</td>
     <td>
         <input size="15" type="text" name="enrol_dbuser" value="<?php echo $frm->enrol_dbuser ?>" />
@@ -49,7 +49,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbpass:</td>
     <td>
         <input size="15" type="text" name="enrol_dbpass" value="<?php echo $frm->enrol_dbpass ?>" />
@@ -59,7 +59,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbname:</td>
     <td>
         <input size="15" type="text" name="enrol_dbname" value="<?php echo $frm->enrol_dbname ?>" />
@@ -69,7 +69,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_dbtable:</td>
     <td>
         <input size="15" type="text" name="enrol_dbtable" value="<?php echo $frm->enrol_dbtable ?>" />
     <?php  print_string("dbtable","enrol_database") ?>
     </td>
 </tr>
-<th colspan="2" scope="col">
-    <?php print_string("field_mapping", "enrol_database") ?>
-</th>
-<tr valign="top">
+<tr>
+    <th colspan="2" scope="col">
+        <?php print_string("field_mapping", "enrol_database") ?>
+    </th>
+</tr>
+<tr>
     <td align="right">enrol_localcoursefield:</td>
     <td>
         <input size="15" type="text" name="enrol_localcoursefield" value="<?php echo $frm->enrol_localcoursefield ?>" />
@@ -91,7 +93,7 @@
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_localuserfield:</td>
     <td>
         <input size="15" type="text" name="enrol_localuserfield" value="<?php echo $frm->enrol_localuserfield ?>" />
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_db_localrolefield:</td>
     <td>
         <input size="15" type="text" name="enrol_db_localrolefield" value="<?php echo $frm->enrol_db_localrolefield ?>" />
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_remotecoursefield:</td>
     <td>
         <input size="15" type="text" name="enrol_remotecoursefield" value="<?php echo $frm->enrol_remotecoursefield ?>" />
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_remoteuserfield:</td>
     <td>
         <input size="15" type="text" name="enrol_remoteuserfield" value="<?php echo $frm->enrol_remoteuserfield ?>" />
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">enrol_db_remoterolefield:</td>
     <td>
         <input size="15" type="text" name="enrol_db_remoterolefield" value="<?php echo $frm->enrol_db_remoterolefield ?>" />
         <?php print_string('roles', 'role') ?>
    </th>
 </tr>
-<tr valign="top">
+<tr>
     <td align="right">enrol_db_defaultcourseroleid:</td>
     <td>
     <?php
         <?php print_string("enrol_database_autocreation_settings", "enrol_database") ?>
    </th>
 </tr>
-<tr valign="top">
+<tr>
     <td align="right">enrol_db_autocreate:</td>
     <td>
     <?php
     <?php  print_string("autocreate","enrol_database") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <td align="right">enrol_db_category:</td>
         <td>
     <?php
     </td>
 </tr>
 
-<tr valign="top">
-        <td align="right">enrol_db_template:</td>
+<tr>
+    <td align="right">enrol_db_template:</td>
         <td>
-    <input name="enrol_db_template" type="text" size="30" value="<?php echo $frm->enrol_db_template?>">
+    <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"]); ?>
     </td><td>
     <?php  print_string("template","enrol_database") ?>
     </td>
 </tr>
-
-<td colspan="2">
-    <?php print_string("general_options", "enrol_database") ?>
-</td>
-
+<tr>
+    <td colspan="2">
+        <?php print_string("general_options", "enrol_database") ?>
+    </td>
+</tr>
 </table>
index e6313da..ce25710 100644 (file)
@@ -1,4 +1,4 @@
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 
 <tr valign="top">
     <td align="right">enrol_flatfilelocation:</td>
index 7f2a8e4..8a37b58 100644 (file)
@@ -1,10 +1,9 @@
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 
 <tr>
-<th colspan="3" scope="col"><?php  print_string("basicsettings", "enrol_imsenterprise") ?></th>
+    <th colspan="3" scope="col"><?php  print_string("basicsettings", "enrol_imsenterprise") ?></th>
 </tr>
 
-
 <tr valign="top">
     <td align="right"><?php  print_string("location", "enrol_imsenterprise") ?>:</td>
     <td colspan="2">
     </td>
 </tr>
 
-
 <tr valign="top">
     <td align="right"><?php  print_string('mailadmins', 'enrol_imsenterprise') ?>:</td>
-    <td width="10">
+    <td style="width:10px">
         <input type="checkbox" value="1" name="enrol_mailadmins" <?php if ($frm->enrol_mailadmins) echo "checked=\"true\"" ?> />
     </td>
     <td>
@@ -74,8 +72,6 @@
     </td>
 </tr>
 
-
-
 <tr valign="top">
     <td align="right"><?php  print_string('sourcedidfallback', 'enrol_imsenterprise') ?>:</td>
     <td>
@@ -106,11 +102,8 @@ Photo processing is deactivated until we hear from Moodle dev forum about modifi
 <td colspan="3"><?php  print_string('imsrolesdescription', 'enrol_imsenterprise') ?></td>
 </tr>
 
-
-
 <?php
 
-
 $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
 $assignableroles = get_assignable_roles($sitecontext);
 $assignableroles = array('0' => get_string('ignore')) + $assignableroles;
@@ -135,7 +128,6 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
 } // End loop
 ?>
 
-
 <tr>
 <th colspan="3" scope="col"><?php  print_string("coursesettings", "enrol_imsenterprise") ?></th>
 </tr>
@@ -180,8 +172,6 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
     </td>
 </tr>
 
-
-
 <tr>
 <th colspan="3" scope="col"><?php  print_string("miscsettings", "enrol_imsenterprise") ?></th>
 </tr>
@@ -206,4 +196,4 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
 
 </table>
 
-<p><i><?php  print_string('aftersaving...', 'enrol_imsenterprise') ?> <a href="../enrol/imsenterprise/importnow.php"><?php  print_string('doitnow', 'enrol_imsenterprise') ?></a>.</i></p>
+<p><i><?php  print_string('aftersaving...', 'enrol_imsenterprise') ?> <a href="../enrol/imsenterprise/importnow.php"><?php  print_string('doitnow', 'enrol_imsenterprise') ?></a>.</i></p>
\ No newline at end of file
index 3e37f5c..968c2cf 100755 (executable)
@@ -85,23 +85,23 @@ if (!isset($frm->enrol_ldap_template)) {
 
 ?>
 
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 <tr>
    <td colspan="2">
         <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top">
+<tr>
     <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?>">
+        <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"]); ?>
     </td>
     <td>
     <?php  print_string("enrol_ldap_host_url","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
     <td align="right">enrol_ldap_version:</td>
     <td>
     <?php
@@ -116,27 +116,27 @@ if (!isset($frm->enrol_ldap_template)) {
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <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?>">
+    <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"]); ?>
     </td><td>
     <?php  print_string("enrol_ldap_bind_dn","enrol_ldap") ?>
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">ldap_bind_pw:</td>
     <td>
-    <input name="enrol_ldap_bind_pw" type="text" size="30" value="<?php echo $frm->enrol_ldap_bind_pw?>">
+    <input name="enrol_ldap_bind_pw" type="text" size="30" value="<?php echo $frm->enrol_ldap_bind_pw?>" />
     <?php  if (isset($err["enrol_ldap_bind_pw"])) formerr($err["enrol_ldap_bind_pw"]); ?>
     </td><td>
     <?php  print_string("enrol_ldap_bind_pw","enrol_ldap") ?>
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
     <td align="right">ldap_search_sub:</td>
     <td>
 <?php
@@ -157,20 +157,20 @@ if (!isset($frm->enrol_ldap_template)) {
         <h4><?php print_string("enrol_ldap_student_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top">
+<tr>
     <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?>">
+    <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"]); ?>
     </td>
     <td>
     <?php  print_string("enrol_ldap_student_contexts","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <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?>">
+    <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"]); ?>
     </td><td>
     <?php  print_string("enrol_ldap_student_memberattribute","enrol_ldap") ?>
@@ -185,17 +185,17 @@ if (!isset($frm->enrol_ldap_template)) {
 <tr valign="top">
     <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?>">
+    <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"]); ?>
     </td>
     <td>
     <?php  print_string("enrol_ldap_teacher_contexts","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <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?>">
+    <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"]); ?>
     </td><td>
     <?php  print_string("enrol_ldap_teacher_memberattribute","enrol_ldap") ?>
@@ -232,58 +232,58 @@ if (!isset($frm->enrol_ldap_template)) {
         <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top">
+<tr>
     <td align="right">enrol_ldap_objectclass:</td>
     <td>
-    <input name=enrol_ldap_objectclass type="text" size="30" value="<?php echo $frm->enrol_ldap_objectclass?>">
+    <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"]); ?>
     </td>
     <td>
     <?php  print_string("enrol_ldap_objectclass","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <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?>">
+    <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"]); ?>
-    <div align="right">
+    <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">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_idnumber_updatelocal ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_idnumber_updatelocal ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_idnumber_updatelocal ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_idnumber_updatelocal ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_idnumber_editlock">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_idnumber_editlock ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_idnumber_editlock ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_idnumber_editlock ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_idnumber_editlock ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select></div>  
     </td><td>
     <?php  print_string("enrol_ldap_course_idnumber","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <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?>">
+    <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"]); ?>
-    <div align="right">
+    <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">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_shortname_updatelocal ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_shortname_updatelocal ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_shortname_updatelocal ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_shortname_updatelocal ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_shortname_editlock">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_shortname_editlock ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_shortname_editlock ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_shortname_editlock ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_shortname_editlock ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select></div>
     </td><td>
@@ -291,24 +291,24 @@ if (!isset($frm->enrol_ldap_template)) {
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
         <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 ?>">
+    <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"]); ?>
-    <div align="right">
+    <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">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_fullname_updatelocal ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_fullname_updatelocal ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_fullname_updatelocal ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_fullname_updatelocal ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_idnumber_editlock">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_fullname_editlock ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_fullname_editlock ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_fullname_editlock ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_fullname_editlock ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select></div>
     </td><td>
@@ -316,24 +316,24 @@ if (!isset($frm->enrol_ldap_template)) {
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
         <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?>">    
+    <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"]); ?>
-    <div align="right">
+    <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">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_summary_updatelocal ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_summary_updatelocal ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_summary_updatelocal ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_summary_updatelocal ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_summary_editlock">
-        <option value="0" <?php echo ($frm->enrol_ldap_course_summary_editlock ? '' : 'selected="yes"') ?> >
+        <option value="0" <?php echo ($frm->enrol_ldap_course_summary_editlock ? '' : 'selected="selected"') ?> >
             <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($frm->enrol_ldap_course_summary_editlock ? 'selected="yes"' : '') ?> >
+        <option value="1" <?php echo ($frm->enrol_ldap_course_summary_editlock ? 'selected="selected"' : '') ?> >
             <?php  print_string("yes") ?></option>
     </select></div>
     </td><td>
@@ -358,7 +358,7 @@ if (!isset($frm->enrol_ldap_template)) {
     <?php  print_string("enrol_ldap_autocreate","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top">
+<tr>
         <td align="right">enrol_ldap_category:</td>
         <td>
     <?php
@@ -374,10 +374,10 @@ if (!isset($frm->enrol_ldap_template)) {
     </td>
 </tr>
 
-<tr valign="top">
+<tr>
         <td align="right">enrol_ldap_template:</td>
         <td>
-    <input name=enrol_ldap_template type="text" size="30" value="<?php echo $frm->enrol_ldap_template?>">
+    <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"]); ?>
     </td><td>
     <?php  print_string("enrol_ldap_template","enrol_ldap") ?>
index d630659..4737c7c 100644 (file)
@@ -9,7 +9,7 @@ if (is_array($mnethosts)) {
     $servercount = count(array_keys($mnethosts));
 }
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 
 <tr valign="top">
     <th align="center" colspan="3">Local courses for external users:</th>
index 84f42d0..be03a5c 100644 (file)
@@ -1,4 +1,4 @@
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
 
 <tr valign="top">
     <td align="right">enrol_cost:</td>
index 81a48b1..ceda243 100644 (file)
@@ -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 <a href=\'../help.php?module=enrol/imsenterprise&file=formatoverview.html\' target=\'_blank\'>IMS Enterprise specifications</a> 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 <a href=\'../help.php?module=enrol/imsenterprise&amp;file=formatoverview.html\'>IMS Enterprise specifications</a> 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.';