From beebcf2606b4a8b00cc404480bc841d67ebf2468 Mon Sep 17 00:00:00 2001
From: samhemelryk <samhemelryk>
Date: Thu, 15 Oct 2009 06:58:21 +0000
Subject: [PATCH] grade MDL-19797 Added set_url calls

---
 grade/edit/outcome/course.php          |  2 ++
 grade/edit/settings/index.php          |  2 ++
 grade/edit/tree/action.php             |  2 ++
 grade/edit/tree/calculation.php        |  9 +++++++++
 grade/edit/tree/category.php           |  6 ++++++
 grade/edit/tree/grade.php              | 12 ++++++++++++
 grade/edit/tree/item.php               |  6 ++++++
 grade/edit/tree/outcomeitem.php        |  6 ++++++
 grade/export/ods/index.php             |  2 ++
 grade/export/txt/index.php             |  2 ++
 grade/export/xls/index.php             |  2 ++
 grade/export/xml/index.php             |  2 ++
 grade/import/csv/index.php             |  9 +++++++++
 grade/import/xml/import.php            |  6 ++++++
 grade/import/xml/index.php             |  2 ++
 grade/report/grader/preferences.php    |  2 ++
 grade/report/grader/quickedit_item.php | 10 ++++++++++
 grade/report/index.php                 |  2 ++
 grade/report/outcomes/index.php        |  2 ++
 grade/report/overview/index.php        |  6 ++++++
 grade/report/user/index.php            |  6 ++++++
 21 files changed, 98 insertions(+)

diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php
index fae404b7c4..adc22bb5b6 100644
--- a/grade/edit/outcome/course.php
+++ b/grade/edit/outcome/course.php
@@ -21,6 +21,8 @@ require_once $CFG->libdir.'/gradelib.php';
 
 $courseid = required_param('id', PARAM_INT);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/edit/outcome/course.php', array('id'=>$courseid)));
+
 /// Make sure they can even access this course
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php
index 6f92c10c45..e4594ffcf3 100644
--- a/grade/edit/settings/index.php
+++ b/grade/edit/settings/index.php
@@ -22,6 +22,8 @@ require_once 'form.php';
 
 $courseid  = optional_param('id', SITEID, PARAM_INT);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/edit/setting/index.php', array('id'=>$courseid)));
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/edit/tree/action.php b/grade/edit/tree/action.php
index 4d821f5bf6..b888236079 100644
--- a/grade/edit/tree/action.php
+++ b/grade/edit/tree/action.php
@@ -22,6 +22,8 @@ $courseid = required_param('id', PARAM_INT);
 $action   = required_param('action', PARAM_ALPHA);
 $eid      = required_param('eid', PARAM_ALPHANUM);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/edit/tree/action.php', array('id'=>$courseid, 'action'=>$action, 'eid'=>$eid)));
+
 /// Make sure they can even access this course
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
index 937535f9ab..f09b062f2b 100644
--- a/grade/edit/tree/calculation.php
+++ b/grade/edit/tree/calculation.php
@@ -25,6 +25,15 @@ $id        = required_param('id', PARAM_INT);
 $section   = optional_param('section', 'calculation', PARAM_ALPHA);
 $idnumbers = optional_param('idnumbers', null, PARAM_RAW);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/edit/tree/calculation.php', array('id'=>$id, 'courseid'=>$courseid));
