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

22
lib/datalib.php
View file

@ -1,6 +1,12 @@
<?PHP // $Id$
/// CONSTANTS /////////////////////////////////////////////////////////////
define('SITEID', 1);
/// FUNCTIONS FOR DATABASE HANDLING ////////////////////////////////
/**
* execute a given sql command string
*
@ -947,9 +953,7 @@ function get_user_info_from_db($field, $value) {
$user->admin = true;
}
if ($site = get_site()) {
$user->student[$site->id] = isstudent($site->id, $user->id);
}
$user->student[SITEID] = isstudent(SITEID, $user->id);
/// Determine enrolments based on current enrolment module
@ -1173,8 +1177,7 @@ function get_course_students($courseid, $sort="s.timeaccess", $dir="", $page=0,
// make sure it works on the site course
$select = "s.course = '$courseid' AND ";
$site = get_site();
if ($courseid == $site->id) {
if ($courseid == SITEID) {
$select = '';
}
@ -1367,8 +1370,7 @@ function search_users($courseid, $groupid, $searchtext, $sort='', $exceptions=''
$order = '';
}
$site = get_site();
if (!$courseid or $courseid == $site->id) {
if (!$courseid or $courseid == SITEID) {
if (!$admins = get_records_sql("SELECT u.id, u.firstname, u.lastname, u.email
FROM {$CFG->prefix}user u,
{$CFG->prefix}user_admins s
@ -2279,9 +2281,9 @@ function add_to_log($courseid, $module, $action, $url="", $info="", $cm=0, $user
echo "<P>Error: Could not insert a new entry to the Moodle log</P>"; // Don't throw an error
}
if (!$user and isset($USER->id)) {
$site = get_site();
if ($courseid == $site->id) {
update_user_in_db();
if ($courseid == SITEID) {
$db->Execute("UPDATE {$CFG->prefix}user SET lastIP='$REMOTE_ADDR', lastaccess='$timenow'
WHERE id = '$USER->id' ");
} else if (isstudent($courseid)) {
$db->Execute("UPDATE {$CFG->prefix}user_students SET timeaccess = '$timenow' ".
"WHERE course = '$courseid' AND userid = '$userid'");