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

webservice MDL-20805 fix sql column naming

Browse source
This commit is contained in:
jerome mouneyrac 2010-01-14 08:40:32 +00:00
parent 1a887a5eef
commit d69f5012c9
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/webservice/forms.php
View file

@ -142,11 +142,11 @@ class web_service_token_form extends moodleform {
if (empty($data->nouserselection)) { if (empty($data->nouserselection)) {
//user searchable selector //user searchable selector
$sql = "SELECT user.id, user.firstname, user.lastname $sql = "SELECT u.id, u.firstname, u.lastname
FROM {user} user FROM {user} u
WHERE NOT EXISTS ( SELECT 1 WHERE NOT EXISTS ( SELECT 1
FROM {user} adminuser, {role_assignments} rassign FROM {user} au, {role_assignments} r
WHERE adminuser.id=user.id AND rassign.roleid = 1 AND rassign.userid = adminuser.id) WHERE au.id=u.id AND r.roleid = 1 AND r.userid = au.id)
ORDER BY user.lastname"; ORDER BY user.lastname";
$users = $DB->get_records_sql($sql,array()); $users = $DB->get_records_sql($sql,array());
$options = array(); $options = array();

6
admin/webservice/tokens.php
View file

@ -99,11 +99,11 @@ switch ($action) {
case 'delete': case 'delete':
$sql = "SELECT $sql = "SELECT
token.id, token.token, user.firstname, user.lastname, service.name t.id, t.token, u.firstname, u.lastname, s.name
FROM FROM
{external_tokens} token, {user} user, {external_services} service {external_tokens} t, {user} u, {external_services} s
WHERE WHERE
token.creatorid=? AND token.id=? AND token.tokentype = ".EXTERNAL_TOKEN_PERMANENT." AND service.id = token.externalserviceid AND token.userid = user.id"; t.creatorid=? AND t.id=? AND t.tokentype = ".EXTERNAL_TOKEN_PERMANENT." AND s.id = t.externalserviceid AND t.userid = u.id";
$token = $DB->get_record_sql($sql, array($USER->id, $tokenid), MUST_EXIST); //must be the token creator $token = $DB->get_record_sql($sql, array($USER->id, $tokenid), MUST_EXIST); //must be the token creator
if (!$confirm) { if (!$confirm) {
admin_externalpage_print_header(); admin_externalpage_print_header();

12
user/managetoken.php
View file

@ -94,11 +94,11 @@ switch ($action) {
case 'delete': case 'delete':
$sql = "SELECT $sql = "SELECT
token.id, token.token, user.firstname, user.lastname, service.name t.id, t.token, u.firstname, u.lastname, s.name
FROM FROM
{external_tokens} token, {user} user, {external_services} service {external_tokens} t, {user} u, {external_services} s
WHERE WHERE
token.creatorid=? AND token.id=? AND token.tokentype = ".EXTERNAL_TOKEN_PERMANENT." AND service.id = token.externalserviceid AND token.userid = user.id"; t.creatorid=? AND t.id=? AND t.tokentype = ".EXTERNAL_TOKEN_PERMANENT." AND s.id = t.externalserviceid AND t.userid = u.id";
$token = $DB->get_record_sql($sql, array($USER->id, $tokenid), MUST_EXIST); //must be the token creator $token = $DB->get_record_sql($sql, array($USER->id, $tokenid), MUST_EXIST); //must be the token creator
if (!$confirm) { if (!$confirm) {
echo $OUTPUT->header(); echo $OUTPUT->header();
@ -138,11 +138,11 @@ switch ($action) {
//here retrieve token list (including linked users firstname/lastname and linked services name) //here retrieve token list (including linked users firstname/lastname and linked services name)
$sql = "SELECT $sql = "SELECT
token.id, token.token, user.firstname, user.lastname, service.name, token.validuntil t.id, t.token, u.firstname, u.lastname, s.name, t.validuntil
FROM FROM
{external_tokens} token, {user} user, {external_services} service {external_tokens} t, {user} u, {external_services} s
WHERE WHERE
token.creatorid=? AND token.tokentype = 2 AND service.id = token.externalserviceid AND token.userid = user.id"; t.creatorid=? AND t.tokentype = 2 AND s.id = t.externalserviceid AND t.userid = u.id";
$tokens = $DB->get_records_sql($sql, array( $USER->id)); $tokens = $DB->get_records_sql($sql, array( $USER->id));
if (!empty($tokens)) { if (!empty($tokens)) {
foreach ($tokens as $token) { foreach ($tokens as $token) {