# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/enrol/flatfile/db/install.xml
--- moodle/enrol/flatfile/db/install.xml No Base Revision
+++ moodle/enrol/flatfile/db/install.xml Locally New
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: moodle/enrol/flatfile/db/upgrade.php
--- moodle/enrol/flatfile/db/upgrade.php No Base Revision
+++ moodle/enrol/flatfile/db/upgrade.php Locally New
@@ -0,0 +1,63 @@
+.
+
+/**
+ * Keeps track of upgrades to the enrol_mnet plugin
+ *
+ * @package enrol
+ * @subpackage flatfile
+ * @copyright 2010 Aparup Banerjee
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+function xmldb_enrol_flatfile_upgrade($oldversion) {
+ global $CFG, $DB;
+
+ $result = TRUE;
+ $dbman = $DB->get_manager();
+
+ if ($oldversion < 2010090202) {
+
+ // Define table enrol_flatfile to be created
+ $table = new xmldb_table('enrol_flatfile');
+
+ // Adding fields to table enrol_flatfile
+ $table->add_field('id', XMLDB_TYPE_INTEGER, '20', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
+ $table->add_field('action', XMLDB_TYPE_CHAR, '10', null, null, null, 'add');
+ $table->add_field('role_shortname', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('user_idnumber', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('course_shortname', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('timestart', XMLDB_TYPE_INTEGER, '20', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('timeend', XMLDB_TYPE_INTEGER, '20', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '20', null, XMLDB_NOTNULL, null, null);
+
+ // Adding keys to table enrol_flatfile
+ $table->add_key('id', XMLDB_KEY_PRIMARY, array('id'));
+
+ // Conditionally launch create table for enrol_flatfile
+ if (!$dbman->table_exists($table)) {
+ $dbman->create_table($table);
+ }
+
+ // flatfile savepoint reached
+ upgrade_plugin_savepoint(true, 2010090202, 'enrol', 'flatfile');
+ }
+
+ return $result;
+}
Index: moodle/enrol/flatfile/lib.php
--- moodle/enrol/flatfile/lib.php Base (1.3)
+++ moodle/enrol/flatfile/lib.php Locally Modified (Based On 1.3)
@@ -48,14 +48,22 @@
* starttime = start time (in seconds since epoch) - optional
* endtime = end time (in seconds since epoch) - optional
*/
+ private $log;
+
public function cron() {
+ error_log(__LINE__);
+ $this->process_file();
+
+ $this->process_buffer();
+
+ echo $this->log;
+ } // end of function
+
+ protected function process_file() {
global $CFG, $DB;
$filelocation = $this->get_config('location');
- $mailstudents = $this->get_config('mailstudents');
- $mailteachers = $this->get_config('mailteachers');
$mailadmins = $this->get_config('mailadmins');
-
if (empty($filelocation)) {
$filename = "$CFG->dataroot/1/enrolments.txt"; // Default location
} else {
@@ -63,7 +71,6 @@
}
if ( file_exists($filename) ) {
-
$this->log = userdate(time()) . "\n";
$this->log .= "Flatfile enrol cron found file: $filename\n\n";
@@ -77,7 +84,6 @@
$line++;
$fields = explode( ",", str_replace( "\r", "", fgets($fh) ) );
-
/// If a line is incorrectly formatted ie does not have 4 comma separated fields then ignore it
if (count($fields) != 4 and count($fields) !=6) {
if ( count($fields) > 1 or strlen($fields[0]) > 1) { // no error for blank lines
@@ -86,7 +92,6 @@
continue;
}
-
$fields[0] = trim(strtolower($fields[0]));
$fields[1] = trim(strtolower($fields[1]));
$fields[2] = trim($fields[2]);
@@ -104,51 +109,137 @@
}
$this->log .= ":";
+ error_log(__LINE__);
+ $this->process_records($roles, $rolemap, $fields[0],$fields[1],$fields[2],$fields[3],$fields[4],$fields[5]);
+ } // end of while loop
+ fclose($fh);
+ } // end of if(file_open)
+ if(! @unlink($filename)) {
+ $eventdata = new object();
+ $eventdata->modulename = 'moodle';
+ $eventdata->component = 'course';
+ $eventdata->name = 'flatfile_enrolment';
+ $eventdata->userfrom = get_admin();
+ $eventdata->userto = get_admin();
+ $eventdata->subject = get_string("filelockedmailsubject", "enrol_flatfile");
+ $eventdata->fullmessage = get_string("filelockedmail", "enrol_flatfile", $filename);
+ $eventdata->fullmessageformat = FORMAT_PLAIN;
+ $eventdata->fullmessagehtml = '';
+ $eventdata->smallmessage = '';
+ message_send($eventdata);
+ $this->log .= "Error unlinking file $filename\n";
+ }
+
+ if (!empty($mailadmins)) {
+
+ // Send mail to admin
+ $eventdata = new object();
+ $eventdata->modulename = 'moodle';
+ $eventdata->component = 'course';
+ $eventdata->name = 'flatfile_enrolment';
+ $eventdata->userfrom = get_admin();
+ $eventdata->userto = get_admin();
+ $eventdata->subject = "Flatfile Enrolment Log";
+ $eventdata->fullmessage = $this->log;
+ $eventdata->fullmessageformat = FORMAT_PLAIN;
+ $eventdata->fullmessagehtml = '';
+ $eventdata->smallmessage = '';
+ message_send($eventdata);
+ }
+
+ } // end of if(file_exists)
+
+ } // end of function
+
+ protected function process_buffer() {
+ global $DB;
+ // get records from enrol_flatfile table and process any records that are due.
+ if ( $future_enrols = $DB->get_records('enrol_flatfile', null, '')) {
+ list($roles, $rolemap) = $this->get_roles();
+ foreach($future_enrols as $id => $future_en) {
+ $this->log .= "Processing buffered enrolments.\n";
+ // enrol the person.
+ if($this->process_records($roles, $rolemap,
+ $future_en->action, $future_en->role_shortname, $future_en->user_idnumber,
+ $future_en->course_shortname, $future_en->timestart, $future_en->timeend, false)) {
+ //ok record went thru, get rid of the record.
+ $DB->delete_records('enrol_flatfile', array('id'=>$future_en->id));
+ }
+ }
+ }
+ }
+
+ private function process_records($roles, $rolemap, $action, $role, $userid, $courseid, $timestart, $timeend, $store_to_buffer = true) {
+ global $CFG, $DB;
+
+ $mailstudents = $this->get_config('mailstudents');
+ $mailteachers = $this->get_config('mailteachers');
+
/// check correct formatting of operation field
- if ($fields[0] != "add" and $fields[0] != "del") {
+ if ($action != "add" and $action != "del") {
$this->log .= "Unknown operation in field 1 - ignoring line\n";
- continue;
+ return false;
}
/// check correct formatting of role field
- if (!isset($rolemap[$fields[1]]) && !isset($roles[$fields[1]])) {
+ if (!isset($rolemap[$role]) && !isset($roles[$role])) {
+ var_dump($role);
+ var_dump($roles);
+ var_dump($rolemap);
$this->log .= "Unknown role in field2 - ignoring line\n";
- continue;
+ return false;
}
- if (! $user = $DB->get_record("user", array("idnumber"=>$fields[2]))) {
+
+ if (! $user = $DB->get_record("user", array("idnumber"=>$userid))) {
$this->log .= "Unknown user idnumber in field 3 - ignoring line\n";
- continue;
+ return false;
}
- if (! $course = $DB->get_record("course", array("idnumber"=>$fields[3]))) {
+ if (! $course = $DB->get_record("course", array("idnumber"=>$courseid))) {
$this->log .= "Unknown course idnumber in field 4 - ignoring line\n";
- continue;
+ return false;;
}
- if ($fields[4] > $fields[5]) {
+ if ($timestart > $timeend) {
$this->log .= "Start time was later than end time - ignoring line\n";
- continue;
+ return false;
}
+ // check if timestart is for future processing.
+ if ($timestart > time()) {
+ if ($store_to_buffer) {
+ // populate into enrol_flatfile table as a future role to be assigned by cron.
+ $future_en = new object();
+ $future_en->action = $action;
+ $future_en->role_shortname = $role;
+ $future_en->user_idnumber = $userid;
+ $future_en->course_shortname = $courseid;
+ $future_en->timestart = $timestart;
+ $future_en->timeend = $timeend;
+ $future_en->timemodified = time();
+ $future_en->id = $DB->insert_record('enrol_flatfile', $future_en);
+ }
+ return false;
+ }
unset($elog);
// Either field[1] is a name that appears in the mapping,
// or it's an actual short name. It has to be one or the
// other, or we don't get to this point.
- $roleid = isset($rolemap[$fields[1]]) ? $roles[$rolemap[$fields[1]]] : $roles[$fields[1]];
+ $roleid = isset($rolemap[$role]) ? $roles[$rolemap[$role]] : $roles[$role];
// Create/resurrect a context object
$context = get_context_instance(CONTEXT_COURSE, $course->id);
- if ($fields[0] == 'add') {
+ if ($action == 'add') {
$instance = $DB->get_record('enrol',
array('courseid' => $course->id, 'enrol' => 'flatfile'));
if (empty($instance)) {
@@ -158,7 +249,7 @@
}
// Enrol the user with this plugin instance
- $this->enrol_user($instance, $user->id, $roleid, $fields[4], $fields[5]);
+ $this->enrol_user($instance, $user->id, $roleid, $timestart, $timeend);
} else {
$instances = $DB->get_records('enrol',
array('enrol' => 'flatfile', 'courseid' => $course->id));
@@ -169,9 +260,9 @@
}
- if ( empty($elog) and ($fields[0] == "add") ) {
+ if ( empty($elog) and ($action== "add") ) {
- if ($fields[1] == "student") {
+ if ($role == "student") {
// TODO: replace this with check for $CFG->couremanager, 'moodle/course:update' is definitely wrong
if ($teachers = get_users_by_capability($context, 'moodle/course:update', 'u.*')) {
@@ -236,48 +327,9 @@
}
$this->log .= $elog;
- } // end of while loop
-
- fclose($fh);
- } // end of if(file_open)
-
- if(! @unlink($filename)) {
- $eventdata = new object();
- $eventdata->modulename = 'moodle';
- $eventdata->component = 'course';
- $eventdata->name = 'flatfile_enrolment';
- $eventdata->userfrom = get_admin();
- $eventdata->userto = get_admin();
- $eventdata->subject = get_string("filelockedmailsubject", "enrol_flatfile");
- $eventdata->fullmessage = get_string("filelockedmail", "enrol_flatfile", $filename);
- $eventdata->fullmessageformat = FORMAT_PLAIN;
- $eventdata->fullmessagehtml = '';
- $eventdata->smallmessage = '';
- message_send($eventdata);
- $this->log .= "Error unlinking file $filename\n";
+ return true;
}
- if (!empty($mailadmins)) {
-
- // Send mail to admin
- $eventdata = new object();
- $eventdata->modulename = 'moodle';
- $eventdata->component = 'course';
- $eventdata->name = 'flatfile_enrolment';
- $eventdata->userfrom = get_admin();
- $eventdata->userto = get_admin();
- $eventdata->subject = "Flatfile Enrolment Log";
- $eventdata->fullmessage = $this->log;
- $eventdata->fullmessageformat = FORMAT_PLAIN;
- $eventdata->fullmessagehtml = '';
- $eventdata->smallmessage = '';
- message_send($eventdata);
- }
-
- } // end of if(file_exists)
-
- } // end of function
-
/**
* Returns a pair of arrays. The first is the set of roleids, indexed by
* their shortnames. The second is the set of shortnames that have
Index: moodle/enrol/flatfile/version.php
--- moodle/enrol/flatfile/version.php Base (1.3)
+++ moodle/enrol/flatfile/version.php Locally Modified (Based On 1.3)
@@ -27,5 +27,5 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2010070800;
+$plugin->version = 2010090202;
$plugin->cron = 60;