From add569ebe0ef324599c5435cc50530db4d99f55e Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Thu, 4 Oct 2012 16:11:09 +0800
Subject: [PATCH 1/2] MDL-35787 Mnet: fixed php strict standards warnings

---
 auth/mnet/auth.php            | 3 ++-
 mnet/service/enrol/course.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 0a136e846ee..2e21aaacb4f 100644
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -378,7 +378,8 @@ class auth_plugin_mnet extends auth_plugin_base {
                 $extra = $DB->get_records_sql($sql);
 
                 $keys = array_keys($courses);
-                $defaultrole = reset(get_archetype_roles('student'));
+                $studentroles = get_archetype_roles('student');
+                $defaultrole = reset($studentroles);
                 //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!!
                 foreach ($keys AS $id) {
                     if ($courses[$id]->visible == 0) {
diff --git a/mnet/service/enrol/course.php b/mnet/service/enrol/course.php
index d67eaf62bb3..632e4d36915 100644
--- a/mnet/service/enrol/course.php
+++ b/mnet/service/enrol/course.php
@@ -62,7 +62,7 @@ echo $OUTPUT->heading($icon . s($course->fullname));
 
 // collapsible course summary
 if (!empty($course->summary)) {
-    unset($options);
+    $options = new stdClass();
     $options->trusted = false;
     $options->para    = false;
     $options->filter  = false;

From 18f9ad377fc6ac4cc51480bf07be7dc152d056b2 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Tue, 9 Oct 2012 15:22:03 +0800
Subject: [PATCH 2/2] MDL-35787 Mnet: If student role is not defined then throw
 error

---
 auth/mnet/auth.php | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 2e21aaacb4f..14a42ac0fb6 100644
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -379,23 +379,27 @@ class auth_plugin_mnet extends auth_plugin_base {
 
                 $keys = array_keys($courses);
                 $studentroles = get_archetype_roles('student');
-                $defaultrole = reset($studentroles);
-                //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!!
-                foreach ($keys AS $id) {
-                    if ($courses[$id]->visible == 0) {
-                        unset($courses[$id]);
-                        continue;
-                    }
-                    $courses[$id]->cat_id          = $courses[$id]->category;
-                    $courses[$id]->defaultroleid   = $defaultrole->id;
-                    unset($courses[$id]->category);
-                    unset($courses[$id]->visible);
+                if (!empty($studentroles)) {
+                    $defaultrole = reset($studentroles);
+                    //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!!
+                    foreach ($keys AS $id) {
+                        if ($courses[$id]->visible == 0) {
+                            unset($courses[$id]);
+                            continue;
+                        }
+                        $courses[$id]->cat_id          = $courses[$id]->category;
+                        $courses[$id]->defaultroleid   = $defaultrole->id;
+                        unset($courses[$id]->category);
+                        unset($courses[$id]->visible);
 
-                    $courses[$id]->cat_name        = $extra[$id]->cat_name;
-                    $courses[$id]->cat_description = $extra[$id]->cat_description;
-                    $courses[$id]->defaultrolename = $defaultrole->name;
-                    // coerce to array
-                    $courses[$id] = (array)$courses[$id];
+                        $courses[$id]->cat_name        = $extra[$id]->cat_name;
+                        $courses[$id]->cat_description = $extra[$id]->cat_description;
+                        $courses[$id]->defaultrolename = $defaultrole->name;
+                        // coerce to array
+                        $courses[$id] = (array)$courses[$id];
+                    }
+                } else {
+                    throw new moodle_exception('unknownrole', 'error', '', 'student');
                 }
             } else {
                 // if the array is empty, send it anyway