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

webservice MDL-17135 add service user settings administration

Browse Source
This commit is contained in:
jerome
2009-10-16 08:50:02 +00:00
parent 3795247688
commit bb1dff214d
3 changed files with 112 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/external_service_users.php
+89 -4
View File
@@ -34,7 +34,7 @@ $PAGE->set_url('admin/external_service_users.php', array('id'=>$id));
admin_externalpage_setup('externalserviceusers');
admin_externalpage_print_header();
global $DB;
/// Get the user_selector we will need.
$potentialuserselector = new service_user_selector('addselect', array('serviceid' => $id, 'displayallowedusers' => 0));
$alloweduserselector = new service_user_selector('removeselect', array('serviceid' => $id, 'displayallowedusers' => 1));
@@ -45,7 +45,6 @@ $alloweduserselector = new service_user_selector('removeselect', array('servicei
if (!empty($userstoassign)) {
foreach ($userstoassign as $adduser) {
global $DB;
$serviceuser = new object();
$serviceuser->externalserviceid = $id;
$serviceuser->userid = $adduser->id;
@@ -64,8 +63,7 @@ $alloweduserselector = new service_user_selector('removeselect', array('servicei
$userstoremove = $alloweduserselector->get_selected_users();
if (!empty($userstoremove)) {
foreach ($userstoremove as $removeuser) {
global $DB;
foreach ($userstoremove as $removeuser) {
$DB->delete_records('external_services_users', array('externalserviceid' => $id, 'userid' => $removeuser->id));
add_to_log(1, 'core', 'assign', 'admin/external_service_users.php?id='.$id, 'remove', '', $removeuser->id);
}
@@ -106,4 +104,91 @@ $alloweduserselector = new service_user_selector('removeselect', array('servicei
<?php
/// save user settings (administrator clicked on update button)
if (optional_param('updateuser', false, PARAM_BOOL) && confirm_sesskey()) {
$useridtoupdate = optional_param('userid', false, PARAM_BOOL);
$iprestriction = optional_param('iprestriction', '', PARAM_TEXT);
$serviceuserid = optional_param('serviceuserid', '', PARAM_INT);
$fromday = optional_param('fromday', '', PARAM_INT);
$frommonth = optional_param('frommonth', '', PARAM_INT);
$fromyear = optional_param('fromyear', '', PARAM_INT);
$addcap = optional_param('addcap', false, PARAM_INT);
$validuntil = mktime(23, 59, 59, $frommonth, $fromday, $fromyear);
$serviceuser = new object();
$serviceuser->id = $serviceuserid;
$serviceuser->validuntil = $validuntil;
$serviceuser->iprestriction = $iprestriction;
$DB->update_record('external_services_users', $serviceuser);
//TODO: assign capability
}
//display the list of allowed users with their options (ip/timecreated / validuntil...)
//check that the user has the service required capability (if needed)
$sql = " SELECT u.id as id, esu.id as serviceuserid, u.email as email, u.firstname as firstname, u.lastname as lastname,
esu.iprestriction as iprestriction, esu.validuntil as validuntil,
esu.timecreated as timecreated
FROM {user} u, {external_services_users} esu
WHERE username <> 'guest' AND deleted = 0 AND confirmed = 1
AND esu.userid = u.id
AND esu.externalserviceid = ?";
$allowedusers = $DB->get_records_sql($sql, array($id));
if (!empty($allowedusers)) {
echo $OUTPUT->box_start('generalbox', 'alloweduserlist');
echo "<label><strong>".get_string('serviceuserssettings', 'webservice').":</strong></label>";
echo "<br/><br/><span style=\"font-size:90%\">"; //reduce font of the user settings
foreach($allowedusers as $user) {
echo "<strong>";
echo print_collapsible_region_start('', 'usersettings'.$user->id,$user->firstname." ".$user->lastname.", ".$user->email,false,true,true);
echo "</strong>";
//user settings form
$contents = "<div class=\"fcontainer clearfix\">";
$form = new html_form();
$form->url = new moodle_url('/admin/external_service_users.php', array('id' => $id, 'userid' => $user->id, 'updateuser' => 1, 'serviceuserid' => $user->serviceuserid)); // Required
$form->button = new html_button();
$form->button->text = get_string('update'); // Required
$form->button->disabled = false;
$form->button->title = get_string('update');
$form->method = 'post';
$form->id = 'usersetting'.$user->id;
//ip restriction textfield
$contents .= "<div class=\"fitem\"><div class=\"fitemtitle\"><label>".get_string('iprestriction','webservice')." </label></div><div class=\"felement\">";
$field = new html_field();
$field->name = 'iprestriction';
$field->value = $user->iprestriction;
$field->style = 'width: 30em;';
$contents .= $OUTPUT->textfield($field);
$contents .= "</div></div>";
//valid until date selector
$contents .= "<div class=\"fitem\"><div class=\"fitemtitle\"><label>".get_string('validuntil','webservice')." </label></div><div class=\"felement\">";
$selectors = html_select::make_time_selectors(array('days' => 'fromday','months' => 'frommonth', 'years' => 'fromyear'),$user->validuntil);
foreach ($selectors as $select) {
$contents .= $OUTPUT->select($select);
}
$contents .= "</div></div>";
//TO IMPLEMENT : assign the required capability (if needed)
$contents .= "<div class=\"fitem\"><div class=\"fitemtitle\"><label>".get_string('addrequiredcapability','webservice')." </label></div><div class=\"felement fcheckbox\">";
$checkbox = new html_select_option();
$checkbox->value = $user->id;
$checkbox->selected = false;
$checkbox->text = ' ';
$checkbox->label->text = ' ';
$checkbox->alt = 'TODO:'.get_string('addrequiredcapability', 'webservice');
$contents .= $OUTPUT->checkbox($checkbox, 'addcap')."</div></div>";
$contents .= "</div>";
echo $OUTPUT->form($form, $contents);
echo print_collapsible_region_end(true);
}
echo "</span>";
echo $OUTPUT->box_end();
}
echo $OUTPUT->footer();
admin/webservice/lib.php
+15 -4
View File
@@ -32,10 +32,10 @@ class service_user_selector extends user_selector_base {
const MAX_USERS_PER_PAGE = 100;
protected $serviceid;
protected $displayallowedusers; //set to true if the selector display the
//allowed user on this service
//, set to false if the selector display the
// other user (false is the default default)
protected $displayallowedusers; //set to true if the selector displays the
//allowed users on this service
//, set to false if the selector displays the
// other users (false is the default default)
public function __construct($name, $options) {
parent::__construct($name, $options);
@@ -48,6 +48,12 @@ class service_user_selector extends user_selector_base {
$this->displayallowedusers = !empty($options['displayallowedusers']);
}
/**
* Find allowed or not allowed users of a service (depend of $this->displayallowedusers)
* @global object $DB
* @param <type> $search
* @return array
*/
public function find_users($search) {
global $DB;
//by default wherecondition retrieves all users except the deleted, not
@@ -104,6 +110,11 @@ class service_user_selector extends user_selector_base {
return array($groupname => $availableusers);
}
/**
* This options are automatically used by the AJAX search
* @global object $CFG
* @return object options pass to the constructor when AJAX search call a new selector
*/
protected function get_options() {
global $CFG;
$options = parent::get_options();
lang/en_utf8/webservice.php
+8 -4
View File
@@ -1,6 +1,7 @@
<?php
$string['addfunction'] = 'Add function';
$string['addrequiredcapability'] = 'Assign/Unassign the required capability';
$string['actwebserviceshhdr'] = 'Active web service protocols';
$string['configwebserviceplugins'] = 'For security reasons enable only protocols that are used.';
$string['deleteserviceconfirm'] = 'Do you really want to delete external service \"$a\"?';
@@ -12,10 +13,11 @@ $string['externalservicefunctions'] = 'External service functions';
$string['externalserviceusers'] = 'External service users';
$string['function'] = 'Function';
$string['functions'] = 'Functions';
$string['iprestriction'] = 'IP restriction';
$string['manageprotocols'] = 'Manage protocols';
$string['nouserrestriction'] = 'No restriction';
$string['potusers'] = 'Potential users';
$string['potusersmatching'] = 'Potential users matching';
$string['potusers'] = 'Not authorized users';
$string['potusersmatching'] = 'Not authorized users matching';
$string['protocol'] = 'Protocol';
$string['removefunction'] = 'Remove';
$string['removefunctionconfirm'] = 'Do you really want to remove function \"$a->function\" from service \"$a->service\"?';
@@ -23,8 +25,10 @@ $string['requiredcapability'] = 'Required capability';
$string['restrictedusers'] = 'Restricted users';
$string['servicesbuiltin'] = 'Built-in services';
$string['servicescustom'] = 'Custom services';
$string['serviceusers'] = 'Allowed users';
$string['serviceusersmatching'] = 'Allowed users matching';
$string['serviceusers'] = 'Authorized users';
$string['serviceusersmatching'] = 'Authorized users matching';
$string['serviceuserssettings'] = 'Change settings for the Authorized users';
$string['test'] = 'Test';
$string['testclient'] = 'Test client';
$string['validuntil'] = 'Valid until';
$string['webservices'] = 'Web services';