Various cleanups for XHTML and so on

diff --git a/enrol/database/config.html b/enrol/database/config.html
index 847f8270693eea7c81b2b178bfe110fdf0e8acfa..089eee6c99b18687fbb0528e7a1d5d396340118b 100644 (file)
--- a/enrol/database/config.html
+++ b/enrol/database/config.html
@@ -1,11 +1,15 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 <tr valign="top">
-       <td align="right"><p>enrol_dbtype:</p></td>
+       <td align="right">enrol_dbtype:</td>
        <td>
-    <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
+    <?php  
+       $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
            $dboptions[$dbtype] = $dbtype;
        }
+       if (!isset($frm->enrol_dbtype)) {
+           $frm->enrol_dbtype = 'mysql';
+       }
        choose_from_menu($dboptions, "enrol_dbtype", $frm->enrol_dbtype, '', '', '');
     ?>
       
@@ -16,9 +20,14 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_dbhost:</p></td>
+       <td align="right">enrol_dbhost:</td>
        <td>
-        <input size="15" type="text" name="enrol_dbhost" value="<?php echo $frm->enrol_dbhost ?>" />
+    <?php 
+        if (!isset($frm->enrol_dbhost)) {
+            $frm->enrol_dbhost = '';
+        } 
+    ?>
+        <input size="15" type="text" name="enrol_dbhost" value="<?php p($frm->enrol_dbhost) ?>" />
     </td>
     <td>
     <?php  print_string("dbhost","enrol_database") ?>
@@ -26,7 +35,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_dbuser:</p></td>
+       <td align="right">enrol_dbuser:</td>
        <td>
         <input size="15" type="text" name="enrol_dbuser" value="<?php echo $frm->enrol_dbuser ?>" />
     </td>
@@ -36,7 +45,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_dbpass:</p></td>
+       <td align="right">enrol_dbpass:</td>
        <td>
         <input size="15" type="text" name="enrol_dbpass" value="<?php echo $frm->enrol_dbpass ?>" />
     </td>
@@ -46,7 +55,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_dbname:</p></td>
+       <td align="right">enrol_dbname:</td>
        <td>
         <input size="15" type="text" name="enrol_dbname" value="<?php echo $frm->enrol_dbname ?>" />
     </td>
@@ -56,7 +65,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_dbtable:</p></td>
+       <td align="right">enrol_dbtable:</td>
        <td>
         <input size="15" type="text" name="enrol_dbtable" value="<?php echo $frm->enrol_dbtable ?>" />
     </td>
@@ -66,7 +75,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_localcoursefield:</p></td>
+       <td align="right">enrol_localcoursefield:</td>
        <td>
         <input size="15" type="text" name="enrol_localcoursefield" value="<?php echo $frm->enrol_localcoursefield ?>" />
     </td>
@@ -76,7 +85,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_localuserfield:</p></td>
+       <td align="right">enrol_localuserfield:</td>
        <td>
         <input size="15" type="text" name="enrol_localuserfield" value="<?php echo $frm->enrol_localuserfield ?>" />
     </td>
@@ -86,7 +95,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_remotecoursefield:</p></td>
+       <td align="right">enrol_remotecoursefield:</td>
        <td>
         <input size="15" type="text" name="enrol_remotecoursefield" value="<?php echo $frm->enrol_remotecoursefield ?>" />
     </td>
@@ -96,7 +105,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_remoteuserfield:</p></td>
+       <td align="right">enrol_remoteuserfield:</td>
        <td>
         <input size="15" type="text" name="enrol_remoteuserfield" value="<?php echo $frm->enrol_remoteuserfield ?>" />
     </td>
@@ -106,7 +115,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_allowinternal:</p></td>
+       <td align="right">enrol_allowinternal:</td>
        <td>
         <input type="checkbox" name="enrol_allowinternal" <?php if ($frm->enrol_allowinternal) echo "checked=\"true\"" ?> />
     </td>

