mnet: introducing print_remote_course() and use it in print_my_moodle()

mbwa-ha-ha-ha! All your remote courses belong to us.

diff --git a/course/lib.php b/course/lib.php
index 658784cb2087b973b026f9355488153887a1374e..ea4153a33a7044ae13719c7167c725964e910dfe 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1736,6 +1736,7 @@ function print_courses($category, $width="100%", $hidesitecourse = false) {
     global $CFG;
 
     if (empty($category)) {
+        error_log(1);
         $categories = get_categories(0);  // Parent = 0   ie top-level categories only
         if (count($categories) == 1) {
             $category   = array_shift($categories);
@@ -1745,6 +1746,7 @@ function print_courses($category, $width="100%", $hidesitecourse = false) {
         }
         unset($categories);
     } else {
+error_log(2);
         $categories = get_categories($category->id);  // sub categories
         $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
     }
@@ -1767,6 +1769,9 @@ function print_courses($category, $width="100%", $hidesitecourse = false) {
             echo '</div>';
         }
     }
+
+
+
 }
 
 
@@ -1830,13 +1835,39 @@ function print_my_moodle() {
         error("It shouldn't be possible to see My Moodle without being logged in.");
     }
 
-    if ($courses = get_my_courses($USER->id)) {
-        foreach ($courses as $course) {
-            if ($course->id == SITEID) {
-                continue;
+    $courses  = get_my_courses($USER->id);
+    $rhosts   = array();
+    $rcourses = array();
+    if ($CFG->mnet_dispatcher_mode === 'strict') {
+        $rcourses = get_my_remotecourses($USER->id);
+        $rhosts   = get_my_remotehosts($USER->id);
+    }
+
+    if (!empty($courses) || !empty($rcourses) || !empty($rhosts)) {
+
+        if (!empty($courses)) {
+            foreach ($courses as $course) {
+                if ($course->id == SITEID) {
+                    continue;
+                }
+                print_course($course, "100%");
+            }
+        }
+
+        // MNET
+        if (!empty($rcourses)) { 
+            // at the IDP, we know of all the remote courses
+            foreach ($rcourses as $course) {
+                print_remote_course($course, "100%");
+            }
+        } elseif (!empty($rhosts)) {
+            // non-IDP, we know of all the remote servers, but not courses
+            foreach ($rhosts as $host) {
+                // print_remote_host($host, "100%");
             }
-            print_course($course, "100%");
         }
+        unset($course);
+        unset($host);
 
         if (count_records("course") > (count($courses) + 1) ) {  // Some courses not being displayed
             echo "<table width=\"100%\"><tr><td align=\"center\">";
@@ -1845,6 +1876,7 @@ function print_my_moodle() {
             print_single_button("$CFG->wwwroot/course/index.php", NULL, get_string("fulllistofcourses"), "get");
             echo "</td></tr></table>\n";
         }
+
     } else {
         if (count_records("course_categories") > 1) {
             print_simple_box_start("center", "100%", "#FFFFFF", 5, "categorybox");
@@ -1889,6 +1921,33 @@ function print_course_search($value="", $return=false, $format="plain") {
     echo $output;
 }
 
+function print_remote_course($course, $width="100%") {
+
+    global $CFG, $USER;
+
+    $linkcss = '';
+
+    $url = "{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&amp;wantsurl=/course/view.php?id={$course->remoteid}";
+
+    echo '<div class="coursebox">';
+    echo '<div class="info">';
+    echo '<div class="name"><a title="'.get_string('entercourse').'"'.
+         $linkcss.' href="'.$url.'">'
+        . s($course->fullname) .'</a><br />'
+        . s($course->hostname) . ' : '
+        . s($course->cat_name) . ' : ' 
+        . s($course->shortname). '</div>';   
+    echo '</div><div class="summary">';
+    $options = NULL;
+    $options->noclean = true;
+    $options->para = false;
+    echo format_text($course->summary, FORMAT_MOODLE, $options);
+    echo '</div>';
+    echo '</div>';
+    echo '<div class="clearer"></div>';
+}
+
+
 /// MODULE FUNCTIONS /////////////////////////////////////////////////////////////////
 
 function add_course_module($mod) {

diff --git a/lib/datalib.php b/lib/datalib.php
index d5a3258d6e34f78be06b37be40b38fcbf2e0c53b..7235624c6818c9046258503bae31043bf06f21fb 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1016,9 +1016,12 @@ function get_my_remotecourses($userid=0) {
         $userid = $USER->id;
     }
 
-    $sql = "SELECT c.remoteid, c.shortname, c.fullname, c.hostid
+    $sql = "SELECT c.remoteid, c.shortname, c.fullname, 
+                   c.hostid, c.summary, c.cat_name,
+                   h.name AS hostname
             FROM   {$CFG->prefix}mnet_enrol_course c
             JOIN   {$CFG->prefix}mnet_enrol_assignments a ON c.id=a.courseid
+            JOIN   {$CFG->prefix}mnet_host h        ON c.hostid=h.id
             WHERE  a.userid={$userid}";
 
     return get_records_sql($sql);