admin MDL-19787 Added PAGE->set_url calls and removed $Id tags

diff --git a/admin/auth.php b/admin/auth.php
index fbd9a7cd46d00792dec77a5e6f95a7defb1925e6..fe3d6108278e177891c50151a1225de43ca4a525 100644 (file)
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -16,6 +16,8 @@ require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
 
+$PAGE->set_url($returnurl);
+
 $action = optional_param('action', '', PARAM_ACTION);
 $auth   = optional_param('auth', '', PARAM_SAFEDIR);
 

diff --git a/admin/dbperformance.php b/admin/dbperformance.php
index 69364f96f3cb87f45cf9d6c7e6ba4c9bd3cfee36..f5f597b6225ecd3a196ea4647d7ffc9183c08c80 100644 (file)
--- a/admin/dbperformance.php
+++ b/admin/dbperformance.php
@@ -1,4 +1,4 @@
-<?PHP  // $Id$
+<?PHP
        // dbperformance.php - shows latest ADOdb stats for the current server
 
     require_once('../config.php');
@@ -21,6 +21,7 @@ error('TODO: rewrite db perf code'); // TODO: rewrite
     $site = get_site();
 
     if (!empty($topframe)) {
+        $PAGE->set_url(new moodle_url($CFG->wwwroot.'/admin/dbperformance.php'));
         $PAGE->navbar->add($stradministration, new moodle_url($CFG->wwwroot.'/admin/index.php'));
         $PAGE->navbar->add($strdatabaseperformance);
         $PAGE->set_title("$site->shortname: $strdatabaseperformance");

diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html
index 2729e85989986b64ec9949a7a0db5dce398247a0..234d78053f451e1b04101db9dd572e978f4455f8 100644 (file)
--- a/admin/mnet/delete.html
+++ b/admin/mnet/delete.html
@@ -1,12 +1,5 @@
 <?php
-$PAGE->navbar->add($stradministration, new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/index.php'));
-$PAGE->navbar->add(get_string('mnetsettings', 'mnet'), new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/mnet/index.php'));
-$PAGE->navbar->add(get_string('deletehost', 'mnet'));
-
-$PAGE->set_title("$site->shortname: $strmnetsettings");
-$PAGE->set_heading($site->fullname);
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
+// Please see delete.php for PAGE and OUTPUT calls that preceed including this file
 ?>
 <div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
     <table class="generalbox standard" border="0" cellpadding="5" cellspacing="0">
@@ -50,6 +43,3 @@ echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
         </tr>
     </table>
 </div>
-<?php
-echo $OUTPUT->footer();
-?>

diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php
index 15781bdf7214dd8d662d8adc7bd7871eedc2fb40..0b8a466c32af1ef82ab07ac013c093c7b65e5f3e 100644 (file)
--- a/admin/mnet/delete.php
+++ b/admin/mnet/delete.php
@@ -1,4 +1,4 @@
-<?PHP // $Id$
+<?php
 
     require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
@@ -38,7 +38,17 @@
         if ($live_users > 0) {
             $warn[] = get_string('usersareonline', 'mnet', $live_users);
         }
+        $PAGE->set_url(new moodle_url($CFG->wwwroot.'/admin/mnet/delete.php'));
+        $PAGE->navbar->add($stradministration, new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/index.php'));
+        $PAGE->navbar->add(get_string('mnetsettings', 'mnet'), new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/mnet/index.php'));
+        $PAGE->navbar->add(get_string('deletehost', 'mnet'));
+
+        $PAGE->set_title("$site->shortname: $strmnetsettings");
+        $PAGE->set_heading($site->fullname);
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
         include('delete.html');
+        echo $OUTPUT->footer();
     } elseif ('delete' == $step) {
         $mnet_peer = new mnet_peer();
         $mnet_peer->set_id($hostid);

diff --git a/admin/report/courseoverview/reportsgraph.php b/admin/report/courseoverview/reportsgraph.php
index db3e71a2a96380593b8f7c59be35f0a63062b14c..b6b4a6de79b238b067f0ae2d6c9e5b5b2b683c4b 100644 (file)
--- a/admin/report/courseoverview/reportsgraph.php
+++ b/admin/report/courseoverview/reportsgraph.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
     require_once('../../../config.php');
     require_once($CFG->dirroot.'/lib/statslib.php');
@@ -30,7 +30,8 @@
     $courses = $DB->get_records_sql($sql, $param->$params, 0, $numcourses);
 
     if (empty($courses)) {
-        print_error('statsnodata', 'error', $CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
+        $PAGE->set_url(new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php'));
+        print_error('statsnodata', 'error', $PAGE->url->out());
     }
 
 

diff --git a/admin/roles/explain.php b/admin/roles/explain.php
index a4b6c0a6c3053817e1e75302850f4d23462200eb..d904be28e70b6e24113d6dd81c23cfb36377f93a 100755 (executable)
--- a/admin/roles/explain.php
+++ b/admin/roles/explain.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -37,6 +37,8 @@ $userid = required_param('user', PARAM_INTEGER); // We use 0 here to mean not-lo
 $contextid = required_param('contextid', PARAM_INTEGER);
 $capability = required_param('capability', PARAM_CAPABILITY);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/admin/roles/explain.php', array('user'=>$userid, 'contextid'=>$contextid, 'capability'=>$capability)));
+
 // Get the context and its parents.
 $context = get_context_instance_by_id($contextid);
 if (!$context) {

diff --git a/admin/timezone.php b/admin/timezone.php
index 576f4e0f52683338f97c4e585e818c31ca30fbe1..e8b21c80a3865e8a18ad5a45b9798e7f1b102981 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -1,4 +1,4 @@
-<?php   // $Id$
+<?php
 
     require_once('../config.php');
 
@@ -18,6 +18,7 @@
     $strusers = get_string("users");
     $strall = get_string("all");
 
+    $PAGE->set_url(new moodle_url($CFG->wwwroot.'/admin/timezone.php'));
     $PAGE->set_title($strtimezone);
     $PAGE->set_heading($strtimezone);
     $PAGE->navbar->add($strtimezone);