--- loncom/interface/loncreateuser.pm 2007/12/14 00:20:53 1.209
+++ loncom/interface/loncreateuser.pm 2007/12/21 14:35:42 1.215
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.209 2007/12/14 00:20:53 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.215 2007/12/21 14:35:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -223,15 +223,15 @@ sub print_username_entry_form {
my $start_page =
&Apache::loncommon::start_page('User Management',
$jscript,{'add_entries' => \%loaditems,});
- if ($env{'form.action'} eq 'singleuser') {
+ if ($env{'form.action'} eq 'custom') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.crtuser)",
- text=>"Single user search",
- faq=>282,bug=>'Instructor Interface',});
- } elsif ($env{'form.action'} eq 'custom') {
+ text=>"Pick custom role",});
+ } else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.crtuser)",
- text=>"Pick custom role",});
+ text=>"Single user search",
+ faq=>282,bug=>'Instructor Interface',});
}
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
my %existingroles=&Apache::lonuserutils::my_custom_roles();
@@ -245,22 +245,19 @@ sub print_username_entry_form {
'ecrp' => "Edit Custom Role Privileges",
'nr' => "Name of Role",
'cre' => "Custom Role Editor",
- 'mod' => "to edit user information or add/modify roles",
+ 'mod' => "to modify user information or add/modify roles",
+ 'enrl' => "to enroll one student",
);
my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
+ my $helpsist=&Apache::loncommon::help_open_topic('Course_Add_Student');
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
if ($sellink) {
$sellink = "$lt{'or'} ".$sellink;
}
$r->print($start_page."\n".$crumbs);
- if ($env{'form.action'} eq 'singleuser') {
- $r->print("
-<h3>$lt{'srch'} $sellink $lt{'mod'}$helpsiur</h3>
-$response");
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context));
- } elsif ($env{'form.action'} eq 'custom') {
+ if ($env{'form.action'} eq 'custom') {
if (&Apache::lonnet::allowed('mcr','/')) {
$r->print(<<ENDCUSTOM);
<form action="/adm/createuser" method="post" name="docustom">
@@ -272,20 +269,41 @@ $lt{'nr'}: $choice <input type="text" si
</form>
ENDCUSTOM
}
+ } else {
+ my $actiontext = $lt{'mod'}.$helpsiur;
+ if ($env{'form.action'} eq 'singlestudent') {
+ $actiontext = $lt{'enrl'}.$helpsist;
+ }
+ $r->print("
+<h3>$lt{'srch'} $sellink $actiontext</h3>");
+ if ($env{'form.origform'} ne 'crtusername') {
+ $r->print("\n".$response);
+ }
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
}
$r->print(&Apache::loncommon::end_page());
}
sub entry_form {
- my ($dom,$srch,$forcenewuser,$context) = @_;
+ my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
- my $cancreate = &Apache::lonuserutils::can_create_user($dom,$context);
- if (!$cancreate) {
- $forcenewuser = '';
+ my $usertype;
+ if (ref($srch) eq 'HASH') {
+ if (($srch->{'srchin'} eq 'dom') &&
+ ($srch->{'srchby'} eq 'uname') &&
+ ($srch->{'srchtype'} eq 'exact') &&
+ ($srch->{'srchdomain'} ne '') &&
+ ($srch->{'srchterm'} ne '')) {
+ my ($rules,$ruleorder) =
+ &Apache::lonnet::inst_userrules($srch->{'srchdomain'},'username');
+ $usertype = &Apache::lonuserutils::check_usertype($srch->{'srchdomain'},$srch->{'srchterm'},$rules);
+ }
}
+ my $cancreate =
+ &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
my $userpicker =
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
- 'document.crtuser');
+ 'document.crtuser',$cancreate,$usertype);
my $srchbutton = &mt('Search');
my $output = <<"ENDBLOCK";
<form action="/adm/createuser" method="post" name="crtuser">
@@ -295,7 +313,7 @@ $userpicker
<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
</form>
ENDBLOCK
- if ($cancreate) {
+ if ($cancreate && $env{'form.phase'} eq '') {
my $defdom=$env{'request.role.domain'};
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
my $helpcrt=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
@@ -315,6 +333,7 @@ ENDBLOCK
<input type="hidden" name="forcenewuser" value="1" />
<input type="hidden" name="origform" value="crtusername" />
<h3>$lt{crnu}$helpcrt</h3>
+$responsemsg
<table>
<tr>
<td>$lt{'usr'}:</td>
@@ -392,8 +411,8 @@ ENDSCRIPT
'firstname' => "first name",
'permanentemail' => "permanent e-mail",
);
+ $r->print(&Apache::loncommon::start_page('User Management',$jscript));
if ($operation eq 'createuser') {
- $r->print(&Apache::loncommon::start_page('User Management',$jscript));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.usersrchform,'','')",
text=>"Create/modify user",
@@ -405,9 +424,17 @@ ENDSCRIPT
$r->print("<b>$lt{'usrch'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
$r->print('<h3>'.$lt{'usel'}.'</h3>');
- } else {
+ } elsif ($operation eq 'enrollstudent') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.usersrchform,'','')",
+ text=>"Create/modify student",
+ faq=>282,bug=>'Instructor Interface',},
+ {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+ text=>"Select Student",
+ faq=>282,bug=>'Instructor Interface',});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
$r->print($jscript."<b>$lt{'stusrch'}</b><br />");
- $r->print(&Apache::londropadd::single_user_entry_form($srch->{'srchdomain'},$srch));
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
$r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
}
$r->print('<form name="usersrchform" method="post">'.
@@ -453,14 +480,8 @@ ENDSCRIPT
' <input type="hidden" name="seludom" value="" />'."\n".
' <input type="hidden" name="currstate" value="select" />'."\n".
' <input type="hidden" name="phase" value="get_user_info" />'."\n".
- ' <input type="hidden" name="action" value="singleuser" />'."\n");
- $r->print($response);
- if ($operation eq 'createuser') {
- $r->print('</form>'.&Apache::loncommon::end_page());
- } else {
- $r->print('<input type="hidden" name="action" value="enrollstudent" />'."\n".
- '<input type="hidden" name="state" value="gotusername" />'."\n");
- }
+ ' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
+ $r->print($response.'</form>'.&Apache::loncommon::end_page());
}
sub print_user_query_page {
@@ -472,17 +493,50 @@ sub print_user_query_page {
}
sub print_user_modification_page {
- my ($r,$ccuname,$ccdomain,$srch,$response,$context) = @_;
+ my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
if (($ccuname eq '') || ($ccdomain eq '')) {
- my $usermsg = &mt('No username and/or domain provided.');
+ my $usermsg = &mt('No username and/or domain provided.');
+ $env{'form.phase'} = '';
&print_username_entry_form($r,$context,$usermsg);
return;
}
+ my ($form,$formname);
+ if ($env{'form.action'} eq 'singlestudent') {
+ $form = 'document.enrollstudent';
+ $formname = 'enrollstudent';
+ } else {
+ $form = 'document.cu';
+ $formname = 'cu';
+ }
my %abv_auth = &auth_abbrev();
my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser,
%alerts,%curr_rules,%got_rules);
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
if ($uhome eq 'no_host') {
+ my $usertype;
+ my ($rules,$ruleorder) =
+ &Apache::lonnet::inst_userrules($ccdomain,'username');
+ $usertype =
+ &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules);
+ my $cancreate =
+ &Apache::lonuserutils::can_create_user($ccdomain,$context,
+ $usertype);
+ if (!$cancreate) {
+ my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+ my %usertypetext = (
+ official => 'institutional',
+ unofficial => 'non-institutional',
+ );
+ my $response;
+ if ($env{'form.origform'} eq 'crtusername') {
+ $response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
+ '</span><br />';
+ }
+ $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+ $env{'form.phase'} = '';
+ &print_username_entry_form($r,$context,$response);
+ return;
+ }
$newuser = 1;
my $checkhash;
my $checks = { 'username' => 1 };
@@ -503,9 +557,10 @@ sub print_user_modification_page {
$domdesc,$curr_rules{$ccdomain}{'username'},
'username');
}
+ $env{'form.phase'} = '';
&print_username_entry_form($r,$context,$userchkmsg);
return;
- }
+ }
}
}
} else {
@@ -520,7 +575,7 @@ sub print_user_modification_page {
}
}
if ($response) {
- $response = '<br />'.$response
+ $response = '<br />'.$response;
}
my $defdom=$env{'request.role.domain'};
@@ -540,7 +595,6 @@ sub print_user_modification_page {
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';
my $nondc_setsection_code = '';
-
my %loaditem;
my $groupslist;
@@ -721,6 +775,7 @@ ENDFORMINFO
&initialize_authen_forms($ccdomain);
my %lt=&Apache::lonlocal::texthash(
'cnu' => 'Create New User',
+ 'ast' => 'as a student',
'ind' => 'in domain',
'lg' => 'Login Data',
'hs' => "Home Server",
@@ -736,10 +791,13 @@ $loginscript
<input type='hidden' name='makeuser' value='1' />
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
ENDTITLE
- $r->print('<div class="LC_left_float">');
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print(' ('.$lt{'ast'}.')');
+ }
+ $r->print('</h2>'."\n".'<div class="LC_left_float">');
my $personal_table =
- &personal_data_display($ccuname,$ccdomain,$newuser,
- $context,%inst_results);
+ &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+ $inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -802,25 +860,34 @@ ENDAUTH
} else {
$r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
}
- $r->print(<<ENDPORT);
- $portfolioform
-</div><div class="LC_clear_float_footer"></div>
-ENDPORT
- } else { # user already exists
+ $r->print($portfolioform);
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print(&date_sections_select($context,$newuser,$formname,
+ $permission));
+ }
+ $r->print('</div><div class="LC_clear_float_footer"></div>');
+ } else { # user already exist-
my %lt=&Apache::lonlocal::texthash(
'cup' => "Modify existing user: ",
+ 'ens' => "Enroll one student: ",
'id' => "in domain",
);
$r->print(<<ENDCHANGEUSER);
$start_page
$crumbs
$forminfo
-<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
+<h2>
ENDCHANGEUSER
- $r->print('<div class="LC_left_float">');
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print($lt{'ens'});
+ } else {
+ $r->print($lt{'cup'});
+ }
+ $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
+ "\n".'<div class="LC_left_float">');
my ($personal_table,$showforceid) =
- &personal_data_display($ccuname,$ccdomain,$newuser,
- $context,%inst_results);
+ &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+ $inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
if ($showforceid) {
$r->print(&Apache::lonuserutils::forceid_change($context));
@@ -852,12 +919,21 @@ ENDNOPORTPRIV
if ($user_quota_text ne '') {
$r->print($user_quota_text);
}
- $r->print('</div>');
-
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print(&date_sections_select($context,$newuser,$formname));
+ }
} elsif ($user_quota_text ne '') {
- $r->print('<div class="LC_left_float">'.$user_quota_text.'</div>');
+ $r->print('<div class="LC_left_float">'.$user_quota_text);
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print(&date_sections_select($context,$newuser,$formname));
+ }
+ } else {
+ if ($env{'form.action'} eq 'singlestudent') {
+ $r->print('<div class="LC_left_float">'.
+ &date_sections_select($context,$newuser,$formname));
+ }
}
- $r->print('<div class="LC_clear_float_footer"></div>');
+ $r->print('</div><div class="LC_clear_float_footer"></div>');
my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
# Build up table of user roles to allow revocation of a role.
my ($tmp) = keys(%rolesdump);
@@ -1186,6 +1262,35 @@ ENDNOPORTPRIV
$r->print("</form>".&Apache::loncommon::end_page());
}
+sub singleuser_breadcrumb {
+ my %breadcrumb_text;
+ if ($env{'form.action'} eq 'singlestudent') {
+ $breadcrumb_text{'search'} = 'Enroll a student';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'modify'} = 'Set section/dates',
+ } else {
+ $breadcrumb_text{'search'} = 'Create/modify user';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'modify'} = 'Set user role',
+ }
+ return %breadcrumb_text;
+}
+
+sub date_sections_select {
+ my ($context,$newuser,$formname,$permission) = @_;
+ my $cid = $env{'request.course.id'};
+ my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity($cid);
+ my $date_table = '<h3>'.&mt('Starting and Ending Dates').'</h3>'."\n".
+ &Apache::lonuserutils::date_setting_table(undef,undef,$context,
+ undef,$formname,$permission);
+ my $rowtitle = 'Section';
+ my $secbox = '<h3>'.&mt('Section').'</h3>'."\n".
+ &Apache::lonuserutils::section_picker($cdom,$cnum,'st',$rowtitle,
+ $permission);
+ my $output = $date_table.$secbox;
+ return $output;
+}
+
sub user_authentication {
my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -1353,7 +1458,7 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,%inst_results) = @_;
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results) = @_;
my ($output,$showforceid,%userenv,%domconfig);
if (!$newuser) {
# Get the users information
@@ -1394,8 +1499,12 @@ sub personal_data_display {
}
$output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
if ($newuser) {
- if ($inst_results{$item} ne '') {
- $output .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item};
+ if (ref($inst_results) eq 'HASH') {
+ if ($inst_results->{$item} ne '') {
+ $output .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
+ } else {
+ $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+ }
} else {
$output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
}
@@ -1455,20 +1564,20 @@ sub update_user_data {
} else {
$title='Modify User Privileges';
}
-
+ my $newuser = 0;
my ($jsback,$elements) = &crumb_utilities();
my $jscript = '<script type="text/javascript">'."\n".
$jsback."\n".'</script>'."\n";
-
+ my %breadcrumb_text = &singleuser_breadcrumb();
$r->print(&Apache::loncommon::start_page($title,$jscript));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.userupdate)",
- text=>"Create/modify user",
+ text=>$breadcrumb_text{'search'},
faq=>282,bug=>'Instructor Interface',});
if ($env{'form.prevphase'} eq 'userpicked') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.userupdate,'get_user_info','select')",
- text=>"Select a user",
+ text=>$breadcrumb_text{'userpicked'},
faq=>282,bug=>'Instructor Interface',});
}
&Apache::lonhtmlcommon::add_breadcrumb
@@ -1628,6 +1737,10 @@ sub update_user_data {
}
}
##
+ my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+ if ($context eq 'course') {
+ ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+ }
if (! $env{'form.makeuser'} ) {
# Check for need to change
my %userenv = &Apache::lonnet::get
@@ -1643,10 +1756,9 @@ sub update_user_data {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usermodification'],
$env{'form.ccdomain'});
- my @roletypes = ('active','future');
- my %roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},'userroles',\@roletypes,undef,$env{'request.role.domain'});
- my @userroles;
- my ($cnum,$cdom,$auname,$audom);
+ my @statuses = ('active','future');
+ my %roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},'userroles',\@statuses,undef,$env{'request.role.domain'});
+ my ($auname,$audom);
if ($context eq 'course') {
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1779,7 +1891,7 @@ sub update_user_data {
}
}
}
- my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
+ my ($quotachanged,$oldportfolioquota,$newportfolioquota,
$inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
$newdefquotatext);
my ($defquota,$settingstatus) =
@@ -1914,7 +2026,7 @@ END
($env{'form.ccuname'} => $env{'form.cid'}));
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
- my %userupdate = (
+ %userupdate = (
lastname => $env{'form.clasaname'},
middlename => $env{'form.cmiddlename'},
firstname => $env{'form.cfirstname'},
@@ -2651,22 +2763,8 @@ sub handler {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}
$r->print('</form>'.&Apache::loncommon::end_page());
- } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
- $r->print(&header());
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/createuser?action=expire',
- text=>"Expire User Roles"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
- 'User_Management_Drops'));
- if (! exists($env{'form.state'})) {
- &Apache::lonuserutils::print_expire_menu($r,$context);
- } elsif ($env{'form.state'} eq 'done') {
- &Apache::lonuserutils::expire_user_list($r,$context);
- } else {
- &Apache::lonuserutils::print_expire_menu($r,$context);
- }
- $r->print(&Apache::loncommon::end_page());
- } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
+ } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
+ eq 'singlestudent')) && ($permission->{'cusr'})) {
my $phase = $env{'form.phase'};
my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
&Apache::loncreateuser::restore_prev_selections();
@@ -2695,8 +2793,14 @@ sub handler {
$currstate = $env{'form.currstate'};
}
if ($currstate eq 'select') {
+ my $operation;
+ if ($env{'form.action'} eq 'singleuser') {
+ $operation = 'createuser';
+ } elsif ($env{'form.action'} eq 'singlestudent') {
+ $operation = 'enrollstudent';
+ }
&print_user_selection_page($r,$response,$srch,$results,
- 'createuser',\@search,$context);
+ $operation,\@search,$context);
} elsif ($currstate eq 'modify') {
my ($ccuname,$ccdomain);
if (($srch->{'srchby'} eq 'uname') &&
@@ -2779,19 +2883,24 @@ sub handler {
$formname,$totcodes,$codetitles,$idlist,$idlist_titles);
$r->print(&Apache::loncommon::end_page());
}
- } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
+ } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
$r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',
- text=>"Expire Users"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
- 'User_Management_Drops'));
- if (! exists($env{'form.state'})) {
- &Apache::lonuserutils::print_expire_menu($r,$context);
+ text=>"Drop Students"});
+ if (!exists($env{'form.state'})) {
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+ 'Course_Drop_Student'));
+
+ &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
} elsif ($env{'form.state'} eq 'done') {
- &Apache::lonuserutiles::expire_user_list($r,$context);
- } else {
- &print_expire_menu($r,$context);
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=drop',
+ text=>"Result"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+ 'Course_Drop_Student'));
+ &Apache::lonuserutils::update_user_list($r,$context,undef,
+ $env{'form.action'});
}
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'dateselect') {
@@ -2892,21 +3001,33 @@ sub print_main_menu {
push(@menu,$customlink);
}
if ($context eq 'course') {
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my @courselinks =
+ my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+ my @courselinks =
(
- { text => 'Automated Enrollment Manager',
+ { text => 'Enroll a Single Student',
+ help => 'Course_Single_Student',
+ action => 'singlestudent',
+ permission => $permission->{'cusr'},
+ },
+ { text => 'Drop Students',
+ help => 'Course_Drop_Student',
+ action => 'drop',
+ permission => $permission->{'cusr'},
+ });
+ if (!exists($permission->{'cusr_section'})) {
+ push(@courselinks,
+ { text => 'Automated Student Enrollment Manager',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)
&& $permission->{'cusr'}),
url => '/adm/populate',
- },
+ });
+ }
+ push(@courselinks,
{ text => 'Manage Course Groups',
help => 'Course_Manage_Group',
permission => $permission->{'grp_manage'},
url => '/adm/coursegroups?refpage=cusr',
- },
- );
+ });
push(@menu,@courselinks);
}
my $menu_html = '';
@@ -3351,8 +3472,18 @@ sub crumb_utilities {
my $jsback .= qq|
function backPage(formname,prevphase,prevstate) {
- formname.phase.value = prevphase;
- formname.currstate.value = prevstate;
+ if (typeof prevphase == 'undefined') {
+ formname.phase.value = '';
+ }
+ else {
+ formname.phase.value = prevphase;
+ }
+ if (typeof prevstate == 'undefined') {
+ formname.currstate.value = '';
+ }
+ else {
+ formname.currstate.value = prevstate;
+ }
formname.submit();
}
|;
@@ -3394,7 +3525,8 @@ sub course_level_table {
&Apache::loncommon::get_sections($domain,$cnum);
}
}
- foreach my $role ('st','ta','ep','in','cc') {
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
+ foreach my $role (@roles) {
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
my $plrole=&Apache::lonnet::plaintext($role);
$table .= &Apache::loncommon::start_data_table_row().
@@ -3494,6 +3626,7 @@ $table.
sub course_level_dc {
my ($dcdom) = @_;
my %customroles=&Apache::lonuserutils::my_custom_roles();
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
'<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
'<input type="hidden" name="dccourse" value="" />';
@@ -3518,7 +3651,7 @@ sub course_level_dc {
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";
- foreach my $role ('st','ta','ep','in','cc') {
+ foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);
$otheritems .= ' <option value="'.$role.'">'.$plrole;
}