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

webservice MDL-21351

Browse Source 
Manage token page: user should be linked to their user profil
Security keys page: display token created by administrator
Manage service page: rewording :
Authorised user only => user
This commit is contained in:
jerome mouneyrac
2010-02-12 04:14:26 +00:00
parent 1762a2642a
commit 1bd06507df
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+9 -5
View File
@@ -6218,7 +6218,7 @@ class admin_setting_manageexternalservices extends admin_setting {
$strplugin = get_string('plugin', 'admin');
$stradd = get_string('add');
$strfunctions = get_string('functions', 'webservice');
$strusers = get_string('restrictedusers', 'webservice');
$strusers = get_string('users');
$strserviceusers = get_string('serviceusers', 'webservice');
$esurl = "$CFG->wwwroot/$CFG->admin/webservice/service.php";
@@ -6258,7 +6258,7 @@ class admin_setting_manageexternalservices extends admin_setting {
if ($service->restrictedusers) {
$users = "<a href=\"$euurl?id=$service->id\">$strserviceusers</a>";
} else {
$users = '-';
$users = get_string('allusers', 'webservice');
}
$edit = "<a href=\"$esurl?id=$service->id\">$stredit</a>";
@@ -6299,7 +6299,7 @@ class admin_setting_manageexternalservices extends admin_setting {
if ($service->restrictedusers) {
$users = "<a href=\"$euurl?id=$service->id\">$strserviceusers</a>";
} else {
$users = '-';
$users = get_string('allusers', 'webservice');
}
$edit = "<a href=\"$esurl?id=$service->id\">$stredit</a>";
@@ -6789,7 +6789,7 @@ class admin_setting_managewebservicetokens extends admin_setting {
//TODO: in order to let the administrator delete obsolete token, split this request in multiple request or use LEFT JOIN
//here retrieve token list (including linked users firstname/lastname and linked services name)
$sql = "SELECT t.id, t.token, u.firstname, u.lastname, s.name, t.validuntil
$sql = "SELECT t.id, t.token, u.id AS userid, u.firstname, u.lastname, s.name, t.validuntil
FROM {external_tokens} t, {user} u, {external_services} s
WHERE t.creatorid=? AND t.tokentype = ? AND s.id = t.externalserviceid AND t.userid = u.id";
$tokens = $DB->get_records_sql($sql, array($USER->id, EXTERNAL_TOKEN_PERMANENT));
@@ -6814,7 +6814,11 @@ class admin_setting_managewebservicetokens extends admin_setting {
$iprestriction = $token->iprestriction;
}
$table->data[] = array($token->token, $token->firstname." ".$token->lastname, $token->name, '', $iprestriction, $validuntil, $delete);
$userprofilurl = new moodle_url('/user/view.php?id='.$token->userid);
$useratag = html_writer::start_tag('a', array('href' => $userprofilurl));
$useratag .= $token->firstname." ".$token->lastname;
$useratag .= html_writer::end_tag('a');
$table->data[] = array($token->token, $useratag, $token->name, '', $iprestriction, $validuntil, $delete);
}
$return .= $OUTPUT->table($table);