grade MDL-19797 Added set_url calls

diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php
index fae404b7c45b8caffdda7fc57b4329a227bb0d56..adc22bb5b69d5668ab946933b750079e0fb5999c 100644 (file)
--- 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 6f92c10c4582f6454e3ec45b5028cf0accbb8dbe..e4594ffcf32819c35cbfa3345a4d7da5a49af044 100644 (file)
--- 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 4d821f5bf650df5b9cdb719e604f8056e4b53380..b888236079fe138d983d20de95cb30c75f2db675 100644 (file)
--- 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 937535f9ab67b1aeebd643890b1795073103080e..f09b062f2b9fc631b838fd5cdbb3f9959150c0b7 100644 (file)
--- 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 844cf67ab4a416fc7165a8e12a83202fd39c654e..2e80e1b3e06921f2e3615e7c92d25876a3c3571a 100644 (file)
--- 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 7d6a1af8f11260cc2737e85b5c9253b36875e1e5..c5333354ea9e001c6b79317ed4334b432f27f13d 100644 (file)
--- 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 8d6ddb90cd1519230b5647ce3cc1ba4e931154d7..5e14b48715da80142fec9c879a4744478ee4eb55 100644 (file)
--- 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 279f7977f70fa8d8541dd833f14dc978d6de0a58..a3b20ac55add8d9b3b7422c2378c58b838793a06 100644 (file)
--- 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 b43d879c31d2e41cc3ccfabae4ca787a6b03895d..75a5e1a05ebf9abcf1b9215658684643ccf2795f 100755 (executable)
--- 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 dbcddf6dc090418b9dfa509e793b214ef2942d82..8a2cb4874dbeb636ac8f0ff591bb613bc6300d71 100755 (executable)
--- 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 7adab3af5bf042b6629ba6458fc91ad95d7b302e..bf3ffe182f8fd488c4609a92c8c0e7e0869ef8aa 100755 (executable)
--- 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 ef93124ad14045a3dad4c35b4b8aa641a977c7a2..3ad63e0d709e0be9ff246004bb28dd8c74a5b0d6 100755 (executable)
--- 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 695e78d68f7627ad687bf0f804bad1b135292354..f663b76c282603822e747f155cfdad7beb033bcf 100755 (executable)
--- 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 52fce61964a263c574f920cca6793827ee95180e..a6762c2bab91b8f3ed87ef75143d75be20b50252 100644 (file)
--- 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 2c354cd7bb3af8526e76189600850efeeca84243..fc28221c97b84632263458c6a08a2d27b7a51b87 100755 (executable)
--- 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 686bd895ee1e88e7563f5dc4bec21b5c872666aa..5cd9558a2aa97f4b22470db7303a8b39c9764a9b 100644 (file)
--- 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 f0c9f32835a75459a8fd6564628cffb4b44976ff..86a7ed9d4eb44bc039815d50a9262b7cd2314ff0 100644 (file)
--- 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 718adb894bf3e002c5562755ba9a777d417191e3..9f065e32f4aaa3da8078be66e9fe732d10966df4 100644 (file)
--- 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 4eddb8f3ee0f59e9e1d5e5bfa1ebc2c91003cada..6d44e102539da89cfbf6d589c9310f529a0f208a 100644 (file)
--- 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 9a46270c2188fb28797b763c04e71f7eed0b5e5b..177de8a8a95e058cfe7cce4c7795564db250a85e 100644 (file)
--- 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 bc04b6e95418cfe5730aa8d11de04f98cd5567d6..296adf2401efb62950f44f457c11aaf9496ab0f2 100644 (file)
--- 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');