diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html
deleted file mode 100644
index 56ba350..0000000
--- a/enrol/imsenterprise/config.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<table cellspacing="0" cellpadding="5" border="0" class="boxaligncenter">
-
-<tr>
-    <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">
-        <input type="text" size="50" name="enrol_imsfilelocation" value="<?php echo ($frm->enrol_imsfilelocation ? $frm->enrol_imsfilelocation : '') ?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string("logtolocation", "enrol_imsenterprise") ?>:</td>
-    <td colspan="2">
-        <input type="text" size="50" name="enrol_logtolocation" value="<?php echo ($frm->enrol_logtolocation ? $frm->enrol_logtolocation : '') ?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('mailadmins', 'enrol_imsenterprise') ?>:</td>
-    <td style="width:10px">
-        <input type="checkbox" value="1" name="enrol_mailadmins" <?php if ($frm->enrol_mailadmins) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-
-    </td>
-</tr>
-
-<tr>
-<th colspan="3" scope="col"><?php  print_string("usersettings", "enrol_imsenterprise") ?></th>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('createnewusers', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_createnewusers" <?php if ($frm->enrol_createnewusers) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('createnewusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('deleteusers', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_imsdeleteusers" <?php if ($frm->enrol_imsdeleteusers) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('deleteusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('fixcaseusernames', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_fixcaseusernames" <?php if ($frm->enrol_fixcaseusernames) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('fixcasepersonalnames', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_fixcasepersonalnames" <?php if ($frm->enrol_fixcasepersonalnames) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('sourcedidfallback', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_imssourcedidfallback" <?php if ($frm->enrol_imssourcedidfallback) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('sourceddidfallback', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-<!--
-Photo processing is deactivated until we hear from Moodle dev forum about modification to gdlib.
-
-<tr valign="top">
-    <td align="right"><?php  print_string('processphoto', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_processphoto" <?php if ($frm->enrol_processphoto) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-        <?php  print_string('processphotowarning', 'enrol_imsenterprise') ?>
-    </td>
-</tr>
--->
-<tr>
-<td colspan="3" ><?php  print_string('roles') ?></td>
-</tr>
-
-<tr>
-<td colspan="3"><?php  print_string('imsrolesdescription', 'enrol_imsenterprise') ?></td>
-</tr>
-
-<?php
-
-$sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$assignableroles = get_assignable_roles($sitecontext);
-$assignableroles = array('0' => get_string('ignore')) + $assignableroles;
-
-foreach($this->imsroles as $imsrolenum=>$imsrolename){
-?>
-<tr valign="top">
-    <td align="right">&quot;<?php echo $imsrolename ?>&quot;&nbsp;(<?php echo $imsrolenum ?>):</td>
-    <td>
-    <?php
-
-        $configref = "enrol_imse_imsrolemap" . $imsrolenum;
-
-        echo html_writer::select($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum,
-           strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), false);
-    ?>
-    </td>
-    <td>
-    </td>
-</tr>
-<?php
-} // End loop
-?>
-
-<tr>
-<th colspan="3" scope="col"><?php  print_string("coursesettings", "enrol_imsenterprise") ?></th>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('truncatecoursecodes', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="text" <?php echo 'value="'.intval($frm->enrol_truncatecoursecodes).'"' ?> name="enrol_truncatecoursecodes" size="3" maxlength="3" />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('truncatecoursecodes', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('createnewcourses', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_createnewcourses" <?php if ($frm->enrol_createnewcourses) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('createnewcourses', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('createnewcategories', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_createnewcategories" <?php if ($frm->enrol_createnewcategories) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('categorisation', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('allowunenrol', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_imsunenrol" <?php if ($frm->enrol_imsunenrol) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('unenrol', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr>
-<th colspan="3" scope="col"><?php  print_string("miscsettings", "enrol_imsenterprise") ?></th>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('restricttarget', 'enrol_imsenterprise') ?>:</td>
-    <td colspan="2">
-        <input type="text" <?php echo 'value="'.htmlspecialchars($frm->enrol_imsrestricttarget).'"' ?> name="enrol_imsrestricttarget" size="20" maxlength="32" />
-    <?php echo $OUTPUT->old_help_icon('target', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><?php  print_string('usecapitafix', 'enrol_imsenterprise') ?>:</td>
-    <td>
-        <input type="checkbox" value="1" name="enrol_imscapitafix" <?php if ($frm->enrol_imscapitafix) echo "checked=\"checked\"" ?> />
-    </td>
-    <td>
-    <?php echo $OUTPUT->old_help_icon('capita', 'More detail about this option', 'enrol/imsenterprise'); ?>
-    </td>
-</tr>
-
-</table>
-
-<p><i><?php  print_string('aftersaving...', 'enrol_imsenterprise') ?> <a href="../enrol/imsenterprise/importnow.php"><?php  print_string('doitnow', 'enrol_imsenterprise') ?></a>.</i></p>
diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
deleted file mode 100644
index 1575f28..0000000
--- a/enrol/imsenterprise/enrol.php
+++ /dev/null
@@ -1,878 +0,0 @@
-<?php
-/**
-* @author Dan Stowell
-* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
-* @package enrol_imsenterprise
-*/
-require_once($CFG->dirroot.'/group/lib.php');
-
-// The following flags are set in the configuration
-// $CFG->enrol_imsfilelocation:        where is the file we are looking for?
-// $CFG->enrol_logtolocation:          if you want to store a log of processing, specify filepath here
-// $CFG->enrol_allowinternal:          allow internal enrolment in courses
-// $CFG->enrol_emailadmins:            email a notification to the admin
-// $CFG->enrol_createnewusers:         should this script create user accounts for those who don't seem to be registered yet?
-// $CFG->enrol_imsdeleteusers:         should this script mark user accounts as deleted, if the data requests this?
-// $CFG->enrol_fixcaseusernames:       whether to force all usernames to lowercase
-// $CFG->enrol_fixcasepersonalnames:   convert personal names, e.g. from "TOM VEK" to "Tom Vek"
-// $CFG->enrol_truncatecoursecodes:    if this number is greater than zero, truncate the codes found in the IMS data to the given number of characters
-// $CFG->enrol_imsunenrol:             allow this script to UNENROL students/tutors from courses (if the data marks them as having left the course)
-// $CFG->enrol_createnewcourses:       should this script create a (hidden, empty) course for any course that doesn't seem to have been registered yet?
-// $CFG->enrol_createnewcategories:    should this script create a (hidden) category if Moodle doesn't have one by the same name as the desired one?
-// $CFG->enrol_imssourcedidfallback:   some systems don't output a <userid> element (contrary to the specifications). If this is the case, activating this setting will cause us to use the <sourcedid><id> element instead as the userid. This may or may not be desirable in your situation.
-// $CFG->enrol_includephoto:           Process IMS <photo> tag to create user photo. Be warned that this may add significant server load.
-
-/*
-
-Note for programmers:
-
-This class uses regular expressions to mine the data file. The main reason is
-that XML handling changes from PHP 4 to PHP 5, so this should work on both.
-
-One drawback is that the pattern-matching doesn't (currently) handle XML
-namespaces - it only copes with a <group> tag if it says <group>, and not
-(for example) <ims:group>.
-
-This should also be able to handle VERY LARGE FILES - so the entire IMS file is
-NOT loaded into memory at once. It's handled line-by-line, 'forgetting' tags as
-soon as they are processed.
-
-N.B. The "sourcedid" ID code is translated to Moodle's "idnumber" field, both
-for users and for courses.
-
-*/
-
-
-class enrolment_plugin_imsenterprise {
-
-    var $log;
-
-// The "roles" hard-coded in the IMS specification are:
-var $imsroles = array(
-'01'=>'Learner',
-'02'=>'Instructor',
-'03'=>'Content Developer',
-'04'=>'Member',
-'05'=>'Manager',
-'06'=>'Mentor',
-'07'=>'Administrator',
-'08'=>'TeachingAssistant',
-);
-// PLEASE NOTE: It may seem odd that "Content Developer" has a space in it
-// but "TeachingAssistant" doesn't. That's what the spec says though!!!
-
-
-/**
-* This function is only used when first setting up the plugin, to
-* decide which role assignments to recommend by default.
-* For example, IMS role '01' is 'Learner', so may map to 'student' in Moodle.
-*/
-function determine_default_rolemapping($imscode) {
-    global $DB;
-
-    switch($imscode) {
-        case '01':
-        case '04':
-            $shortname = 'student';
-            break;
-        case '06':
-        case '08':
-            $shortname = 'teacher';
-            break;
-        case '02':
-        case '03':
-            $shortname = 'editingteacher';
-            break;
-        case '05':
-        case '07':
-            $shortname = 'admin';
-            break;
-        default:
-            return 0; // Zero for no match
-    }
-    return $DB->get_field('role', 'id', array('shortname'=>$shortname));
-}
-
-
-
-/// Override the base config_form() function
-function config_form($frm) {
-    global $CFG, $OUTPUT, $imsroles;
-
-    $vars = array('enrol_imsfilelocation', 'enrol_logtolocation', 'enrol_createnewusers', 'enrol_fixcaseusernames', 'enrol_fixcasepersonalnames', 'enrol_truncatecoursecodes',
-            'enrol_createnewcourses', 'enrol_createnewcategories', 'enrol_createnewusers', 'enrol_mailadmins',
-            'enrol_imsunenrol', 'enrol_imssourcedidfallback', 'enrol_imscapitafix', 'enrol_imsrestricttarget', 'enrol_imsdeleteusers',
-            'enrol_imse_imsrolemap01','enrol_imse_imsrolemap02','enrol_imse_imsrolemap03','enrol_imse_imsrolemap04',
-            'enrol_imse_imsrolemap05','enrol_imse_imsrolemap06','enrol_imse_imsrolemap07','enrol_imse_imsrolemap08');
-    foreach ($vars as $var) {
-        if (!isset($frm->$var)) {
-            $frm->$var = '';
-        }
-    }
-    include ("$CFG->dirroot/enrol/imsenterprise/config.html");
-}
-
-
-/// Override the base process_config() function
-function process_config($config) {
-
-    if (!isset($config->enrol_imsfilelocation)) {
-        $config->enrol_imsfilelocation = '';
-    }
-    set_config('enrol_imsfilelocation', $config->enrol_imsfilelocation);
-
-    if (!isset($config->enrol_logtolocation)) {
-        $config->enrol_logtolocation = '';
-    }
-    set_config('enrol_logtolocation', $config->enrol_logtolocation);
-
-    if (!isset($config->enrol_fixcaseusernames)) {
-        $config->enrol_fixcaseusernames = '';
-    }
-    set_config('enrol_fixcaseusernames', $config->enrol_fixcaseusernames);
-
-    if (!isset($config->enrol_fixcasepersonalnames)) {
-        $config->enrol_fixcasepersonalnames = '';
-    }
-    set_config('enrol_fixcasepersonalnames', $config->enrol_fixcasepersonalnames);
-
-    if (!isset($config->enrol_truncatecoursecodes)) {
-        $config->enrol_truncatecoursecodes = 0;
-    }
-    set_config('enrol_truncatecoursecodes', intval($config->enrol_truncatecoursecodes));
-
-    if (!isset($config->enrol_createnewcourses)) {
-        $config->enrol_createnewcourses = '';
-    }
-    set_config('enrol_createnewcourses', $config->enrol_createnewcourses);
-
-    if (!isset($config->enrol_createnewcategories)) {
-        $config->enrol_createnewcategories = '';
-    }
-    set_config('enrol_createnewcategories', $config->enrol_createnewcategories);
-
-    if (!isset($config->enrol_createnewusers)) {
-        $config->enrol_createnewusers = '';
-    }
-    set_config('enrol_createnewusers', $config->enrol_createnewusers);
-
-    if (!isset($config->enrol_imsdeleteusers)) {
-        $config->enrol_imsdeleteusers = '';
-    }
-    set_config('enrol_imsdeleteusers', $config->enrol_imsdeleteusers);
-
-    if (!isset($config->enrol_mailadmins)) {
-        $config->enrol_mailadmins = '';
-    }
-    set_config('enrol_mailadmins', $config->enrol_mailadmins);
-
-    if (!isset($config->enrol_imsunenrol)) {
-        $config->enrol_imsunenrol = '';
-    }
-    set_config('enrol_imsunenrol', $config->enrol_imsunenrol);
-
-    if (!isset($config->enrol_imssourcedidfallback)) {
-        $config->enrol_imssourcedidfallback = '';
-    }
-    set_config('enrol_imssourcedidfallback', $config->enrol_imssourcedidfallback);
-
-    if (!isset($config->enrol_imscapitafix)) {
-        $config->enrol_imscapitafix = '';
-    }
-    set_config('enrol_imscapitafix', $config->enrol_imscapitafix);
-
-    //Antoni Mas. 07/12/2005. Incloem la opci de la foto dels usuaris
-    if (!isset($config->enrol_processphoto)) {
-        $config->enrol_processphoto = '';
-    }
-    set_config('enrol_processphoto', $config->enrol_processphoto);
-
-    if (!isset($config->enrol_imsrestricttarget)) {
-        $config->enrol_imsrestricttarget = '';
-    }
-    set_config('enrol_imsrestricttarget', $config->enrol_imsrestricttarget);
-
-
-
-    foreach($this->imsroles as $imsrolenum=>$imsrolename){
-        $configref = 'enrol_imse_imsrolemap' . $imsrolenum;
-        if (!isset($config->$configref)) {
-            echo "<p>Resetting config->$configref</p>";
-            $config->$configref = 0;
-        }
-        set_config('enrol_imse_imsrolemap' . $imsrolenum, $config->$configref);
-    }
-
-
-    set_config('enrol_ims_prev_md5',  ''); // Forget the MD5 - to force re-processing if we change the config setting
-    set_config('enrol_ims_prev_time', ''); // Ditto
-    return true;
-
-}
-
-function get_access_icons($course){}
-
-/**
-* Read in an IMS Enterprise file.
-* Originally designed to handle v1.1 files but should be able to handle
-* earlier types as well, I believe.
-*
-*/
-function cron() {
-    global $CFG;
-
-    if (empty($CFG->enrol_imsfilelocation)) {
-        // $filename = "$CFG->dirroot/enrol/imsenterprise/example.xml";  // Default location
-        $filename = "$CFG->dataroot/1/imsenterprise-enrol.xml";  // Default location
-    } else {
-        $filename = $CFG->enrol_imsfilelocation;
-    }
-
-    $this->logfp = false; // File pointer for writing log data to
-    if(!empty($CFG->enrol_logtolocation)) {
-        $this->logfp = fopen($CFG->enrol_logtolocation, 'a');
-    }
-
-
-
-    if ( file_exists($filename) ) {
-        @set_time_limit(0);
-        $starttime = time();
-
-        $this->log_line('----------------------------------------------------------------------');
-        $this->log_line("IMS Enterprise enrol cron process launched at " . userdate(time()));
-        $this->log_line('Found file '.$filename);
-        $this->xmlcache = '';
-
-        // Make sure we understand how to map the IMS-E roles to Moodle roles
-        $this->load_role_mappings();
-
-        $md5 = md5_file($filename); // NB We'll write this value back to the database at the end of the cron
-        $filemtime = filemtime($filename);
-
-        // Decide if we want to process the file (based on filepath, modification time, and MD5 hash)
-        // This is so we avoid wasting the server's efforts processing a file unnecessarily
-        if(empty($CFG->enrol_ims_prev_path)  || ($filename != $CFG->enrol_ims_prev_path)){
-            $fileisnew = true;
-        }elseif(isset($CFG->enrol_ims_prev_time) && ($filemtime <= $CFG->enrol_ims_prev_time)){
-            $fileisnew = false;
-            $this->log_line('File modification time is not more recent than last update - skipping processing.');
-        }elseif(isset($CFG->enrol_ims_prev_md5) && ($md5 == $CFG->enrol_ims_prev_md5)){
-            $fileisnew = false;
-            $this->log_line('File MD5 hash is same as on last update - skipping processing.');
-        }else{
-            $fileisnew = true; // Let's process it!
-        }
-
-        if($fileisnew){
-
-            $listoftags = array('group', 'person', 'member', 'membership', 'comments', 'properties'); // The list of tags which should trigger action (even if only cache trimming)
-            $this->continueprocessing = true; // The <properties> tag is allowed to halt processing if we're demanding a matching target
-
-            // FIRST PASS: Run through the file and process the group/person entries
-            if (($fh = fopen($filename, "r")) != false) {
-
-                $line = 0;
-                while ((!feof($fh)) && $this->continueprocessing) {
-
-                    $line++;
-                    $curline = fgets($fh);
-                    $this->xmlcache .= $curline; // Add a line onto the XML cache
-
-                    while(true){
-                      // If we've got a full tag (i.e. the most recent line has closed the tag) then process-it-and-forget-it.
-                      // Must always make sure to remove tags from cache so they don't clog up our memory
-                      if($tagcontents = $this->full_tag_found_in_cache('group', $curline)){
-                          $this->process_group_tag($tagcontents);
-                          $this->remove_tag_from_cache('group');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('person', $curline)){
-                          $this->process_person_tag($tagcontents);
-                          $this->remove_tag_from_cache('person');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('membership', $curline)){
-                          $this->process_membership_tag($tagcontents);
-                          $this->remove_tag_from_cache('membership');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('comments', $curline)){
-                          $this->remove_tag_from_cache('comments');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('properties', $curline)){
-                          $this->process_properties_tag($tagcontents);
-                          $this->remove_tag_from_cache('properties');
-                      }else{
-                    break;
-                  }
-                } // End of while-tags-are-detected
-                } // end of while loop
-                fclose($fh);
-                fix_course_sortorder();
-            } // end of if(file_open) for first pass
-
-            /*
-
-
-            SECOND PASS REMOVED
-            Since the IMS specification v1.1 insists that "memberships" should come last,
-            and since vendors seem to have done this anyway (even with 1.0),
-            we can sensibly perform the import in one fell swoop.
-
-
-            // SECOND PASS: Now go through the file and process the membership entries
-            $this->xmlcache = '';
-            if (($fh = fopen($filename, "r")) != false) {
-                $line = 0;
-                while ((!feof($fh)) && $this->continueprocessing) {
-                    $line++;
-                    $curline = fgets($fh);
-                    $this->xmlcache .= $curline; // Add a line onto the XML cache
-
-                    while(true){
-                  // Must always make sure to remove tags from cache so they don't clog up our memory
-                  if($tagcontents = $this->full_tag_found_in_cache('group', $curline)){
-                          $this->remove_tag_from_cache('group');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('person', $curline)){
-                          $this->remove_tag_from_cache('person');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('membership', $curline)){
-                          $this->process_membership_tag($tagcontents);
-                          $this->remove_tag_from_cache('membership');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('comments', $curline)){
-                          $this->remove_tag_from_cache('comments');
-                      }elseif($tagcontents = $this->full_tag_found_in_cache('properties', $curline)){
-                          $this->remove_tag_from_cache('properties');
-                      }else{
-                    break;
-                  }
-                }
-                } // end of while loop
-                fclose($fh);
-            } // end of if(file_open) for second pass
-
-
-           */
-
-            $timeelapsed = time() - $starttime;
-            $this->log_line('Process has completed. Time taken: '.$timeelapsed.' seconds.');
-
-
-        } // END of "if file is new"
-
-
-        // These variables are stored so we can compare them against the IMS file, next time round.
-        set_config('enrol_ims_prev_time', $filemtime);
-        set_config('enrol_ims_prev_md5',  $md5);
-        set_config('enrol_ims_prev_path', $filename);
-
-
-
-    }else{ // end of if(file_exists)
-        $this->log_line('File not found: '.$filename);
-    }
-
-    if (!empty($CFG->enrol_mailadmins)) {
-        $msg = "An IMS enrolment has been carried out within Moodle.\nTime taken: $timeelapsed seconds.\n\n";
-        if(!empty($CFG->enrol_logtolocation)){
-            if($this->logfp){
-                $msg .= "Log data has been written to:\n";
-                $msg .= "$CFG->enrol_logtolocation\n";
-                $msg .= "(Log file size: ".ceil(filesize($CFG->enrol_logtolocation)/1024)."Kb)\n\n";
-            }else{
-                $msg .= "The log file appears not to have been successfully written.\nCheck that the file is writeable by the server:\n";
-                $msg .= "$CFG->enrol_logtolocation\n\n";
-            }
-        }else{
-            $msg .= "Logging is currently not active.";
-        }
-
-        $eventdata = new object();
-        $eventdata->modulename        = 'moodle';
-        $eventdata->userfrom          = get_admin();
-        $eventdata->userto            = get_admin();
-        $eventdata->subject           = "Moodle IMS Enterprise enrolment notification";
-        $eventdata->fullmessage       = $msg;
-        $eventdata->fullmessageformat = FORMAT_PLAIN;
-        $eventdata->fullmessagehtml   = '';
-        $eventdata->smallmessage      = '';
-        message_send($eventdata);
-
-        $this->log_line('Notification email sent to administrator.');
-
-    }
-
-    if($this->logfp){
-      fclose($this->logfp);
-    }
-
-
-} // end of cron() function
-
-/**
-* Check if a complete tag is found in the cached data, which usually happens
-* when the end of the tag has only just been loaded into the cache.
-* Returns either false, or the contents of the tag (including start and end).
-* @param string $tagname Name of tag to look for
-* @param string $latestline The very last line in the cache (used for speeding up the match)
-*/
-function full_tag_found_in_cache($tagname, $latestline){ // Return entire element if found. Otherwise return false.
-    if(strpos(strtolower($latestline), '</'.strtolower($tagname).'>')===false){
-        return false;
-    }elseif(preg_match('{(<'.$tagname.'\b.*?>.*?</'.$tagname.'>)}is', $this->xmlcache, $matches)){
-        return $matches[1];
-    }else return false;
-}
-
-/**
-* Remove complete tag from the cached data (including all its contents) - so
-* that the cache doesn't grow to unmanageable size
-* @param string $tagname Name of tag to look for
-*/
-function remove_tag_from_cache($tagname){ // Trim the cache so we're not in danger of running out of memory.
-    ///echo "<p>remove_tag_from_cache: $tagname</p>";  flush();  ob_flush();
-    //  echo "<p>remove_tag_from_cache:<br />".htmlspecialchars($this->xmlcache);
-    $this->xmlcache = trim(preg_replace('{<'.$tagname.'\b.*?>.*?</'.$tagname.'>}is', '', $this->xmlcache, 1)); // "1" so that we replace only the FIRST instance
-    //  echo "<br />".htmlspecialchars($this->xmlcache)."</p>";
-}
-
-/**
-* Very simple convenience function to return the "recstatus" found in person/group/role tags.
-* 1=Add, 2=Update, 3=Delete, as specified by IMS, and we also use 0 to indicate "unspecified".
-* @param string $tagdata the tag XML data
-* @param string $tagname the name of the tag we're interested in
-*/
-function get_recstatus($tagdata, $tagname){
-    if(preg_match('{<'.$tagname.'\b[^>]*recstatus\s*=\s*["\'](\d)["\']}is', $tagdata, $matches)){
-        // echo "<p>get_recstatus($tagname) found status of $matches[1]</p>";
-        return intval($matches[1]);
-    }else{
-        // echo "<p>get_recstatus($tagname) found nothing</p>";
-        return 0; // Unspecified
-    }
-}
-
-/**
-* Process the group tag. This defines a Moodle course.
-* @param string $tagconents The raw contents of the XML element
-*/
-function process_group_tag($tagcontents){
-    global $CFG, $DB;
-
-    // Process tag contents
-    unset($group);
-    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
-        $group->coursecode = trim($matches[1]);
-    }
-    if(preg_match('{<description>.*?<short>(.*?)</short>.*?</description>}is', $tagcontents, $matches)){
-        $group->description = trim($matches[1]);
-    }
-    if(preg_match('{<org>.*?<orgunit>(.*?)</orgunit>.*?</org>}is', $tagcontents, $matches)){
-        $group->category = trim($matches[1]);
-    }
-
-    $recstatus = ($this->get_recstatus($tagcontents, 'group'));
-    //echo "<p>get_recstatus for this group returned $recstatus</p>";
-
-    if(!(strlen($group->coursecode)>0)){
-        $this->log_line('Error at line '.$line.': Unable to find course code in \'group\' element.');
-    }else{
-        // First, truncate the course code if desired
-        if(intval($CFG->enrol_truncatecoursecodes)>0){
-            $group->coursecode = ($CFG->enrol_truncatecoursecodes > 0)
-                     ? substr($group->coursecode, 0, intval($CFG->enrol_truncatecoursecodes))
-                     : $group->coursecode;
-        }
-
-        /* -----------Course aliasing is DEACTIVATED until a more general method is in place---------------
-
-       // Second, look in the course alias table to see if the code should be translated to something else
-        if($aliases = $DB->get_field('enrol_coursealias', 'toids', array('fromid'=>$group->coursecode))){
-            $this->log_line("Found alias of course code: Translated $group->coursecode to $aliases");
-            // Alias is allowed to be a comma-separated list, so let's split it
-            $group->coursecode = explode(',', $aliases);
-        }
-       */
-
-        // For compatibility with the (currently inactive) course aliasing, we need this to be an array
-        $group->coursecode = array($group->coursecode);
-
-        // Third, check if the course(s) exist
-        foreach($group->coursecode as $coursecode){
-            $coursecode = trim($coursecode);
-            if(!$DB->get_field('course', 'id', array('idnumber'=>$coursecode))) {
-              if(!$CFG->enrol_createnewcourses) {
-                  $this->log_line("Course $coursecode not found in Moodle's course idnumbers.");
-              } else {
-                // Create the (hidden) course(s) if not found
-                $course = new object();
-                $course->fullname = $group->description;
-                $course->shortname = $coursecode;
-                $course->idnumber = $coursecode;
-                $course->format = 'topics';
-                $course->visible = 0;
-                // Insert default names for teachers/students, from the current language
-                $site = get_site();
-
-                // Handle course categorisation (taken from the group.org.orgunit field if present)
-                if(strlen($group->category)>0){
-                    // If the category is defined and exists in Moodle, we want to store it in that one
-                    if($catid = $DB->get_field('course_categories', 'id', array('name'=>$group->category))){
-                        $course->category = $catid;
-                    }elseif($CFG->enrol_createnewcategories){
-                        // Else if we're allowed to create new categories, let's create this one
-                        $newcat->name = $group->category;
-                       $newcat->visible = 0;
-                       if($catid = $DB->insert_record('course_categories', $newcat)){
-                           $course->category = $catid;
-                           $this->log_line("Created new (hidden) category, #$catid: $newcat->name");
-                       }else{
-                           $this->log_line('Failed to create new category: '.$newcat->name);
-                       }
-                    }else{
-                        // If not found and not allowed to create, stick with default
-                        $this->log_line('Category '.$group->category.' not found in Moodle database, so using default category instead.');
-                        $course->category = 1;
-                    }
-                }else{
-                    $course->category = 1;
-                }
-                $course->timecreated = time();
-                $course->startdate = time();
-                $course->numsections = 1;
-                // Choose a sort order that puts us at the start of the list!
-                $course->sortorder = 0;
-
-                if ($courseid = $DB->insert_record('course', $course)) {
-
-                    // Setup the blocks
-                    $course = $DB->get_record('course', array('id' => $courseid));
-                    blocks_add_default_course_blocks($course);
-
-                    $section = new object();
-                    $section->course = $course->id;   // Create a default section.
-                    $section->section = 0;
-                    $section->summaryformat = FORMAT_HTML;
-                    $section->id = $DB->insert_record("course_sections", $section);
-
-                    add_to_log(SITEID, "course", "new", "view.php?id=$course->id", "$course->fullname (ID $course->id)");
-
-                    $this->log_line("Created course $coursecode in Moodle (Moodle ID is $course->id)");
-                }else{
-                    $this->log_line('Failed to create course '.$coursecode.' in Moodle');
-                }
-              }
-            }elseif($recstatus==3 && ($courseid = $DB->get_field('course', 'id', array('idnumber'=>$coursecode)))){
-                // If course does exist, but recstatus==3 (delete), then set the course as hidden
-                $DB->set_field('course', 'visible', '0', array('id'=>$courseid));
-            }
-        } // End of foreach(coursecode)
-    }
-} // End process_group_tag()
-
-/**
-* Process the person tag. This defines a Moodle user.
-* @param string $tagconents The raw contents of the XML element
-*/
-function process_person_tag($tagcontents){
-    global $CFG, $DB;
-
-    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
-        $person->idnumber = trim($matches[1]);
-    }
-    if(preg_match('{<name>.*?<n>.*?<given>(.+?)</given>.*?</n>.*?</name>}is', $tagcontents, $matches)){
-        $person->firstname = trim($matches[1]);
-    }
-    if(preg_match('{<name>.*?<n>.*?<family>(.+?)</family>.*?</n>.*?</name>}is', $tagcontents, $matches)){
-        $person->lastname = trim($matches[1]);
-    }
-    if(preg_match('{<userid>(.*?)</userid>}is', $tagcontents, $matches)){
-        $person->username = trim($matches[1]);
-    }
-    if($CFG->enrol_imssourcedidfallback && trim($person->username)==''){
-      // This is the point where we can fall back to useing the "sourcedid" if "userid" is not supplied
-      // NB We don't use an "elseif" because the tag may be supplied-but-empty
-        $person->username = $person->idnumber;
-    }
-    if(preg_match('{<email>(.*?)</email>}is', $tagcontents, $matches)){
-        $person->email = trim($matches[1]);
-    }
-    if(preg_match('{<url>(.*?)</url>}is', $tagcontents, $matches)){
-        $person->url = trim($matches[1]);
-    }
-    if(preg_match('{<adr>.*?<locality>(.+?)</locality>.*?</adr>}is', $tagcontents, $matches)){
-        $person->city = trim($matches[1]);
-    }
-    if(preg_match('{<adr>.*?<country>(.+?)</country>.*?</adr>}is', $tagcontents, $matches)){
-        $person->country = trim($matches[1]);
-    }
-
-    // Fix case of some of the fields if required
-    if($CFG->enrol_fixcaseusernames && isset($person->username)){
-        $person->username = strtolower($person->username);
-    }
-    if($CFG->enrol_fixcasepersonalnames){
-        if(isset($person->firstname)){
-            $person->firstname = ucwords(strtolower($person->firstname));
-        }
-        if(isset($person->lastname)){
-            $person->lastname = ucwords(strtolower($person->lastname));
-        }
-    }
-
-    $recstatus = ($this->get_recstatus($tagcontents, 'person'));
-
-
-    // Now if the recstatus is 3, we should delete the user if-and-only-if the setting for delete users is turned on
-    // In the "users" table we can do this by setting deleted=1
-    if($recstatus==3){
-
-        if($CFG->enrol_imsdeleteusers){ // If we're allowed to delete user records
-            // Make sure their "deleted" field is set to one
-            $DB->set_field('user', 'deleted', 1, array('username'=>$person->username));
-            $this->log_line("Marked user record for user '$person->username' (ID number $person->idnumber) as deleted.");
-        }else{
-            $this->log_line("Ignoring deletion request for user '$person->username' (ID number $person->idnumber).");
-        }
-
-    }else{ // Add or update record
-
-
-        // If the user exists (matching sourcedid) then we don't need to do anything.
-        if(!$DB->get_field('user', 'id', array('idnumber'=>$person->idnumber)) && $CFG->enrol_createnewusers){
-            // If they don't exist and haven't a defined username, we log this as a potential problem.
-            if((!isset($person->username)) || (strlen($person->username)==0)){
-                $this->log_line("Cannot create new user for ID # $person->idnumber - no username listed in IMS data for this person.");
-            } else if ($DB->get_field('user', 'id', array('username'=>$person->username))){
-                // If their idnumber is not registered but their user ID is, then add their idnumber to their record
-                $DB->set_field('user', 'idnumber', $person->idnumber, array('username'=>$person->username));
-            } else {
-
-            // If they don't exist and they have a defined username, and $CFG->enrol_createnewusers == true, we create them.
-            $person->lang = 'manual'; //TODO: this needs more work due tu multiauth changes
-            $person->auth = $CFG->auth;
-            $person->confirmed = 1;
-            $person->timemodified = time();
-            $person->mnethostid = $CFG->mnet_localhost_id;
-            if($id = $DB->insert_record('user', $person)){
-    /*
-    Photo processing is deactivated until we hear from Moodle dev forum about modification to gdlib.
-
-                                 //Antoni Mas. 07/12/2005. If a photo URL is specified then we might want to load
-                                 // it into the user's profile. Beware that this may cause a heavy overhead on the server.
-                                 if($CFG->enrol_processphoto){
-                                   if(preg_match('{<photo>.*?<extref>(.*?)</extref>.*?</photo>}is', $tagcontents, $matches)){
-                                     $person->urlphoto = trim($matches[1]);
-                                   }
-                                   //Habilitam el flag que ens indica que el personatge t foto prpia.
-                                   $person->picture = 1;
-                                   //Llibreria creada per nosaltres mateixos.
-                                   require_once($CFG->dirroot.'/lib/gdlib.php');
-                                   if ($usernew->picture = save_profile_image($id, $person->urlphoto,'user')) {
-                                     $DB->set_field('user', 'picture', $usernew->picture, array('id'=>$id));  /// Note picture in DB
-                                   }
-                                 }
-    */
-                    $this->log_line("Created user record for user '$person->username' (ID number $person->idnumber).");
-                }else{
-                    $this->log_line("Database error while trying to create user record for user '$person->username' (ID number $person->idnumber).");
-                }
-            }
-        }elseif($CFG->enrol_createnewusers){
-            $this->log_line("User record already exists for user '$person->username' (ID number $person->idnumber).");
-
-            // Make sure their "deleted" field is set to zero.
-            $DB->set_field('user', 'deleted', 0, array('idnumber'=>$person->idnumber));
-        }else{
-            $this->log_line("No user record found for '$person->username' (ID number $person->idnumber).");
-        }
-
-    } // End of are-we-deleting-or-adding
-
-} // End process_person_tag()
-
-/**
-* Process the membership tag. This defines whether the specified Moodle users
-* should be added/removed as teachers/students.
-* @param string $tagconents The raw contents of the XML element
-*/
-function process_membership_tag($tagcontents){
-    global $CFG, $DB;
-    $memberstally = 0;
-    $membersuntally = 0;
-
-    // In order to reduce the number of db queries required, group name/id associations are cached in this array:
-    $groupids = array();
-
-    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
-        $ship->coursecode = ($CFG->enrol_truncatecoursecodes > 0)
-                                 ? substr(trim($matches[1]), 0, intval($CFG->enrol_truncatecoursecodes))
-                                 : trim($matches[1]);
-        $ship->courseid = $DB->get_field('course', 'id', array('idnumber'=>$ship->coursecode));
-    }
-    if($ship->courseid && preg_match_all('{<member>(.*?)</member>}is', $tagcontents, $membermatches, PREG_SET_ORDER)){
-        foreach($membermatches as $mmatch){
-            unset($member);
-            unset($memberstoreobj);
-            if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $mmatch[1], $matches)){
-                $member->idnumber = trim($matches[1]);
-            }
-            if(preg_match('{<role\s+roletype=["\'](.+?)["\'].*?>}is', $mmatch[1], $matches)){
-                $member->roletype = trim($matches[1]); // 01 means Student, 02 means Instructor, 3 means ContentDeveloper, and there are more besides
-            }elseif($CFG->enrol_imscapitafix && preg_match('{<roletype>(.+?)</roletype>}is', $mmatch[1], $matches)){
-                // The XML that comes out of Capita Student Records seems to contain a misinterpretation of the IMS specification!
-                $member->roletype = trim($matches[1]); // 01 means Student, 02 means Instructor, 3 means ContentDeveloper, and there are more besides
-            }
-            if(preg_match('{<role\b.*?<status>(.+?)</status>.*?</role>}is', $mmatch[1], $matches)){
-                $member->status = trim($matches[1]); // 1 means active, 0 means inactive - treat this as enrol vs unenrol
-            }
-
-            $recstatus = ($this->get_recstatus($mmatch[1], 'role'));
-            if($recstatus==3){
-              $member->status = 0; // See above - recstatus of 3 (==delete) is treated the same as status of 0
-              //echo "<p>process_membership_tag: unenrolling member due to recstatus of 3</p>";
-            }
-
-            $timeframe->begin = 0;
-            $timeframe->end = 0;
-            if(preg_match('{<role\b.*?<timeframe>(.+?)</timeframe>.*?</role>}is', $mmatch[1], $matches)){
-                $timeframe = $this->decode_timeframe($matches[1]);
-            }
-            if(preg_match('{<role\b.*?<extension>.*?<cohort>(.+?)</cohort>.*?</extension>.*?</role>}is', $mmatch[1], $matches)){
-                $member->groupname = trim($matches[1]);
-                // The actual processing (ensuring a group record exists, etc) occurs below, in the enrol-a-student clause
-            }
-
-            $rolecontext = get_context_instance(CONTEXT_COURSE, $ship->courseid);
-            $rolecontext = $rolecontext->id; // All we really want is the ID
-//$this->log_line("Context instance for course $ship->courseid is...");
-//print_r($rolecontext);
-
-            // Add or remove this student or teacher to the course...
-            $memberstoreobj->userid = $DB->get_field('user', 'id', array('idnumber'=>$member->idnumber));
-            $memberstoreobj->enrol = 'imsenterprise';
-            $memberstoreobj->course = $ship->courseid;
-            $memberstoreobj->time = time();
-            $memberstoreobj->timemodified = time();
-            if($memberstoreobj->userid){
-
-                // Decide the "real" role (i.e. the Moodle role) that this user should be assigned to.
-                // Zero means this roletype is supposed to be skipped.
-                $moodleroleid = $this->rolemappings[$member->roletype];
-                if(!$moodleroleid){
-                    $this->log_line("SKIPPING role $member->roletype for $memberstoreobj->userid ($member->idnumber) in course $memberstoreobj->course");
-                    continue;
-                }
-
-                if(intval($member->status) == 1){
-
-                    // Enrol unsing the generic role_assign() function
-
-                    //TODO: some real enrolment here
-                    if ((!role_assign($moodleroleid, $memberstoreobj->userid, $rolecontext, 'enrol_imsenterprise')) && (trim($memberstoreobj->userid)!='')) {
-                        $this->log_line("Error enrolling user #$memberstoreobj->userid ($member->idnumber) to role $member->roletype in course $memberstoreobj->course");
-                    }else{
-                        $this->log_line("Enrolled user #$memberstoreobj->userid ($member->idnumber) to role $member->roletype in course $memberstoreobj->course");
-                        $memberstally++;
-
-                        // At this point we can also ensure the group membership is recorded if present
-                        if(isset($member->groupname)){
-                            // Create the group if it doesn't exist - either way, make sure we know the group ID
-                            if(isset($groupids[$member->groupname])){
-                                $member->groupid = $groupids[$member->groupname]; // Recall the group ID from cache if available
-                            }else{
-                                if($groupid = $DB->get_field('groups', 'id', 'name', $member->groupname, array('courseid'=>$ship->courseid))){
-                                    $member->groupid = $groupid;
-                                    $groupids[$member->groupname] = $groupid; // Store ID in cache
-                                }else{
-                                    // Attempt to create the group
-                                    $group->name = $member->groupname;
-                                    $group->courseid = $ship->courseid;
-                                    $group->timecreated = time();
-                                    $group->timemodified = time();
-                                    $groupid = $DB->insert_record('groups', $group);
-                                    $this->log_line('Added a new group for this course: '.$group->name);
-                                    $groupids[$member->groupname] = $groupid; // Store ID in cache
-                                    $member->groupid = $groupid;
-                                }
-                            }
-                            // Add the user-to-group association if it doesn't already exist
-                            if($member->groupid) {
-                                groups_add_member($member->groupid, $memberstoreobj->userid);
-                            }
-                        } // End of group-enrolment (from member.role.extension.cohort tag)
-
-                    }
-                }elseif($CFG->enrol_imsunenrol){
-                    // Unenrol
-
-                    role_unassign($moodleroleid, $memberstoreobj->userid, 0, $rolecontext, 'imsenterprise');
-                    $membersuntally++;
-                    $this->log_line("Unenrolled $member->idnumber from role $moodleroleid in course");
-                }
-
-            }
-        }
-        $this->log_line("Added $memberstally users to course $ship->coursecode");
-        if($membersuntally > 0){
-            $this->log_line("Removed $membersuntally users from course $ship->coursecode");
-        }
-    }
-} // End process_membership_tag()
-
-/**
-* Process the properties tag. The only data from this element
-* that is relevant is whether a <target> is specified.
-* @param string $tagconents The raw contents of the XML element
-*/
-function process_properties_tag($tagcontents){
-    global $CFG;
-
-    if($CFG->enrol_imsrestricttarget){
-        if(!(preg_match('{<target>'.preg_quote($CFG->enrol_imsrestricttarget).'</target>}is', $tagcontents, $matches))){
-            $this->log_line("Skipping processing: required target \"$CFG->enrol_imsrestricttarget\" not specified in this data.");
-            $this->continueprocessing = false;
-        }
-    }
-}
-
-/**
-* Store logging information. This does two things: uses the {@link mtrace()}
-* function to print info to screen/STDOUT, and also writes log to a text file
-* if a path has been specified.
-* @param string $string Text to write (newline will be added automatically)
-*/
-function log_line($string){
-    mtrace($string);
-    if($this->logfp) {
-        fwrite($this->logfp, $string . "\n");
-    }
-}
-
-/**
-* Process the INNER contents of a <timeframe> tag, to return beginning/ending dates.
-*/
-function decode_timeframe($string){ // Pass me the INNER CONTENTS of a <timeframe> tag - beginning and/or ending is returned, in unix time, zero indicating not specified
-    $ret->begin = $ret->end = 0;
-    // Explanatory note: The matching will ONLY match if the attribute restrict="1"
-    // because otherwise the time markers should be ignored (participation should be
-    // allowed outside the period)
-    if(preg_match('{<begin\s+restrict="1">(\d\d\d\d)-(\d\d)-(\d\d)</begin>}is', $string, $matches)){
-        $ret->begin = mktime(0,0,0, $matches[2], $matches[3], $matches[1]);
-    }
-    if(preg_match('{<end\s+restrict="1">(\d\d\d\d)-(\d\d)-(\d\d)</end>}is', $string, $matches)){
-        $ret->end = mktime(0,0,0, $matches[2], $matches[3], $matches[1]);
-    }
-    return $ret;
-} // End decode_timeframe
-
-/**
-* Load the role mappings (from the config), so we can easily refer to
-* how an IMS-E role corresponds to a Moodle role
-*/
-function load_role_mappings() {
-    global $DB;
-
-    $this->rolemappings = array();
-    foreach($this->imsroles as $imsrolenum=>$imsrolename) {
-        $this->rolemappings[$imsrolenum] = $this->rolemappings[$imsrolename]
-            = $DB->get_field('config', 'value', array('name'=>'enrol_imse_imsrolemap' . $imsrolenum));
-    }
-}
-
-} // end of class
-
-
diff --git a/enrol/imsenterprise/importnow.php b/enrol/imsenterprise/importnow.php
index 32267af..e9379bc 100644
--- a/enrol/imsenterprise/importnow.php
+++ b/enrol/imsenterprise/importnow.php
@@ -1,25 +1,29 @@
 <?php
 require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-require_login();
+require_login(0, false);
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
 $site = get_site();
 
 /// get language strings
-$str = get_strings(array('enrolments', 'users', 'administration', 'settings'));
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
 
 $PAGE->set_url('/enrol/imsenterprise/importnow.php');
-$PAGE->set_title("$site->shortname: $str->enrolments");
-$PAGE->set_heading($site->fullname);
-$PAGE->navbar->add($str->administration, new moodle_url('/admin/index.php'));
-$PAGE->navbar->add($str->enrolments);
-$PAGE->navbar->add('IMS import');
+$PAGE->set_title(get_string('importimsfile', 'enrol_imsenterprise'));
+$PAGE->set_heading(get_string('importimsfile', 'enrol_imsenterprise'));
+$PAGE->navbar->add(get_string('administrationsite'));
+$PAGE->navbar->add(get_string('plugins', 'admin'));
+$PAGE->navbar->add(get_string('enrolments', 'enrol'));
+$PAGE->navbar->add(get_string('pluginname', 'enrol_imsenterprise'), new moodle_url('/admin/settings.php', array('section'=>'enrolsettingsimsenterprise')));
+$PAGE->navbar->add(get_string('importimsfile', 'enrol_imsenterprise'));
+$PAGE->navigation->clear_cache();
+
 echo $OUTPUT->header();
 
-require_once('enrol.php');
+require_once('lib.php');
 
 //echo "Creating the IMS Enterprise enroller object\n";
-$enrol = new enrolment_plugin_imsenterprise();
+$enrol = new enrol_imsenterprise_plugin();
 
 ?>
 <p>Launching the IMS Enterprise "cron" function. The import log will appear below (giving details of any
diff --git a/enrol/imsenterprise/lang/en/enrol_imsenterprise.php b/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
index a81ad1c..1905862 100644
--- a/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
+++ b/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
@@ -42,9 +42,9 @@ Users are searched for first by their "idnumber", and second by their Moodle use
 $string['cronfrequency'] = 'Frequency of processing';
 $string['deleteusers'] = 'Delete user accounts when specified in IMS data';
 $string['deleteusers_help'] = 'If enabled, IMS Enterprise enrolment data can specify the deletion of user accounts (if the "recstatus" flag is set to 3, which represents deletion of an account). As is standard in Moodle, the user record isn\'t actually deleted from Moodle\'s database, but a flag is set to mark the account as deleted.';
-$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['pluginname_desc'] = '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['pluginname'] = '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.';
 $string['filelockedmailsubject'] = 'Important error: Enrolment file';
 $string['fixcasepersonalnames'] = 'Change personal names to Title Case';
@@ -71,3 +71,6 @@ $string['usecapitafix'] = 'Tick this box if using &quot;Capita&quot; (their XML
 $string['usecapitafix_help'] = 'The student data system produced by Capita has been found to have one slight error in its XML output. If you are using Capita you should enable this setting - otherwise leave it un-ticked.';
 $string['usersettings'] = 'User data options';
 $string['zeroisnotruncation'] = '0 indicates no truncation';
+$string['roles'] = 'Roles';
+$string['ignore'] = 'Ignore';
+$string['importimsfile'] = 'Import IMS Enterprise file';
diff --git a/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php
new file mode 100644
index 0000000..84ddb7c
--- /dev/null
+++ b/enrol/imsenterprise/lib.php
@@ -0,0 +1,762 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * IMS Enterprise file enrolment plugin.
+ *
+ * This plugin lets the user specify an IMS Enterprise file to be processed.
+ * The IMS Enterprise file is mainly parsed on a regular cron,
+ * but can also be imported via the UI (Admin Settings).
+ * @package   enrol_imsenterprise
+ * @copyright 2010 Eugene Venter
+ * @author Eugene Venter - based on code by Dan Stowell
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/*
+
+Note for programmers:
+
+This class uses regular expressions to mine the data file. The main reason is
+that XML handling changes from PHP 4 to PHP 5, so this should work on both.
+
+One drawback is that the pattern-matching doesn't (currently) handle XML
+namespaces - it only copes with a <group> tag if it says <group>, and not
+(for example) <ims:group>.
+
+This should also be able to handle VERY LARGE FILES - so the entire IMS file is
+NOT loaded into memory at once. It's handled line-by-line, 'forgetting' tags as
+soon as they are processed.
+
+N.B. The "sourcedid" ID code is translated to Moodle's "idnumber" field, both
+for users and for courses.
+
+*/
+
+require_once($CFG->dirroot.'/group/lib.php');
+
+
+class enrol_imsenterprise_plugin extends enrol_plugin {
+
+var $log;
+
+
+/**
+* Read in an IMS Enterprise file.
+* Originally designed to handle v1.1 files but should be able to handle
+* earlier types as well, I believe.
+*
+*/
+function cron() {
+    global $CFG;
+
+    // Get configs
+    $imsfilelocation    = $this->get_config('imsfilelocation');
+    $logtolocation      = $this->get_config('logtolocation');
+    $mailadmins         = $this->get_config('mailadmins');
+    $prev_time          = $this->get_config('prev_time');
+    $prev_md5           = $this->get_config('prev_md5');
+    $prev_path          = $this->get_config('prev_path');
+
+    if (empty($imsfilelocation)) {
+        // $filename = "$CFG->dirroot/enrol/imsenterprise/example.xml";  // Default location
+        $filename = "$CFG->dataroot/1/imsenterprise-enrol.xml";  // Default location
+    } else {
+        $filename = $imsfilelocation;
+    }
+
+    $this->logfp = false; // File pointer for writing log data to
+    if(!empty($logtolocation)) {
+        $this->logfp = fopen($logtolocation, 'a');
+    }
+
+    if ( file_exists($filename) ) {
+        @set_time_limit(0);
+        $starttime = time();
+
+        $this->log_line('----------------------------------------------------------------------');
+        $this->log_line("IMS Enterprise enrol cron process launched at " . userdate(time()));
+        $this->log_line('Found file '.$filename);
+        $this->xmlcache = '';
+
+        // Make sure we understand how to map the IMS-E roles to Moodle roles
+        $this->load_role_mappings();
+
+        $md5 = md5_file($filename); // NB We'll write this value back to the database at the end of the cron
+        $filemtime = filemtime($filename);
+
+        // Decide if we want to process the file (based on filepath, modification time, and MD5 hash)
+        // This is so we avoid wasting the server's efforts processing a file unnecessarily
+        if(empty($prev_path)  || ($filename != $prev_path)) {
+            $fileisnew = true;
+        } elseif(isset($prev_time) && ($filemtime <= $prev_time)) {
+            $fileisnew = false;
+            $this->log_line('File modification time is not more recent than last update - skipping processing.');
+        } elseif(isset($prev_md5) && ($md5 == $prev_md5)) {
+            $fileisnew = false;
+            $this->log_line('File MD5 hash is same as on last update - skipping processing.');
+        } else {
+            $fileisnew = true; // Let's process it!
+        }
+
+        if($fileisnew) {
+
+            $listoftags = array('group', 'person', 'member', 'membership', 'comments', 'properties'); // The list of tags which should trigger action (even if only cache trimming)
+            $this->continueprocessing = true; // The <properties> tag is allowed to halt processing if we're demanding a matching target
+
+            // FIRST PASS: Run through the file and process the group/person entries
+            if (($fh = fopen($filename, "r")) != false) {
+
+                $line = 0;
+                while ((!feof($fh)) && $this->continueprocessing) {
+
+                    $line++;
+                    $curline = fgets($fh);
+                    $this->xmlcache .= $curline; // Add a line onto the XML cache
+
+                    while (true) {
+                      // If we've got a full tag (i.e. the most recent line has closed the tag) then process-it-and-forget-it.
+                      // Must always make sure to remove tags from cache so they don't clog up our memory
+                      if($tagcontents = $this->full_tag_found_in_cache('group', $curline)) {
+                          $this->process_group_tag($tagcontents);
+                          $this->remove_tag_from_cache('group');
+                      } elseif($tagcontents = $this->full_tag_found_in_cache('person', $curline)) {
+                          $this->process_person_tag($tagcontents);
+                          $this->remove_tag_from_cache('person');
+                      } elseif($tagcontents = $this->full_tag_found_in_cache('membership', $curline)) {
+                          $this->process_membership_tag($tagcontents);
+                          $this->remove_tag_from_cache('membership');
+                      } elseif($tagcontents = $this->full_tag_found_in_cache('comments', $curline)) {
+                          $this->remove_tag_from_cache('comments');
+                      } elseif($tagcontents = $this->full_tag_found_in_cache('properties', $curline)) {
+                          $this->process_properties_tag($tagcontents);
+                          $this->remove_tag_from_cache('properties');
+                      } else {
+                          break;
+                      }
+                    } // End of while-tags-are-detected
+                } // end of while loop
+                fclose($fh);
+                fix_course_sortorder();
+            } // end of if(file_open) for first pass
+
+            /*
+
+
+            SECOND PASS REMOVED
+            Since the IMS specification v1.1 insists that "memberships" should come last,
+            and since vendors seem to have done this anyway (even with 1.0),
+            we can sensibly perform the import in one fell swoop.
+
+
+            // SECOND PASS: Now go through the file and process the membership entries
+            $this->xmlcache = '';
+            if (($fh = fopen($filename, "r")) != false) {
+                $line = 0;
+                while ((!feof($fh)) && $this->continueprocessing) {
+                    $line++;
+                    $curline = fgets($fh);
+                    $this->xmlcache .= $curline; // Add a line onto the XML cache
+
+                    while(true){
+                  // Must always make sure to remove tags from cache so they don't clog up our memory
+                  if($tagcontents = $this->full_tag_found_in_cache('group', $curline)){
+                          $this->remove_tag_from_cache('group');
+                      }elseif($tagcontents = $this->full_tag_found_in_cache('person', $curline)){
+                          $this->remove_tag_from_cache('person');
+                      }elseif($tagcontents = $this->full_tag_found_in_cache('membership', $curline)){
+                          $this->process_membership_tag($tagcontents);
+                          $this->remove_tag_from_cache('membership');
+                      }elseif($tagcontents = $this->full_tag_found_in_cache('comments', $curline)){
+                          $this->remove_tag_from_cache('comments');
+                      }elseif($tagcontents = $this->full_tag_found_in_cache('properties', $curline)){
+                          $this->remove_tag_from_cache('properties');
+                      }else{
+                    break;
+                  }
+                }
+                } // end of while loop
+                fclose($fh);
+            } // end of if(file_open) for second pass
+
+
+           */
+
+            $timeelapsed = time() - $starttime;
+            $this->log_line('Process has completed. Time taken: '.$timeelapsed.' seconds.');
+
+
+        } // END of "if file is new"
+
+
+        // These variables are stored so we can compare them against the IMS file, next time round.
+        $this->set_config('prev_time', $filemtime);
+        $this->set_config('prev_md5',  $md5);
+        $this->set_config('prev_path', $filename);
+
+
+
+    }else{ // end of if(file_exists)
+        $this->log_line('File not found: '.$filename);
+    }
+
+    if (!empty($mailadmins)) {
+        $msg = "An IMS enrolment has been carried out within Moodle.\nTime taken: $timeelapsed seconds.\n\n";
+        if(!empty($logtolocation)){
+            if($this->logfp){
+                $msg .= "Log data has been written to:\n";
+                $msg .= "$logtolocation\n";
+                $msg .= "(Log file size: ".ceil(filesize($logtolocation)/1024)."Kb)\n\n";
+            }else{
+                $msg .= "The log file appears not to have been successfully written.\nCheck that the file is writeable by the server:\n";
+                $msg .= "$logtolocation\n\n";
+            }
+        }else{
+            $msg .= "Logging is currently not active.";
+        }
+
+        $eventdata = new object();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->component         = 'imsenterprise';
+        $eventdata->name              = 'imsenterprise_enrolment';
+        $eventdata->userfrom          = get_admin();
+        $eventdata->userto            = get_admin();
+        $eventdata->subject           = "Moodle IMS Enterprise enrolment notification";
+        $eventdata->fullmessage       = $msg;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+
+        $this->log_line('Notification email sent to administrator.');
+
+    }
+
+    if($this->logfp){
+      fclose($this->logfp);
+    }
+
+
+} // end of cron() function
+
+/**
+* Check if a complete tag is found in the cached data, which usually happens
+* when the end of the tag has only just been loaded into the cache.
+* Returns either false, or the contents of the tag (including start and end).
+* @param string $tagname Name of tag to look for
+* @param string $latestline The very last line in the cache (used for speeding up the match)
+*/
+function full_tag_found_in_cache($tagname, $latestline){ // Return entire element if found. Otherwise return false.
+    if(strpos(strtolower($latestline), '</'.strtolower($tagname).'>')===false){
+        return false;
+    }elseif(preg_match('{(<'.$tagname.'\b.*?>.*?</'.$tagname.'>)}is', $this->xmlcache, $matches)){
+        return $matches[1];
+    }else return false;
+}
+
+/**
+* Remove complete tag from the cached data (including all its contents) - so
+* that the cache doesn't grow to unmanageable size
+* @param string $tagname Name of tag to look for
+*/
+function remove_tag_from_cache($tagname){ // Trim the cache so we're not in danger of running out of memory.
+    ///echo "<p>remove_tag_from_cache: $tagname</p>";  flush();  ob_flush();
+    //  echo "<p>remove_tag_from_cache:<br />".htmlspecialchars($this->xmlcache);
+    $this->xmlcache = trim(preg_replace('{<'.$tagname.'\b.*?>.*?</'.$tagname.'>}is', '', $this->xmlcache, 1)); // "1" so that we replace only the FIRST instance
+    //  echo "<br />".htmlspecialchars($this->xmlcache)."</p>";
+}
+
+/**
+* Very simple convenience function to return the "recstatus" found in person/group/role tags.
+* 1=Add, 2=Update, 3=Delete, as specified by IMS, and we also use 0 to indicate "unspecified".
+* @param string $tagdata the tag XML data
+* @param string $tagname the name of the tag we're interested in
+*/
+function get_recstatus($tagdata, $tagname){
+    if(preg_match('{<'.$tagname.'\b[^>]*recstatus\s*=\s*["\'](\d)["\']}is', $tagdata, $matches)){
+        // echo "<p>get_recstatus($tagname) found status of $matches[1]</p>";
+        return intval($matches[1]);
+    }else{
+        // echo "<p>get_recstatus($tagname) found nothing</p>";
+        return 0; // Unspecified
+    }
+}
+
+/**
+* Process the group tag. This defines a Moodle course.
+* @param string $tagconents The raw contents of the XML element
+*/
+function process_group_tag($tagcontents){
+    global $DB;
+
+    // Get configs
+    $truncatecoursecodes    = $this->get_config('truncatecoursecodes');
+    $createnewcourses       = $this->get_config('createnewcourses');
+    $createnewcategories    = $this->get_config('createnewcategories');
+
+    // Process tag contents
+    unset($group);
+    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
+        $group->coursecode = trim($matches[1]);
+    }
+    if(preg_match('{<description>.*?<short>(.*?)</short>.*?</description>}is', $tagcontents, $matches)){
+        $group->description = trim($matches[1]);
+    }
+    if(preg_match('{<org>.*?<orgunit>(.*?)</orgunit>.*?</org>}is', $tagcontents, $matches)){
+        $group->category = trim($matches[1]);
+    }
+
+    $recstatus = ($this->get_recstatus($tagcontents, 'group'));
+    //echo "<p>get_recstatus for this group returned $recstatus</p>";
+
+    if(!(strlen($group->coursecode)>0)){
+        $this->log_line('Error at line '.$line.': Unable to find course code in \'group\' element.');
+    }else{
+        // First, truncate the course code if desired
+        if(intval($truncatecoursecodes)>0){
+            $group->coursecode = ($truncatecoursecodes > 0)
+                     ? substr($group->coursecode, 0, intval($truncatecoursecodes))
+                     : $group->coursecode;
+        }
+
+        /* -----------Course aliasing is DEACTIVATED until a more general method is in place---------------
+
+       // Second, look in the course alias table to see if the code should be translated to something else
+        if($aliases = $DB->get_field('enrol_coursealias', 'toids', array('fromid'=>$group->coursecode))){
+            $this->log_line("Found alias of course code: Translated $group->coursecode to $aliases");
+            // Alias is allowed to be a comma-separated list, so let's split it
+            $group->coursecode = explode(',', $aliases);
+        }
+       */
+
+        // For compatibility with the (currently inactive) course aliasing, we need this to be an array
+        $group->coursecode = array($group->coursecode);
+
+        // Third, check if the course(s) exist
+        foreach($group->coursecode as $coursecode){
+            $coursecode = trim($coursecode);
+            if(!$DB->get_field('course', 'id', array('idnumber'=>$coursecode))) {
+              if(!$createnewcourses) {
+                  $this->log_line("Course $coursecode not found in Moodle's course idnumbers.");
+              } else {
+                // Create the (hidden) course(s) if not found
+                $course = new object();
+                $course->fullname = $group->description;
+                $course->shortname = $coursecode;
+                $course->idnumber = $coursecode;
+                $course->format = 'topics';
+                $course->visible = 0;
+                // Insert default names for teachers/students, from the current language
+                $site = get_site();
+
+                // Handle course categorisation (taken from the group.org.orgunit field if present)
+                if(strlen($group->category)>0){
+                    // If the category is defined and exists in Moodle, we want to store it in that one
+                    if($catid = $DB->get_field('course_categories', 'id', array('name'=>$group->category))){
+                        $course->category = $catid;
+                    } elseif($createnewcategories) {
+                        // Else if we're allowed to create new categories, let's create this one
+                        $newcat->name = $group->category;
+                       $newcat->visible = 0;
+                       if($catid = $DB->insert_record('course_categories', $newcat)){
+                           $course->category = $catid;
+                           $this->log_line("Created new (hidden) category, #$catid: $newcat->name");
+                       }else{
+                           $this->log_line('Failed to create new category: '.$newcat->name);
+                       }
+                    }else{
+                        // If not found and not allowed to create, stick with default
+                        $this->log_line('Category '.$group->category.' not found in Moodle database, so using default category instead.');
+                        $course->category = 1;
+                    }
+                }else{
+                    $course->category = 1;
+                }
+                $course->timecreated = time();
+                $course->startdate = time();
+                $course->numsections = 1;
+                // Choose a sort order that puts us at the start of the list!
+                $course->sortorder = 0;
+
+                if ($courseid = $DB->insert_record('course', $course)) {
+
+                    // Setup the blocks
+                    $course = $DB->get_record('course', array('id' => $courseid));
+                    blocks_add_default_course_blocks($course);
+
+                    $section = new object();
+                    $section->course = $course->id;   // Create a default section.
+                    $section->section = 0;
+                    $section->summaryformat = FORMAT_HTML;
+                    $section->id = $DB->insert_record("course_sections", $section);
+
+                    add_to_log(SITEID, "course", "new", "view.php?id=$course->id", "$course->fullname (ID $course->id)");
+
+                    $this->log_line("Created course $coursecode in Moodle (Moodle ID is $course->id)");
+                }else{
+                    $this->log_line('Failed to create course '.$coursecode.' in Moodle');
+                }
+              }
+            }elseif($recstatus==3 && ($courseid = $DB->get_field('course', 'id', array('idnumber'=>$coursecode)))){
+                // If course does exist, but recstatus==3 (delete), then set the course as hidden
+                $DB->set_field('course', 'visible', '0', array('id'=>$courseid));
+            }
+        } // End of foreach(coursecode)
+    }
+} // End process_group_tag()
+
+/**
+* Process the person tag. This defines a Moodle user.
+* @param string $tagconents The raw contents of the XML element
+*/
+function process_person_tag($tagcontents){
+    global $CFG, $DB;
+
+    // Get plugin configs
+    $imssourcedidfallback   = $this->get_config('imssourcedidfallback');
+    $fixcaseusernames       = $this->get_config('fixcaseusernames');
+    $fixcasepersonalnames   = $this->get_config('fixcasepersonalnames');
+    $imsdeleteusers         = $this->get_config('imsdeleteusers');
+    $createnewusers         = $this->get_config('createnewusers');
+
+    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
+        $person->idnumber = trim($matches[1]);
+    }
+    if(preg_match('{<name>.*?<n>.*?<given>(.+?)</given>.*?</n>.*?</name>}is', $tagcontents, $matches)){
+        $person->firstname = trim($matches[1]);
+    }
+    if(preg_match('{<name>.*?<n>.*?<family>(.+?)</family>.*?</n>.*?</name>}is', $tagcontents, $matches)){
+        $person->lastname = trim($matches[1]);
+    }
+    if(preg_match('{<userid>(.*?)</userid>}is', $tagcontents, $matches)){
+        $person->username = trim($matches[1]);
+    }
+    if($imssourcedidfallback && trim($person->username)==''){
+      // This is the point where we can fall back to useing the "sourcedid" if "userid" is not supplied
+      // NB We don't use an "elseif" because the tag may be supplied-but-empty
+        $person->username = $person->idnumber;
+    }
+    if(preg_match('{<email>(.*?)</email>}is', $tagcontents, $matches)){
+        $person->email = trim($matches[1]);
+    }
+    if(preg_match('{<url>(.*?)</url>}is', $tagcontents, $matches)){
+        $person->url = trim($matches[1]);
+    }
+    if(preg_match('{<adr>.*?<locality>(.+?)</locality>.*?</adr>}is', $tagcontents, $matches)){
+        $person->city = trim($matches[1]);
+    }
+    if(preg_match('{<adr>.*?<country>(.+?)</country>.*?</adr>}is', $tagcontents, $matches)){
+        $person->country = trim($matches[1]);
+    }
+
+    // Fix case of some of the fields if required
+    if($fixcaseusernames && isset($person->username)){
+        $person->username = strtolower($person->username);
+    }
+    if($fixcasepersonalnames){
+        if(isset($person->firstname)){
+            $person->firstname = ucwords(strtolower($person->firstname));
+        }
+        if(isset($person->lastname)){
+            $person->lastname = ucwords(strtolower($person->lastname));
+        }
+    }
+
+    $recstatus = ($this->get_recstatus($tagcontents, 'person'));
+
+
+    // Now if the recstatus is 3, we should delete the user if-and-only-if the setting for delete users is turned on
+    // In the "users" table we can do this by setting deleted=1
+    if($recstatus==3){
+
+        if($imsdeleteusers){ // If we're allowed to delete user records
+            // Make sure their "deleted" field is set to one
+            $DB->set_field('user', 'deleted', 1, array('username'=>$person->username));
+            $this->log_line("Marked user record for user '$person->username' (ID number $person->idnumber) as deleted.");
+        }else{
+            $this->log_line("Ignoring deletion request for user '$person->username' (ID number $person->idnumber).");
+        }
+
+    }else{ // Add or update record
+
+
+        // If the user exists (matching sourcedid) then we don't need to do anything.
+        if(!$DB->get_field('user', 'id', array('idnumber'=>$person->idnumber)) && $createnewusers){
+            // If they don't exist and haven't a defined username, we log this as a potential problem.
+            if((!isset($person->username)) || (strlen($person->username)==0)){
+                $this->log_line("Cannot create new user for ID # $person->idnumber - no username listed in IMS data for this person.");
+            } else if ($DB->get_field('user', 'id', array('username'=>$person->username))){
+                // If their idnumber is not registered but their user ID is, then add their idnumber to their record
+                $DB->set_field('user', 'idnumber', $person->idnumber, array('username'=>$person->username));
+            } else {
+
+            // If they don't exist and they have a defined username, and $createnewusers == true, we create them.
+            $person->lang = 'manual'; //TODO: this needs more work due tu multiauth changes
+            $person->auth = $CFG->auth;
+            $person->confirmed = 1;
+            $person->timemodified = time();
+            $person->mnethostid = $CFG->mnet_localhost_id;
+            if($id = $DB->insert_record('user', $person)){
+    /*
+    Photo processing is deactivated until we hear from Moodle dev forum about modification to gdlib.
+
+                                 //Antoni Mas. 07/12/2005. If a photo URL is specified then we might want to load
+                                 // it into the user's profile. Beware that this may cause a heavy overhead on the server.
+                                 if($CFG->enrol_processphoto){
+                                   if(preg_match('{<photo>.*?<extref>(.*?)</extref>.*?</photo>}is', $tagcontents, $matches)){
+                                     $person->urlphoto = trim($matches[1]);
+                                   }
+                                   //Habilitam el flag que ens indica que el personatge t foto prpia.
+                                   $person->picture = 1;
+                                   //Llibreria creada per nosaltres mateixos.
+                                   require_once($CFG->dirroot.'/lib/gdlib.php');
+                                   if ($usernew->picture = save_profile_image($id, $person->urlphoto,'user')) {
+                                     $DB->set_field('user', 'picture', $usernew->picture, array('id'=>$id));  /// Note picture in DB
+                                   }
+                                 }
+    */
+                    $this->log_line("Created user record for user '$person->username' (ID number $person->idnumber).");
+                }else{
+                    $this->log_line("Database error while trying to create user record for user '$person->username' (ID number $person->idnumber).");
+                }
+            }
+        } elseif ($createnewusers) {
+            $this->log_line("User record already exists for user '$person->username' (ID number $person->idnumber).");
+
+            // Make sure their "deleted" field is set to zero.
+            $DB->set_field('user', 'deleted', 0, array('idnumber'=>$person->idnumber));
+        }else{
+            $this->log_line("No user record found for '$person->username' (ID number $person->idnumber).");
+        }
+
+    } // End of are-we-deleting-or-adding
+
+} // End process_person_tag()
+
+/**
+* Process the membership tag. This defines whether the specified Moodle users
+* should be added/removed as teachers/students.
+* @param string $tagconents The raw contents of the XML element
+*/
+function process_membership_tag($tagcontents){
+    global $DB;
+
+    // Get plugin configs
+    $truncatecoursecodes = $this->get_config('truncatecoursecodes');
+    $imscapitafix = $this->get_config('imscapitafix');
+
+    $memberstally = 0;
+    $membersuntally = 0;
+
+    // In order to reduce the number of db queries required, group name/id associations are cached in this array:
+    $groupids = array();
+
+    if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
+        $ship->coursecode = ($truncatecoursecodes > 0)
+                                 ? substr(trim($matches[1]), 0, intval($truncatecoursecodes))
+                                 : trim($matches[1]);
+        $ship->courseid = $DB->get_field('course', 'id', array('idnumber'=>$ship->coursecode));
+    }
+    if($ship->courseid && preg_match_all('{<member>(.*?)</member>}is', $tagcontents, $membermatches, PREG_SET_ORDER)){
+        $courseobj = new stdClass();
+        $courseobj->id = $ship->courseid;
+
+        foreach($membermatches as $mmatch){
+            unset($member);
+            unset($memberstoreobj);
+            if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $mmatch[1], $matches)){
+                $member->idnumber = trim($matches[1]);
+            }
+            if(preg_match('{<role\s+roletype=["\'](.+?)["\'].*?>}is', $mmatch[1], $matches)){
+                $member->roletype = trim($matches[1]); // 01 means Student, 02 means Instructor, 3 means ContentDeveloper, and there are more besides
+            } elseif($imscapitafix && preg_match('{<roletype>(.+?)</roletype>}is', $mmatch[1], $matches)){
+                // The XML that comes out of Capita Student Records seems to contain a misinterpretation of the IMS specification!
+                $member->roletype = trim($matches[1]); // 01 means Student, 02 means Instructor, 3 means ContentDeveloper, and there are more besides
+            }
+            if(preg_match('{<role\b.*?<status>(.+?)</status>.*?</role>}is', $mmatch[1], $matches)){
+                $member->status = trim($matches[1]); // 1 means active, 0 means inactive - treat this as enrol vs unenrol
+            }
+
+            $recstatus = ($this->get_recstatus($mmatch[1], 'role'));
+            if($recstatus==3){
+              $member->status = 0; // See above - recstatus of 3 (==delete) is treated the same as status of 0
+              //echo "<p>process_membership_tag: unenrolling member due to recstatus of 3</p>";
+            }
+
+            $timeframe->begin = 0;
+            $timeframe->end = 0;
+            if(preg_match('{<role\b.*?<timeframe>(.+?)</timeframe>.*?</role>}is', $mmatch[1], $matches)){
+                $timeframe = $this->decode_timeframe($matches[1]);
+            }
+            if(preg_match('{<role\b.*?<extension>.*?<cohort>(.+?)</cohort>.*?</extension>.*?</role>}is', $mmatch[1], $matches)){
+                $member->groupname = trim($matches[1]);
+                // The actual processing (ensuring a group record exists, etc) occurs below, in the enrol-a-student clause
+            }
+
+            $rolecontext = get_context_instance(CONTEXT_COURSE, $ship->courseid);
+            $rolecontext = $rolecontext->id; // All we really want is the ID
+//$this->log_line("Context instance for course $ship->courseid is...");
+//print_r($rolecontext);
+
+            // Add or remove this student or teacher to the course...
+            $memberstoreobj->userid = $DB->get_field('user', 'id', array('idnumber'=>$member->idnumber));
+            $memberstoreobj->enrol = 'imsenterprise';
+            $memberstoreobj->course = $ship->courseid;
+            $memberstoreobj->time = time();
+            $memberstoreobj->timemodified = time();
+            if($memberstoreobj->userid){
+
+                // Decide the "real" role (i.e. the Moodle role) that this user should be assigned to.
+                // Zero means this roletype is supposed to be skipped.
+                $moodleroleid = $this->rolemappings[$member->roletype];
+                if(!$moodleroleid) {
+                    $this->log_line("SKIPPING role $member->roletype for $memberstoreobj->userid ($member->idnumber) in course $memberstoreobj->course");
+                    continue;
+                }
+
+                if(intval($member->status) == 1) {
+                    // Enrol the member
+
+                    $einstance = $DB->get_record('enrol',
+                                    array('courseid' => $courseobj->id, 'enrol' => $memberstoreobj->enrol));
+                    if (empty($einstance)) {
+                        // Only add an enrol instance to the course if non-existent
+                        $enrolid = $this->add_instance($courseobj);
+                        $einstance = $DB->get_record('enrol', array('id' => $enrolid));
+                    }
+
+                    $this->enrol_user($einstance, $memberstoreobj->userid, $moodleroleid, $timeframe->begin, $timeframe->end);
+
+                    $this->log_line("Enrolled user #$memberstoreobj->userid ($member->idnumber) to role $member->roletype in course $memberstoreobj->course");
+                    $memberstally++;
+
+                    // At this point we can also ensure the group membership is recorded if present
+                    if(isset($member->groupname)){
+                        // Create the group if it doesn't exist - either way, make sure we know the group ID
+                        if(isset($groupids[$member->groupname])) {
+                            $member->groupid = $groupids[$member->groupname]; // Recall the group ID from cache if available
+                        } else {
+                            if($groupid = $DB->get_field('groups', 'id', 'name', $member->groupname, array('courseid'=>$ship->courseid))){
+                                $member->groupid = $groupid;
+                                $groupids[$member->groupname] = $groupid; // Store ID in cache
+                            } else {
+                                // Attempt to create the group
+                                $group->name = $member->groupname;
+                                $group->courseid = $ship->courseid;
+                                $group->timecreated = time();
+                                $group->timemodified = time();
+                                $groupid = $DB->insert_record('groups', $group);
+                                $this->log_line('Added a new group for this course: '.$group->name);
+                                $groupids[$member->groupname] = $groupid; // Store ID in cache
+                                $member->groupid = $groupid;
+                            }
+                        }
+                        // Add the user-to-group association if it doesn't already exist
+                        if($member->groupid) {
+                            groups_add_member($member->groupid, $memberstoreobj->userid);
+                        }
+                    } // End of group-enrolment (from member.role.extension.cohort tag)
+
+                } elseif ($this->get_config('imsunenrol')) {
+                    // Unenrol member
+
+                    $einstances = $DB->get_records('enrol',
+                                    array('enrol' => $memberstoreobj->enrol, 'courseid' => $courseobj->id));
+                    foreach ($einstances as $einstance) {
+                        // Unenrol the user from all imsenterprise enrolment instances
+                        $this->unenrol_user($einstance, $memberstoreobj->userid);
+                    }
+
+                    $membersuntally++;
+                    $this->log_line("Unenrolled $member->idnumber from role $moodleroleid in course");
+                }
+
+            }
+        }
+        $this->log_line("Added $memberstally users to course $ship->coursecode");
+        if($membersuntally > 0){
+            $this->log_line("Removed $membersuntally users from course $ship->coursecode");
+        }
+    }
+} // End process_membership_tag()
+
+/**
+* Process the properties tag. The only data from this element
+* that is relevant is whether a <target> is specified.
+* @param string $tagconents The raw contents of the XML element
+*/
+function process_properties_tag($tagcontents){
+    $imsrestricttarget = $this->get_config('imsrestricttarget');
+
+    if ($imsrestricttarget) {
+        if(!(preg_match('{<target>'.preg_quote($imsrestricttarget).'</target>}is', $tagcontents, $matches))){
+            $this->log_line("Skipping processing: required target \"$imsrestricttarget\" not specified in this data.");
+            $this->continueprocessing = false;
+        }
+    }
+}
+
+/**
+* Store logging information. This does two things: uses the {@link mtrace()}
+* function to print info to screen/STDOUT, and also writes log to a text file
+* if a path has been specified.
+* @param string $string Text to write (newline will be added automatically)
+*/
+function log_line($string){
+    mtrace($string);
+    if($this->logfp) {
+        fwrite($this->logfp, $string . "\n");
+    }
+}
+
+/**
+* Process the INNER contents of a <timeframe> tag, to return beginning/ending dates.
+*/
+function decode_timeframe($string){ // Pass me the INNER CONTENTS of a <timeframe> tag - beginning and/or ending is returned, in unix time, zero indicating not specified
+    $ret->begin = $ret->end = 0;
+    // Explanatory note: The matching will ONLY match if the attribute restrict="1"
+    // because otherwise the time markers should be ignored (participation should be
+    // allowed outside the period)
+    if(preg_match('{<begin\s+restrict="1">(\d\d\d\d)-(\d\d)-(\d\d)</begin>}is', $string, $matches)){
+        $ret->begin = mktime(0,0,0, $matches[2], $matches[3], $matches[1]);
+    }
+    if(preg_match('{<end\s+restrict="1">(\d\d\d\d)-(\d\d)-(\d\d)</end>}is', $string, $matches)){
+        $ret->end = mktime(0,0,0, $matches[2], $matches[3], $matches[1]);
+    }
+    return $ret;
+} // End decode_timeframe
+
+/**
+* Load the role mappings (from the config), so we can easily refer to
+* how an IMS-E role corresponds to a Moodle role
+*/
+function load_role_mappings() {
+    require_once('locallib.php');
+    global $DB;
+
+    $imsroles = new imsenterprise_roles();
+    $imsroles = $imsroles->get_imsroles();
+
+    $this->rolemappings = array();
+    foreach($imsroles as $imsrolenum=>$imsrolename) {
+        $this->rolemappings[$imsrolenum] = $this->rolemappings[$imsrolename]
+            = $DB->get_field('config_plugins', 'value', array('name'=>'imsrolemap' . $imsrolenum));
+    }
+}
+
+} // end of class
+
+
diff --git a/enrol/imsenterprise/locallib.php b/enrol/imsenterprise/locallib.php
new file mode 100644
index 0000000..ea6214c
--- /dev/null
+++ b/enrol/imsenterprise/locallib.php
@@ -0,0 +1,84 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * IMS Enterprise enrol plugin implementation.
+ *
+ * @package   enrol_imsenterprise
+ * @copyright 2010 Eugene Venter
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Eugene Venter
+ */
+
+defined('MOODLE_INTERNAL') || die;
+
+
+class imsenterprise_roles {
+    private $imsroles;
+
+    function __construct() {
+        $this->imsroles = array(
+        '01'=>'Learner',
+        '02'=>'Instructor',
+        '03'=>'Content Developer',
+        '04'=>'Member',
+        '05'=>'Manager',
+        '06'=>'Mentor',
+        '07'=>'Administrator',
+        '08'=>'TeachingAssistant',
+        );
+        // PLEASE NOTE: It may seem odd that "Content Developer" has a space in it
+        // but "TeachingAssistant" doesn't. That's what the spec says though!!!
+    }
+
+    function get_imsroles() {
+        return $this->imsroles;
+    }
+
+    /**
+    * This function is only used when first setting up the plugin, to
+    * decide which role assignments to recommend by default.
+    * For example, IMS role '01' is 'Learner', so may map to 'student' in Moodle.
+    */
+    function determine_default_rolemapping($imscode) {
+        global $DB;
+
+        switch($imscode) {
+            case '01':
+            case '04':
+                $shortname = 'student';
+                break;
+            case '06':
+            case '08':
+                $shortname = 'teacher';
+                break;
+            case '02':
+            case '03':
+                $shortname = 'editingteacher';
+                break;
+            case '05':
+            case '07':
+                $shortname = 'admin';
+                break;
+            default:
+                return 0; // Zero for no match
+        }
+        return (string)$DB->get_field('role', 'id', array('shortname'=>$shortname));
+    }
+
+
+}  // class
diff --git a/enrol/imsenterprise/settings.php b/enrol/imsenterprise/settings.php
new file mode 100644
index 0000000..5c76b76
--- /dev/null
+++ b/enrol/imsenterprise/settings.php
@@ -0,0 +1,88 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * IMS Enterprise enrolments plugin settings and presets.
+ *
+ * @package   enrol_imsenterprise
+ * @copyright 2010 Eugene Venter
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die;
+
+if ($ADMIN->fulltree) {
+    require_once('locallib.php');
+
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_settings', '', get_string('pluginname_desc', 'enrol_imsenterprise')));
+
+    //--- general settings -----------------------------------------------------------------------------------
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_basicsettings', get_string('basicsettings', 'enrol_imsenterprise'), ''));
+
+    $settings->add(new admin_setting_configtext('enrol_imsenterprise/imsfilelocation', get_string('location', 'enrol_imsenterprise'), '', ''));
+
+    $settings->add(new admin_setting_configtext('enrol_imsenterprise/logtolocation', get_string('logtolocation', 'enrol_imsenterprise'), '', ''));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/mailadmins', get_string('mailadmins', 'enrol_imsenterprise'), '', 0));
+
+    //--- user data options ---------------------------------------------------------------------------------
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_usersettings', get_string('usersettings', 'enrol_imsenterprise'), ''));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/createnewusers', get_string('createnewusers', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/imsdeleteusers', get_string('deleteusers', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/fixcaseusernames', get_string('fixcaseusernames', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/fixcasepersonalnames', get_string('fixcasepersonalnames', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/imssourcedidfallback', get_string('sourcedidfallback', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_usersettings_roles', get_string('roles', 'enrol_imsenterprise'), get_string('imsrolesdescription', 'enrol_imsenterprise')));
+
+    if (!during_initial_install()) {
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+        $assignableroles = get_assignable_roles($sitecontext);
+        $assignableroles = array('0' => get_string('ignore', 'enrol_imsenterprise')) + $assignableroles;
+        $imsroles = new imsenterprise_roles();
+
+        foreach ($imsroles->get_imsroles() as $imsrolenum => $imsrolename) {
+            $settings->add(new admin_setting_configselect('enrol_imsenterprise/imsrolemap'.$imsrolenum, format_string('"'.$imsrolename.'" ('.$imsrolenum.')'), '', $imsroles->determine_default_rolemapping($imsrolenum), $assignableroles));
+        }
+    }
+
+    //--- course data options -------------------------------------------------------------------------------
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_coursesettings', get_string('coursesettings', 'enrol_imsenterprise'), ''));
+
+    $settings->add(new admin_setting_configtext('enrol_imsenterprise/truncatecoursecodes', get_string('truncatecoursecodes', 'enrol_imsenterprise'), '', 0, PARAM_INT, 2));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/createnewcourses', get_string('createnewcourses', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/createnewcategories', get_string('createnewcategories', 'enrol_imsenterprise'), '', 0));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/imsunenrol', get_string('allowunenrol', 'enrol_imsenterprise'), '', 0));
+
+    //--- miscellaneous -------------------------------------------------------------------------------------
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_miscsettings', get_string('miscsettings', 'enrol_imsenterprise'), ''));
+
+    $settings->add(new admin_setting_configtext('enrol_imsenterprise/imsrestricttarget', get_string('restricttarget', 'enrol_imsenterprise'), '', ''));
+
+    $settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/imscapitafix', get_string('usecapitafix', 'enrol_imsenterprise'), '', 0));
+
+    $importnowstring = get_string('aftersaving...', 'enrol_imsenterprise').' <a href="../enrol/imsenterprise/importnow.php">'.get_string('doitnow', 'enrol_imsenterprise').'</a>';
+    $settings->add(new admin_setting_heading('enrol_imsenterprise_doitnowmessage', '', $importnowstring));
+}
diff --git a/enrol/imsenterprise/version.php b/enrol/imsenterprise/version.php
new file mode 100644
index 0000000..14eb3c8
--- /dev/null
+++ b/enrol/imsenterprise/version.php
@@ -0,0 +1,27 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * IMS Enterprise file enrolment plugin version specification.
+ *
+ * @package   enrol_imsenterprise
+ * @copyright 2010 Eugene Venter
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$plugin->version = 2010071200;
+$plugin->cron = 60;
