From b1d76077fcf9b6596d592239cafa0a4748836ab0 Mon Sep 17 00:00:00 2001
From: Adam Olley <adam.olley@netspot.com.au>
Date: Sat, 28 Jul 2012 14:10:54 +0930
Subject: [PATCH] MDL-34647: admintool: uploaduser enrolments now obey
 enrolperiod directive

---
 admin/tool/uploaduser/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/tool/uploaduser/index.php b/admin/tool/uploaduser/index.php
index b9c645aea4f..8db37d04606 100644
--- a/admin/tool/uploaduser/index.php
+++ b/admin/tool/uploaduser/index.php
@@ -857,6 +857,8 @@ if ($formdata = $mform2->is_cancelled()) {
                         if ($duration > 0) { // sanity check
                             $timeend = $today + $duration;
                         }
+                    } else if ($manualcache[$courseid]->enrolperiod > 0) {
+                        $timeend = $today + $manualcache[$courseid]->enrolperiod;
                     }
 
                     $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend);