moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed unnecessary calls to get_site()

Browse source
This commit is contained in:
gustav_delius 2004-08-29 14:15:40 +00:00
parent afd97e8449
commit 222ac91bc9
26 changed files with 219 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/moodlelib.php
View file

@ -383,8 +383,7 @@ function require_login($courseid=0, $autologinguest=true) {
// Check that the user account is properly set up
if (user_not_fully_set_up($USER)) {
$site = get_site();
redirect("$CFG->wwwroot/user/edit.php?id=$USER->id&course=$site->id");
redirect("$CFG->wwwroot/user/edit.php?id=$USER->id&course=SITEID");
die;
}
@ -588,8 +587,7 @@ function isstudent($courseid, $userid=0) {
return false;
}
$site = get_site();
if ($courseid == $site->id) {
if ($courseid == SITEID) {
if (!$userid) {
$userid = $USER->id;
}
@ -968,9 +966,8 @@ function add_admin($userid) {
$admin->userid = $userid;
// any admin is also a teacher on the site course
$site = get_site();
if (!record_exists('user_teachers', 'course', $site->id, 'userid', $userid)) {
if (!add_teacher($userid, $site->id)) {
if (!record_exists('user_teachers', 'course', SITEID, 'userid', $userid)) {
if (!add_teacher($userid, SITEID)) {
return false;
}
}
@ -987,8 +984,7 @@ function remove_admin($userid) {
global $db;
// remove also from the list of site teachers
$site = get_site();
remove_teacher($userid, $site->id);
remove_teacher($userid, SITEID);
return delete_records("user_admins", "userid", $userid);
}
@ -1534,8 +1530,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml="", $a
return true;
} else {
mtrace("ERROR: $mail->ErrorInfo");
$site = get_site();
add_to_log($site->id, "library", "mailer", $_SERVER["REQUEST_URI"], "ERROR: $mail->ErrorInfo");
add_to_log(SITEID, "library", "mailer", $_SERVER["REQUEST_URI"], "ERROR: $mail->ErrorInfo");
return false;
}
}