webservice MDL-20805 fix sql column naming

diff --git a/admin/webservice/forms.php b/admin/webservice/forms.php
index c352db204c0055b360c9cfcd54959da4bff8a5c5..725e9cc60a3bda4048d24c9ee141934d3e866ba3 100644 (file)
--- a/admin/webservice/forms.php
+++ b/admin/webservice/forms.php
@@ -142,11 +142,11 @@ class web_service_token_form extends moodleform {
 
         if (empty($data->nouserselection)) {
             //user searchable selector
-            $sql = "SELECT user.id, user.firstname, user.lastname
-            FROM {user} user
+            $sql = "SELECT u.id, u.firstname, u.lastname
+            FROM {user} u
             WHERE NOT EXISTS ( SELECT 1
-                                    FROM {user} adminuser, {role_assignments} rassign
-                                    WHERE adminuser.id=user.id AND rassign.roleid = 1 AND rassign.userid = adminuser.id)
+                                    FROM {user} au, {role_assignments} r
+                                    WHERE au.id=u.id AND r.roleid = 1 AND r.userid = au.id)
             ORDER BY user.lastname";
             $users = $DB->get_records_sql($sql,array());
             $options = array();

diff --git a/admin/webservice/tokens.php b/admin/webservice/tokens.php
index 170c6c086b40382937765d68ce919e193c0a4471..d0ceb0bc02f7571c82a6e2878a7998f98ebe1dbd 100644 (file)
--- a/admin/webservice/tokens.php
+++ b/admin/webservice/tokens.php
@@ -99,11 +99,11 @@ switch ($action) {
 
     case 'delete':
         $sql = "SELECT
-                    token.id, token.token, user.firstname, user.lastname, service.name
+                    t.id, t.token, u.firstname, u.lastname, s.name
                 FROM
-                    {external_tokens} token, {user} user, {external_services} service
+                    {external_tokens} t, {user} u, {external_services} s
                 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
         if (!$confirm) {
             admin_externalpage_print_header();

diff --git a/user/managetoken.php b/user/managetoken.php
index 9164145efb25ad48715110b7be46c8e7e83bfcdf..802d1d1fe02a5f48d68713fbdb2234384ce27621 100644 (file)
--- a/user/managetoken.php
+++ b/user/managetoken.php
@@ -94,11 +94,11 @@ switch ($action) {
 
     case 'delete':
         $sql = "SELECT
-                    token.id, token.token, user.firstname, user.lastname, service.name
+                    t.id, t.token, u.firstname, u.lastname, s.name
                 FROM
-                    {external_tokens} token, {user} user, {external_services} service
+                    {external_tokens} t, {user} u, {external_services} s
                 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
         if (!$confirm) {
             echo $OUTPUT->header();
@@ -138,11 +138,11 @@ switch ($action) {
 
         //here retrieve token list (including linked users firstname/lastname and linked services name)
         $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
-                    {external_tokens} token, {user} user, {external_services} service
+                    {external_tokens} t, {user} u, {external_services} s
                 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));
         if (!empty($tokens)) {
             foreach ($tokens as $token) {