--- loncom/interface/lonuserutils.pm 2007/12/05 16:49:55 1.8
+++ loncom/interface/lonuserutils.pm 2007/12/26 13:55:32 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.8 2007/12/05 16:49:55 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.35 2007/12/26 13:55:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,8 +46,7 @@ sub modifystudent {
# if $csec is undefined, drop the student from all the courses matching
# this one. If $csec is defined, drop them from all other sections of
# this course and add them to section $csec
- my $cdom = $env{'course.'.$courseid.'.domain'};
- my $cnum = $env{'course.'.$courseid.'.num'};
+ my ($cnum,$cdom) = &get_course_identity($courseid);
my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
@@ -69,7 +68,8 @@ sub modifystudent {
my $reply=&Apache::lonnet::modifystudent
# dom name id mode pass f m l g
($udom,$unam,'', '', '',undef,undef,undef,undef,
- $section,time,undef,undef,$desiredhost);
+ $section,time,undef,undef,$desiredhost,'','manual',
+ '',$courseid);
$result .= $reply.':';
}
}
@@ -96,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') {
@@ -127,6 +127,7 @@ sub modifyuserrole {
$email,$role,$start,$end);
if ($userresult eq 'ok') {
if ($role ne '') {
+ $role =~ s/_/\//g;
$roleresult = &Apache::lonnet::assignrole($udom,$uname,$scope,
$role,$end,$start);
}
@@ -136,22 +137,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 ($cnum,$cdom,$role) = split(/:/,$item,-1);
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";
}
}
}
@@ -203,7 +212,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
@@ -225,11 +234,11 @@ 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');
- unshift(@roles,'cr');
+ my $custom = 1;
+ @roles = &course_roles('domain',undef,$custom);
}
my $order = ['Any',@roles];
$select_menus{$roletype}->{'order'} = $order;
@@ -246,7 +255,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;
}
@@ -258,7 +267,7 @@ sub hidden_input {
}
sub print_upload_manager_header {
- my ($r,$datatoken,$distotal,$krbdefdom,$context)=@_;
+ my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission)=@_;
my $javascript;
#
if (! exists($env{'form.upfile_associate'})) {
@@ -288,9 +297,14 @@ sub print_upload_manager_header {
$password_choice = 'int';
}
#
+ my $groupslist;
+ if ($context eq 'course') {
+ $groupslist = &get_groupslist();
+ }
my $javascript_validations =
- &javascript_validations('auth',$krbdefdom,$password_choice,undef,
- $env{'request.role.domain'});
+ &javascript_validations('upload',$krbdefdom,$password_choice,undef,
+ $env{'request.role.domain'},$context,
+ $groupslist);
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
$r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal).
"<br />\n");
@@ -317,27 +331,52 @@ sub print_upload_manager_header {
###############################################################
###############################################################
sub javascript_validations {
- my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain)=@_;
- my $authheader;
- if ($mode eq 'auth') {
- my %param = ( formname => 'studentform',
- kerb_def_dom => $krbdefdom,
- curr_authtype => $curr_authtype);
- $authheader = &Apache::loncommon::authform_header(%param);
- } elsif ($mode eq 'createcourse') {
- my %param = ( formname => 'ccrs',
- kerb_def_dom => $krbdefdom,
- curr_authtype => $curr_authtype );
- $authheader = &Apache::loncommon::authform_header(%param);
- } elsif ($mode eq 'modifycourse') {
- my %param = ( formname => 'cmod',
+ my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain,
+ $context,$groupslist)=@_;
+
+ my %param = (
kerb_def_dom => $krbdefdom,
- mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $curr_authfield );
- $authheader = &Apache::loncommon::authform_header(%param);
+ );
+ if ($mode eq 'createuser') {
+ $param{'formname'} = 'cu';
+ } elsif ($mode eq 'upload') {
+ $param{'formname'} = 'studentform';
+ } elsif ($mode eq 'singlestudent') {
+ $param{'formname'} = 'cu';
+ } elsif ($mode eq 'createcourse') {
+ $param{'formname'} = 'ccrs';
+ } elsif ($mode eq 'modifycourse') {
+ $param{'formname'} = 'cmod';
+ $param{'mode'} = 'modifycourse',
+ $param{'curr_autharg'} = $curr_authfield;
}
+ my ($setsection_call,$setsections_js);
+ my $finish = " vf.submit();\n";
+ if ($mode eq 'upload') {
+ if (($context eq 'course') || ($context eq 'domain')) {
+ if ($context eq 'course') {
+ if ($env{'request.course.sec'} eq '') {
+ $setsection_call = 'setSections(document.'.$param{'formname'}.');';
+ $setsections_js =
+ &setsections_javascript($param{'formname'},$groupslist,
+ $mode);
+ } else {
+ $setsection_call = "'ok'";
+ }
+ } elsif ($context eq 'domain') {
+ $setsection_call = 'setCourse()';
+ $setsections_js = &dc_setcourse_js($param{'formname'},$mode);
+ }
+ $finish = " var checkSec = $setsection_call\n".
+ " if (checkSec == 'ok') {\n".
+ " vf.submit();\n".
+ " }\n";
+ }
+ }
+ my $authheader = &Apache::loncommon::authform_header(%param);
+
my %alert = &Apache::lonlocal::texthash
(username => 'You need to specify the username field.',
authen => 'You must choose an authentication type.',
@@ -351,8 +390,9 @@ sub javascript_validations {
continue => 'Continue adding users?',
);
-# my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $function_name =(<<END);
+$setsections_js
+
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
END
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain);
@@ -472,21 +512,21 @@ END
message+= '\\n$alert{'continue'}';
if (confirm(message)) {
vf.state.value='enrolling';
- vf.submit();
+ $finish
}
} else {
vf.state.value='enrolling';
- vf.submit();
+ $finish
}
}
END
}
my $result = $function_name;
- if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+ if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
$result .= $auth_checks;
}
$result .= $optional_checks."\n".$section_checks;
- if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+ if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
$result .= $authheader;
}
return $result;
@@ -647,18 +687,12 @@ ENDPICK
###############################################################
###############################################################
sub print_upload_manager_footer {
- my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context)=@_;
- my $formname;
- if ($context eq 'course') {
- $formname = 'document.studentform';
- } elsif ($context eq 'construction_space') {
- $formname = 'document.studentform';
- } elsif ($context eq 'domain') {
- $formname = 'document.studentform';
- }
+ my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission) = @_;
+ my $form = 'document.studentform';
+ my $formname = 'studentform';
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
- my %param = ( formname => $formname,
+ my %param = ( formname => $form,
kerb_def_dom => $krbdefdom,
kerb_def_auth => $krbdef
);
@@ -670,8 +704,8 @@ sub print_upload_manager_footer {
my $krbform = &Apache::loncommon::authform_kerberos(%param);
my $intform = &Apache::loncommon::authform_internal(%param);
my $locform = &Apache::loncommon::authform_local(%param);
- my $date_table = &date_setting_table(undef,undef,$context);
-
+ my $date_table = &date_setting_table(undef,undef,$context,undef,
+ $formname,$permission);
my $Str = "\n".'<div class="LC_left_float">';
$Str .= &hidden_input('nfields',$i);
$Str .= &hidden_input('keyfields',$keyfields);
@@ -702,31 +736,32 @@ 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');
+ &mt('Choose the role to assign to users without a value specified in the uploaded file');
} elsif ($context eq 'course') {
$Str .= '<h3>'.&mt('Default role and section')."</h3>\n".
- &mt('Choose the role and/or section to assign to users without one specified in the uploaded file');
+ &mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file');
} else {
- $Str .= '<br /><br /><b>'.&mt('Default role and/or section')."</b><br />\n".
- &mt('Role and/or section for users without one in the uploaded file.');
- }
- $Str .= '<br /><br />';
- 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') {
- $Str .= $options;
- } else {
- $Str .= '<table><tr><td><span class="LC_nobreak"<b>'.&mt('role').': </b>'.
- $options.'</span></td><td> </td><td><span class="LC_nobreak">'.
- '<b>'.&mt('section').': </b><input type="text" name="section" value="" size="12" /></span></td></tr></table>';
+ $Str .= '<br /><br /><b>'.&mt('Default role and/or section(s)')."</b><br />\n".
+ &mt('Role and/or section(s) for users without values specified in the uploaded file.');
}
- if ($context eq 'course') {
- $Str .= "<h3>".&mt('Full Update')."</h3>\n".
- '<label><input type="checkbox" name="fullup" value="yes">'.
- ' '.&mt('Full update (also print list of users not enrolled anymore)').
+ $Str .= '<br />';
+ if (($context eq 'domain') || ($context eq 'author')) {
+ my ($options,$cb_script,$coursepick) = &default_role_selector($context,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 'author') {
+ $Str .= $options;
+ }
+ } else {
+ my ($cnum,$cdom) = &get_course_identity();
+ my $rowtitle = &mt('section');
+ my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle,
+ $permission,$context,'upload');
+ $Str .= $secbox."<h3>".&mt('Full Update')."</h3>\n".
+ '<p><label><input type="checkbox" name="fullup" value="yes">'.
+ ' '.&mt('Display students with current/future access, who are not in the uploaded file.').'<br />'.&mt('Students selected from this list can be dropped.');
"</label></p>\n";
}
if ($context eq 'course' || $context eq 'domain') {
@@ -751,20 +786,21 @@ sub forceid_change {
"<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'.
&mt('Disable ID/Student Number Safeguard and Force Change '.
'of Conflicting IDs').'</label><br />'."\n".
- &mt('(only do if you know what you are doing.)')."</br><br />\n";
+ &mt('(only do if you know what you are doing.)')."\n";
if ($context eq 'domain') {
- $output .= '<label><input type="checkbox" name="recurseid"'.
+ $output .= '<br /><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).').
- '</label></p>'."\n";
+ &mt('Update ID/Student Number in courses in which user is Active/Future student,<br />(if forcing change).').
+ '</label>'."\n";
}
+ $output .= '</p>';
return $output;
}
###############################################################
###############################################################
sub print_upload_manager_form {
- my ($r,$context) = @_;
+ my ($r,$context,$permission) = @_;
my $firstLine;
my $datatoken;
if (!$env{'form.datatoken'}) {
@@ -808,7 +844,8 @@ sub print_upload_manager_form {
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
#
- &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context);
+ &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context,
+ $permission);
my $i;
my $keyfields;
if ($total>=0) {
@@ -842,11 +879,14 @@ sub print_upload_manager_form {
}
$r->print('</div>');
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
- $context);
+ $context,$permission);
}
sub setup_date_selectors {
- my ($starttime,$endtime,$mode) = @_;
+ my ($starttime,$endtime,$mode,$nolink,$formname) = @_;
+ if ($formname eq '') {
+ $formname = 'studentform';
+ }
if (! defined($starttime)) {
$starttime = time;
unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
@@ -867,12 +907,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($formname,'startdate',$starttime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
+ my $enddateform =
+ &Apache::lonhtmlcommon::date_setter($formname,'enddate',$endtime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
if ($mode eq 'create_enrolldates') {
$startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
'startenroll',
@@ -903,35 +946,47 @@ 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,$formname,$permission) = @_;
+ my $nolink;
+ if ($bulkaction) {
+ $nolink = 1;
+ }
+ my ($startform,$endform) =
+ &setup_date_selectors($starttime,$endtime,$mode,$nolink,$formname);
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') ||
+ ($env{'form.action'} eq 'upload')) {
+ if ($env{'request.course.sec'} eq '') {
+ $dateDefault = '<span class="LC_nobreak">'.
+ '<label><input type="checkbox" name="makedatesdefault" value="1" /> '.
+ &mt('make these dates the default access dates for future student 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();
if ($dateDefault) {
$result .= $dateDefault.'<br />'."\n";
}
@@ -942,19 +997,19 @@ sub make_dates_default {
my ($startdate,$enddate,$context) = @_;
my $result = '';
if ($context eq 'course') {
- my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my ($cnum,$cdom) = &get_course_identity();
my $put_result = &Apache::lonnet::put('environment',
{'default_enrollment_start_date'=>$startdate,
- 'default_enrollment_end_date' =>$enddate},$dom,$crs);
+ 'default_enrollment_end_date' =>$enddate},$cdom,$cnum);
if ($put_result eq 'ok') {
- $result .= "Set default start and end dates for course<br />";
+ $result .= &mt('Set default start and end access dates for course.').
+ '<br />'."\n";
#
# Refresh the course environment
&Apache::lonnet::coursedescription($env{'request.course.id'},
{'freshen_cache' => 1});
} else {
- $result .= &mt('Unable to set default dates for course').":".$put_result.
+ $result .= &mt('Unable to set default access dates for course.').":".$put_result.
'<br />';
}
}
@@ -965,7 +1020,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();
}
@@ -979,7 +1034,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);
@@ -992,33 +1047,36 @@ sub default_role_selector {
$options .= ' <option value="'.$role.'">'.$plrole.'</option>';
}
my $courseform = &Apache::loncommon::selectcourse_link
- ('studentform','defaultcourse','defaultdomain','defaultdesc',"$env{'request.role.domain'}",undef,'Course');
+ ('studentform','dccourse','dcdomain','coursedesc',"$env{'request.role.domain'}",undef,'Course');
$cb_jscript =
- &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'defaultsec','studentform');
+ &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform');
$coursepick = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th>'.
'<th>'.$lt{'grs'}.'</th>'.
&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row()."\n".
- '<td><input type="text" name="defaultdesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','defcourse','defdomain','coursedesc',''".')" /></td>'."\n".
+ '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="courserole">'."\n".
&default_course_roles($context,$checkpriv,%customroles)."\n".
'</select></td><td>'.
'<table class="LC_createuser">'.
'<tr class="LC_section_row"><td valign"top">'.
- $lt{'exs'}.'<br /><select name="defaultsec">'.
+ $lt{'exs'}.'<br /><select name="currsec">'.
' <option value=""><--'.&mt('Pick course first').
'</select></td>'.
'<td> </td>'.
'<td valign="top">'.$lt{'new'}.'<br />'.
'<input type="text" name="newsec" value="" size="5" />'.
- '<input type="hidden" name="groups" value="" /></td>'.
- '</tr></table></td>'.
+ '<input type="hidden" name="groups" value="" />'.
+ '<input type="hidden" name="sections" value="" />'.
+ '<input type="hidden" name="origdom" value="'.
+ $env{'request.role.domain'}.'" />'.
+ '<input type="hidden" name="dccourse" value="" />'.
+ '<input type="hidden" name="dcdomain" value="" />'.
+ '</td></tr></table></td>'.
&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table()."\n".
- '<input type="hidden" name="defaultcourse" value="" />'.
- '<input type="hidden" name="defaultdomain" value="" />';
+ &Apache::loncommon::end_data_table()."\n";
}
$options .= '</select>';
return ($options,$cb_jscript,$coursepick);
@@ -1027,17 +1085,21 @@ sub default_role_selector {
sub default_course_roles {
my ($context,$checkpriv,%customroles) = @_;
my $output;
- my @roles = &course_roles($context,$checkpriv);
+ my $custom = 1;
+ my @roles = &course_roles($context,$checkpriv,$custom);
foreach my $role (@roles) {
- my $plrole=&Apache::lonnet::plaintext($role);
- $output .= ' <option value="'.$role.'">'.$plrole.'</option>';
+ if ($role ne 'cr') {
+ my $plrole=&Apache::lonnet::plaintext($role);
+ $output .= ' <option value="'.$role.'">'.$plrole.'</option>';
+ }
}
if (keys(%customroles) > 0) {
- my %customroles = &my_custom_roles();
- foreach my $cust (sort(keys(%customroles))) {
- my $custrole='cr_cr_'.$env{'user.domain'}.
- '_'.$env{'user.name'}.'_'.$cust;
- $output .= ' <option value="'.$custrole.'">'.$cust.'</option>';
+ if (grep(/^cr$/,@roles)) {
+ foreach my $cust (sort(keys(%customroles))) {
+ my $custrole='cr_'.$env{'user.domain'}.
+ '_'.$env{'user.name'}.'_'.$cust;
+ $output .= ' <option value="'.$custrole.'">'.$cust.'</option>';
+ }
}
}
return $output;
@@ -1045,7 +1107,7 @@ sub default_course_roles {
sub construction_space_roles {
my ($checkpriv) = @_;
- my @allroles = ('ca','aa');
+ my @allroles = &roles_by_context('author');
my @roles;
if ($checkpriv) {
foreach my $role (@allroles) {
@@ -1061,7 +1123,7 @@ sub construction_space_roles {
sub domain_roles {
my ($checkpriv) = @_;
- my @allroles = ('dc','li','dg','au','sc');
+ my @allroles = &roles_by_context('domain');
my @roles;
if ($checkpriv) {
foreach my $role (@allroles) {
@@ -1076,8 +1138,8 @@ sub domain_roles {
}
sub course_roles {
- my ($context,$checkpriv) = @_;
- my @allroles = ('st','ta','ep','in','cc');
+ my ($context,$checkpriv,$custom) = @_;
+ my @allroles = &roles_by_context('course',$custom);
my @roles;
if ($context eq 'domain') {
@roles = @allroles;
@@ -1088,10 +1150,10 @@ sub course_roles {
if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
push(@roles,$role);
} else {
- if ($role ne 'cc' && $env{'request.course.section'} ne '') {
- if (!&Apache::lonnet::allowed('c'.$role,
+ if ($role ne 'cc' && $env{'request.course.sec'} ne '') {
+ if (&Apache::lonnet::allowed('c'.$role,
$env{'request.course.id'}.'/'.
- $env{'request.course.section'})) {
+ $env{'request.course.sec'})) {
push(@roles,$role);
}
}
@@ -1107,17 +1169,18 @@ sub course_roles {
sub curr_role_permissions {
my ($context,$setting,$checkpriv) = @_;
+ my $custom = 1;
my @roles;
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
@roles = &construction_space_roles($checkpriv);
} elsif ($context eq 'domain') {
if ($setting eq 'course') {
- @roles = &course_roles($context,$checkpriv);
+ @roles = &course_roles($context,$checkpriv,$custom);
} else {
@roles = &domain_roles($checkpriv);
}
} elsif ($context eq 'course') {
- @roles = &course_roles($context,$checkpriv);
+ @roles = &course_roles($context,$checkpriv,$custom);
}
return @roles;
}
@@ -1149,7 +1212,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)$/ ) {
@@ -1197,7 +1264,7 @@ sub print_userlist {
if ($env{'form.showrole'} eq 'Any') {
$roleselected = ' selected="selected" ';
}
- my $role_select;
+ my ($role_select,$cnum,$cdom);
if ($context eq 'domain') {
$role_select = &domain_roles_select();
$r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>');
@@ -1211,19 +1278,24 @@ sub print_userlist {
if ($role eq $env{'form.showrole'}) {
$roleselected = ' selected="selected" ';
}
- my $plrole=&Apache::lonnet::plaintext($role);
+ my $plrole;
+ if ($role eq 'cr') {
+ $plrole = &mt('Custom role');
+ } else {
+ $plrole=&Apache::lonnet::plaintext($role);
+ }
$role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
}
- $roleselected = '';
- if ($env{'form.showrole'} eq 'cr') {
- $roleselected = ' selected="selected" ';
- }
- $role_select .= '<option value="cr"'.$roleselected.'>'.&mt('Custom role').'</option>'.
- '</select>';
+ $role_select .= '</select>';
$r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>');
+ if ($context eq 'course') {
+ ($cnum,$cdom) = &get_course_identity();
+ $r->print(§ion_group_filter($cnum,$cdom));
+ }
}
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
- $r->print(&list_submit_button(&mt('Update Display'))."\n</p>\n");
+ $r->print(' '.&list_submit_button(&mt('Update Display')).
+ "\n</p>\n");
}
my ($indexhash,$keylist) = &make_keylist_array();
my (%userlist,%userinfo);
@@ -1239,16 +1311,22 @@ sub print_userlist {
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</p>'.
'<p>'.&list_submit_button(&mt('Update Display')).
- "\n</p>\n");
+ "\n".'</p><span class="LC_warning">'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').'</span>'."\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();
my $secidx = &Apache::loncoursedata::CL_SECTION();
+ my $viewablesec = &viewable_section($permission);
foreach my $student (keys(%{$classlist})) {
- if (exists($permission->{'view_section'})) {
- if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
+ my $section = $classlist->{$student}[$secidx];
+ if ($viewablesec ne '') {
+ if ($section ne $viewablesec) {
next;
} else {
$userlist{$student} = $classlist->{$student};
@@ -1257,61 +1335,59 @@ sub print_userlist {
$userlist{$student} = $classlist->{$student};
}
}
- my $cid =$env{'request.course.id'};
- my $cdom=$env{'course.'.$cid.'.domain'};
- my $cnum=$env{'course.'.$cid.'.num'};
my $showroles;
if ($env{'form.showrole'} ne 'Any') {
$showroles = [$env{'form.showrole'}];
} else {
$showroles = undef;
}
+ my $withsec = 1;
my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
- \@statuses,$showroles);
+ \@statuses,$showroles,undef,$withsec);
&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');
+ my @possroles = &roles_by_context($context);
%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') {
- @possroles = ('ca','aa');
+ @possroles = &roles_by_context('author');
} else {
@possroles = ($env{'form.showrole'});
}
foreach my $author (sort(keys(%{$dom_roles{$key}}))) {
- my ($role,$authorname,$authordom) = split(/:/,$author);
+ my ($role,$authorname,$authordom) = split(/:/,$author,-1);
my $extent = '/'.$authordom.'/'.$authorname;
%{$coauthors{$extent}} =
&Apache::lonnet::get_my_roles($authorname,
$authordom,undef,\@statuses,\@possroles);
}
&gather_userinfo($context,$format,\%userlist,
- $indexhash,\%userinfo,\%coauthors);
+ $indexhash,\%userinfo,\%coauthors,$permission);
}
}
}
@@ -1320,16 +1396,13 @@ sub print_userlist {
my %courses = &process_coursepick();
my %allusers;
foreach my $cid (keys(%courses)) {
- my %coursehash =
- &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
- my $cdom = $coursehash{'domain'};
- my $cnum = $coursehash{'num'};
- my $cdesc = $coursehash{'description'};
+ my ($cnum,$cdom,$cdesc) = &get_course_identity($cid);
+ next if ($cnum eq '' || $cdom eq '');
+ my $custom = 1;
my (@roles,@sections,%access,%users,%userdata,
%statushash);
if ($env{'form.showrole'} eq 'Any') {
- @roles = &course_roles($context);
- unshift(@roles,'cr');
+ @roles = &course_roles($context,undef,$custom);
} else {
@roles = ($env{'form.showrole'});
}
@@ -1356,20 +1429,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");
@@ -1381,41 +1456,109 @@ 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 section_group_filter {
+ my ($cnum,$cdom) = @_;
+ my @filters;
+ if ($env{'request.course.sec'} eq '') {
+ @filters = ('sec');
+ }
+ push(@filters,'grp');
+ my %name = (
+ sec => 'secfilter',
+ grp => 'grpfilter',
+ );
+ my %title = &Apache::lonlocal::texthash (
+ sec => 'Section(s)',
+ grp => 'Group(s)',
+ all => 'all',
+ none => 'none',
+ );
+ my ($output,@options);
+ foreach my $item (@filters) {
+ my $markup;
+ if ($env{'form.'.$name{$item}} eq '') {
+ $env{'form.'.$name{$item}} = 'all';
+ }
+ if ($item eq 'sec') {
+ if ($env{'form.showrole'} eq 'cc') {
+ $env{'form.'.$name{$item}} = 'none';
+ }
+ my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+ @options = sort(keys(%sections_count));
+ } elsif ($item eq 'grp') {
+ my %curr_groups = &Apache::longroup::coursegroups();
+ @options = sort(keys(%curr_groups));
+ }
+ if (@options > 0) {
+ my $currsel;
+ $markup = '<select name="'.$name{$item}.'" />'."\n";
+ foreach my $option ('all','none',@options) {
+ $currsel = '';
+ if ($env{'form.'.$name{$item}} eq $option) {
+ $currsel = ' selected="selected" ';
+ }
+ $markup .= ' <option value="'.$option.'"'.$currsel.'>';
+ if (($option eq 'all') || ($option eq 'none')) {
+ $markup .= $title{$option};
+ } else {
+ $markup .= $option;
+ }
+ $markup .= '</option>'."\n";
+ }
+ $markup .= '</select>'."\n";
+ $output .= (' 'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
+ }
+ }
+ return $output;
}
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') {
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
split(/:/,$item);
($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
- &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+ &build_user_record($context,\%userdata,$userinfo,$indexhash,
+ $item,$userlist);
+ } elsif ($context eq 'course') {
+ my $viewablesec = &viewable_section($permission);
+ ($userdata{'username'},$userdata{'domain'},$userdata{'role'},
+ $userdata{'section'}) = split(/:/,$item,-1);
+ ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
+ if (($viewablesec ne '') && ($userdata{'section'} ne '')) {
+ next if ($viewablesec ne $userdata{'section'});
+ }
+ &build_user_record($context,\%userdata,$userinfo,$indexhash,
+ $item,$userlist);
} elsif ($context eq 'domain') {
if ($env{'form.roletype'} eq 'domain') {
($userdata{'role'},$userdata{'username'},$userdata{'domain'}) =
split(/:/,$item);
($userdata{'end'},$userdata{'start'})=split(/:/,$rolehash->{$item});
- &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ &build_user_record($context,\%userdata,$userinfo,$indexhash,
+ $item,$userlist);
+ } elsif ($env{'form.roletype'} eq 'author') {
if (ref($rolehash->{$item}) eq 'HASH') {
$userdata{'extent'} = $item;
foreach my $key (keys(%{$rolehash->{$item}})) {
@@ -1423,13 +1566,15 @@ sub gather_userinfo {
($userdata{'start'},$userdata{'end'}) =
split(/:/,$rolehash->{$item}{$key});
my $uniqid = $key.':'.$item;
- &build_user_record(\%userdata,$userinfo,$indexhash,$uniqid,$userlist);
+ &build_user_record($context,\%userdata,$userinfo,
+ $indexhash,$uniqid,$userlist);
}
}
} elsif ($env{'form.roletype'} eq 'course') {
($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 = '';
@@ -1437,6 +1582,14 @@ sub gather_userinfo {
my $space = ', ';
if ($format eq 'html' || $format eq 'view') {
$spanstart = '<span class="LC_nobreak">';
+ # FIXME: actions on courses disabled for now
+# 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 = ', ';
}
@@ -1444,13 +1597,20 @@ sub gather_userinfo {
$rolehash->{$item}{$cid}{'desc'}.$space;
if (ref($rolehash->{$item}{$cid}{'secs'}) eq 'HASH') {
foreach my $sec (sort(keys(%{$rolehash->{$item}{$cid}{'secs'}}))) {
- $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend;
+ if (($env{'form.Status'} eq 'Any') ||
+ ($env{'form.Status'} eq $rolehash->{$item}{$cid}{'secs'}{$sec})) {
+ $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend;
+ $userdata{'status'} = $rolehash->{$item}{$cid}{'secs'}{$sec};
+ }
}
}
}
}
}
- &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+ if ($userdata{'status'} ne '') {
+ &build_user_record($context,\%userdata,$userinfo,
+ $indexhash,$item,$userlist);
+ }
}
}
}
@@ -1458,13 +1618,15 @@ sub gather_userinfo {
}
sub build_user_record {
- my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
- &process_date_info($userdata);
+ my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
+ next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
+ if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
+ &process_date_info($userdata);
+ }
my $username = $userdata->{'username'};
my $domain = $userdata->{'domain'};
if (ref($userinfo->{$username.':'.$domain}) eq 'HASH') {
- $userdata->{'fullname'} =
- $userinfo->{$username.':'.$domain}{'fullname'};
+ $userdata->{'fullname'} = $userinfo->{$username.':'.$domain}{'fullname'};
$userdata->{'id'} = $userinfo->{$username.':'.$domain}{'id'};
} else {
&aggregate_user_info($domain,$username,$userinfo);
@@ -1696,7 +1858,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);
@@ -1714,23 +1876,26 @@ sub show_users_list {
if (!grep(/^\Q$sortby\E$/,@sortable)) {
$sortby = 'username';
}
+ my $setting = $env{'form.roletype'};
my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
if ($context eq 'course') {
- $cid=$env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
+ $cid = $env{'request.course.id'};
+ ($cnum,$cdom) = &get_course_identity($cid);
($classgroups) = &Apache::loncoursedata::get_group_memberships(
$userlist,$keylist,$cdom,$cnum);
- if (! exists($env{'form.displayphotos'})) {
- $env{'form.displayphotos'} = 'off';
- }
- $displayphotos = $env{'form.displayphotos'};
- if (! exists($env{'form.displayclickers'})) {
- $env{'form.displayclickers'} = 'off';
- }
- $displayclickers = $env{'form.displayclickers'};
- if ($env{'course.'.$cid.'.internal.showphoto'}) {
- $r->print('
+ if ($mode eq 'autoenroll') {
+ $env{'form.showrole'} = 'st';
+ } else {
+ if (! exists($env{'form.displayphotos'})) {
+ $env{'form.displayphotos'} = 'off';
+ }
+ $displayphotos = $env{'form.displayphotos'};
+ if (! exists($env{'form.displayclickers'})) {
+ $env{'form.displayclickers'} = 'off';
+ }
+ $displayclickers = $env{'form.displayclickers'};
+ if ($env{'course.'.$cid.'.internal.showphoto'}) {
+ $r->print('
<script type="text/javascript">
function photowindow(photolink) {
var title = "Photo_Viewer";
@@ -1740,15 +1905,78 @@ function photowindow(photolink) {
stdeditbrowser.focus();
}
</script>
- ');
- }
- $r->print(<<END);
+ ');
+ }
+ $r->print(<<END);
<input type="hidden" name="displayphotos" value="$displayphotos" />
<input type="hidden" name="displayclickers" value="$displayclickers" />
END
+ }
}
- unless ($mode eq 'autoenroll') {
+ if ($mode ne '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
}
@@ -1772,10 +2000,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');
@@ -1788,7 +2023,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');
}
@@ -1807,19 +2042,91 @@ END
} elsif ($env{'form.showrole'} ne 'Any') {
$rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'});
}
- my $results_description = &results_header_row($rolefilter,$statusmode,
- $context);
- $r->print('<b>'.$results_description.'</b><br />');
- my $output;
- if ($mode eq 'html' || $mode eq 'view') {
- $r->print(<<END);
-<input type="hidden" name="sname" value="" />
-<input type="hidden" name="sdom" value="" />
+ my $results_description;
+ if ($mode ne 'autoenroll') {
+ $results_description = &results_header_row($rolefilter,$statusmode,
+ $context,$permission,$mode);
+ $r->print('<b>'.$results_description.'</b><br />');
+ }
+ my ($output,$actionselect,%canchange,%canchangesec);
+ if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
+ if ($mode ne 'autoenroll') {
+ if ($permission->{'cusr'}) {
+ $actionselect = &select_actions($context,$setting,$statusmode);
+ }
+ $r->print(<<END);
+<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
+ $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");
+ my @allroles;
+ if ($env{'form.showrole'} eq 'Any') {
+ my $custom = 1;
+ if ($context eq 'domain') {
+ @allroles = &roles_by_context($setting,$custom);
+ } else {
+ @allroles = &roles_by_context($context,$custom);
+ }
+ } else {
+ @allroles = ($env{'form.showrole'});
+ }
+ foreach my $role (@allroles) {
+ if ($context eq 'domain') {
+ if ($setting eq 'domain') {
+ if (&Apache::lonnet::allowed('c'.$role,
+ $env{'request.role.domain'})) {
+ $canchange{$role} = 1;
+ }
+ } elsif ($setting eq 'author') {
+ if (&Apache::lonnet::allowed('c'.$role,
+ $env{'request.role.domain'})) {
+ $canchange{$role} = 1;
+ }
+ }
+ } elsif ($context eq 'author') {
+ if (&Apache::lonnet::allowed('c'.$role,
+ $env{'user.domain'}.'/'.$env{'user.name'})) {
+ $canchange{$role} = 1;
+ }
+ } elsif ($context eq 'course') {
+ if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
+ $canchange{$role} = 1;
+ } elsif ($env{'request.course.sec'} ne '') {
+ if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+ $canchangesec{$role} = $env{'request.course.sec'};
+ }
+ }
+ }
+ }
+ }
}
$output .= "\n<p>\n".
&Apache::loncommon::start_data_table().
@@ -1829,15 +2136,16 @@ 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";
}
my %role_types = &role_type_names();
- if ($context eq 'course') {
+ if ($context eq 'course' && $mode ne 'autoenroll') {
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
# Clicker display on or off?
my %clicker_options = &Apache::lonlocal::texthash(
@@ -1871,8 +2179,8 @@ END
' </th>'."\n";
}
}
- $output .= &Apache::loncommon::end_data_table_header_row();
}
+ $output .= &Apache::loncommon::end_data_table_header_row();
# Done with the HTML header line
} elsif ($mode eq 'csv') {
#
@@ -1913,9 +2221,24 @@ END
$index{$idx} = $i++;
}
my $usercount = 0;
+ my ($secfilter,$grpfilter);
+ if ($context eq 'course') {
+ $secfilter = $env{'form.secfilter'};
+ $grpfilter = $env{'form.grpfilter'};
+ if ($secfilter eq '') {
+ $secfilter = 'all';
+ }
+ if ($grpfilter eq '') {
+ $grpfilter = 'all';
+ }
+ }
# 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)) {
@@ -1925,8 +2248,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);
@@ -1942,11 +2269,40 @@ END
delete($userlist->{$user});
next;
}
- if (ref($classgroups) eq 'HASH') {
- $groups = $classgroups->{$user};
- }
- if (ref($groups->{active}) eq 'HASH') {
- $userlist->{$user}->[$index{'groups'}] = join(', ',keys(%{$groups->{'active'}}));
+ if ($context eq 'course') {
+ my @ac_groups;
+ if (ref($classgroups) eq 'HASH') {
+ $groups = $classgroups->{$user};
+ }
+ if (ref($groups->{'active'}) eq 'HASH') {
+ @ac_groups = keys(%{$groups->{'active'}});
+ $userlist->{$user}->[$index{'groups'}] = join(', ',@ac_groups);
+ }
+ if ($mode ne 'autoenroll') {
+ my $section = $userlist->{$user}->[$index{'section'}];
+ if ($secfilter eq 'none') {
+ if ($section ne '') {
+ delete($userlist->{$user});
+ next;
+ }
+ } elsif ($secfilter ne 'all') {
+ if ($section ne $secfilter) {
+ delete($userlist->{$user});
+ next;
+ }
+ }
+ if ($grpfilter eq 'none') {
+ if (@ac_groups > 0) {
+ delete($userlist->{$user});
+ next;
+ }
+ } elsif ($grpfilter ne 'all') {
+ if (!grep(/^\Q$grpfilter\E$/,@ac_groups)) {
+ delete($userlist->{$user});
+ next;
+ }
+ }
+ }
}
my %emails = &Apache::loncommon::getemails($uname,$udom);
if ($emails{'permanentemail'} =~ /\S/) {
@@ -1986,6 +2342,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');
@@ -1999,25 +2356,74 @@ 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 eq 'autoenroll') {
+ my $cellentry;
+ if ($in{'type'} eq 'auto') {
+ $cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label>';
+ $autocount ++;
+ } else {
+ $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label></nobr></td></tr><tr><td><nobr>';
+ $manualcount ++;
+ if ($in{'lockedtype'}) {
+ $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Unlock').'</label>';
+ $unlockcount ++;
+ } else {
+ $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Lock').'</label>';
+ $lockcount ++;
+ }
+ $cellentry .= '</nobr></td></tr></table>';
+ }
+ $r->print("<td>$cellentry</td>\n");
+ } else {
+ $r->print("<td>$rowcount</td>\n");
+ $checkval;
+ if ($actionselect) {
+ my $showcheckbox;
+ if ($role =~ /^cr\//) {
+ $showcheckbox = $canchange{'cr'};
+ } else {
+ $showcheckbox = $canchange{$role};
+ }
+ if (!$showcheckbox) {
+ if ($context eq 'course') {
+ if ($canchangesec{$role} ne '') {
+ if ($canchangesec{$role} eq $in{'section'}) {
+ $showcheckbox = 1;
+ }
+ }
+ }
+ }
+ if ($showcheckbox) {
+ $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>');
+ } else {
+ $r->print('<td> </td>');
+ }
+ }
}
foreach my $item (@cols) {
- $r->print('<td>'.$in{$item}.'</td>'."\n");
+ if ($item eq 'username') {
+ $r->print('<td>'.&print_username_link($mode,$permission,
+ \%in).'</td>');
+ } elsif (($item eq 'start' || $item eq 'end') && ($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 (($context eq 'course') && ($mode ne 'autoenroll')) {
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
if ($displayclickers eq 'on') {
my $clickers =
@@ -2096,27 +2502,333 @@ END
}
}
+sub print_username_link {
+ my ($mode,$permission,$in) = @_;
+ my $output;
+ if ($mode eq 'autoenroll') {
+ $output = $in->{'username'};
+ } elsif (!$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);
+ # FIXME Disable actions for now for roletype=course in domain context
+ if ($context eq 'domain' && $setting eq 'course') {
+ return;
+ }
+ if ($context eq 'course') {
+ if ($env{'form.showrole'} ne 'Any') {
+ if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},
+ $env{'request.course.id'})) {
+ if ($env{'request.course.sec'} eq '') {
+ return;
+ } else {
+ if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+ return;
+ }
+ }
+ }
+ }
+ }
+ 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') && ($env{'request.course.sec'} eq '')) {
+ $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,$permission) = @_;
+ 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')) {
+ if ($env{'request.course.sec'} eq '') {
+ $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'},$formname,
+ $permission);
+ }
+ $output .= '<h3>'.$headertext.'</h3>'.
+ '<form name="'.$formname.'" method="post">'."\n".
+ $date_items;
+ if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
+ my ($cnum,$cdom) = &get_course_identity();
+ my $info;
+ if ($env{'form.showrole'} eq 'st') {
+ $output .= '<p>'.$lt{'fors'}.'</p>';
+ } elsif ($env{'form.showrole'} 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 $rowtitle = &mt('New section to assign');
+ my $secbox = §ion_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context);
+ $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 section_picker {
+ my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode) = @_;
+ my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+ my $sections_select .= &course_sections(\%sections_count,$role);
+ my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
+ if ($mode eq 'upload') {
+ my ($options,$cb_script,$coursepick) =
+ &default_role_selector($context,1);
+ $secbox .= &Apache::lonhtmlcommon::row_title('role','LC_oddrow_value').
+ $options. &Apache::lonhtmlcommon::row_closure(1)."\n";
+ }
+ $secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n";
+ if ($env{'request.course.sec'} eq '') {
+ $secbox .= '<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";
+ } else {
+ $secbox .= '<input type="hidden" name="sections" value="'.
+ $env{'request.course.sec'}.'" />'.
+ $env{'request.course.sec'};
+ }
+ $secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::end_pick_box().'</p>';
+ return $secbox;
+}
+
sub results_header_row {
- my ($rolefilter,$statusmode,$context) = @_;
+ my ($rolefilter,$statusmode,$context,$permission,$mode) = @_;
my ($description,$showfilter);
if ($rolefilter ne 'Any') {
$showfilter = $rolefilter;
}
if ($context eq 'course') {
- $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': ';
+ if ($mode eq 'csv' || $mode eq 'excel') {
+ $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);
@@ -2127,8 +2839,52 @@ 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].').' ';
+ my $constraint;
+ my $viewablesec = &viewable_section($permission);
+ if ($viewablesec ne '') {
+ if ($env{'form.showrole'} eq 'st') {
+ $constraint = &mt('only users in section "[_1]"',$viewablesec);
+ } elsif ($env{'form.showrole'} ne 'cc') {
+ $constraint = &mt('only users affiliated with no section or section "[_1]"',$viewablesec);
+ }
+ if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) {
+ if ($env{'form.grpfilter'} eq 'none') {
+ $constraint .= &mt(' and not in any group');
+ } else {
+ $constraint .= &mt(' and members of group: "[_1]"',$env{'form.grpfilter'});
+ }
+ }
+ } else {
+ if (($env{'form.secfilter'} ne 'all') && ($env{'form.secfilter'} ne '')) {
+ if ($env{'form.secfilter'} eq 'none') {
+ $constraint = &mt('only users affiliated with no section');
+ } else {
+ $constraint = &mt('only users affiliated with section "[_1]"',$env{'form.secfilter'});
+ }
+ }
+ if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) {
+ if ($env{'form.grpfilter'} eq 'none') {
+ if ($constraint eq '') {
+ $constraint = &mt('only users not in any group');
+ } else {
+ $constraint .= &mt(' and also not in any group');
+ }
+ } else {
+ if ($constraint eq '') {
+ $constraint = &mt('only members of group: "[_1]"',$env{'form.grpfilter'});
+ } else {
+ $constraint .= &mt(' and also members of group: "[_1]"'.$env{'form.grpfilter'});
+ }
+ }
+ }
+ }
+ if ($constraint ne '') {
+ $description .= ' ('.$constraint.')';
+ }
+ } 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') {
@@ -2159,7 +2915,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') {
@@ -2204,12 +2960,27 @@ sub results_header_row {
}
return $description;
}
+
+sub viewable_section {
+ my ($permission) = @_;
+ my $viewablesec;
+ if (ref($permission) eq 'HASH') {
+ if (exists($permission->{'view_section'})) {
+ $viewablesec = $permission->{'view_section'};
+ } elsif (exists($permission->{'cusr_section'})) {
+ $viewablesec = $permission->{'cusr_section'};
+ }
+ }
+ return $viewablesec;
+}
+
#################################################
#################################################
sub show_drop_list {
- my ($r,$classlist,$keylist,$nosort)=@_;
- my $cid=$env{'request.course.id'};
+ my ($r,$classlist,$nosort,$permission) = @_;
+ my $cid = $env{'request.course.id'};
+ my ($cnum,$cdom) = &get_course_identity($cid);
if (! exists($env{'form.sortby'})) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['sortby']);
@@ -2218,43 +2989,56 @@ sub show_drop_list {
if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) {
$sortby = 'username';
}
- my $cdom = $env{'course.'.$cid.'.domain'};
- my $cnum = $env{'course.'.$cid,'.num'};
- my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
- $classlist,$keylist,$cdom,$cnum);
- #
my $action = "drop";
+ my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<END);
<input type="hidden" name="sortby" value="$sortby" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="state" value="done" />
-<script>
-function checkAll(field) {
- for (i = 0; i < field.length; i++)
- field[i].checked = true ;
-}
-
-function uncheckAll(field) {
- for (i = 0; i < field.length; i++)
- field[i].checked = false ;
-}
+<script type="text/javascript" language="Javascript">
+$check_uncheck_js
</script>
<p>
<input type="hidden" name="phase" value="four">
END
-
-my %lt=&Apache::lonlocal::texthash('usrn' => "username",
- 'dom' => "domain",
- 'sn' => "student name",
- 'sec' => "section",
- 'start' => "start date",
- 'end' => "end date",
- 'groups' => "active groups",
- );
+ my ($indexhash,$keylist) = &make_keylist_array();
+ my $studentcount = 0;
+ if (ref($classlist) eq 'HASH') {
+ foreach my $student (keys(%{$classlist})) {
+ my $sdata = $classlist->{$student};
+ my $status = $sdata->[$indexhash->{'status'}];
+ my $section = $sdata->[$indexhash->{'section'}];
+ if ($status ne 'Active') {
+ delete($classlist->{$student});
+ next;
+ }
+ if ($env{'request.course.sec'} ne '') {
+ if ($section ne $env{'request.course.sec'}) {
+ delete($classlist->{$student});
+ next;
+ }
+ }
+ $studentcount ++;
+ }
+ }
+ if (!$studentcount) {
+ $r->print(&mt('There are no students to drop.'));
+ return;
+ }
+ my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+ $classlist,$keylist,$cdom,$cnum);
+ my %lt=&Apache::lonlocal::texthash('usrn' => "username",
+ 'dom' => "domain",
+ 'sn' => "student name",
+ 'sec' => "section",
+ 'start' => "start date",
+ 'end' => "end date",
+ 'groups' => "active groups",
+ );
if ($nosort) {
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print(<<END);
-<tr>
<th> </th>
<th>$lt{'usrn'}</th>
<th>$lt{'dom'}</th>
@@ -2264,61 +3048,55 @@ my %lt=&Apache::lonlocal::texthash('usrn
<th>$lt{'start'}</th>
<th>$lt{'end'}</th>
<th>$lt{'groups'}</th>
-</tr>
END
-
+ $r->print(&Apache::loncommon::end_data_table_header_row());
} else {
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print(<<END);
-<tr><th> </th>
+ <th> </th>
<th>
- <a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
+ <a href="/adm/createuser?action=$action&sortby=username">$lt{'usrn'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=domain">$lt{'dom'}</a>
+ <a href="/adm/createuser?action=$action&sortby=domain">$lt{'dom'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
+ <a href="/adm/createuser?action=$action&sortby=id">ID</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=fullname">$lt{'sn'}</a>
+ <a href="/adm/createuser?action=$action&sortby=fullname">$lt{'sn'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=section">$lt{'sec'}</a>
+ <a href="/adm/createuser?action=$action&sortby=section">$lt{'sec'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=start">$lt{'start'}</a>
+ <a href="/adm/createuser?action=$action&sortby=start">$lt{'start'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=end">$lt{'end'}</a>
+ <a href="/adm/createuser?action=$action&sortby=end">$lt{'end'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=groups">$lt{'groups'}</a>
+ <a href="/adm/createuser?action=$action&sortby=groups">$lt{'groups'}</a>
</th>
-</tr>
END
+ $r->print(&Apache::loncommon::end_data_table_header_row());
}
#
# Sort the students
- my %index;
- my $i;
- foreach (@$keylist) {
- $index{$_} = $i++;
- }
- $index{'groups'} = scalar(@$keylist);
- my $index = $index{$sortby};
- my $second = $index{'username'};
- my $third = $index{'domain'};
+ my $index = $indexhash->{$sortby};
+ my $second = $indexhash->{'username'};
+ my $third = $indexhash->{'domain'};
my @Sorted_Students = sort {
lc($classlist->{$a}->[$index]) cmp lc($classlist->{$b}->[$index])
||
lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
||
lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
- } (keys(%$classlist));
+ } (keys(%{$classlist}));
foreach my $student (@Sorted_Students) {
my $error;
my $sdata = $classlist->{$student};
- my $username = $sdata->[$index{'username'}];
- my $domain = $sdata->[$index{'domain'}];
- my $section = $sdata->[$index{'section'}];
- my $name = $sdata->[$index{'fullname'}];
- my $id = $sdata->[$index{'id'}];
- my $start = $sdata->[$index{'start'}];
- my $end = $sdata->[$index{'end'}];
+ my $username = $sdata->[$indexhash->{'username'}];
+ my $domain = $sdata->[$indexhash->{'domain'}];
+ my $section = $sdata->[$indexhash->{'section'}];
+ my $name = $sdata->[$indexhash->{'fullname'}];
+ my $id = $sdata->[$indexhash->{'id'}];
+ my $start = $sdata->[$indexhash->{'start'}];
+ my $end = $sdata->[$indexhash->{'end'}];
my $groups = $classgroups->{$student};
my $active_groups;
if (ref($groups->{active}) eq 'HASH') {
@@ -2334,18 +3112,18 @@ END
} else {
$end = &Apache::lonlocal::locallocaltime($end);
}
- my $status = $sdata->[$index{'status'}];
- next if ($status ne 'Active');
+ my $studentkey = $student.':'.$section;
+ my $startitem = '<input type="hidden" name="'.$studentkey.'_start" value="'.$sdata->[$indexhash->{'start'}].'" />';
#
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
- <td><input type="checkbox" name="droplist" value="$student"></td>
+ <td><input type="checkbox" name="droplist" value="$studentkey"></td>
<td>$username</td>
<td>$domain</td>
<td>$id</td>
<td>$name</td>
<td>$section</td>
- <td>$start</td>
+ <td>$start $startitem</td>
<td>$end</td>
<td>$active_groups</td>
END
@@ -2353,7 +3131,7 @@ END
}
$r->print(&Apache::loncommon::end_data_table().'<br />');
%lt=&Apache::lonlocal::texthash(
- 'dp' => "Expire Users' Roles",
+ 'dp' => "Drop Students",
'ca' => "check all",
'ua' => "uncheck all",
);
@@ -2395,7 +3173,7 @@ sub print_first_users_upload_form {
# ================================================= Drop/Add from uploaded file
sub upfile_drop_add {
- my ($r,$context) = @_;
+ my ($r,$context,$permission) = @_;
&Apache::loncommon::load_tmp_file($r);
my @userdata=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){shift(@userdata);}
@@ -2410,6 +3188,10 @@ sub upfile_drop_add {
$fields{$env{'form.f'.$i}}=$keyfields[$i];
}
}
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
+ }
#
# Store the field choices away
foreach my $field (qw/username names
@@ -2431,7 +3213,7 @@ sub upfile_drop_add {
#
my ($startdate,$enddate) = &get_dates_from_form();
if ($env{'form.makedatesdefault'}) {
- $r->print(&make_dates_default($startdate,$enddate));
+ $r->print(&make_dates_default($startdate,$enddate,$context));
}
# Determine domain and desired host (home server)
my $domain=$env{'request.role.domain'};
@@ -2484,22 +3266,59 @@ sub upfile_drop_add {
$defaultrole = $env{'form.defaultrole'};
} elsif ($setting eq 'course') {
$defaultrole = $env{'form.courserole'};
+ $defaultsec = $env{'form.sections'};
}
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$defaultrole = $env{'form.defaultrole'};
- }
- if ($context eq 'domain' && $setting eq 'course') {
- if ($env{'form.newsec'} ne '') {
- $defaultsec = $env{'form.newsec'};
- } elsif ($env{'form.defaultsec'} ne '') {
- $defaultsec = $env{'form.defaultsec'}
- }
+ } elsif ($context eq 'course') {
+ $defaultrole = $env{'form.defaultrole'};
+ $defaultsec = $env{'form.sections'};
}
if ($env{'request.course.id'} ne '') {
$cid = $env{'request.course.id'};
- } elsif ($env{'form.defaultdomain'} ne '' && $env{'form.defaultcourse'} ne '') {
- $cid = $env{'form.defaultdomain'}.'_'.
- $env{'form.defaultcourse'};
+ } elsif ($setting eq 'course') {
+ if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
+ $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
+ }
+ }
+ # Check to see if user information can be changed
+ my @userinfo = ('firstname','middlename','lastname','generation',
+ 'permanentemail','id');
+ my %canmodify;
+ if (&Apache::lonnet::allowed('mau',$domain)) {
+ foreach my $field (@userinfo) {
+ $canmodify{$field} = 1;
+ }
+ }
+ my (%userlist,%modifiable_fields,@poss_roles);
+ my $secidx = &Apache::loncoursedata::CL_SECTION();
+ my @courseroles = &roles_by_context('course',1);
+ if (!&Apache::lonnet::allowed('mau',$domain)) {
+ if ($context eq 'course' || $context eq 'author') {
+ @poss_roles = &curr_role_permissions($context);
+ my @statuses = ('active','future');
+ my ($indexhash,$keylist) = &make_keylist_array();
+ my %info;
+ foreach my $role (@poss_roles) {
+ %{$modifiable_fields{$role}} = &can_modify_userinfo($context,$domain,
+ \@userinfo,[$role]);
+ }
+ if ($context eq 'course') {
+ my ($cnum,$cdom) = &get_course_identity();
+ my $roster = &Apache::loncoursedata::get_classlist();
+ %userlist = %{$roster};
+ my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
+ \@statuses,\@poss_roles);
+ &gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
+ \%advrolehash,$permission);
+ } elsif ($context eq 'author') {
+ my %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+ \@statuses,\@poss_roles);
+ &gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
+ \%cstr_roles,$permission);
+
+ }
+ }
}
if ( $domain eq &LONCAPA::clean_domain($domain)
&& ($amode ne '')) {
@@ -2508,7 +3327,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");
@@ -2520,16 +3339,50 @@ sub upfile_drop_add {
);
my $flushc=0;
my %student=();
- my %curr_groups;
+ my (%curr_groups,@sections,@cleansec,@secs,$defaultwarn,$groupwarn);
my %userchg;
- if ($context eq 'course') {
- # Get information about course groups
- %curr_groups = &Apache::longroup::coursegroups();
+ if ($context eq 'course' || $setting eq 'course') {
+ if ($context eq 'course') {
+ # Get information about course groups
+ %curr_groups = &Apache::longroup::coursegroups();
+ } elsif ($setting eq 'course') {
+ if ($cid) {
+ %curr_groups =
+ &Apache::longroup::coursegroups($env{'form.dcdomain'},
+ $env{'form.dccourse'});
+ }
+ }
+ # determine section number
+ if ($defaultsec =~ /,/) {
+ push(@sections,split(/,/,$defaultsec));
+ } else {
+ push(@sections,$defaultsec);
+ }
+ # remove non alphanumeric values from section
+ foreach my $item (@sections) {
+ $item =~ s/\W//g;
+ if ($item eq "none" || $item eq 'all') {
+ $defaultwarn = &mt('Default section name [_1] could not be used as it is a reserved word.',$item);
+ } elsif ($item ne '' && exists($curr_groups{$item})) {
+ $groupwarn = &mt('Default section name "[_1]" is the name of a course group. Section names and group names must be distinct.',$item);
+ } elsif ($item ne '') {
+ push(@cleansec,$item);
+ }
+ }
+ if ($defaultwarn) {
+ $r->print($defaultwarn.'<br />');
+ }
+ if ($groupwarn) {
+ $r->print($groupwarn.'<br />');
+ }
}
my (%curr_rules,%got_rules,%alerts);
+ my %customroles = &my_custom_roles();
+ my ($custom_ok,@permitted_roles) =
+ &roles_on_upload($context,%customroles);
# Get new users list
- foreach (@userdata) {
- my %entries=&Apache::loncommon::record_sep($_);
+ foreach my $line (@userdata) {
+ my %entries=&Apache::loncommon::record_sep($line);
# Determine user name
unless (($entries{$fields{'username'}} eq '') ||
(!defined($entries{$fields{'username'}}))) {
@@ -2557,30 +3410,43 @@ sub upfile_drop_add {
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
$entries{$fields{'username'}},$fname,$mname,$lname,$gen).
'</b>');
+ next;
} else {
my $username = $entries{$fields{'username'}};
- my $sec;
- if ($context eq 'course' || $setting eq 'course') {
- # determine section number
- if (defined($fields{'sec'})) {
- if (defined($entries{$fields{'sec'}})) {
- $sec=$entries{$fields{'sec'}};
+ if (defined($fields{'sec'})) {
+ if (defined($entries{$fields{'sec'}})) {
+ my $item = $entries{$fields{'sec'}};
+ $item =~ s/(\s+$|^\s+)//g;
+ if ($item eq "none" || $item eq 'all') {
+ $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item));
+ next;
+ } elsif (exists($curr_groups{$item})) {
+ $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+ next;
+ } else {
+ push(@secs,$item);
}
- } else {
- $sec = $defaultsec;
}
- # remove non alphanumeric values from section
- $sec =~ s/\W//g;
- if ($sec eq "none" || $sec eq 'all') {
- $r->print('<br />'.
- &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.',
- $username,$sec,$fname,$mname,$lname,$gen));
- next;
- } elsif (($sec ne '') && (exists($curr_groups{$sec}))) {
- $r->print('<br />'.
- &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.',
- $username,$sec,$fname,$mname,$lname,$gen));
- next;
+ }
+ if ($env{'request.course.sec'} ne '') {
+ @secs = ($env{'request.course.sec'});
+ if (ref($userlist{$username.':'.$domain}) eq 'ARRAY') {
+ my $currsec = $userlist{$username.':'.$domain}[$secidx];
+ if ($currsec ne $env{'request.course.sec'}) {
+ $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+ if ($currsec eq '') {
+ $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));
+
+ } else {
+ $r->print(&mt('This user already has an active/future role in section "[_1]" of the course.',$currsec));
+ }
+ $r->print('<br />'.&mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$secs[0]).'<br />');
+ next;
+ }
+ }
+ } elsif ($context eq 'course' || $setting eq 'course') {
+ if (@secs == 0) {
+ @secs = @cleansec;
}
}
# determine id number
@@ -2609,12 +3475,17 @@ sub upfile_drop_add {
my $role = '';
if (defined($fields{'role'})) {
if ($entries{$fields{'role'}}) {
- my @poss_roles =
- &curr_role_permissions($context,$setting);
- if (grep(/^\Q$entries{$fields{'role'}}\E/,@poss_roles)) {
+ if (grep(/^\Q$entries{$fields{'role'}}\E$/,@permitted_roles)) {
$role=$entries{$fields{'role'}};
- } else {
- my $rolestr = join(', ',@poss_roles);
+ $role =~ s/(\s+$|^\s+)//g;
+ }
+ if ($custom_ok) {
+ if ($customroles{$role}) {
+ $role = 'cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$entries{$fields{'role'}};
+ }
+ }
+ if ($role eq '') {
+ my $rolestr = join(', ',@permitted_roles);
$r->print('<br />'.
&mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n");
next;
@@ -2626,7 +3497,7 @@ sub upfile_drop_add {
}
# Clean up whitespace
foreach (\$domain,\$username,\$id,\$fname,\$mname,
- \$lname,\$gen,\$sec,\$role) {
+ \$lname,\$gen) {
$$_ =~ s/(\s+$|^\s+)//g;
}
# check against rules
@@ -2648,6 +3519,36 @@ sub upfile_drop_add {
next if ($alerts{'username'}{$domain}{$username});
}
}
+ } else {
+ if ($context eq 'course' || $context eq 'author') {
+ if ($role eq '') {
+ my @checkroles;
+ foreach my $role (@poss_roles) {
+ my $endkey;
+ if ($role ne 'st') {
+ $endkey = ':'.$role;
+ }
+ if (exists($userlist{$username.':'.$domain.$endkey})) {
+ if (!grep(/^\Q$role\E$/,@checkroles)) {
+ push(@checkroles,$role);
+ }
+ }
+ }
+ if (@checkroles > 0) {
+ %canmodify = &can_modify_userinfo($context,$domain,\@userinfo,\@checkroles);
+ }
+ } elsif (ref($modifiable_fields{$role}) eq 'HASH') {
+ %canmodify = %{$modifiable_fields{$role}};
+ }
+ }
+ my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id);
+ for (my $i=0; $i<@userinfo; $i++) {
+ if (${$newinfo[$i]} ne '') {
+ if (!$canmodify{$userinfo[$i]}) {
+ ${$newinfo[$i]} = '';
+ }
+ }
+ }
}
if ($id ne '') {
if (!$newuser) {
@@ -2672,35 +3573,79 @@ sub upfile_drop_add {
}
}
if ($password || $env{'form.login'} eq 'loc') {
- my ($userresult,$authresult,$roleresult);
+ my $multiple = 0;
+ my ($userresult,$authresult,$roleresult,$idresult);
+ my (%userres,%authres,%roleres,%idres);
if ($role eq 'st') {
- &modifystudent($domain,$username,$cid,$sec,
- $desiredhost);
- $roleresult =
- &Apache::lonnet::modifystudent
- ($domain,$username,$id,$amode,$password,
- $fname,$mname,$lname,$gen,$sec,$enddate,
- $startdate,$env{'form.forceid'},
- $desiredhost,$email);
+ my $sec;
+ if ($cid) {
+ if (@secs > 0) {
+ $sec = $secs[0];
+ }
+ &modifystudent($domain,$username,$cid,$sec,
+ $desiredhost);
+ $roleresult =
+ &Apache::lonnet::modifystudent
+ ($domain,$username,$id,$amode,$password,
+ $fname,$mname,$lname,$gen,$sec,$enddate,
+ $startdate,$env{'form.forceid'},
+ $desiredhost,$email,'manual','',$cid);
+ $userresult = $roleresult;
+ }
+ } else {
+ if (($context eq 'course') ||
+ (grep(/^\Q$role\E$/,@courseroles))) {
+ if (!$cid) {
+ next;
+ }
+ }
+ my $singlesec;
+ if ((grep(/^\Q$role\E$/,@courseroles)) && ($role ne 'cc')) {
+ if (@secs > 1) {
+ $multiple = 1;
+ foreach my $sec (@secs) {
+ ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
+ &modifyuserrole($context,$setting,
+ $changeauth,$cid,$domain,$username,
+ $id,$amode,$password,$fname,
+ $mname,$lname,$gen,$sec,
+ $env{'form.forceid'},$desiredhost,
+ $email,$role,$enddate,$startdate,$checkid);
+ }
+ } elsif (@secs > 0) {
+ $singlesec = $secs[0];
+ }
+ }
+ if (!$multiple) {
+ ($userresult,$authresult,$roleresult,$idresult) =
+ &modifyuserrole($context,$setting,
+ $changeauth,$cid,$domain,$username,
+ $id,$amode,$password,$fname,
+ $mname,$lname,$gen,$singlesec,
+ $env{'form.forceid'},$desiredhost,
+ $email,$role,$enddate,$startdate,$checkid);
+ }
+ }
+ if ($multiple) {
+ foreach my $sec (sort(keys(%userres))) {
+ $flushc =
+ &user_change_result($r,$userres{$sec},$authres{$sec},
+ $roleres{$sec},$idres{$sec},\%counts,$flushc,
+ $username,\%userchg);
+
+ }
} else {
- ($userresult,$authresult,$roleresult) =
- &modifyuserrole($context,$setting,
- $changeauth,$cid,$domain,$username,
- $id,$amode,$password,$fname,
- $mname,$lname,$gen,$sec,
- $env{'form.forceid'},$desiredhost,
- $email,$role,$enddate,$startdate,$checkid);
- }
- $flushc =
- &user_change_result($r,$userresult,$authresult,
- $roleresult,\%counts,$flushc,
- $username,%userchg);
+ $flushc =
+ &user_change_result($r,$userresult,$authresult,
+ $roleresult,$idresult,\%counts,$flushc,
+ $username,\%userchg);
+ }
} else {
if ($context eq 'course') {
$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)
);
@@ -2715,67 +3660,36 @@ sub upfile_drop_add {
} # end of foreach (@userdata)
# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();
- $r->print("</p>\n<p>\n".&mt('Processed [_1] user(s).',$counts{'user'}).
+ $r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
"</p>\n");
if ($counts{'role'} > 0) {
$r->print("<p>\n".
- &mt('Roles added for [_1] users. If user is active, the new role will be available when the user next logs in to LON-CAPA.',$counts{'role'})."</p>\n");
+ &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n");
+ } else {
+ $r->print('<p>'.&mt('No roles added').'</p>');
}
if ($counts{'auth'} > 0) {
$r->print("<p>\n".
&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('<form name="uploadresult" action="/adm/createuser">');
- $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','prevphase','currstate']));
- $r->print('</form>');
+ $r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules));
#####################################
- # Drop students #
+ # Display list of students to drop #
#####################################
if ($env{'form.fullup'} eq 'yes') {
- $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
+ $r->print('<h3>'.&mt('Students to Drop')."</h3>\n");
# Get current classlist
- my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+ my $classlist = &Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
- $r->print(&mt('There are no students currently enrolled.').
- "\n");
+ $r->print('<form name="studentform" method="post" action="/adm/createuser" />'.
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
+ &mt('There are no students with current/future access to the course.').
+ '</form>'."\n");
} else {
# Remove the students we just added from the list of students.
- foreach (@userdata) {
- my %entries=&Apache::loncommon::record_sep($_);
+ foreach my $line (@userdata) {
+ my %entries=&Apache::loncommon::record_sep($line);
unless (($entries{$fields{'username'}} eq '') ||
(!defined($entries{$fields{'username'}}))) {
delete($classlist->{$entries{$fields{'username'}}.
@@ -2783,15 +3697,58 @@ sub upfile_drop_add {
}
}
# Print out list of dropped students.
- &show_drop_list($r,$classlist,$keylist,'nosort');
+ &show_drop_list($r,$classlist,'nosort',$permission);
}
}
} # end of unless
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
+}
+
+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) = @_;
+ my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc,
+ $username,$userchg) = @_;
my $okresult = 0;
if ($userresult ne 'ok') {
if ($userresult =~ /^error:(.+)$/) {
@@ -2832,60 +3789,279 @@ sub user_change_result {
$flushc=0;
}
}
+ if ($idresult) {
+ $r->print($idresult);
+ }
return $flushc;
}
# ========================================================= Menu Phase Two Drop
-sub print_expire_menu {
- my ($r,$context) = @_;
- $r->print("<h3>".&mt("Expire Users' Roles")."</h3>");
- my $cid=$env{'request.course.id'};
- my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
+sub print_drop_menu {
+ my ($r,$context,$permission) = @_;
+ $r->print('<h3>'.&mt("Drop Students").'</h3>'."\n".
+ '<form name="studentform" method="post">'."\n");
+ my $classlist = &Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
$r->print(&mt('There are no students currently enrolled.')."\n");
- return;
+ } else {
+ &show_drop_list($r,$classlist,'nosort',$permission);
}
- # Print out the available choices
- &show_drop_list($r,$classlist,$keylist);
+ $r->print('</form>'. &Apache::loncommon::end_page());
return;
}
-
# ================================================================== 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 eq 'drop') {
+ @changelist = &Apache::loncommon::get_env_multiple('form.droplist');
+ } else {
+ @changelist = &Apache::loncommon::get_env_multiple('form.actionlist');
+ }
+ my %result_text = ( ok => { 'revoke' => 'Revoked',
+ 'delete' => 'Deleted',
+ 'reenable' => 'Re-enabled',
+ 'activate' => 'Activated',
+ 'chgdates' => 'Changed Access Dates for',
+ 'chgsec' => 'Changed section for',
+ 'drop' => 'Dropped',
+ },
+ error => {'revoke' => 'revoking',
+ 'delete' => 'deleting',
+ 'reenable' => 're-enabling',
+ 'activate' => 'activating',
+ 'chgdates' => 'changing access dates for',
+ 'chgsec' => 'changing section for',
+ 'drop' => 'dropping',
+ },
+ );
+ 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 ($choice eq 'drop') {
+ ($uname,$udom,$sec) = split(/:/,$item,-1);
+ $role = 'st';
+ $cid = $env{'request.course.id'};
+ $scopestem = '/'.$cid;
+ $scopestem =~s/\_/\//g;
+ if ($sec eq '') {
+ $scope = $scopestem;
+ } else {
+ $scope = $scopestem.'/'.$sec;
+ }
+ } elsif ($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 $start = $env{'form.'.$item.'_start'};
+ my $end = $env{'form.'.$item.'_end'};
+ if ($choice eq 'drop') {
+ # drop students
+ $end = $now;
+ $type = 'manual';
+ $result =
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+ } elsif ($choice eq 'revoke') {
+ # revoke or delete user role
+ $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') {
+ if ($role eq 'st') {
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid);
+ }
+ $result =
+ &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
+ $start,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 (@newsecs > 0) {
+ if (grep(/^\Q$sec\E$/,@newsecs)) {
+ push(@retained,$sec);
+ } else {
+ $revresult =
+ &Apache::lonnet::revokerole($udom,$uname,
+ $scope,$role);
+ }
+ } else {
+ $revresult =
+ &Apache::lonnet::revokerole($udom,$uname,
+ $scope,$role);
+ }
+ }
+ } else {
+ if ($sec eq '') {
+ $nochg = 1;
+ } else {
+ push(@retained,$sec);
+ }
+ }
+ # add new sections
+ if (@newsecs == 0) {
+ if (!$nochg) {
+ 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);
+ }
+ }
+ }
+ }
+ }
+ }
+ my $extent = $scope;
+ if ($choice eq 'drop' || $context eq 'course') {
+ my ($cnum,$cdom,$cdesc) = &get_course_identity($cid);
+ if ($cdesc) {
+ $extent = $cdesc;
+ }
+ }
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,$extent,$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,$extent,$uname.':'.$udom,$result).'<br />');
+ }
+ }
+ $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n");
+ if ($choice eq 'drop') {
+ $r->print('<input type="hidden" name="action" value="listusers" />'."\n".
+ '<input type="hidden" name="Status" value="Active" />'."\n".
+ '<input type="hidden" name="showrole" value="st" />'."\n");
+ } else {
+ foreach my $item ('action','sortby','roletype','showrole','Status','secfilter','grpfilter') {
+ if ($env{'form.'.$item} ne '') {
+ $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.
+ '" />'."\n");
+ }
+ }
+ }
+ $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
+ if ($count > 0) {
+ if ($choice eq 'revoke' || $choice eq 'drop') {
+ $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,$context));
}
}
- $r->print('<p><b>'.&mt('Dropped [_1] user(s).',$count).'</b></p>');
- $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
+ my $linktext = &mt('Display User Lists');
+ if ($choice eq 'drop') {
+ $linktext = &mt('Display current class roster');
+ }
+ $r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n");
}
sub classlist_drop {
- my ($scope,$uname,$udom,$now,$action) = @_;
+ my ($scope,$uname,$udom,$now) = @_;
my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
- my $cid=$cdom.'_'.$cnum;
- my $user = $uname.':'.$udom;
- if ($action eq 'drop') {
+ if (&Apache::lonnet::is_course($cdom,$cnum)) {
+ my $user = $uname.':'.$udom;
if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
my $result =
&Apache::lonnet::cput('classlist',
- { $user => $now },
- $env{'course.'.$cid.'.domain'},
- $env{'course.'.$cid.'.num'});
+ { $user => $now },$cdom,$cnum);
return &mt('Drop from classlist: [_1]',
'<b>'.$result.'</b>').'<br />';
}
@@ -2904,7 +4080,7 @@ 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.");
@@ -2955,16 +4131,26 @@ sub course_sections {
my ($sections_count,$role) = @_;
my $output = '';
my @sections = (sort {$a <=> $b} keys %{$sections_count});
- if (scalar(@sections) == 1) {
+ my $numsec = scalar(@sections);
+ if ($numsec <= 1) {
$output = '<select name="currsec_'.$role.'" >'."\n".
- ' <option value="">Select</option>'."\n".
- ' <option value="">No section</option>'."\n".
+ ' <option value="">'.&mt('Select').'</option>'."\n".
+ ' <option value="">'.&mt('No section').'</option>'."\n";
+ if ($numsec == 1) {
+ $output .=
' <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";
+ if ($role eq 'st') {
+ $output .= '>'."\n".
+ ' <option value="">'.&mt('Select').'</option>'."\n".
+ ' <option value="">'.&mt('No section')."</option>\n";
+ } else {
+ $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
+ }
foreach my $sec (@sections) {
$output .= '<option value="'.$sec.'">'.$sec."</option>\n";
}
@@ -2980,21 +4166,32 @@ sub get_groupslist {
$groupslist = join('","',sort(keys(%curr_groups)));
$groupslist = '"'.$groupslist.'"';
}
- return $groupslist;
+ return $groupslist;
}
sub setsections_javascript {
- my ($form,$groupslist) = @_;
- my ($checkincluded,$finish,$roleplace,$setsection_js);
- if ($form eq 'cu') {
+ my ($formname,$groupslist,$mode) = @_;
+ my ($checkincluded,$finish,$rolecode,$setsection_js);
+ if ($mode eq 'upload') {
+ $checkincluded = 'formname.name == "'.$formname.'"';
+ $finish = "return 'ok';";
+ $rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n";
+ } elsif ($formname eq 'cu') {
$checkincluded = 'formname.elements[i-1].checked == true';
$finish = 'formname.submit()';
- $roleplace = 3;
+ $rolecode = "var match = str.split('_');
+ var role = match[3];\n";
+ } elsif ($formname eq 'enrollstudent') {
+ $checkincluded = 'formname.name == "'.$formname.'"';
+ $finish = 'formname.submit()';
+ $rolecode = "var match = str.split('_');
+ var role = match[1];\n";
} else {
- $checkincluded = 'formname.name == "'.$form.'"';
+ $checkincluded = 'formname.name == "'.$formname.'"';
$finish = "seccheck = 'ok';";
- $roleplace = 1;
- $setsection_js = "var seccheck = 'alert';";
+ $rolecode = "var match = str.split('_');
+ var role = match[1];\n";
+ $setsection_js = "var seccheck = 'alert';";
}
my %alerts = &Apache::lonlocal::texthash(
secd => 'Section designations do not apply to Course Coordinator roles.',
@@ -3007,7 +4204,7 @@ sub setsections_javascript {
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) {
@@ -3018,8 +4215,7 @@ function setSections(formname) {
var checkcurr = str.match(re1);
if (checkcurr != null) {
if ($checkincluded) {
- var match = str.split('_');
- var role = match[$roleplace];
+ $rolecode
if (role == 'cc') {
alert("$alerts{'secd'}\\n$alerts{'accr'}");
}
@@ -3087,7 +4283,378 @@ function setSections(formname) {
$finish
}
ENDSECCODE
- return $setsection_js;
+ return $setsection_js;
+}
+
+sub can_create_user {
+ my ($dom,$context,$usertype) = @_;
+ my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+ my $cancreate = 1;
+ if (&Apache::lonnet::allowed('mau',$dom)) {
+ return $cancreate;
+ }
+ if (ref($domconf{'usercreation'}) eq 'HASH') {
+ if (ref($domconf{'usercreation'}{'cancreate'}) eq 'HASH') {
+ if ($context eq 'course' || $context eq 'author') {
+ my $creation = $domconf{'usercreation'}{'cancreate'}{$context};
+ if ($creation eq 'none') {
+ $cancreate = 0;
+ } elsif ($creation ne 'any') {
+ if (defined($usertype)) {
+ if ($creation ne $usertype) {
+ $cancreate = 0;
+ }
+ }
+ }
+ }
+ }
+ }
+ return $cancreate;
+}
+
+sub can_modify_userinfo {
+ my ($context,$dom,$fields,$userroles) = @_;
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usermodification'],
+ $dom);
+ my %canmodify;
+ if (ref($fields) eq 'ARRAY') {
+ foreach my $field (@{$fields}) {
+ $canmodify{$field} = 0;
+ if (&Apache::lonnet::allowed('mau',$dom)) {
+ $canmodify{$field} = 1;
+ } else {
+ if (ref($domconfig{'usermodification'}) eq 'HASH') {
+ if (ref($domconfig{'usermodification'}{$context}) eq 'HASH') {
+ if (ref($userroles) eq 'ARRAY') {
+ foreach my $role (@{$userroles}) {
+ my $testrole;
+ if ($role =~ /^cr\//) {
+ $testrole = 'cr';
+ } else {
+ $testrole = $role;
+ }
+ if (ref($domconfig{'usermodification'}{$context}{$testrole}) eq 'HASH') {
+ if ($domconfig{'usermodification'}{$context}{$testrole}{$field}) {
+ $canmodify{$field} = 1;
+ last;
+ }
+ }
+ }
+ } else {
+ foreach my $key (keys(%{$domconfig{'usermodification'}{$context}})) {
+ if (ref($domconfig{'usermodification'}{$context}{$key}) eq 'HASH') {
+ if ($domconfig{'usermodification'}{$context}{$key}{$field}) {
+ $canmodify{$field} = 1;
+ last;
+ }
+ }
+ }
+ }
+ }
+ } elsif ($context eq 'course') {
+ if (ref($userroles) eq 'ARRAY') {
+ if (grep(/^st$/,@{$userroles})) {
+ $canmodify{$field} = 1;
+ }
+ } else {
+ $canmodify{$field} = 1;
+ }
+ }
+ }
+ }
+ }
+ return %canmodify;
+}
+
+sub check_usertype {
+ my ($dom,$uname,$rules) = @_;
+ my $usertype;
+ if (ref($rules) eq 'HASH') {
+ my @user_rules = keys(%{$rules});
+ if (@user_rules > 0) {
+ my %rule_check = &Apache::lonnet::inst_rulecheck($dom,$uname,undef,'username',\@user_rules);
+ if (keys(%rule_check) > 0) {
+ $usertype = 'unofficial';
+ foreach my $item (keys(%rule_check)) {
+ if ($rule_check{$item}) {
+ $usertype = 'official';
+ last;
+ }
+ }
+ }
+ }
+ }
+ return $usertype;
+}
+
+sub roles_by_context {
+ my ($context,$custom) = @_;
+ my @allroles;
+ if ($context eq 'course') {
+ @allroles = ('st','ad','ta','ep','in','cc');
+ if ($custom) {
+ push(@allroles,'cr');
+ }
+ } elsif ($context eq 'author') {
+ @allroles = ('ca','aa');
+ } elsif ($context eq 'domain') {
+ @allroles = ('li','dg','sc','au','dc');
+ }
+ return @allroles;
+}
+
+sub get_permission {
+ my ($context,$roles) = @_;
+ my %permission;
+ if ($context eq 'course') {
+ my $custom = 1;
+ my @allroles = &roles_by_context($context,$custom);
+ foreach my $role (@allroles) {
+ if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
+ $permission{'cusr'} = 1;
+ last;
+ }
+ }
+ if (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) {
+ $permission{'custom'} = 1;
+ }
+ if (&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) {
+ $permission{'view'} = 1;
+ }
+ if (!$permission{'view'}) {
+ my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
+ $permission{'view'} = &Apache::lonnet::allowed('vcl',$scope);
+ if ($permission{'view'}) {
+ $permission{'view_section'} = $env{'request.course.sec'};
+ }
+ }
+ if (!$permission{'cusr'}) {
+ if ($env{'request.course.sec'} ne '') {
+ my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
+ $permission{'cusr'} = (&Apache::lonnet::allowed('cst',$scope));
+ if ($permission{'cusr'}) {
+ $permission{'cusr_section'} = $env{'request.course.sec'};
+ }
+ }
+ }
+ if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+ $permission{'grp_manage'} = 1;
+ }
+ } elsif ($context eq 'author') {
+ $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
+ $permission{'view'} = $permission{'cusr'};
+ } else {
+ my @allroles = &roles_by_context($context);
+ foreach my $role (@allroles) {
+ if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) {
+ $permission{'cusr'} = 1;
+ last;
+ }
+ }
+ if (!$permission{'cusr'}) {
+ if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+ $permission{'cusr'} = 1;
+ }
+ }
+ if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) {
+ $permission{'custom'} = 1;
+ }
+ $permission{'view'} = $permission{'cusr'};
+ }
+ my $allowed = 0;
+ foreach my $perm (values(%permission)) {
+ if ($perm) { $allowed=1; last; }
+ }
+ return (\%permission,$allowed);
+}
+
+# ==================================================== Figure out author access
+
+sub authorpriv {
+ my ($auname,$audom)=@_;
+ unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
+ || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1;
+}
+
+sub roles_on_upload {
+ my ($context,%customroles) = @_;
+ my (@possible_roles,@permitted_roles);
+ if ($context eq 'domain') {
+ @possible_roles = &curr_role_permissions($context,undef,1);
+ push(@possible_roles,&curr_role_permissions($context,'course',1));
+ } else {
+ @possible_roles = &curr_role_permissions($context,undef,1);
+ }
+ my $custom_ok = 0;
+ foreach my $role (@possible_roles) {
+ if ($role eq 'cr') {
+ $custom_ok = 1;
+ push(@permitted_roles,keys(%customroles));
+ } else {
+ push(@permitted_roles,$role);
+ }
+ }
+ return ($custom_ok,@permitted_roles);
+}
+
+sub get_course_identity {
+ my ($cid) = @_;
+ my ($cnum,$cdom,$cdesc);
+ if ($cid eq '') {
+ $cid = $env{'request.course.id'}
+ }
+ if ($cid ne '') {
+ $cnum = $env{'course.'.$cid.'.num'};
+ $cdom = $env{'course.'.$cid.'.domain'};
+ $cdesc = $env{'course.'.$cid.'.description'};
+ if ($cnum eq '' || $cdom eq '') {
+ my %coursehash =
+ &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
+ $cdom = $coursehash{'domain'};
+ $cnum = $coursehash{'num'};
+ $cdesc = $coursehash{'description'};
+ }
+ }
+ return ($cnum,$cdom,$cdesc);
+}
+
+sub dc_setcourse_js {
+ my ($formname,$mode) = @_;
+ my $dc_setcourse_code;
+ my $cctext = &Apache::lonnet::plaintext('cc');
+ my %alerts = §ioncheck_alerts();
+ my $role = 'role';
+ if ($mode eq 'upload') {
+ $role = 'courserole';
+ }
+ $dc_setcourse_code = (<<"SCRIPTTOP");
+function setCourse() {
+ var course = document.$formname.dccourse.value;
+ if (course != "") {
+ if (document.$formname.dcdomain.value != document.$formname.origdom.value) {
+ alert("$alerts{'curd'}");
+ return;
+ }
+ var userrole = document.$formname.$role.options[document.$formname.$role.selectedIndex].value
+ var section="";
+ var numsections = 0;
+ var newsecs = new Array();
+ for (var i=0; i<document.$formname.currsec.length; i++) {
+ if (document.$formname.currsec.options[i].selected == true ) {
+ if (document.$formname.currsec.options[i].value != "" && document.$formname.currsec.options[i].value != null) {
+ if (numsections == 0) {
+ section = document.$formname.currsec.options[i].value
+ numsections = 1;
+ }
+ else {
+ section = section + "," + document.$formname.currsec.options[i].value
+ numsections ++;
+ }
+ }
+ }
+ }
+ if (document.$formname.newsec.value != "" && document.$formname.newsec.value != null) {
+ if (numsections == 0) {
+ section = document.$formname.newsec.value
+ }
+ else {
+ section = section + "," + document.$formname.newsec.value
+ }
+ newsecs = document.$formname.newsec.value.split(/,/g);
+ numsections = numsections + newsecs.length;
+ }
+ if ((userrole == 'st') && (numsections > 1)) {
+ alert("$alerts{'inea'}. $alerts{'youh'} "+numsections+" $alerts{'sect'}.\\n$alerts{'plsm'}.")
+ return;
+ }
+ for (var j=0; j<newsecs.length; j++) {
+ if ((newsecs[j] == 'all') || (newsecs[j] == 'none')) {
+ alert("'"+newsecs[j]+"' $alerts{'mayn'}.\\n$alerts{'plsc'}.");
+ return;
+ }
+ if (document.$formname.groups.value != '') {
+ var groups = document.$formname.groups.value.split(/,/g);
+ for (var k=0; k<groups.length; k++) {
+ if (newsecs[j] == groups[k]) {
+ alert("'"+newsecs[j]+"' $alerts{'mayt'}.\\n$alerts{'secn'}. $alerts{'plsc'}.");
+ return;
+ }
+ }
+ }
+ }
+ if ((userrole == 'cc') && (numsections > 0)) {
+ alert("$alerts{'secd'} $cctext $alerts{'role'}.\\n$alerts{'accr'}.");
+ section = "";
+ }
+SCRIPTTOP
+ if ($mode ne 'upload') {
+ $dc_setcourse_code .= (<<"ENDSCRIPT");
+ var coursename = "_$env{'request.role.domain'}"+"_"+course+"_"+userrole
+ var numcourse = getIndex(document.$formname.dccourse);
+ if (numcourse == "-1") {
+ alert("$alerts{'thwa'}");
+ return;
+ }
+ else {
+ document.$formname.elements[numcourse].name = "act"+coursename;
+ var numnewsec = getIndex(document.$formname.newsec);
+ if (numnewsec != "-1") {
+ document.$formname.elements[numnewsec].name = "sec"+coursename;
+ document.$formname.elements[numnewsec].value = section;
+ }
+ var numstart = getIndex(document.$formname.start);
+ if (numstart != "-1") {
+ document.$formname.elements[numstart].name = "start"+coursename;
+ }
+ var numend = getIndex(document.$formname.end);
+ if (numend != "-1") {
+ document.$formname.elements[numend].name = "end"+coursename
+ }
+ }
+ }
+ document.$formname.submit();
+}
+
+ENDSCRIPT
+ } else {
+ $dc_setcourse_code .= "
+ document.$formname.sections.value = section;
+ }
+ return 'ok';
+}
+";
+ }
+ $dc_setcourse_code .= (<<"ENDSCRIPT");
+
+ function getIndex(caller) {
+ for (var i=0;i<document.$formname.elements.length;i++) {
+ if (document.$formname.elements[i] == caller) {
+ return i;
+ }
+ }
+ return -1;
+ }
+ENDSCRIPT
+}
+
+sub sectioncheck_alerts {
+ my %alerts = &Apache::lonlocal::texthash(
+ curd => 'You must select a course in the current domain',
+ inea => 'In each course, each user may only have one student role at a time',
+ youh => 'You had selected',
+ sect => 'sections',
+ plsm => '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',
+ plsc => 'Please choose a different section name',
+ mayt => 'may not be used as the name for a section, as it is the name of a course group',
+ secn => 'Section names and group names must be distinct',
+ secd => 'Section designations do not apply to ',
+ role => 'roles',
+ accr => 'role will be added with access to all sections',
+ thwa => 'There was a problem with your course selection'
+ );
+ return %alerts;
}
1;