L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-29290 - few more coding guideline fixes with function

Browse Source
This commit is contained in:
Dan Marsden
2011-11-16 08:51:58 +13:00
parent 20d694ac59
commit 801fdcfd3f
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/imsenterprise/lib.php
+16 -17
View File
@@ -302,7 +302,7 @@ function get_recstatus($tagdata, $tagname){
* Process the group tag. This defines a Moodle course.
* @param string $tagconents The raw contents of the XML element
*/
function process_group_tag($tagcontents){
function process_group_tag($tagcontents) {
global $DB;
// Get configs
@@ -312,24 +312,24 @@ function process_group_tag($tagcontents){
// Process tag contents
$group = new stdClass();
if(preg_match('{<sourcedid>.*?<id>(.+?)</id>.*?</sourcedid>}is', $tagcontents, $matches)){
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)){
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)){
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)){
if (!(strlen($group->coursecode)>0)) {
$this->log_line('Error at line '.$line.': Unable to find course code in \'group\' element.');
}else{
} else {
// First, truncate the course code if desired
if(intval($truncatecoursecodes)>0){
if (intval($truncatecoursecodes)>0) {
$group->coursecode = ($truncatecoursecodes > 0)
? substr($group->coursecode, 0, intval($truncatecoursecodes))
: $group->coursecode;
@@ -349,10 +349,10 @@ function process_group_tag($tagcontents){
$group->coursecode = array($group->coursecode);
// Third, check if the course(s) exist
foreach($group->coursecode as $coursecode){
foreach ($group->coursecode as $coursecode) {
$coursecode = trim($coursecode);
if(!$DB->get_field('course', 'id', array('idnumber'=>$coursecode))) {
if(!$createnewcourses) {
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
@@ -374,14 +374,13 @@ function process_group_tag($tagcontents){
$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 (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))){
if ($catid = $DB->get_field('course_categories', 'id', array('name'=>$group->category))) {
$course->category = $catid;
} elseif($createnewcategories) {
} else if ($createnewcategories) {
// Else if we're allowed to create new categories, let's create this one
$newcat = new stdClass();
$newcat->name = $group->category;
@@ -389,12 +388,12 @@ function process_group_tag($tagcontents){
$catid = $DB->insert_record('course_categories', $newcat);
$course->category = $catid;
$this->log_line("Created new (hidden) category, #$catid: $newcat->name");
}else{
} 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{
} else {
$course->category = 1;
}
$course->timecreated = time();
@@ -418,7 +417,7 @@ function process_group_tag($tagcontents){
$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)))){
} else if ($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));
}