+if ($section !== 'calculation') {
+    $url->param('section', $section);
+}
+if ($idnumbers !== null) {
+    $url->param('idnumbers', $idnumbers);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index 844cf67ab4..2e80e1b3e0 100644
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -23,6 +23,12 @@ require_once 'category_form.php';
 $courseid = required_param('courseid', PARAM_INT);
 $id       = optional_param('id', 0, PARAM_INT); // grade_category->id
 
+$url = new moodle_url($CFG->wwwroot.'/grade/edit/tree/category.php', array('courseid'=>$courseid));
+if ($id !== 0) {
+    $url->param('id', $id);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 7d6a1af8f1..c5333354ea 100644
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -25,6 +25,18 @@ $id       = optional_param('id', 0, PARAM_INT);
 $itemid   = optional_param('itemid', 0, PARAM_INT);
 $userid   = optional_param('userid', 0, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/edit/tree/grade.php', array('courseid'=>$courseid));
+if ($id !== 0) {
+    $url->param('id', $id);
+}
+if ($itemid !== 0) {
+    $url->param('itemid', $itemid);
+}
+if ($userid !== 0) {
+    $url->param('userid', $userid);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
index 8d6ddb90cd..5e14b48715 100644
--- a/grade/edit/tree/item.php
+++ b/grade/edit/tree/item.php
@@ -23,6 +23,12 @@ require_once 'item_form.php';
 $courseid = required_param('courseid', PARAM_INT);
 $id       = optional_param('id', 0, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/edit/tree/item.php', array('courseid'=>$courseid));
+if ($id !== 0) {
+    $url->param('id', $id);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index 279f7977f7..a3b20ac55a 100644
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -23,6 +23,12 @@ require_once 'outcomeitem_form.php';
 $courseid = required_param('courseid', PARAM_INT);
 $id       = optional_param('id', 0, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/edit/tree/outcomeitem.php', array('courseid'=>$courseid));
+if ($id !== 0) {
+    $url->param('id', $id);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php
index b43d879c31..75a5e1a05e 100755
--- a/grade/export/ods/index.php
+++ b/grade/export/ods/index.php
@@ -21,6 +21,8 @@ require_once 'grade_export_ods.php';
 
 $id = required_param('id', PARAM_INT); // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/export/ods/index.php', array('id'=>$id)));
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php
index dbcddf6dc0..8a2cb4874d 100755
--- a/grade/export/txt/index.php
+++ b/grade/export/txt/index.php
@@ -21,6 +21,8 @@ require_once 'grade_export_txt.php';
 
 $id = required_param('id', PARAM_INT); // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/export/txt/index.php', array('id'=>$id)));
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php
index 7adab3af5b..bf3ffe182f 100755
--- a/grade/export/xls/index.php
+++ b/grade/export/xls/index.php
@@ -21,6 +21,8 @@ require_once 'grade_export_xls.php';
 
 $id = required_param('id', PARAM_INT); // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/export/xls/index.php', array('id'=>$id)));
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php
index ef93124ad1..3ad63e0d70 100755
--- a/grade/export/xml/index.php
+++ b/grade/export/xml/index.php
@@ -21,6 +21,8 @@ require_once 'grade_export_xml.php';
 
 $id = required_param('id', PARAM_INT); // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/export/xml/index.php', array('id'=>$id)));
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 695e78d68f..f663b76c28 100755
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -25,6 +25,15 @@ $id            = required_param('id', PARAM_INT); // course id
 $separator     = optional_param('separator', '', PARAM_ALPHA);
 $verbosescales = optional_param('verbosescales', 1, PARAM_BOOL);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/import/csv/index.php', array('id'=>$id));
+if ($separator !== '') {
+    $url->param('separator', $separator);
+}
+if ($verbosescales !== 1) {
+    $url->param('verbosescales', $verbosescales);
+}
+$PAGE->set_url($url);
+
 define('GRADE_CSV_LINE_LENGTH', 4096);
 
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php
index 52fce61964..a6762c2bab 100644
--- a/grade/import/xml/import.php
+++ b/grade/import/xml/import.php
@@ -23,6 +23,12 @@ $url       = required_param('url', PARAM_URL); // only real urls here
 $id        = required_param('id', PARAM_INT); // course id
 $feedback  = optional_param('feedback', 0, PARAM_BOOL);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/import/xml/import.php', array('id'=>$id,'url'=>$url));
+if ($feedback !== 0) {
+    $url->param('feedback', $feedback);
+}
+$PAGE->set_url($url);
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 2c354cd7bb..fc28221c97 100755
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -21,6 +21,8 @@ require_once 'grade_import_form.php';
 
 $id = required_param('id', PARAM_INT); // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/import/xml/index.php', array('id'=>$id)));
+
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
 }
diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php
index 686bd895ee..5cd9558a2a 100644
--- a/grade/report/grader/preferences.php
+++ b/grade/report/grader/preferences.php
@@ -22,6 +22,8 @@ require_once '../../lib.php';
 
 $courseid      = required_param('id', PARAM_INT);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/report/grader/preferences.php', array('id'=>$courseid)));
+
 /// Make sure they can even access this course
 
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
diff --git a/grade/report/grader/quickedit_item.php b/grade/report/grader/quickedit_item.php
index f0c9f32835..86a7ed9d4e 100644
--- a/grade/report/grader/quickedit_item.php
+++ b/grade/report/grader/quickedit_item.php
@@ -25,6 +25,16 @@ $itemid        = required_param('itemid', PARAM_INT);        // item id
 $page          = optional_param('page', 0, PARAM_INT);   // active page
 $perpageurl    = optional_param('perpage', 0, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/report/grader/quickedit_item.php', array('id'=>$courseid, 'itemid'=>$itemid));
+if ($page !== 0) {
+    $url->param('page', $page);
+}
+if ($perpage !== 0) {
+    $url->param('perpage', $perpage);
+}
+$PAGE->set_url($url);
+
+
 /// basic access checks
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
diff --git a/grade/report/index.php b/grade/report/index.php
index 718adb894b..9f065e32f4 100644
--- a/grade/report/index.php
+++ b/grade/report/index.php
@@ -19,6 +19,8 @@ require_once '../../config.php';
 
 $courseid = required_param('id', PARAM_INT);
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/report/index.php', array('id'=>$courseid)));
+
 /// basic access checks
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
diff --git a/grade/report/outcomes/index.php b/grade/report/outcomes/index.php
index 4eddb8f3ee..6d44e10253 100644
--- a/grade/report/outcomes/index.php
+++ b/grade/report/outcomes/index.php
@@ -21,6 +21,8 @@ require_once $CFG->dirroot.'/grade/lib.php';
 
 $courseid = required_param('id', PARAM_INT);                   // course id
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/grade/report/outcomes/index.php', array('id'=>$courseid)));
+
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
 }
diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index 9a46270c21..177de8a8a9 100644
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -23,6 +23,12 @@ require_once $CFG->dirroot.'/grade/report/overview/lib.php';
 $courseid = required_param('id', PARAM_INT);
 $userid   = optional_param('userid', $USER->id, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/report/overview/index.php', array('id'=>$courseid));
+if ($userid !== $USER->id) {
+    $url->param('userid', $userid);
+}
+$PAGE->set_url($url);
+
 /// basic access checks
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index bc04b6e954..296adf2401 100644
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -23,6 +23,12 @@ require_once $CFG->dirroot.'/grade/report/user/lib.php';
 $courseid = required_param('id', PARAM_INT);
 $userid   = optional_param('userid', $USER->id, PARAM_INT);
 
+$url = new moodle_url($CFG->wwwroot.'/grade/report/user/index.php', array('id'=>$courseid));
+if ($userid !== $USER->id) {
+    $url->param('userid', $userid);
+}
+$PAGE->set_url($url);
+
 /// basic access checks
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
-- 
2.39.5