--- loncom/interface/lonuserutils.pm 2007/12/01 03:48:20 1.6
+++ loncom/interface/lonuserutils.pm 2007/12/12 19:47:56 1.14
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.6 2007/12/01 03:48:20 albertel Exp $
+# $Id: lonuserutils.pm,v 1.14 2007/12/12 19:47:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,8 @@ use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon;
use Apache::lonlocal;
-use LONCAPA();
+use Apache::longroup;
+use LONCAPA qw(:DEFAULT :match);
###############################################################
###############################################################
@@ -95,7 +96,7 @@ sub modifyuserrole {
}
} elsif ($context eq 'domain') {
$scope = '/'.$env{'request.role.domain'}.'/';
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'};
}
if ($context eq 'domain') {
@@ -135,22 +136,30 @@ sub modifyuserrole {
sub propagate_id_change {
my ($uname,$udom,$user) = @_;
- my (@types,@roles,@cdoms);
+ my (@types,@roles);
@types = ('active','future');
@roles = ('st');
my $idresult;
my %roleshash = &Apache::lonnet::get_my_roles($uname,
- $udom,'userroles',\@types,\@roles,\@cdoms);
+ $udom,'userroles',\@types,\@roles);
+ my %args = (
+ one_time => 1,
+ );
foreach my $item (keys(%roleshash)) {
my ($cnum,$cdom,$role) = split(/:/,$item);
my ($start,$end) = split(/:/,$roleshash{$item});
if (&Apache::lonnet::is_course($cdom,$cnum)) {
- my %userupdate;
- my $result = &update_classlist($cdom,$cnum,$udom,$uname,\%userupdate);
+ my $result = &update_classlist($cdom,$cnum,$udom,$uname,$user);
+ my %coursehash =
+ &Apache::lonnet::coursedescription($cdom.'_'.$cnum,\%args);
+ my $cdesc = $coursehash{'description'};
+ if ($cdesc eq '') {
+ $cdesc = $cdom.'_'.$cnum;
+ }
if ($result eq 'ok') {
- $idresult .= "Classlist change: $uname:$udom - class -> $cnum:$cdom\n";
+ $idresult .= &mt('Classlist update for "[_1]" in "[_2]".',$uname.':'.$udom,$cdesc).'<br />'."\n";
} else {
- $idresult .= "Error - $result -during classlist update for $uname:$udom in $cnum:$cdom\n";
+ $idresult .= &mt('Error: "[_1]" during classlist update for "[_2]" in "[_3]".',$result,$uname.':'.$udom,$cdesc).'<br />'."\n";
}
}
}
@@ -202,7 +211,7 @@ sub domain_roles_select {
# domain context
#
# Role types
- my @roletypes = ('domain','construction_space','course');
+ my @roletypes = ('domain','author','course');
my %lt = &role_type_names();
#
# build up the menu information to be passed to
@@ -224,7 +233,7 @@ sub domain_roles_select {
my @roles;
if ($roletype eq 'domain') {
@roles = &domain_roles();
- } elsif ($roletype eq 'construction_space') {
+ } elsif ($roletype eq 'author') {
@roles = &construction_space_roles();
} else {
@roles = &course_roles('domain');
@@ -245,7 +254,7 @@ sub domain_roles_select {
}
my $result = &Apache::loncommon::linked_select_forms
('studentform',(' 'x3).&mt('Role: '),$env{'form.roletype'},
- 'roletype','showrole',\%select_menus,['domain','construction_space','course']);
+ 'roletype','showrole',\%select_menus,['domain','author','course']);
return $result;
}
@@ -650,7 +659,7 @@ sub print_upload_manager_footer {
my $formname;
if ($context eq 'course') {
$formname = 'document.studentform';
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$formname = 'document.studentform';
} elsif ($context eq 'domain') {
$formname = 'document.studentform';
@@ -701,7 +710,7 @@ sub print_upload_manager_footer {
$Str .= '<h3>'.&mt('Settings for assigning roles:').'</h3>'."\n".
&mt('Pick the action to take on roles for these users:').'<br /><span class="LC_nobreak"><label><input type="radio" name="roleaction" value="norole" checked="checked" /> '.&mt('No role changes').'</label> <label><input type="radio" name="roleaction" value="domain" /> '.&mt('Add a domain role').'</label> <label><input type="radio" name="roleaction" value="course" /> '.&mt('Add a course role').'</label></span>';
}
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
$Str .= '<h3>'.&mt('Default role')."</h3>\n".
&mt('Choose the role to assign to users without one specified in the uploaded file');
} elsif ($context eq 'course') {
@@ -715,7 +724,7 @@ sub print_upload_manager_footer {
my ($options,$cb_script,$coursepick) = &default_role_selector($context,'defaultrole',1);
if ($context eq 'domain') {
$Str .= '<span class="LC_role_level">'.&mt('Domain Level').'</span><br />'.$options.'<br /><br /><span class="LC_role_level">'.&mt('Course Level').'</span><br />'.$cb_script.$coursepick;
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$Str .= $options;
} else {
$Str .= '<table><tr><td><span class="LC_nobreak"<b>'.&mt('role').': </b>'.
@@ -754,7 +763,7 @@ sub forceid_change {
if ($context eq 'domain') {
$output .= '<label><input type="checkbox" name="recurseid"'.
' value="yes">'.
- &mt('Update ID/Student Number in courses in which user is an Active or Future student, (if forcing change).').
+ &mt('Update ID/Student Number in courses in which user is Active/Future student,<br />(if forcing change).').
'</label></p>'."\n";
}
return $output;
@@ -845,7 +854,7 @@ sub print_upload_manager_form {
}
sub setup_date_selectors {
- my ($starttime,$endtime,$mode) = @_;
+ my ($starttime,$endtime,$mode,$nolink) = @_;
if (! defined($starttime)) {
$starttime = time;
unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
@@ -866,12 +875,15 @@ sub setup_date_selectors {
}
}
}
- my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'startdate',
- $starttime);
- my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'enddate',
- $endtime);
+
+ my $startdateform =
+ &Apache::lonhtmlcommon::date_setter('studentform','startdate',$starttime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
+ my $enddateform =
+ &Apache::lonhtmlcommon::date_setter('studentform','enddate',$endtime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
if ($mode eq 'create_enrolldates') {
$startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
'startenroll',
@@ -902,35 +914,44 @@ sub get_dates_from_form {
}
sub date_setting_table {
- my ($starttime,$endtime,$mode) = @_;
- my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
+ my ($starttime,$endtime,$mode,$bulkaction) = @_;
+ my $nolink;
+ if ($bulkaction) {
+ $nolink = 1;
+ }
+ my ($startform,$endform) =
+ &setup_date_selectors($starttime,$endtime,$mode,$nolink);
my $dateDefault;
if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
$dateDefault = ' ';
- } elsif ($mode ne 'construction_space' && $mode ne 'domain') {
- $dateDefault = '<nobr>'.
- '<label><input type="checkbox" name="makedatesdefault" /> '.
- &mt('make these dates the default for future enrollment').
- '</label></nobr>';
+ } elsif ($mode ne 'author' && $mode ne 'domain') {
+ if (($bulkaction eq 'reenable') ||
+ ($bulkaction eq 'activate') ||
+ ($bulkaction eq 'chgdates')) {
+ $dateDefault = '<span class="LC_nobreak">'.
+ '<label><input type="checkbox" name="makedatesdefault" /> '.
+ &mt('make these dates the default for future enrollment').
+ '</label></span>';
+ }
}
- my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
+ my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
if (defined($endtime) && $endtime == 0) {
$perpetual .= ' checked';
}
- $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
+ $perpetual.= ' /> '.&mt('no ending date').'</label></span>';
if ($mode eq 'create_enrolldates') {
$perpetual = ' ';
}
- my $result = &Apache::lonhtmlcommon::start_pick_box()."\n".
- &Apache::lonhtmlcommon::row_title(&mt('Starting Date'),
- 'LC_oddrow_value')."\n".
- $startform."\n".
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title(&mt('Ending Date'),
- 'LC_oddrow_value')."\n".
- $endform.' '.$perpetual.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'<br />';
+ my $result = &Apache::lonhtmlcommon::start_pick_box()."\n";
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Starting Date'),
+ 'LC_oddrow_value')."\n".
+ $startform."\n".
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Ending Date'),
+ 'LC_oddrow_value')."\n".
+ $endform.' '.$perpetual.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'<br />';
if ($dateDefault) {
$result .= $dateDefault.'<br />'."\n";
}
@@ -947,7 +968,8 @@ sub make_dates_default {
{'default_enrollment_start_date'=>$startdate,
'default_enrollment_end_date' =>$enddate},$dom,$crs);
if ($put_result eq 'ok') {
- $result .= "Set default start and end dates for course<br />";
+ $result .= &mt('Set default start and end dates for course').
+ '<br />'."\n";
#
# Refresh the course environment
&Apache::lonnet::coursedescription($env{'request.course.id'},
@@ -964,7 +986,7 @@ sub default_role_selector {
my ($context,$checkpriv) = @_;
my %customroles;
my ($options,$coursepick,$cb_jscript);
- if ($context ne 'construction_space') {
+ if ($context ne 'author') {
%customroles = &my_custom_roles();
}
@@ -978,7 +1000,7 @@ sub default_role_selector {
' <option value="">'.&mt('Please select').'</option>'."\n";
if ($context eq 'course') {
$options .= &default_course_roles($context,$checkpriv,%customroles);
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
my @roles = &construction_space_roles($checkpriv);
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);
@@ -1107,7 +1129,7 @@ sub course_roles {
sub curr_role_permissions {
my ($context,$setting,$checkpriv) = @_;
my @roles;
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
@roles = &construction_space_roles($checkpriv);
} elsif ($context eq 'domain') {
if ($setting eq 'course') {
@@ -1148,7 +1170,11 @@ sub print_userlist {
($env{'form.Status'});
if ($env{'form.showrole'} eq '') {
- $env{'form.showrole'} = 'Any';
+ if ($context eq 'course') {
+ $env{'form.showrole'} = 'st';
+ } else {
+ $env{'form.showrole'} = 'Any';
+ }
}
if (! defined($env{'form.output'}) ||
$env{'form.output'} !~ /^(csv|excel|html)$/ ) {
@@ -1239,8 +1265,12 @@ sub print_userlist {
&Apache::lonhtmlcommon::end_pick_box().'</p>'.
'<p>'.&list_submit_button(&mt('Update Display')).
"\n</p>\n");
+ if ($env{'form.coursepick'}) {
+ $r->print('<hr />'.&mt('Searching').' ...<br /> <br />');
+ }
+ } else {
+ $r->print('<hr />'.&mt('Searching').' ...<br /> <br />');
}
- $r->print('<hr />'.&mt('Searching').' ...<br /> <br />');
$r->rflush();
if ($context eq 'course') {
my $classlist = &Apache::loncoursedata::get_classlist();
@@ -1268,33 +1298,33 @@ sub print_userlist {
my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
\@statuses,$showroles);
&gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
- \%advrolehash);
+ \%advrolehash,$permission);
} else {
my (%cstr_roles,%dom_roles);
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
# List co-authors and assistant co-authors
my @possroles = ('ca','aa');
%cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
\@statuses,\@possroles);
&gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
- \%cstr_roles);
+ \%cstr_roles,$permission);
} elsif ($context eq 'domain') {
if ($env{'form.roletype'} eq 'domain') {
%dom_roles = &Apache::lonnet::get_domain_roles($env{'request.role.domain'});
foreach my $key (keys(%dom_roles)) {
if (ref($dom_roles{$key}) eq 'HASH') {
&gather_userinfo($context,$format,\%userlist,$indexhash,
- \%userinfo,$dom_roles{$key});
+ \%userinfo,$dom_roles{$key},$permission);
}
}
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } elsif ($env{'form.roletype'} eq 'author') {
my %dom_roles = &Apache::lonnet::get_domain_roles($env{'request.role.domain'},['au']);
my %coauthors;
foreach my $key (keys(%dom_roles)) {
if (ref($dom_roles{$key}) eq 'HASH') {
if ($env{'form.showrole'} eq 'au') {
&gather_userinfo($context,$format,\%userlist,$indexhash,
- \%userinfo,$dom_roles{$key});
+ \%userinfo,$dom_roles{$key},$permission);
} else {
my @possroles;
if ($env{'form.showrole'} eq 'Any') {
@@ -1310,7 +1340,7 @@ sub print_userlist {
$authordom,undef,\@statuses,\@possroles);
}
&gather_userinfo($context,$format,\%userlist,
- $indexhash,\%userinfo,\%coauthors);
+ $indexhash,\%userinfo,\%coauthors,$permission);
}
}
}
@@ -1323,6 +1353,7 @@ sub print_userlist {
&Apache::lonnet::coursedescription($cid,{'one_time' => 1});
my $cdom = $coursehash{'domain'};
my $cnum = $coursehash{'num'};
+ next if ($cnum eq '' || $cdom eq '');
my $cdesc = $coursehash{'description'};
my (@roles,@sections,%access,%users,%userdata,
%statushash);
@@ -1355,20 +1386,22 @@ sub print_userlist {
}
}
&gather_userinfo($context,$format,\%userlist,$indexhash,
- \%userinfo,\%allusers);
+ \%userinfo,\%allusers,$permission);
} else {
+ $r->print('<input type="hidden" name="phase" value="'.
+ $env{'form.phase'}.'" /></form>');
return;
}
}
}
}
if (keys(%userlist) == 0) {
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
$r->print(&mt('There are no co-authors to display.')."\n");
} elsif ($context eq 'domain') {
if ($env{'form.roletype'} eq 'domain') {
$r->print(&mt('There are no users with domain roles to display.')."\n");
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } elsif ($env{'form.roletype'} eq 'author') {
$r->print(&mt('There are no authors or co-authors to display.')."\n");
} elsif ($env{'form.roletype'} eq 'course') {
$r->print(&mt('There are no course users to display')."\n");
@@ -1380,30 +1413,31 @@ sub print_userlist {
# Print out the available choices
my $usercount;
if ($env{'form.action'} eq 'modifystudent') {
- ($usercount) = &show_users_list($r,$context,'view','modify',
+ ($usercount) = &show_users_list($r,$context,'view',$permission,
$env{'form.Status'},\%userlist,$keylist);
} else {
($usercount) = &show_users_list($r,$context,$env{'form.output'},
- 'aboutme',$env{'form.Status'},\%userlist,$keylist);
+ $permission,$env{'form.Status'},\%userlist,$keylist);
}
if (!$usercount) {
$r->print('<br />'.&mt('There are no users matching the search criteria.'));
}
}
- $r->print('</form>');
+ $r->print('<input type="hidden" name="phase" value="'.
+ $env{'form.phase'}.'" /></form>');
}
sub list_submit_button {
my ($text) = @_;
- return '<input type="submit" value="'.$text.'" />';
+ return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />';
}
sub gather_userinfo {
- my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash) = @_;
+ my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_;
foreach my $item (keys(%{$rolehash})) {
@{$userlist->{$item}} = ();
my %userdata;
- if ($context eq 'construction_space' || $context eq 'course') {
+ if ($context eq 'author' || $context eq 'course') {
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
split(/:/,$item);
($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
@@ -1414,7 +1448,7 @@ sub gather_userinfo {
split(/:/,$item);
($userdata{'end'},$userdata{'start'})=split(/:/,$rolehash->{$item});
&build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } elsif ($env{'form.roletype'} eq 'author') {
if (ref($rolehash->{$item}) eq 'HASH') {
$userdata{'extent'} = $item;
foreach my $key (keys(%{$rolehash->{$item}})) {
@@ -1429,6 +1463,7 @@ sub gather_userinfo {
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
split(/:/,$item);
if (ref($rolehash->{$item}) eq 'HASH') {
+ my $numcids = keys(%{$rolehash->{$item}});
foreach my $cid (sort(keys(%{$rolehash->{$item}}))) {
if (ref($rolehash->{$item}{$cid}) eq 'HASH') {
my $spanstart = '';
@@ -1436,6 +1471,13 @@ sub gather_userinfo {
my $space = ', ';
if ($format eq 'html' || $format eq 'view') {
$spanstart = '<span class="LC_nobreak">';
+ if ($permission->{'cusr'}) {
+ if ($numcids > 1) {
+ $spanstart .= '<input type="radio" name="'.$item.'" value="'.$cid.'" />';
+ } else {
+ $spanstart .= '<input type="hidden" name="'.$item.'" value="'.$cid.'" />';
+ }
+ }
$spanend = '</span><br />';
$space = ', ';
}
@@ -1458,6 +1500,7 @@ sub gather_userinfo {
sub build_user_record {
my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
+ next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
&process_date_info($userdata);
my $username = $userdata->{'username'};
my $domain = $userdata->{'domain'};
@@ -1492,7 +1535,8 @@ sub courses_selector {
my $format_reply;
my $jscript = '';
- my $totcodes =
+ my $totcodes = 0;
+ $totcodes =
&Apache::courseclassifier::retrieve_instcodes(\%coursecodes,
$cdom,$totcodes);
if ($totcodes > 0) {
@@ -1694,7 +1738,7 @@ sub process_date_info {
}
sub show_users_list {
- my ($r,$context,$mode,$linkto,$statusmode,$userlist,$keylist)=@_;
+ my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist)=@_;
#
# Variables for excel output
my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1712,6 +1756,7 @@ sub show_users_list {
if (!grep(/^\Q$sortby\E$/,@sortable)) {
$sortby = 'username';
}
+ my $setting = $env{'form.roleaction'};
my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
if ($context eq 'course') {
$cid=$env{'request.course.id'};
@@ -1746,7 +1791,69 @@ function photowindow(photolink) {
END
}
unless ($mode eq 'autoenroll') {
+ my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
+ my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox");
+ my $singconfirm = &mt(' for a single user');
+ my $multconfirm = &mt(' for multiple users');
+ my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode);
$r->print(<<END);
+
+<script type="text/javascript" language="Javascript">
+$check_uncheck_js
+
+function verify_action (field) {
+ var numchecked = 0;
+ var singconf = '$singconfirm';
+ var multconf = '$multconfirm';
+ if (field.length > 0) {
+ for (i = 0; i < field.length; i++) {
+ if (field[i].checked == true) {
+ numchecked ++;
+ }
+ }
+ } else {
+ if (field.checked == true) {
+ numchecked ++;
+ }
+ }
+ if (numchecked == 0) {
+ alert("$alert");
+ }
+ else {
+ var message = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].text;
+ if (numchecked == 1) {
+ message += singconf;
+ }
+ else {
+ message += multconf;
+ }
+ if (confirm(message)) {
+ document.studentform.phase.value = 'bulkchange';
+ document.studentform.submit();
+ }
+ }
+}
+
+function username_display_launch(username,domain) {
+ var target;
+ for (var i=0; i<document.studentform.usernamelink.length; i++) {
+ if (document.studentform.usernamelink[i].checked) {
+ target = document.studentform.usernamelink[i].value;
+ }
+ }
+ if (target == 'modify') {
+ document.studentform.srchterm.value=username;
+ document.studentform.srchdomain.value=domain;
+ document.studentform.phase.value='get_user_info';
+ document.studentform.action.value = 'singleuser';
+ document.studentform.submit();
+ }
+ else {
+ document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
+ }
+}
+</script>
+$date_sec_selector
<input type="hidden" name="state" value="$env{'form.state'}" />
END
}
@@ -1770,10 +1877,17 @@ END
'clicker' => "clicker id",
'photo' => "photo",
'extent' => "extent",
+ 'pr' => "Proceed",
+ 'ca' => "check all",
+ 'ua' => "uncheck all",
+ 'ac' => "Action to take for selected users",
+ 'link' => "Behavior of username links",
+ 'aboutme' => "Display a user's personal page",
+ 'modify' => "Modify a user's information",
);
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
$lt{'extent'} = &mt('Course(s): description, section(s), status');
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$lt{'extent'} = &mt('Author');
}
my @cols = ('username','domain','id','fullname');
@@ -1786,7 +1900,7 @@ END
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
push(@cols,'role');
}
- if ($context eq 'domain' && ($env{'form.roletype'} eq 'construction_space' ||
+ if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
$env{'form.roletype'} eq 'course')) {
push (@cols,'extent');
}
@@ -1808,16 +1922,46 @@ END
my $results_description = &results_header_row($rolefilter,$statusmode,
$context);
$r->print('<b>'.$results_description.'</b><br />');
- my $output;
+ my ($output,$actionselect);
if ($mode eq 'html' || $mode eq 'view') {
+ if ($permission->{'cusr'}) {
+ $actionselect = &select_actions($context,$setting,$statusmode);
+ }
$r->print(<<END);
-<input type="hidden" name="sname" value="" />
-<input type="hidden" name="sdom" value="" />
+<input type="hidden" name="srchby" value="uname" />
+<input type="hidden" name="srchin" value="dom" />
+<input type="hidden" name="srchtype" value="exact" />
+<input type="hidden" name="srchterm" value="" />
+<input type="hidden" name="srchdomain" value="" />
+END
+ if ($mode ne 'autoenroll') {
+ $output = '<p>';
+ my @linkdests = ('aboutme');
+ if ($permission->{'cusr'}) {
+ push (@linkdests,'modify');
+ $output .= '<span class="LC_nobreak">'.$lt{'link'}.': ';
+ my $usernamelink = $env{'form.usernamelink'};
+ if ($usernamelink eq '') {
+ $usernamelink = 'aboutme';
+ }
+ foreach my $item (@linkdests) {
+ my $checkedstr = '';
+ if ($item eq $usernamelink) {
+ $checkedstr = ' checked="checked" ';
+ }
+ $output .= '<label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'> '.$lt{$item}.'</label> ';
+ }
+ $output .= '</span><br />';
+ } else {
+ $output .= &mt("Click on a username to view the user's personal page.").'<br />';
+ }
+ if ($actionselect) {
+ $output .= <<"END";
+$lt{'ac'}: $actionselect <input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" /></p>
+<p><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.actionlist)" />
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.actionlist)" />
END
- if ($linkto eq 'aboutme') {
- $output = &mt("Select a user name to view the user's personal page.");
- } elsif ($linkto eq 'modify') {
- $output = &mt("Select a user name to modify the user's information");
+ }
}
$output .= "\n<p>\n".
&Apache::loncommon::start_data_table().
@@ -1827,9 +1971,10 @@ END
<th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th>
";
} else {
- $output .= "
-<th>Count</th>
- ";
+ $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
+ if ($actionselect) {
+ $output .= '<th>'.&mt('Select').'</th>'."\n";
+ }
}
foreach my $item (@cols) {
$output .= "<th><a href=\"javascript:document.studentform.sortby.value='$item';document.studentform.submit();\">$lt{$item}</a></th>\n";
@@ -1914,6 +2059,10 @@ END
# Get groups, role, permanent e-mail so we can sort on them if
# necessary.
foreach my $user (keys(%{$userlist})) {
+ if ($context eq 'domain' && $user eq $env{'request.role.domain'}.'-domainconfig:'.$env{'request.role.domain'}) {
+ delete($userlist->{$user});
+ next;
+ }
my ($uname,$udom,$role,$groups,$email);
if (($statusmode ne 'Any') &&
($userlist->{$user}->[$index{'status'}] ne $statusmode)) {
@@ -1923,8 +2072,12 @@ END
if ($context eq 'domain') {
if ($env{'form.roletype'} eq 'domain') {
($role,$uname,$udom) = split(/:/,$user);
-
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ if (($uname eq $env{'request.role.domain'}.'-domainconfig') &&
+ ($udom eq $env{'request.role.domain'})) {
+ delete($userlist->{$user});
+ next;
+ }
+ } elsif ($env{'form.roletype'} eq 'author') {
($uname,$udom,$role) = split(/:/,$user,-1);
} elsif ($env{'form.roletype'} eq 'course') {
($uname,$udom,$role) = split(/:/,$user);
@@ -1984,6 +2137,7 @@ END
foreach my $item (@{$keylist}) {
$in{$item} = $sdata->[$index{$item}];
}
+ my $role = $in{'role'};
$in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}]);
if (! defined($in{'start'}) || $in{'start'} == 0) {
$in{'start'} = &mt('none');
@@ -1998,22 +2152,29 @@ END
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
$r->print(&Apache::loncommon::start_data_table_row());
$r->print("<td>$rowcount</td>\n");
- if ($linkto eq 'aboutme') {
- $in{'username'} =
- &Apache::loncommon::aboutmewrapper($in{'username'},
- $in{'username'},
- $in{'domain'});
- } elsif ($linkto eq 'modify') {
- $in{'username'} = '<a href="'.
- "javascript:document.studentform.sname.value='".
- $in{'username'}.
- "';document.studentform.sdom.value='".$in{'domain'}.
- "';document.studentform.state.value='selected".
- "';document.studentform.submit();".'">'.
- $in{'username'}."</a>\n";
+ my $checkval;
+ if ($mode ne 'autoenroll' && $actionselect) {
+ $checkval = $user;
+ if ($context eq 'course') {
+ if ($role eq 'st') {
+ $checkval .= ':st';
+ }
+ $checkval .= ':'.$in{'section'};
+ if ($role eq 'st') {
+ $checkval .= ':'.$in{'type'}.':'.$in{'lockedtype'};
+ }
+ }
+ $r->print('<td><input type="checkbox" name="actionlist" value="'.
+ $checkval.'"></td>');
}
foreach my $item (@cols) {
- $r->print('<td>'.$in{$item}.'</td>'."\n");
+ if ($item eq 'username') {
+ $r->print('<td>'.&print_username_link($permission,\%in).'</td>');
+ } elsif (($item eq 'start' || $item eq 'end') && ($mode ne 'autoeroll') && ($actionselect)) {
+ $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+ } else {
+ $r->print('<td>'.$in{$item}.'</td>'."\n");
+ }
}
if ($context eq 'course') {
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
@@ -2094,15 +2255,280 @@ END
}
}
+sub print_username_link {
+ my ($permission,$in) = @_;
+ my $output;
+ if (!$permission->{'cusr'}) {
+ $output = &Apache::loncommon::aboutmewrapper($in->{'username'},
+ $in->{'username'},
+ $in->{'domain'});
+ } else {
+ $output = '<a href="javascript:username_display_launch('.
+ "'$in->{'username'}','$in->{'domain'}'".')" />'.
+ $in->{'username'}.'</a>';
+ }
+ return $output;
+}
+
sub role_type_names {
my %lt = &Apache::lonlocal::texthash (
- 'domain' => 'Domain Roles',
- 'construction_space' => 'Co-Author Roles',
- 'course' => 'Course Roles',
+ 'domain' => 'Domain Roles',
+ 'author' => 'Co-Author Roles',
+ 'course' => 'Course Roles',
);
return %lt;
}
+sub select_actions {
+ my ($context,$setting,$statusmode) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ revoke => "Revoke user roles",
+ delete => "Delete user roles",
+ reenable => "Re-enable expired user roles",
+ activate => "Make future user roles active now",
+ chgdates => "Change starting/ending dates",
+ chgsec => "Change section associated with user roles",
+ );
+ my ($output,$options,%choices);
+ if ($statusmode eq 'Any') {
+ $options .= '
+<option value="chgdates">'.$lt{'chgdates'}.'</option>';
+ $choices{'dates'} = 1;
+ } else {
+ if ($statusmode eq 'Future') {
+ $options .= '
+<option value="activate">'.$lt{'activate'}.'</option>';
+ $choices{'dates'} = 1;
+ } elsif ($statusmode eq 'Expired') {
+ $options .= '
+<option value="reenable">'.$lt{'reenable'}.'</option>';
+ $choices{'dates'} = 1;
+ }
+ if ($statusmode eq 'Active' || $statusmode eq 'Future') {
+ $options .= '
+<option value="chgdates">'.$lt{'chgdates'}.'</option>
+<option value="revoke">'.$lt{'revoke'}.'</option>';
+ $choices{'dates'} = 1;
+ }
+ }
+ if ($context eq 'domain') {
+ $options .= '
+<option value="delete">'.$lt{'delete'}.'</option>';
+ }
+ if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) {
+ if ($statusmode ne 'Expired') {
+ $options .= '
+<option value="chgsec">'.$lt{'chgsec'}.'</option>';
+ $choices{'sections'} = 1;
+ }
+ }
+ if ($options) {
+ $output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'studentform'".')" />'."\n".
+ '<option value="" selected="selected">'.
+ &mt('Please select').'</option>'."\n".$options."\n".'</select>';
+ if ($choices{'dates'}) {
+ $output .=
+ '<input type="hidden" name="startdate_month" value="" />'."\n".
+ '<input type="hidden" name="startdate_day" value="" />'."\n".
+ '<input type="hidden" name="startdate_year" value="" />'."\n".
+ '<input type="hidden" name="startdate_hour" value="" />'."\n".
+ '<input type="hidden" name="startdate_minute" value="" />'."\n".
+ '<input type="hidden" name="startdate_second" value="" />'."\n".
+ '<input type="hidden" name="enddate_month" value="" />'."\n".
+ '<input type="hidden" name="enddate_day" value="" />'."\n".
+ '<input type="hidden" name="enddate_year" value="" />'."\n".
+ '<input type="hidden" name="enddate_hour" value="" />'."\n".
+ '<input type="hidden" name="enddate_minute" value="" />'."\n".
+ '<input type="hidden" name="enddate_second" value="" />'."\n";
+ if ($context eq 'course') {
+ $output .= '<input type="hidden" name="makedatesdefault" value="" />'."\n";
+ }
+ }
+ if ($choices{'sections'}) {
+ $output .= '<input type="hidden" name="retainsec" value= "" />'."\n".
+ '<input type="hidden" name="newsecs" value= "" />'."\n";
+ }
+ }
+ return $output;
+}
+
+sub date_section_javascript {
+ my ($context,$setting) = @_;
+ my $title;
+ if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) {
+ $title = &mt('Date and Section selector');
+ } else {
+ $title = &mt('Date selector');
+ }
+ my $output = '
+<script type="text/javascript">
+ var stdeditbrowser;'."\n";
+ $output .= <<"ENDONE";
+ function opendatebrowser(callingform,formname) {
+ var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value;
+ if (bulkaction == 'revoke' || bulkaction == 'delete' || bulkaction == '') {
+ return;
+ }
+ var url = '/adm/createuser?';
+ var type = '';
+ var showrole = callingform.showrole.options[callingform.showrole.selectedIndex].value;
+ENDONE
+ if ($context eq 'domain') {
+ $output .= '
+ type = callingform.roletype.options[callingform.roletype.selectedIndex].value;
+';
+ }
+ my $width= '700';
+ my $height = '400';
+ $output .= <<"ENDTWO";
+ url += 'action=dateselect&callingform=' + formname +
+ '&roletype='+type+'&showrole='+showrole +'&bulkaction='+bulkaction;
+ var title = '$title';
+ var options = 'scrollbars=1,resizable=1,menubar=0';
+ options += ',width=$width,height=$height';
+ stdeditbrowser = open(url,title,options,'1');
+ stdeditbrowser.focus();
+ }
+</script>
+ENDTWO
+ return $output;
+}
+
+sub date_section_selector {
+ my ($context) = @_;
+ my $callingform = $env{'form.callingform'};
+ my $formname = 'dateselect';
+ my $groupslist = &get_groupslist();
+ my $sec_js = &setsections_javascript($formname,$groupslist);
+ my $output = <<"END";
+<script type="text/javascript">
+
+$sec_js
+
+function saveselections(formname) {
+
+END
+ if ($env{'form.bulkaction'} eq 'chgsec') {
+ $output .= <<"END";
+ opener.document.$callingform.retainsec.value = formname.retainsec.value;
+ setSections(formname);
+ if (seccheck == 'ok') {
+ opener.document.$callingform.newsecs.value = formname.sections.value;
+ window.close();
+ }
+ return;
+END
+ } else {
+ if ($context eq 'course') {
+ if (($env{'form.bulkaction'} eq 'reenable') ||
+ ($env{'form.bulkaction'} eq 'activate') ||
+ ($env{'form.bulkaction'} eq 'chgdates')) {
+ $output .= <<"END";
+
+ if (formname.makedatesdefault.checked == true) {
+ opener.document.$callingform.makedatesdefault.value = 1;
+ }
+ else {
+ opener.document.$callingform.makedatesdefault.value = 0;
+ }
+
+END
+ }
+ }
+ $output .= <<"END";
+ opener.document.$callingform.startdate_month.value = formname.startdate_month.options[formname.startdate_month.selectedIndex].value;
+ opener.document.$callingform.startdate_day.value = formname.startdate_day.value;
+ opener.document.$callingform.startdate_year.value = formname.startdate_year.value;
+ opener.document.$callingform.startdate_hour.value = formname.startdate_hour.options[formname.startdate_hour.selectedIndex].value;
+ opener.document.$callingform.startdate_minute.value = formname.startdate_minute.value;
+ opener.document.$callingform.startdate_second.value = formname.startdate_second.value;
+ opener.document.$callingform.enddate_month.value = formname.enddate_month.options[formname.enddate_month.selectedIndex].value;
+ opener.document.$callingform.enddate_day.value = formname.enddate_day.value;
+ opener.document.$callingform.enddate_year.value = formname.enddate_year.value;
+ opener.document.$callingform.enddate_hour.value = formname.enddate_hour.options[formname.enddate_hour.selectedIndex].value;
+ opener.document.$callingform.enddate_minute.value = formname.enddate_minute.value;
+ opener.document.$callingform.enddate_second.value = formname.enddate_second.value;
+ window.close();
+END
+ }
+ $output .= '
+}
+</script>
+';
+ my %lt = &Apache::lonlocal::texthash (
+ chac => 'Access dates to apply for selected users',
+ chse => 'Changes in section affiliation to apply to selected users',
+ fors => 'For student roles changing the section, will result in a section switch as students may only be in one section of a course at a time.',
+ forn => 'For a role in a course that is not a student role, a user may have roles in more than one section of a course at a time.',
+ reta => "Retain each user's current section affiliations?",
+ dnap => '(Does not apply to student roles).',
+ );
+ my ($date_items,$headertext);
+ if ($env{'form.bulkaction'} eq 'chgsec') {
+ $headertext = $lt{'chse'};
+ } else {
+ $headertext = $lt{'chac'};
+ my $starttime;
+ if (($env{'form.bulkaction'} eq 'activate') ||
+ ($env{'form.bulkaction'} eq 'reenable')) {
+ $starttime = time;
+ }
+ $date_items = &date_setting_table($starttime,undef,$context,
+ $env{'form.bulkaction'});
+ }
+ $output .= '<h3>'.$headertext.'</h3>'.
+ '<form name="'.$formname.'" method="post">'."\n".
+ $date_items;
+ if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %sections_count =
+ &Apache::loncommon::get_sections($cdom,$cnum);
+ my $info;
+ if ($env{'form.showrole'} eq 'st') {
+ $output .= '<p>'.$lt{'fors'}.'</p>';
+ } elsif ($env{'form.shorole'} eq 'Any') {
+ $output .= '<p>'.$lt{'fors'}.'</p>'.
+ '<p>'.$lt{'forn'}.' ';
+ $info = $lt{'reta'};
+ } else {
+ $output .= '<p>'.$lt{'forn'}.' ';
+ $info = $lt{'reta'};
+ }
+ if ($info) {
+ $info .= '<span class="LC_nobreak">'.
+ '<label><input type="radio" name="retainsec" value="1" '.
+ 'checked="checked" />'.&mt('Yes').'</label> '.
+ '<label><input type="radio" name="retainsec" value="0" />'.
+ &mt('No').'</label></span>';
+ if ($env{'form.showrole'} eq 'Any') {
+ $info .= '<br />'.$lt{'dnap'};
+ }
+ $info .= '</p>';
+ } else {
+ $info = '<input type="hidden" name="retainsec" value="0" />';
+ }
+ my $sections_select .= &course_sections(\%sections_count,$env{'form.showrole'});
+ my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n".
+ &Apache::lonhtmlcommon::row_title(&mt('New section to assign'),'LC_oddrow_value')."\n".
+ '<table class="LC_createuser"><tr class="LC_section_row">'."\n".
+ '<td align="center">'.&mt('Existing sections')."\n".
+ '<br />'.$sections_select.'</td><td align="center">'.
+ &mt('New section').'<br />'."\n".
+ '<input type="text" name="newsec" size="15" />'."\n".
+ '<input type="hidden" name="sections" value="" />'."\n".
+ '</td></tr></table>'."\n".
+ &Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::end_pick_box().'</p>';
+ $output .= $info.$secbox;
+ }
+ $output .= '<p>'.
+&mt('Use "Save" to update the main window with your selections.').'<br /><br />'.
+'<input type="button" name="dateselection" value="'.&mt('Save').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
+'</form>';
+ return $output;
+}
+
sub results_header_row {
my ($rolefilter,$statusmode,$context) = @_;
my ($description,$showfilter);
@@ -2113,8 +2539,7 @@ sub results_header_row {
$description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': ';
if ($statusmode eq 'Expired') {
$description .= &mt('Users in course with expired [_1] roles',$showfilter);
- }
- if ($statusmode eq 'Future') {
+ } elsif ($statusmode eq 'Future') {
$description .= &mt('Users in course with future [_1] roles',$showfilter);
} elsif ($statusmode eq 'Active') {
$description .= &mt('Users in course with active [_1] roles',$showfilter);
@@ -2125,8 +2550,10 @@ sub results_header_row {
$description .= &mt('All users in course with [_1] roles',$rolefilter);
}
}
- } elsif ($context eq 'construction_space') {
- $description = &mt('Author space for [_1].').' ';
+ } elsif ($context eq 'author') {
+ $description =
+ &mt('Author space for <span class="LC_cusr_emph">[_1]</span>',
+ &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'})).': ';
if ($statusmode eq 'Expired') {
$description .= &mt('Co-authors with expired [_1] roles',$showfilter);
} elsif ($statusmode eq 'Future') {
@@ -2157,7 +2584,7 @@ sub results_header_row {
$description .= &mt('All users in domain with [_1] roles',$rolefilter);
}
}
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } elsif ($env{'form.roletype'} eq 'author') {
if ($statusmode eq 'Expired') {
$description .= &mt('Co-authors in domain with expired [_1] roles',$showfilter);
} elsif ($statusmode eq 'Future') {
@@ -2483,7 +2910,7 @@ sub upfile_drop_add {
} elsif ($setting eq 'course') {
$defaultrole = $env{'form.courserole'};
}
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$defaultrole = $env{'form.defaultrole'};
}
if ($context eq 'domain' && $setting eq 'course') {
@@ -2506,7 +2933,7 @@ sub upfile_drop_add {
#######################################
if ($context eq 'course') {
$r->print('<h3>'.&mt('Enrolling Users')."</h3>\n<p>\n");
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$r->print('<h3>'.&mt('Updating Co-authors')."</h3>\n<p>\n");
} else {
$r->print('<h3>'.&mt('Adding/Modifying Users')."</h3>\n<p>\n");
@@ -2646,6 +3073,8 @@ sub upfile_drop_add {
next if ($alerts{'username'}{$domain}{$username});
}
}
+ } else {
+# FIXME check if user info can be updated.
}
if ($id ne '') {
if (!$newuser) {
@@ -2698,7 +3127,7 @@ sub upfile_drop_add {
$r->print('<br />'.
&mt('<b>[_1]</b>: Unable to enroll. No password specified.',$username)
);
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$r->print('<br />'.
&mt('<b>[_1]</b>: Unable to add co-author. No password specified.',$username)
);
@@ -2724,39 +3153,7 @@ sub upfile_drop_add {
&mt('Authentication changed for [_1] existing users.',
$counts{'auth'})."</p>\n");
}
- if (keys(%alerts) > 0) {
- if (ref($alerts{'username'}) eq 'HASH') {
- foreach my $dom (sort(keys(%{$alerts{'username'}}))) {
- my $count;
- if (ref($alerts{'username'}{$dom}) eq 'HASH') {
- $count = keys(%{$alerts{'username'}{$dom}});
- }
- my $domdesc = &Apache::lonnet::domain($domain,'description');
- if (ref($curr_rules{$dom}) eq 'HASH') {
- $r->print(&Apache::loncommon::instrule_disallow_msg(
- 'username',$domdesc,$count,'upload'));
- }
- $r->print(&Apache::loncommon::user_rule_formats($dom,
- $domdesc,$curr_rules{$dom}{'username'},
- 'username'));
- }
- }
- if (ref($alerts{'id'}) eq 'HASH') {
- foreach my $dom (sort(keys(%{$alerts{'id'}}))) {
- my $count;
- if (ref($alerts{'id'}{$dom}) eq 'HASH') {
- $count = keys(%{$alerts{'id'}{$dom}});
- }
- my $domdesc = &Apache::lonnet::domain($domain,'description');
- if (ref($curr_rules{$dom}) eq 'HASH') {
- $r->print(&Apache::loncommon::instrule_disallow_msg(
- 'id',$domdesc,$count,'upload'));
- }
- $r->print(&Apache::loncommon::user_rule_formats($dom,
- $domdesc,$curr_rules{$dom}{'id'},'id'));
- }
- }
- }
+ $r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules));
$r->print('<form name="uploadresult" action="/adm/createuser">');
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','prevphase','currstate']));
$r->print('</form>');
@@ -2787,6 +3184,46 @@ sub upfile_drop_add {
} # end of unless
}
+sub print_namespacing_alerts {
+ my ($domain,$alerts,$curr_rules) = @_;
+ my $output;
+ if (ref($alerts) eq 'HASH') {
+ if (keys(%{$alerts}) > 0) {
+ if (ref($alerts->{'username'}) eq 'HASH') {
+ foreach my $dom (sort(keys(%{$alerts->{'username'}}))) {
+ my $count;
+ if (ref($alerts->{'username'}{$dom}) eq 'HASH') {
+ $count = keys(%{$alerts->{'username'}{$dom}});
+ }
+ my $domdesc = &Apache::lonnet::domain($domain,'description');
+ if (ref($curr_rules->{$dom}) eq 'HASH') {
+ $output .= &Apache::loncommon::instrule_disallow_msg(
+ 'username',$domdesc,$count,'upload');
+ }
+ $output .= &Apache::loncommon::user_rule_formats($dom,
+ $domdesc,$curr_rules->{$dom}{'username'},
+ 'username');
+ }
+ }
+ if (ref($alerts->{'id'}) eq 'HASH') {
+ foreach my $dom (sort(keys(%{$alerts->{'id'}}))) {
+ my $count;
+ if (ref($alerts->{'id'}{$dom}) eq 'HASH') {
+ $count = keys(%{$alerts->{'id'}{$dom}});
+ }
+ my $domdesc = &Apache::lonnet::domain($domain,'description');
+ if (ref($curr_rules->{$dom}) eq 'HASH') {
+ $output .= &Apache::loncommon::instrule_disallow_msg(
+ 'id',$domdesc,$count,'upload');
+ }
+ $output .= &Apache::loncommon::user_rule_formats($dom,
+ $domdesc,$curr_rules->{$dom}{'id'},'id');
+ }
+ }
+ }
+ }
+}
+
sub user_change_result {
my ($r,$userresult,$authresult,$roleresult,$counts,$flushc,$username,
$userchg) = @_;
@@ -2851,36 +3288,226 @@ sub print_expire_menu {
# ================================================================== Phase four
-sub expire_user_list {
- my ($r,$context) = @_;
+sub update_user_list {
+ my ($r,$context,$setting,$choice) = @_;
+ my $now = time;
my $count=0;
- my @droplist = &Apache::loncommon::get_env_multiple('form.droplist');
- foreach (@droplist) {
- my ($uname,$udom)=split(/\:/,$_);
- # drop student
- my $result = &modifystudent($udom,$uname,$env{'request.course.id'});
+ my @changelist;
+ if ($choice ne '') {
+ @changelist = &Apache::loncommon::get_env_multiple('form.actionlist');
+ } else {
+ @changelist = &Apache::loncommon::get_env_multiple('form.droplist');
+ }
+ my %result_text = ( ok => { 'revoke' => 'Revoked',
+ 'delete' => 'Deleted',
+ 'reenable' => 'Re-enabled',
+ 'activate' => 'Activated',
+ },
+ error => {'revoke' => 'revoking',
+ 'delete' => 'deleting',
+ 'reenable' => 're-enabling',
+ 'activate' => 'activating',
+ },
+ );
+ my ($startdate,$enddate);
+ if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
+ ($startdate,$enddate) = &get_dates_from_form();
+ }
+ foreach my $item (@changelist) {
+ my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections,
+ $scopestem);
+ if ($context eq 'course') {
+ ($uname,$udom,$role,$sec,$type,$locktype) = split(/\:/,$item,-1);
+ $cid = $env{'request.course.id'};
+ $scopestem = '/'.$cid;
+ $scopestem =~s/\_/\//g;
+ if ($sec eq '') {
+ $scope = $scopestem;
+ } else {
+ $scope = $scopestem.'/'.$sec;
+ }
+ } elsif ($context eq 'author') {
+ ($uname,$udom,$role) = split(/\:/,$item,-1);
+ $scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'};
+ } elsif ($context eq 'domain') {
+ if ($setting eq 'domain') {
+ ($role,$uname,$udom) = split(/\:/,$item,-1);
+ $scope = '/'.$env{'request.role.domain'}.'/';
+ } elsif ($setting eq 'author') {
+ ($uname,$udom,$role,$scope) = split(/\:/,$item);
+ } elsif ($setting eq 'course') {
+ ($uname,$udom,$role,$cid,$sec,$type,$locktype) =
+ split(/\:/,$item);
+ $scope = '/'.$cid;
+ $scope =~s/\_/\//g;
+ if ($sec ne '') {
+ $scope .= '/'.$sec;
+ }
+ }
+ }
+ my $plrole = &Apache::lonnet::plaintext($role);
+ my ($uid,$first,$middle,$last,$gene,$sec);
+ my $start = $env{'form.'.$item.'_start'};
+ my $end = $env{'form.'.$item.'_end'};
+ # revoke or delete user role
+ if ($choice eq 'revoke') {
+ $end = $now;
+ if ($role eq 'st') {
+ $result =
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } else {
+ $result =
+ &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+ }
+ } elsif ($choice eq 'delete') {
+ $start = -1;
+ $end = -1;
+ if ($role eq 'st') {
+# FIXME - how does role deletion affect classlist?
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } else {
+ $result =
+ &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
+ 0,1);
+ }
+ } else {
+ #reenable, activate, change access dates or change section
+ if ($choice ne 'chgsec') {
+ $start = $startdate;
+ $end = $enddate;
+ }
+ if ($choice eq 'reenable') {
+ if ($role eq 'st') {
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } else {
+ $result =
+ &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+ $now);
+ }
+ } elsif ($choice eq 'activate') {
+ if ($role eq 'st') {
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } else {
+ $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+ $now);
+ }
+ } elsif ($choice eq 'chgdates') {
+ if ($role eq 'st') {
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } else {
+ $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+ $start);
+ }
+ } elsif ($choice eq 'chgsec') {
+ my (@newsecs,$revresult,$nochg,@retained);
+ if ($role ne 'cc') {
+ @newsecs = split(/,/,$env{'form.newsecs'});
+ }
+ # remove existing section if not to be retained.
+ if (!$env{'form.retainsec'}) {
+ if ($sec eq '') {
+ if (@newsecs == 0) {
+ $result = &mt('No change in section assignment (none)');
+ $nochg = 1;
+ }
+ } else {
+ if (!grep(/^\Q$sec\E$/,@newsecs)) {
+ $revresult =
+ &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+ } else {
+ push(@retained,$sec);
+ }
+ }
+ } else {
+ push(@retained,$sec);
+ }
+ # add new sections
+ if (@newsecs == 0) {
+ if (!$nochg) {
+ if ($sec ne '') {
+ if ($role eq 'st') {
+ $result =
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid);
+ } else {
+ my $newscope = $scopestem;
+ $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start);
+ }
+ }
+ }
+ } else {
+ foreach my $newsec (@newsecs) {
+ if (!grep(/^\Q$newsec\E$/,@retained)) {
+ if ($role eq 'st') {
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid);
+ } else {
+ my $newscope = $scopestem;
+ if ($newsec ne '') {
+ $newscope .= '/'.$newsec;
+ }
+ $result = &Apache::lonnet::assignrole($udom,$uname,
+ $newscope,$role,$end,$start);
+ }
+ }
+ }
+ }
+ }
+ }
if ($result eq 'ok' || $result eq 'ok:') {
- $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
+ $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]",
+ $plrole,$scope,$uname.':'.$udom).'<br />');
$count++;
} else {
$r->print(
- &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result).
- '<br />');
+ &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]:[_4]",
+ $plrole,$scope,$uname.':'.$udom,$result).'<br />');
+ }
+ }
+ $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,users].",$count).'</b></p>');
+ if ($count > 0) {
+ if ($choice eq 'revoke') {
+ $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));
+ }
+ # Flush the course logs so reverse user roles immediately updated
+ &Apache::lonnet::flushcourselogs();
+ }
+ if ($env{'form.makedatesdefault'}) {
+ if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
+ $r->print(&make_dates_default($startdate,$enddate));
}
}
- $r->print('<p><b>'.&mt('Dropped [_1] user(s).',$count).'</b></p>');
- $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
}
-sub section_check_js {
- my $groupslist;
- my %curr_groups = &Apache::longroup::coursegroups();
- if (%curr_groups) {
- $groupslist = join('","',sort(keys(%curr_groups)));
+sub classlist_drop {
+ my ($scope,$uname,$udom,$now,$action) = @_;
+ my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+ my $cid=$cdom.'_'.$cnum;
+ my $user = $uname.':'.$udom;
+ if ($action eq 'drop') {
+ if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+ my $result =
+ &Apache::lonnet::cput('classlist',
+ { $user => $now },
+ $env{'course.'.$cid.'.domain'},
+ $env{'course.'.$cid.'.num'});
+ return &mt('Drop from classlist: [_1]',
+ '<b>'.$result.'</b>').'<br />';
+ }
}
+}
+
+sub active_student_roles {
+ my ($cnum,$cdom,$uname,$udom) = @_;
+ my %roles =
+ &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+ ['future','active'],['st']);
+ return exists($roles{"$cnum:$cdom:st"});
+}
+
+sub section_check_js {
+ my $groupslist= &get_groupslist();
return <<"END";
function validate(caller) {
- var groups = new Array("$groupslist");
+ var groups = new Array($groupslist);
var secname = caller.value;
if ((secname == 'all') || (secname == 'none')) {
alert("'"+secname+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
@@ -2927,5 +3554,144 @@ sub set_login {
return $response;
}
+sub course_sections {
+ my ($sections_count,$role) = @_;
+ my $output = '';
+ my @sections = (sort {$a <=> $b} keys %{$sections_count});
+ if (scalar(@sections) == 1) {
+ $output = '<select name="currsec_'.$role.'" >'."\n".
+ ' <option value="">Select</option>'."\n".
+ ' <option value="">No section</option>'."\n".
+ ' <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n";
+ } else {
+ $output = '<select name="currsec_'.$role.'" ';
+ my $multiple = 4;
+ if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
+ $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
+ foreach my $sec (@sections) {
+ $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
+ }
+ }
+ $output .= '</select>';
+ return $output;
+}
+
+sub get_groupslist {
+ my $groupslist;
+ my %curr_groups = &Apache::longroup::coursegroups();
+ if (%curr_groups) {
+ $groupslist = join('","',sort(keys(%curr_groups)));
+ $groupslist = '"'.$groupslist.'"';
+ }
+ return $groupslist;
+}
+
+sub setsections_javascript {
+ my ($form,$groupslist) = @_;
+ my ($checkincluded,$finish,$roleplace,$setsection_js);
+ if ($form eq 'cu') {
+ $checkincluded = 'formname.elements[i-1].checked == true';
+ $finish = 'formname.submit()';
+ $roleplace = 3;
+ } else {
+ $checkincluded = 'formname.name == "'.$form.'"';
+ $finish = "seccheck = 'ok';";
+ $roleplace = 1;
+ $setsection_js = "var seccheck = 'alert';";
+ }
+ my %alerts = &Apache::lonlocal::texthash(
+ secd => 'Section designations do not apply to Course Coordinator roles.',
+ accr => 'A course coordinator role will be added with access to all sections.',
+ inea => 'In each course, each user may only have one student role at a time.',
+ youh => 'You had selected ',
+ secs => 'sections.',
+ plmo => 'Please modify your selections so they include no more than one section.',
+ mayn => 'may not be used as the name for a section, as it is a reserved word.',
+ plch => 'Please choose a different section name.',
+ mnot => 'may not be used as a section name, as it is the name of a course group.',
+ secn => 'Section names and group names must be distinct. Please choose a different section name.',
+ );
+ $setsection_js .= <<"ENDSECCODE";
+
+function setSections(formname) {
+ var re1 = /^currsec_/;
+ var groups = new Array($groupslist);
+ for (var i=0;i<formname.elements.length;i++) {
+ var str = formname.elements[i].name;
+ var checkcurr = str.match(re1);
+ if (checkcurr != null) {
+ if ($checkincluded) {
+ var match = str.split('_');
+ var role = match[$roleplace];
+ if (role == 'cc') {
+ alert("$alerts{'secd'}\\n$alerts{'accr'}");
+ }
+ else {
+ var sections = '';
+ var numsec = 0;
+ var sections;
+ for (var j=0; j<formname.elements[i].length; j++) {
+ if (formname.elements[i].options[j].selected == true ) {
+ if (formname.elements[i].options[j].value != "") {
+ if (numsec == 0) {
+ if (formname.elements[i].options[j].value != "") {
+ sections = formname.elements[i].options[j].value;
+ numsec ++;
+ }
+ }
+ else {
+ sections = sections + "," + formname.elements[i].options[j].value
+ numsec ++;
+ }
+ }
+ }
+ }
+ if (numsec > 0) {
+ if (formname.elements[i+1].value != "" && formname.elements[i+1].value != null) {
+ sections = sections + "," + formname.elements[i+1].value;
+ }
+ }
+ else {
+ sections = formname.elements[i+1].value;
+ }
+ var newsecs = formname.elements[i+1].value;
+ var numsplit;
+ if (newsecs != null && newsecs != "") {
+ numsplit = newsecs.split(/,/g);
+ numsec = numsec + numsplit.length;
+ }
+
+ if ((role == 'st') && (numsec > 1)) {
+ alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}")
+ return;
+ }
+ else {
+ if (numsplit != null) {
+ for (var j=0; j<numsplit.length; j++) {
+ if ((numsplit[j] == 'all') ||
+ (numsplit[j] == 'none')) {
+ alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
+ return;
+ }
+ for (var k=0; k<groups.length; k++) {
+ if (numsplit[j] == groups[k]) {
+ alert("'"+numsplit[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
+ return;
+ }
+ }
+ }
+ }
+ formname.elements[i+2].value = sections;
+ }
+ }
+ }
+ }
+ }
+ $finish
+}
+ENDSECCODE
+ return $setsection_js;
+}
+
1;