L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

we do not need any new api for fetching of course record - we have DML with MUST_EXIST flag which is the right way now; we should not include course/lib.php on each page anyway

Browse Source
This commit is contained in:
Petr Skoda
2010-06-17 22:50:25 +00:00
parent 42885485fa
commit 1b048629bc
16 changed files with 24 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/external.php
+4 -4
View File
@@ -83,21 +83,21 @@ final class course_external extends moodle_external {
* @subreturn integer $return:course->enablecompletion
*/
static function get_courses($params) {
global $USER;
global $USER, $DB;
if (has_capability('moodle/course:participate', get_context_instance(CONTEXT_SYSTEM))) {
$courses = array();
foreach ($params as $param) {
$course = new stdClass();
if (key_exists('id', $param)) {
$param['id'] = clean_param($param['id'], PARAM_INT);
$course = get_course_by_id($param['id']);
$course = $DB->get_record('course', array('id'=>$param['id']));
} else if (key_exists('idnumber', $param)) {
$param['idnumber'] = clean_param($param['idnumber'], PARAM_ALPHANUM);
$course = get_course_by_idnumber($param['idnumber']);
$course = $DB->get_record('course', array('idnumber'=>$param['idnumber']));
} else if (key_exists('shortname', $param)) {
$param['shortname'] = clean_param($param['shortname'], PARAM_ALPHANUM);
$course = get_course_by_shortname($param['shortname']);
$course = $DB->get_record('course', array('shortname'=>$param['shortname']));
}
if (!empty($course)) {
$returnedcourse = new stdClass();
course/lib.php
+4 -19
View File
@@ -356,7 +356,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
get_string('info')
);
$table->data = array();
if ($course->id == SITEID) {
array_unshift($table->align, 'left');
array_unshift($table->head, get_string('course'));
@@ -400,9 +400,9 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
$row[] = "<a href=\"{$CFG->wwwroot}/course/view.php?id={$log->course}\">". format_string($courses[$log->course])."</a>";
}
}
$row[] = userdate($log->time, '%a').' '.userdate($log->time, $strftimedatetime);
$link = new moodle_url("/iplookup/index.php?ip=$log->ip&user=$log->userid");
$row[] = $OUTPUT->action_link($link, $log->ip, new popup_action('click', $link, 'iplookup', array('height' => 440, 'width' => 700)));
@@ -3296,7 +3296,7 @@ function get_section_name(stdClass $course, stdClass $section) {
/**
* Gets the generic section name for a courses section.
*
*
* @param string $format Course format ID e.g. 'weeks' $course->format
* @param stdClass $section Section object from database
* @return Display name that the course format prefers, e.g. "Week 2"
@@ -3539,21 +3539,6 @@ function update_course($data) {
return false;
}
function get_course_by_id ($id) {
global $DB;
return $DB->get_record('course', array('id' => $id));
}
function get_course_by_shortname ($shortname) {
global $DB;
return $DB->get_record('course', array('shortname' => $shortname));
}
function get_course_by_idnumber ($idnumber) {
global $DB;
return $DB->get_record('course', array('idnumber' => $idnumber));
}
/**
* TODO: Average number of participants (in non-empty courses)
* @return integer
mod/wiki/comments.php
+1 -3
View File
@@ -55,9 +55,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
require_course_login($course->id, true, $cm);
mod/wiki/create.php
+1 -3
View File
@@ -62,9 +62,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemoduleid', 'wiki');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('invalidcourseid', 'wiki');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
require_course_login($course->id, true, $cm);
mod/wiki/diff.php
+1 -3
View File
@@ -60,9 +60,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if ($compare >= $comparewith) {
print_error("A page version can only be compared with an older version.");
mod/wiki/edit.php
+1 -3
View File
@@ -62,9 +62,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
print_error('invalidsection', 'wiki');
mod/wiki/editcomments.php
+1 -3
View File
@@ -48,9 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
print_error('incorrectwikiid', 'wiki');
}
mod/wiki/history.php
+1 -3
View File
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
require_course_login($course->id, true, $cm);
add_to_log($course->id, 'wiki', 'history', 'history.php?id='.$cm->id, $wiki->id);
mod/wiki/instancecomments.php
+1 -3
View File
@@ -53,9 +53,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
print_error('incorrectwikiid', 'wiki');
}
mod/wiki/lock.php
+1 -3
View File
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
print_error('invalidsection', 'wiki');
mod/wiki/map.php
+1 -3
View File
@@ -48,9 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
print_error('incorrectwikiid', 'wiki');
}
mod/wiki/overridelocks.php
+1 -3
View File
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
print_error('invalidsection', 'wiki');
mod/wiki/prettyview.php
+1 -3
View File
@@ -46,9 +46,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
print_error('incorrectwikiid', 'wiki');
}
mod/wiki/restoreversion.php
+1 -3
View File
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
require_course_login($course->id, true, $cm);
mod/wiki/view.php
+3 -9
View File
@@ -66,9 +66,7 @@ if ($id) {
}
// Checking course instance
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
// Checking wiki instance
if (!$wiki = wiki_get_wiki($cm->instance)) {
@@ -136,9 +134,7 @@ if ($id) {
}
// Checking course instance
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
/*
* Case 2:
@@ -237,9 +233,7 @@ if ($id) {
// }
//
// // Checking course instance
// if (!$course = get_course_by_id($wiki->course)) {
// print_error('coursemisconf');
// }
// $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
//
// // Checking course module instance
// if (!$cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {
mod/wiki/viewversion.php
+1 -3
View File
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemodule');
}
if (!$course = get_course_by_id($cm->course)) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
require_course_login($course->id, true, $cm);
add_to_log($course->id, "wiki", "history", "history.php?id=$cm->id", "$wiki->id");