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

Changes throughout Moodle to remove any reserved words from the

Browse source 
Moodle tables.

ie user -> userid in many tables, plus in user_students
   start -> starttime and end -> endtime

I've just done all this as carefully as I could ... I don't think
I missed anything but it's pretty intensive work and I'd be fooling myself
if I didn't think I'd missed a couple.

Note that this version should pretty much be able to bootstrap itself
using PostgreSQL now ... but this is untested
This commit is contained in:
moodler 2002-12-23 09:39:26 +00:00
parent 1f48942e7d
commit ebc3bd2b24
68 changed files with 277 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/moodlelib.php
View file

@ -358,10 +358,10 @@ function isadmin($userid=0) {
global $USER;
if (!$userid) {
return record_exists("user_admins", "user", $USER->id);
return record_exists("user_admins", "userid", $USER->id);
}
return record_exists("user_admins", "user", $userid);
return record_exists("user_admins", "userid", $userid);
}
@ -377,7 +377,7 @@ function isteacher($courseid, $userid=0) {
return $USER->teacher[$courseid];
}
return record_exists("user_teachers", "user", $userid, "course", $courseid);
return record_exists("user_teachers", "userid", $userid, "course", $courseid);
}
@ -389,9 +389,9 @@ function isstudent($courseid, $userid=0) {
return $USER->student[$courseid];
}
$timenow = time(); // todo: add time check below
// $timenow = time(); // todo: add time check below
return record_exists("user_students", "user", $userid, "course", $courseid);
return record_exists("user_students", "userid", $userid, "course", $courseid);
}
function isguest($userid=0) {
@ -519,13 +519,13 @@ function enrol_student($user, $course) {
/// Enrols a student in a given course
global $db;
$record->user = $user;
$record->userid = $user;
$record->course = $course;
$record->start = 0;
$record->end = 0;
$record->time = time();
return insert_record("user", $record);
return insert_record("user_students", $record);
}
function unenrol_student($user, $course=0) {
@ -536,14 +536,14 @@ function unenrol_student($user, $course=0) {
/// First delete any crucial stuff that might still send mail
if ($forums = get_records("forum", "course", $course)) {
foreach ($forums as $forum) {
delete_records("forum_subscriptions", "forum", $forum->id, "user", $user);
delete_records("forum_subscriptions", "forum", $forum->id, "userid", $user);
}
}
return delete_records("user_students", "user", $user, "course", $course);
return delete_records("user_students", "userid", $user, "course", $course);
} else {
delete_records("forum_subscriptions", "user", $user);
return delete_records("user_students", "user", $user);
delete_records("forum_subscriptions", "userid", $user);
return delete_records("user_students", "userid", $user);
}
}
@ -556,13 +556,13 @@ function remove_teacher($user, $course=0) {
/// First delete any crucial stuff that might still send mail
if ($forums = get_records("forum", "course", $course)) {
foreach ($forums as $forum) {
delete_records("forum_subscriptions", "forum", $forum->id, "user", $user);
delete_records("forum_subscriptions", "forum", $forum->id, "userid", $user);
}
}
return delete_records("user_teachers", "user", $user, "course", $course);
return delete_records("user_teachers", "userid", $user, "course", $course);
} else {
delete_records("forum_subscriptions", "user", $user);
return delete_records("user_teachers", "user", $user);
delete_records("forum_subscriptions", "userid", $user);
return delete_records("user_teachers", "userid", $user);
}
}
@ -570,7 +570,7 @@ function remove_admin($user) {
/// Removes an admin from a site
global $db;
return delete_records("user_admins", "user", $user);
return delete_records("user_admins", "userid", $user);
}