diff --git a/enrol/database/enrol.php b/enrol/database/enrol.php
index 5ab891c436013613df4f1d4b622a6a3f51ef4ffb..65f42edfe8f3a84ea38314af00512aa073f2ba6d 100644 (file)
--- a/enrol/database/enrol.php
+++ b/enrol/database/enrol.php
@@ -116,6 +116,17 @@ function get_access_icons($course) {
 /// Overide the base config_form() function
 function config_form($frm) {
     global $CFG;
+
+    $vars = array('enrol_dbhost', 'enrol_dbuser', 'enrol_dbpass', 
+                  'enrol_dbname', 'enrol_dbtable', 
+                  'enrol_localcoursefield', 'enrol_localuserfield', 
+                  'enrol_remotecoursefield', 'enrol_remoteuserfield',
+                  'enrol_allowinternal');
+    foreach ($vars as $var) {
+        if (!isset($frm->$var)) {
+            $frm->$var = '';
+        } 
+    }
     include("$CFG->dirroot/enrol/database/config.html");
 }
 

diff --git a/enrol/flatfile/config.html b/enrol/flatfile/config.html
index cdb3b0b56c1bbde4472b3db86e5a7adbeb573f1a..0cfed7bcc65a35a0fd9f48323b142d7399c8d9a5 100644 (file)
--- a/enrol/flatfile/config.html
+++ b/enrol/flatfile/config.html
@@ -1,7 +1,7 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top">
-       <td align="right"><p>enrol_flatfilelocation:</p></td>
+       <td align="right">enrol_flatfilelocation:</td>
        <td>
         <input type="text" size="20" name="enrol_flatfilelocation" value="<?php echo $frm->enrol_flatfilelocation ?>" />
     </td>
@@ -11,7 +11,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailstudents:</p></td>
+       <td align="right">enrol_mailstudents:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailstudents" <?php if ($frm->enrol_mailstudents) echo "checked=\"true\"" ?> />
     </td>
@@ -21,7 +21,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailteachers:</p></td>
+       <td align="right">enrol_mailteachers:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailteachers" <?php if ($frm->enrol_mailteachers) echo "checked=\"true\"" ?> />
     </td>
@@ -31,7 +31,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailadmins:</p></td>
+       <td align="right">enrol_mailadmins:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailadmins" <?php if ($frm->enrol_mailadmins) echo "checked=\"true\"" ?> />
     </td>
@@ -41,7 +41,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_allowinternal:</p></td>
+       <td align="right">enrol_allowinternal:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_allowinternal" <?php if ($frm->enrol_allowinternal) echo "checked=\"true\"" ?> />
     </td>

diff --git a/enrol/flatfile/enrol.php b/enrol/flatfile/enrol.php
index df57dbc34c3ee756313caa8ac31c37c7f5ea26ee..8b51a767e5057cc79e0b0706a724642f83dcc38f 100644 (file)
--- a/enrol/flatfile/enrol.php
+++ b/enrol/flatfile/enrol.php
@@ -40,6 +40,13 @@ function check_entry($form, $course) {
 /// Override the base config_form() function
 function config_form($frm) {
     global $CFG;
+
+    $vars = array('enrol_flatfilelocation', 'enrol_mailstudents', 'enrol_mailteachers', 'enrol_mailadmins');
+    foreach ($vars as $var) {
+        if (!isset($frm->$var)) {
+            $frm->$var = '';
+        } 
+    }
     include ("$CFG->dirroot/enrol/flatfile/config.html");    
 }
 

diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html
index dfc2815aa6f5f7071bc694e87ebd9b2a7dcefdb5..7b0b6adabebe13b0dd87e2410c1e6cf10853f65d 100755 (executable)
--- a/enrol/ldap/config.html
+++ b/enrol/ldap/config.html
@@ -1,12 +1,10 @@
 <?php // initialize variables
 
-global $THEME;
-
 // general
 optional_variable($frm->enrol_ldap_host_url, '');
 optional_variable($frm->enrol_ldap_version, '');
 optional_variable($frm->enrol_ldap_bind_dn, '');
-optional_variable($frm->ldap_bind_pw, '');
+optional_variable($frm->enrol_ldap_bind_pw, '');
 // student & teacher enrol
 optional_variable($frm->enrol_ldap_student_contexts, '');
 optional_variable($frm->enrol_ldap_student_memberattribute, '');
@@ -40,8 +38,8 @@ optional_variable($frm->enrol_ldap_template, '');
         <h4><?php print_string("enrol_ldap_server_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-       <td align="right"><P>enrol_ldap_host_url:</td>
+<tr valign="top">
+       <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"]); ?>
@@ -50,8 +48,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_host_url","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-       <td align="right"><P>enrol_ldap_version:</td>
+<tr valign="top">
+       <td align="right">enrol_ldap_version:</td>
        <td>
     <?php
        $versions[2] = "2";
@@ -65,8 +63,8 @@ optional_variable($frm->enrol_ldap_template, '');
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>enrol_ldap_bind_dn:</td>
+<tr valign="top">
+    <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"]); ?>
@@ -75,8 +73,8 @@ optional_variable($frm->enrol_ldap_template, '');
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_bind_pw:</td>
+<tr valign="top">
+    <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?>">
     <?php  if (isset($err["enrol_ldap_bind_pw"])) formerr($err["enrol_ldap_bind_pw"]); ?>
@@ -90,8 +88,8 @@ optional_variable($frm->enrol_ldap_template, '');
         <h4><?php print_string("enrol_ldap_student_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-       <td align="right"><P>enrol_ldap_student_contexts:</td>
+<tr valign="top">
+       <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"]); ?>
@@ -100,8 +98,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_student_contexts","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_student_memberattribute:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -115,8 +113,8 @@ optional_variable($frm->enrol_ldap_template, '');
         <h4><?php print_string("enrol_ldap_teacher_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-       <td align="right"><P>enrol_ldap_teacher_contexts:</td>
+<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?>">
     <?php  if (isset($err["enrol_ldap_teacher_contexts"])) formerr($err["enrol_ldap_teacher_contexts"]); ?>
@@ -125,8 +123,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_teacher_contexts","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_teacher_memberattribute:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -140,8 +138,8 @@ optional_variable($frm->enrol_ldap_template, '');
         <h4><?php print_string("enrol_ldap_course_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>enrol_ldap_objectclass:</td>
+<tr valign="top">
+    <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"]); ?>
@@ -150,8 +148,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_objectclass","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_course_idnumber:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -174,8 +172,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_course_idnumber","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_course_shortname:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -199,8 +197,8 @@ optional_variable($frm->enrol_ldap_template, '');
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_course_fullname:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -224,8 +222,8 @@ optional_variable($frm->enrol_ldap_template, '');
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_course_summary:</td>
+<tr valign="top">
+        <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"]); ?>
@@ -254,8 +252,8 @@ optional_variable($frm->enrol_ldap_template, '');
         <h4><?php print_string("enrol_ldap_autocreation_settings", "enrol_ldap") ?> </h4>
    </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-       <td align="right"><P>enrol_ldap_autocreate:</td>
+<tr valign="top">
+       <td align="right">enrol_ldap_autocreate:</td>
        <td>
     <?php
        choose_from_menu(array('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, "");
@@ -266,8 +264,8 @@ optional_variable($frm->enrol_ldap_template, '');
     <?php  print_string("enrol_ldap_autocreate","enrol_ldap") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_category:</td>
+<tr valign="top">
+        <td align="right">enrol_ldap_category:</td>
         <td>
     <?php
            $displaylist = array();
@@ -282,8 +280,8 @@ optional_variable($frm->enrol_ldap_template, '');
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>enrol_ldap_template:</td>
+<tr valign="top">
+        <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"]); ?>

diff --git a/enrol/paypal/config.html b/enrol/paypal/config.html
index 04a7252d11e6068572605018c62c620aa249dd4b..bf78a985cc9ba51192c29f74c0086b67123d8262 100644 (file)
--- a/enrol/paypal/config.html
+++ b/enrol/paypal/config.html
@@ -1,7 +1,7 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top">
-       <td align="right"><p>enrol_cost:</p></td>
+       <td align="right">enrol_cost:</td>
        <td>
         <input type="text" size="5" name="enrol_cost" value="<?php echo $frm->enrol_cost ?>" />
     </td>
@@ -11,7 +11,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_currency:</p></td>
+       <td align="right">enrol_currency:</td>
        <td>
     <?php choose_from_menu ($paypalcurrencies, "enrol_currency", $frm->enrol_currency, "","", "") ?>
     </td>
@@ -21,7 +21,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_paypalbusiness:</p></td>
+       <td align="right">enrol_paypalbusiness:</td>
        <td>
         <input type="text" name="enrol_paypalbusiness" value="<?php echo $frm->enrol_paypalbusiness ?>" />
     </td>
@@ -31,7 +31,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailstudents:</p></td>
+       <td align="right">enrol_mailstudents:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailstudents" <?php if ($frm->enrol_mailstudents) echo "checked=\"true\"" ?> />
     </td>
@@ -41,7 +41,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailteachers:</p></td>
+       <td align="right">enrol_mailteachers:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailteachers" <?php if ($frm->enrol_mailteachers) echo "checked=\"true\"" ?> />
     </td>
@@ -51,7 +51,7 @@
 </tr>
 
 <tr valign="top">
-       <td align="right"><p>enrol_mailadmins:</p></td>
+       <td align="right">enrol_mailadmins:</td>
        <td>
         <input type="checkbox" value="1" name="enrol_mailadmins" <?php if ($frm->enrol_mailadmins) echo "checked=\"true\"" ?> />
     </td>

diff --git a/enrol/paypal/enrol.php b/enrol/paypal/enrol.php
index 60974aa68f306ea92a8a449266545f3c87b641a5..f17e722e136ee086c794e56f7bcd3253fa173f03 100644 (file)
--- a/enrol/paypal/enrol.php
+++ b/enrol/paypal/enrol.php
@@ -113,6 +113,14 @@ function config_form($frm) {
                                 'AUD' => 'Australian Dollars'
                              );
 
+    $vars = array('enrol_cost', 'enrol_currency', 'enrol_paypalbusiness', 
+                  'enrol_mailstudents', 'enrol_mailteachers', 'enrol_mailadmins');
+    foreach ($vars as $var) {
+        if (!isset($frm->$var)) {
+            $frm->$var = '';
+        } 
+    }
+
     include("$CFG->dirroot/enrol/paypal/config.html");
 }