Permalink
Browse files

Merge branch 'MDL-32151-33' of git://github.com/junpataleta/moodle in…

…to MOODLE_33_STABLE
  • Loading branch information...
dmonllao committed Jun 27, 2017
2 parents c46c38d + 32f2e90 commit f786e59224d5912ef1b9ba85b403647f01c7f658
Showing with 41 additions and 41 deletions.
  1. +1 −1 grade/edit/outcome/export.php
  2. +1 −1 grade/edit/outcome/import.php
  3. +1 −1 grade/edit/scale/edit.php
  4. +1 −1 grade/edit/scale/index.php
  5. +1 −1 grade/edit/settings/index.php
  6. +1 −1 grade/edit/tree/action.php
  7. +1 −1 grade/edit/tree/calculation.php
  8. +1 −1 grade/edit/tree/category.php
  9. +1 −1 grade/edit/tree/grade.php
  10. +1 −1 grade/edit/tree/index.php
  11. +1 −1 grade/edit/tree/item.php
  12. +1 −1 grade/edit/tree/outcomeitem.php
  13. +1 −1 grade/export/keymanager.php
  14. +1 −1 grade/export/ods/dump.php
  15. +1 −1 grade/export/ods/export.php
  16. +1 −1 grade/export/ods/index.php
  17. +1 −1 grade/export/txt/dump.php
  18. +1 −1 grade/export/txt/export.php
  19. +1 −1 grade/export/txt/index.php
  20. +1 −1 grade/export/xls/dump.php
  21. +1 −1 grade/export/xls/export.php
  22. +1 −1 grade/export/xls/index.php
  23. +1 −1 grade/export/xml/dump.php
  24. +1 −1 grade/export/xml/export.php
  25. +1 −1 grade/export/xml/index.php
  26. +1 −1 grade/import/csv/index.php
  27. +1 −1 grade/import/direct/index.php
  28. +1 −1 grade/import/keymanager.php
  29. +1 −1 grade/import/xml/fetch.php
  30. +1 −1 grade/import/xml/import.php
  31. +1 −1 grade/import/xml/index.php
  32. +1 −1 grade/report/grader/ajax_callbacks.php
  33. +1 −1 grade/report/grader/index.php
  34. +1 −1 grade/report/grader/preferences.php
  35. +1 −1 grade/report/grader/quickedit_item.php
  36. +1 −1 grade/report/index.php
  37. +1 −1 grade/report/outcomes/index.php
  38. +1 −1 grade/report/overview/index.php
  39. +1 −1 grade/report/singleview/index.php
  40. +1 −1 grade/report/user/index.php
  41. +1 −1 group/groupings.php
@@ -32,7 +32,7 @@
/// Make sure they can even access this course
if ($courseid) {
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -38,7 +38,7 @@
/// Make sure they can even access this course
if ($courseid) {
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -71,7 +71,7 @@
$heading = get_string('addscale', 'grades');
/// adding new scale from course
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
$scale_rec = new stdClass();
$scale_rec->standard = 0;
@@ -34,7 +34,7 @@
/// Make sure they can even access this course
if ($courseid) {
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -33,7 +33,7 @@
$PAGE->set_pagelayout('admin');
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -33,7 +33,7 @@
/// Make sure they can even access this course
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -39,7 +39,7 @@
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -40,7 +40,7 @@
array('id'=>$courseid)));
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -45,7 +45,7 @@
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
$PAGE->set_pagelayout('incourse');
@@ -38,7 +38,7 @@
/// Make sure they can even access this course
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -41,7 +41,7 @@
array('id'=>$courseid)));
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -40,7 +40,7 @@
array('id'=>$courseid)));
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -31,7 +31,7 @@
$PAGE->set_url('/grade/export/keymanager.php', array('id' => $id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -28,7 +28,7 @@
$onlyactive = optional_param('export_onlyactive', 0, PARAM_BOOL);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_user_key_login('grade/export', $id); // we want different keys for each course
@@ -23,7 +23,7 @@
$PAGE->set_url('/grade/export/ods/export.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -24,7 +24,7 @@
$PAGE->set_url('/grade/export/ods/index.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -29,7 +29,7 @@
$onlyactive = optional_param('export_onlyactive', 0, PARAM_BOOL);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_user_key_login('grade/export', $id); // we want different keys for each course
@@ -23,7 +23,7 @@
$PAGE->set_url('/grade/export/txt/export.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -24,7 +24,7 @@
$PAGE->set_url('/grade/export/txt/index.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -28,7 +28,7 @@
$onlyactive = optional_param('export_onlyactive', 0, PARAM_BOOL);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_user_key_login('grade/export', $id); // we want different keys for each course
@@ -23,7 +23,7 @@
$PAGE->set_url('/grade/export/xls/export.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -24,7 +24,7 @@
$PAGE->set_url('/grade/export/xls/index.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -29,7 +29,7 @@
$onlyactive = optional_param('export_onlyactive', 0, PARAM_BOOL);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_user_key_login('grade/export', $id); // we want different keys for each course
@@ -23,7 +23,7 @@
$PAGE->set_url('/grade/export/xml/export.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -24,7 +24,7 @@
$PAGE->set_url('/grade/export/xml/index.php', array('id'=>$id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -39,7 +39,7 @@
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -35,7 +35,7 @@
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id' => $id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -31,7 +31,7 @@
$PAGE->set_url('/grade/import/keymanager.php', array('id' => $id));
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -20,7 +20,7 @@
$id = required_param('id', PARAM_INT); // course id
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_user_key_login('grade/import', $id); // we want different keys for each course
@@ -30,7 +30,7 @@
$PAGE->set_url($url);
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -25,7 +25,7 @@
$PAGE->set_pagelayout('admin');
if (!$course = $DB->get_record('course', array('id'=>$id))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -37,7 +37,7 @@
/// basic access checks
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
$context = context_course::instance($course->id);
require_login($course);
@@ -56,7 +56,7 @@
// basic access checks
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -35,7 +35,7 @@
/// Make sure they can even access this course
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -44,7 +44,7 @@
/// basic access checks
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
if (!$item = $DB->get_record('grade_items', array('id' => $itemid))) {
@@ -30,7 +30,7 @@
/// basic access checks
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$context = context_course::instance($course->id);
@@ -31,7 +31,7 @@
$PAGE->set_url('/grade/report/outcomes/index.php', array('id'=>$courseid));
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -33,7 +33,7 @@
$PAGE->set_url(new moodle_url('/grade/report/overview/index.php', array('id' => $courseid, 'userid' => $userid)));
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login(null, false);
$PAGE->set_course($course);
@@ -59,7 +59,7 @@
$PAGE->set_pagelayout('incourse');
if (!$course = $DB->get_record('course', $courseparams)) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
@@ -41,7 +41,7 @@
/// basic access checks
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);
$PAGE->set_pagelayout('report');
@@ -31,7 +31,7 @@
$PAGE->set_url('/group/groupings.php', array('id'=>$courseid));
if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
print_error('nocourseid');
print_error('invalidcourseid');
}
require_login($course);

0 comments on commit f786e59

Please sign in to comment.