From 20d694ac59c30c4edba183a1c32ca710377a7cfc Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 8 Nov 2011 14:48:26 +1300 Subject: [PATCH] MDL-29290 fix spacing --- enrol/imsenterprise/lib.php | 122 ++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php index ee6efb81eef..56a31d34eaf 100644 --- a/enrol/imsenterprise/lib.php +++ b/enrol/imsenterprise/lib.php @@ -352,72 +352,72 @@ function process_group_tag($tagcontents){ 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 - $courseconfig = get_config('moodlecourse'); // Load Moodle Course shell defaults - $course = new stdClass(); - $course->fullname = $group->description; - $course->shortname = $coursecode; - $course->idnumber = $coursecode; - $course->format = $courseconfig->format; - $course->visible = $courseconfig->visible; - $course->numsections = $courseconfig->numsections; - $course->hiddensections = $courseconfig->hiddensections; - $course->newsitems = $courseconfig->newsitems; - $course->showgrades = $courseconfig->showgrades; - $course->showreports = $courseconfig->showreports; - $course->maxbytes = $courseconfig->maxbytes; - $course->groupmode = $courseconfig->groupmode; - $course->groupmodeforce = $courseconfig->groupmodeforce; - $course->enablecompletion = $courseconfig->enablecompletion; - $course->completionstartonenrol = $courseconfig->completionstartonenrol; - // Insert default names for teachers/students, from the current language - $site = get_site(); + if(!$createnewcourses) { + $this->log_line("Course $coursecode not found in Moodle's course idnumbers."); + } else { + // Create the (hidden) course(s) if not found + $courseconfig = get_config('moodlecourse'); // Load Moodle Course shell defaults + $course = new stdClass(); + $course->fullname = $group->description; + $course->shortname = $coursecode; + $course->idnumber = $coursecode; + $course->format = $courseconfig->format; + $course->visible = $courseconfig->visible; + $course->numsections = $courseconfig->numsections; + $course->hiddensections = $courseconfig->hiddensections; + $course->newsitems = $courseconfig->newsitems; + $course->showgrades = $courseconfig->showgrades; + $course->showreports = $courseconfig->showreports; + $course->maxbytes = $courseconfig->maxbytes; + $course->groupmode = $courseconfig->groupmode; + $course->groupmodeforce = $courseconfig->groupmodeforce; + $course->enablecompletion = $courseconfig->enablecompletion; + $course->completionstartonenrol = $courseconfig->completionstartonenrol; + // 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 = new stdClass(); - $newcat->name = $group->category; - $newcat->visible = 0; - $catid = $DB->insert_record('course_categories', $newcat); - $course->category = $catid; - $this->log_line("Created new (hidden) category, #$catid: $newcat->name"); + // 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 = new stdClass(); + $newcat->name = $group->category; + $newcat->visible = 0; + $catid = $DB->insert_record('course_categories', $newcat); + $course->category = $catid; + $this->log_line("Created new (hidden) category, #$catid: $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{ - // 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(); + // Choose a sort order that puts us at the start of the list! + $course->sortorder = 0; + + $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 stdClass(); + $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)"); } - $course->timecreated = time(); - $course->startdate = time(); - // Choose a sort order that puts us at the start of the list! - $course->sortorder = 0; - - $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 stdClass(); - $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)"); - } }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));