From a722e4912e65cc6997ff729f76e4c132ae41bb65 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Sat, 17 Jul 2010 22:32:15 +0000
Subject: [PATCH] MDL-22787 MNet improved page url handling in Remote
 enrolments client

---
 mnet/service/enrol/host.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mnet/service/enrol/host.php b/mnet/service/enrol/host.php
index deec6830d78..8a81ae9a65d 100644
--- a/mnet/service/enrol/host.php
+++ b/mnet/service/enrol/host.php
@@ -35,7 +35,8 @@ require_once($CFG->dirroot.'/mnet/service/enrol/locallib.php');
 $hostid   = required_param('id', PARAM_INT); // remote host id
 $usecache = optional_param('usecache', true, PARAM_BOOL); // use cached list of courses
 
-admin_externalpage_setup('mnetenrol');
+admin_externalpage_setup('mnetenrol', '', array('id'=>$hostid, 'usecache'=>1),
+        new moodle_url('/mnet/service/enrol/host.php'));
 $service = mnetservice_enrol::get_instance();
 
 if (!$service->is_available()) {
@@ -66,9 +67,10 @@ echo $OUTPUT->heading(get_string('availablecourseson', 'mnetservice_enrol', s($h
 if (empty($courses)) {
     $a = (object)array('hostname' => s($host->hostname), 'hosturl' => s($host->hosturl));
     echo $OUTPUT->box(get_string('availablecoursesonnone','mnetservice_enrol', $a), 'noticebox');
-    echo $OUTPUT->single_button(new moodle_url(new moodle_url('/mnet/service/enrol/host.php'),
-        array('id'=>$host->id, 'usecache'=>0, 'sesskey'=>sesskey())),
-        get_string('refetch', 'mnetservice_enrol'), 'get');
+    if ($usecache) {
+        echo $OUTPUT->single_button(new moodle_url($PAGE->url, array('usecache'=>0, 'sesskey'=>sesskey())),
+                                    get_string('refetch', 'mnetservice_enrol'), 'get');
+    }
     echo $OUTPUT->footer();
     die();
 }
@@ -110,9 +112,8 @@ foreach ($courses as $course) {
 echo html_writer::table($table);
 
 if ($usecache) {
-    echo $OUTPUT->single_button(new moodle_url(new moodle_url('/mnet/service/enrol/host.php'),
-        array('id'=>$host->id, 'usecache'=>0, 'sesskey'=>sesskey())),
-        get_string('refetch', 'mnetservice_enrol'), 'get');
+    echo $OUTPUT->single_button(new moodle_url($PAGE->url, array('usecache'=>0, 'sesskey'=>sesskey())),
+                                get_string('refetch', 'mnetservice_enrol'), 'get');
 }
 
 echo $OUTPUT->footer();