L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-28126 webservice : resolved integration conflicts

Browse Source
This commit is contained in:
Aparup Banerjee
2011-12-21 11:28:33 +08:00
parent 6ff99dde45 b057855440
commit dbfa519ad9
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/webservice/forms.php
+7 -4
View File
@@ -179,7 +179,7 @@ class external_service_functions_form extends moodleform {
class web_service_token_form extends moodleform {
function definition() {
global $USER, $DB;
global $USER, $DB, $CFG;
$mform = $this->_form;
$data = $this->_customdata;
@@ -194,9 +194,12 @@ class web_service_token_form extends moodleform {
if ($usertotal < 500) {
//user searchable selector - get all users (admin and guest included)
$users = $DB->get_records('user',
array('deleted' => 0, 'suspended' => 0, 'confirmed' => 1), 'lastname',
'id, firstname, lastname');
//user must be confirmed, not deleted, not suspended, not guest
$sql = "SELECT u.id, u.firstname, u.lastname
FROM {user} u
WHERE u.deleted = 0 AND u.confirmed = 1 AND u.suspended = 0 AND u.id != ?
ORDER BY u.lastname";
$users = $DB->get_records_sql($sql, array($CFG->siteguest));
$options = array();
foreach ($users as $userid => $user) {
$options[$userid] = $user->firstname . " " . $user->lastname;