mnet MDL-21582 fixing notices

wakamori · Feb 16, 2010 · fc36306 · fc36306
1 parent 6150690
commit fc36306
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php
@@ -60,5 +60,5 @@
     echo $OUTPUT->footer();
 } elseif ('delete' == $step) {
     $mnet_peer->delete();
-    redirect('peers.php', get_string('hostdeleted', 'mnet'), 5);
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('hostdeleted', 'mnet'), 5);
 }
diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
@@ -44,7 +44,7 @@
 // first process the register all hosts setting if required
 if (!empty($updra)) {
     set_config('mnet_register_allhosts', optional_param('registerallhosts', 0, PARAM_INT));
-    redirect('/admin/mnet/peers.php', get_string('changessaved'));
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
 }
 
 $adminsection = 'mnetpeers';
@@ -161,7 +161,7 @@
     $mnet_peer->public_key_expires = $credentials['validTo_time_t'];
 
     if ($mnet_peer->commit()) {
-        redirect('peers.php?hostid='.$mnet_peer->id, get_string('changessaved'));
+        redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));
     } else {
         print_error('invalidaction', 'error', 'index.php');
     }

diff --git a/admin/mnet/profilefields.php b/admin/mnet/profilefields.php
@@ -58,9 +58,9 @@
     set_config('host' . $hostid . 'exportdefault', $data->exportdefault, 'mnet');
     set_config('host' . $hostid . 'exportfields', implode(',', $data->exportfields), 'mnet');
 
-    redirect('/admin/mnet/peers.php', get_string('changessaved'));
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
 } elseif ($form->is_cancelled()) {
-    redirect('/admin/mnet/peers.php?hostid=' . $hostid);
+    redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $hostid)));
 }
 
 admin_externalpage_print_header();

diff --git a/mnet/lib.php b/mnet/lib.php
@@ -524,7 +524,8 @@ function mnet_get_app_jumppath ($applicationid) {
 
 function mnet_debug($debugdata, $debuglevel=1) {
     global $CFG;
-    if (empty($CFG->mnet_rpcdebug) || $CFG->mnet_rpcdebug < $debuglevel) {
+    $setlevel = get_config('', 'mnet_rpcdebug');
+    if (empty($setlevel) || $setlevel < $debuglevel) {
         return;
     }
     if (is_object($debugdata)) {