--- loncom/interface/loncreateuser.pm 2009/09/10 23:04:52 1.314
+++ loncom/interface/loncreateuser.pm 2009/10/31 14:27:48 1.321
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.314 2009/09/10 23:04:52 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.321 2009/10/31 14:27:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -468,7 +468,7 @@ sub courserequest_display {
# =================================================================== Phase one
sub print_username_entry_form {
- my ($r,$context,$response,$srch,$forcenewuser) = @_;
+ my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_;
my $defdom=$env{'request.role.domain'};
my $formtoset = 'crtuser';
if (exists($env{'form.startrolename'})) {
@@ -490,7 +490,7 @@ sub print_username_entry_form {
my %loaditems = (
'onload' => "javascript:setFormElements(document.$formtoset)",
);
- my %breadcrumb_text = &singleuser_breadcrumb();
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $start_page =
&Apache::loncommon::start_page('User Management',
$jscript,{'add_entries' => \%loaditems,});
@@ -517,6 +517,7 @@ sub print_username_entry_form {
('make new role' => 'Generate new role ...',%existingroles));
my %lt=&Apache::lonlocal::texthash(
'srst' => 'Search for a user and enroll as a student',
+ 'srme' => 'Search for a user and enroll as a member',
'srad' => 'Search for a user and modify/add user information or roles',
'usr' => "Username",
'dom' => "Domain",
@@ -540,20 +541,24 @@ ENDCUSTOM
} else {
my $actiontext = $lt{'srad'};
if ($env{'form.action'} eq 'singlestudent') {
- $actiontext = $lt{'srst'};
+ if ($crstype eq 'Community') {
+ $actiontext = $lt{'srme'};
+ } else {
+ $actiontext = $lt{'srst'};
+ }
}
$r->print("
<h3>$actiontext</h3>");
if ($env{'form.origform'} ne 'crtusername') {
$r->print("\n".$response);
}
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
}
$r->print(&Apache::loncommon::end_page());
}
sub entry_form {
- my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
+ my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
my ($usertype,$inexact);
if (ref($srch) eq 'HASH') {
@@ -593,6 +598,7 @@ ENDBLOCK
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
my %lt=&Apache::lonlocal::texthash(
'enro' => 'Enroll one student',
+ 'enrm' => 'Enroll one member',
'admo' => 'Add/modify a single user',
'crea' => 'create new user if required',
'uskn' => "username is known",
@@ -604,8 +610,12 @@ ENDBLOCK
);
my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
my ($title,$buttontext,$showresponse);
- if ($env{'form.action'} eq 'singlestudent') {
- $title = $lt{'enro'};
+ if ($env{'form.action'} eq 'singlestudent') {
+ if ($crstype eq 'Community') {
+ $title = $lt{'enrm'};
+ } else {
+ $title = $lt{'enro'};
+ }
$buttontext = $lt{'enrl'};
} else {
$title = $lt{'admo'};
@@ -676,7 +686,7 @@ END
# =================================================================== Phase two
sub print_user_selection_page {
- my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_;
+ my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;
my @fields = ('username','domain','lastname','firstname','permanentemail');
my $sortby = $env{'form.sortby'};
@@ -704,8 +714,10 @@ ENDSCRIPT
my %lt=&Apache::lonlocal::texthash(
'usrch' => "User Search to add/modify roles",
'stusrch' => "User Search to enroll student",
+ 'memsrch' => "User Search to enroll member",
'usel' => "Select a user to add/modify roles",
- 'stusel' => "Select a user to enroll as a student",
+ 'stusel' => "Select a user to enroll as a student",
+ 'memsel' => "Select a user to enroll as a member",
'username' => "username",
'domain' => "domain",
'lastname' => "last name",
@@ -717,7 +729,7 @@ ENDSCRIPT
} else {
$r->print(&Apache::loncommon::start_page('User Management',$jscript));
- my %breadcrumb_text = &singleuser_breadcrumb();
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.usersrchform,'','')",
text=>$breadcrumb_text{'search'},
@@ -729,14 +741,26 @@ ENDSCRIPT
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Change_Privileges'));
$r->print("<b>$lt{'usrch'}</b><br />");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
$r->print('<h3>'.$lt{'usel'}.'</h3>');
} elsif ($env{'form.action'} eq 'singlestudent') {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Add_Student'));
- $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
- $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+ $r->print($jscript."<b>");
+ if ($crstype eq 'Community') {
+ $r->print($lt{'memsrch'});
+ } else {
+ $r->print($lt{'stusrch'});
+ }
+ $r->print("</b><br />");
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
+ $r->print('</form><h3>');
+ if ($crstype eq 'Community') {
+ $r->print($lt{'memsel'});
+ } else {
+ $r->print($lt{'stusel'});
+ }
+ $r->print('</h3>');
}
}
$r->print('<form name="usersrchform" method="post">'.
@@ -811,11 +835,11 @@ sub print_user_query_page {
}
sub print_user_modification_page {
- my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
+ my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_;
if (($ccuname eq '') || ($ccdomain eq '')) {
my $usermsg = &mt('No username and/or domain provided.');
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$usermsg);
+ &print_username_entry_form($r,$context,$usermsg,'','',$crstype);
return;
}
my ($form,$formname);
@@ -856,7 +880,7 @@ sub print_user_modification_page {
,'<a href="'.$helplink.'">','</a>')
.'</p><br />';
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$response);
+ &print_username_entry_form($r,$context,$response,undef,undef,$crstype);
return;
}
$newuser = 1;
@@ -880,7 +904,7 @@ sub print_user_modification_page {
'username');
}
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$userchkmsg);
+ &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype);
return;
}
}
@@ -907,7 +931,7 @@ sub print_user_modification_page {
}
my $start_page =
&Apache::loncommon::start_page('User Management',$js,$args);
- my %breadcrumb_text = &singleuser_breadcrumb();
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage($form)",
text=>$breadcrumb_text{'search'},
@@ -956,6 +980,7 @@ ENDFORMINFO
my %lt=&Apache::lonlocal::texthash(
'cnu' => 'Create New User',
'ast' => 'as a student',
+ 'ame' => 'as a member',
'ind' => 'in domain',
'lg' => 'Login Data',
'hs' => "Home Server",
@@ -974,7 +999,11 @@ $loginscript
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
ENDTITLE
if ($env{'form.action'} eq 'singlestudent') {
- $r->print(' ('.$lt{'ast'}.')');
+ if ($crstype eq 'Community') {
+ $r->print(' ('.$lt{'ame'}.')');
+ } else {
+ $r->print(' ('.$lt{'ast'}.')');
+ }
}
$r->print('</h2>'."\n".'<div class="LC_left_float">');
my $personal_table =
@@ -993,7 +1022,7 @@ $lt{'hs'}: $home_server_pick
$r->print($home_server_pick);
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
+ $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table().
&build_tools_display($ccuname,$ccdomain,
'requestcourses').
@@ -1067,6 +1096,7 @@ ENDAUTH
my %lt=&Apache::lonlocal::texthash(
'cup' => "Modify existing user: ",
'ens' => "Enroll one student: ",
+ 'enm' => "Enroll one member: ",
'id' => "in domain",
);
$r->print(<<ENDCHANGEUSER);
@@ -1076,7 +1106,11 @@ $forminfo
<h2>
ENDCHANGEUSER
if ($env{'form.action'} eq 'singlestudent') {
- $r->print($lt{'ens'});
+ if ($crstype eq 'Community') {
+ $r->print($lt{'enm'});
+ } else {
+ $r->print($lt{'ens'});
+ }
} else {
$r->print($lt{'cup'});
}
@@ -1090,7 +1124,7 @@ ENDCHANGEUSER
$r->print(&Apache::lonuserutils::forceid_change($context));
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
+ $r->print('<h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table());
if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
@@ -1174,7 +1208,13 @@ ENDNOTOOLSPRIV
} ## End of new user/old user logic
if ($env{'form.action'} eq 'singlestudent') {
- $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
+ my $btntxt;
+ if ($crstype eq 'Community') {
+ $btntxt = &mt('Enroll Member');
+ } else {
+ $btntxt = &mt('Enroll Student');
+ }
+ $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
} else {
$r->print('<h3>'.&mt('Add Roles').'</h3>');
my $addrolesdisplay = 0;
@@ -1213,9 +1253,14 @@ ENDNOTOOLSPRIV
}
sub singleuser_breadcrumb {
+ my ($crstype) = @_;
my %breadcrumb_text;
if ($env{'form.action'} eq 'singlestudent') {
- $breadcrumb_text{'search'} = 'Enroll a student';
+ if ($crstype eq 'Community') {
+ $breadcrumb_text{'search'} = 'Enroll a member';
+ } else {
+ $breadcrumb_text{'search'} = 'Enroll a student';
+ }
$breadcrumb_text{'userpicked'} = 'Select a user',
$breadcrumb_text{'modify'} = 'Set section/dates',
} else {
@@ -1430,9 +1475,9 @@ sub display_existing_roles {
}
$row.= '</td><td>'.$plaintext.
'</td><td>'.$area.
- '</td><td>'.($role_start_time?localtime($role_start_time)
+ '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
: ' ' ).
- '</td><td>'.($role_end_time ?localtime($role_end_time)
+ '</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)
: ' ' )
."</td>";
$sortrole{$sortkey}=$envkey;
@@ -1443,7 +1488,7 @@ sub display_existing_roles {
} # end of foreach (table building loop)
my $rolesdisplay = 0;
my %output = ();
- foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
@@ -1463,7 +1508,8 @@ sub display_existing_roles {
if ($rolesdisplay == 1) {
my $contextrole='';
if ($env{'request.course.id'}) {
- $contextrole = 'Existing Roles in this Course';
+ my $crstype = &Apache::loncommon::course_type();
+ $contextrole = "Existing Roles in this $crstype";
} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = 'Existing Co-Author Roles in your Construction Space';
} else {
@@ -1478,7 +1524,7 @@ sub display_existing_roles {
'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());
- foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
@@ -1973,7 +2019,7 @@ sub get_inststatuses {
# ================================================================= Phase Three
sub update_user_data {
- my ($r,$context) = @_;
+ my ($r,$context,$crstype) = @_;
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
$env{'form.ccdomain'});
# Error messages
@@ -1997,7 +2043,7 @@ sub update_user_data {
$jsback."\n".
'// ]]>'."\n".
'</script>'."\n";
- my %breadcrumb_text = &singleuser_breadcrumb();
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $args;
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
@@ -2229,9 +2275,10 @@ sub update_user_data {
}
}
##
- my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+ my (@userroles,%userupdate,$cnum,$cdom,$crstype,$namechanged);
if ($context eq 'course') {
($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+ $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
}
if (! $env{'form.makeuser'} ) {
# Check for need to change
@@ -2315,7 +2362,7 @@ sub update_user_data {
if ($role eq 'cr') {
push(@longroles,'Custom');
} else {
- push(@longroles,&Apache::lonnet::plaintext($role));
+ push(@longroles,&Apache::lonnet::plaintext($role,$crstype));
}
}
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
@@ -2784,9 +2831,14 @@ END
.'</span>');
}
if ($env{'form.action'} eq 'singlestudent') {
- &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
- $r->print('<p><a href="javascript:backPage(document.userupdate)">'.
- &mt('Enroll Another Student').'</a></p>');
+ &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);
+ $r->print('<p><a href="javascript:backPage(document.userupdate)">');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('Enroll Another Member'));
+ } else {
+ $r->print(&mt('Enroll Another Student'));
+ }
+ $r->print('</a></p>');
} else {
my @rolechanges = &update_roles($r,$context);
if ($namechanged) {
@@ -3255,8 +3307,14 @@ sub update_roles {
}
sub enroll_single_student {
- my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
- $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
+ my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;
+ $r->print('<h3>');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('Enrolling Member'));
+ } else {
+ $r->print(&mt('Enrolling Student'));
+ }
+ $r->print('</h3>');
# Remove non alphanumeric values from section
$env{'form.sections'}=~s/\W//g;
@@ -3289,7 +3347,13 @@ sub enroll_single_student {
}
$r->print('.<br />'.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {
- $r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>");
+ $r->print('<p> ');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
+ } else {
+ $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
+ }
+ $r->print('</p>');
}
} else {
$r->print(&mt('unable to enroll').": ".$enroll_result);
@@ -3484,10 +3548,19 @@ sub custom_role_editor {
my $head_script = "\n";
$head_script .= '<script type="text/javascript">'."\n"
.'// <![CDATA['."\n";
- my @template_roles = ("cc","in","ta","ep","st");
+ my $crstype;
+ if ($env{'request.course.id'}) {
+ $crstype = &Apache::loncommon::course_type();
+ }
+ my @template_roles = ("in","ta","ep","st");
+ if ($crstype eq 'Community') {
+ unshift(@template_roles,'co');
+ } else {
+ unshift(@template_roles,'cc');
+ }
foreach my $role (@template_roles) {
$head_script .= &make_script_template($role);
- $button_code .= &make_button_code($role).' ';
+ $button_code .= &make_button_code($role,$crstype).' ';
}
$head_script .= "\n".$jsback."\n"
.'// ]]>'."\n"
@@ -3529,7 +3602,7 @@ ENDCCF
'</th><th>'.$lt{'ssl'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());
foreach my $priv (sort keys %full) {
- my $privtext = &Apache::lonnet::plaintext($priv);
+ my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.$privtext.'</td><td>'.
($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
@@ -3619,8 +3692,8 @@ sub make_script_template {
}
# ----------------------------------------------------------
sub make_button_code {
- my ($role) = @_;
- my $label = &Apache::lonnet::plaintext($role);
+ my ($role,$crstype) = @_;
+ my $label = &Apache::lonnet::plaintext($role,$crstype);
my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
return ($button_code);
}
@@ -3720,9 +3793,10 @@ sub handler {
$r->send_http_header;
return OK;
}
- my $context;
+ my ($context,$crstype);
if ($env{'request.course.id'}) {
$context = 'course';
+ $crstype = &Apache::loncommon::course_type();
} elsif ($env{'request.role'} =~ /^au\./) {
$context = 'author';
} else {
@@ -3741,7 +3815,7 @@ sub handler {
#SD Following files not added to help, because the corresponding .tex-files seem to
#be missing: Course_Approve_Selfenroll,Course_User_Logs,
my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context);
+ &Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {
$env{'user.error.msg'}=
"/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -3756,7 +3830,7 @@ sub handler {
if (! exists($env{'form.action'})) {
$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
- $r->print(&print_main_menu($permission,$context));
+ $r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
$r->print(&header());
@@ -3772,7 +3846,7 @@ sub handler {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {
&Apache::lonuserutils::print_upload_manager_form($r,$context,
- $permission);
+ $permission,$crstype);
} elsif ($env{'form.state'} eq 'enrolling') {
if ($env{'form.datatoken'}) {
&Apache::lonuserutils::upfile_drop_add($r,$context,$permission);
@@ -3797,13 +3871,13 @@ sub handler {
if ($env{'form.srchterm'} !~ /^$match_username$/) {
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$response,$srch);
+ &print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,
- $permission);
+ $permission,$crstype);
}
} elsif ($env{'form.phase'} eq 'get_user_info') {
my ($currstate,$response,$forcenewuser,$results) =
@@ -3813,7 +3887,7 @@ sub handler {
}
if ($currstate eq 'select') {
&print_user_selection_page($r,$response,$srch,$results,
- \@search,$context);
+ \@search,$context,undef,$crstype);
} elsif ($currstate eq 'modify') {
my ($ccuname,$ccdomain);
if (($srch->{'srchby'} eq 'uname') &&
@@ -3831,24 +3905,24 @@ sub handler {
}
&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,
- $permission);
+ $permission,$crstype);
} elsif ($currstate eq 'query') {
&print_user_query_page($r,'createuser');
} else {
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser);
+ $forcenewuser,$crstype);
}
} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
- $context,$permission);
+ $context,$permission,$crstype);
}
} elsif ($env{'form.phase'} eq 'update_user_data') {
- &update_user_data($r,$context);
+ &update_user_data($r,$context,$crstype);
} else {
- &print_username_entry_form($r,$context,undef,$srch);
+ &print_username_entry_form($r,$context,undef,$srch,undef,$crstype);
}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -3883,10 +3957,22 @@ sub handler {
text=>"List Users"});
my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
my $formname = 'studentform';
- if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
- ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =
- &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
- $formname);
+ if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') ||
+ ($env{'form.roletype'} eq 'community'))) {
+ if ($env{'form.roletype'} eq 'course') {
+ ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =
+ &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+ $formname);
+ } elsif ($env{'form.roletype'} eq 'community') {
+ $cb_jscript =
+ &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
+ my %elements = (
+ coursepick => 'radio',
+ coursetotal => 'text',
+ courselist => 'text',
+ );
+ $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
+ }
$jscript .= &verify_user_display();
my $js = &add_script($jscript).$cb_jscript;
my $loadcode =
@@ -3907,19 +3993,25 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
$r->print(&header());
+ my $brtext;
+ if ($crstype eq 'Community') {
+ $brtext = 'Drop Members';
+ } else {
+ $brtext = 'Drop Students';
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',
- text=>"Drop Students"});
+ text=>$brtext});
if (!exists($env{'form.state'})) {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
'Course_Drop_Student'));
- &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
+ &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype);
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',
text=>"Result"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
'Course_Drop_Student'));
&Apache::lonuserutils::update_user_list($r,$context,undef,
$env{'form.action'});
@@ -3929,7 +4021,7 @@ sub handler {
if ($permission->{'cusr'}) {
$r->print(&header(undef,undef,{'no_nav_bar' => 1}).
&Apache::lonuserutils::date_section_selector($context,
- $permission).
+ $permission,$crstype).
&Apache::loncommon::end_page());
} else {
$r->print(&header().
@@ -3994,7 +4086,7 @@ sub handler {
} else {
$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
- $r->print(&print_main_menu($permission,$context));
+ $r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());
}
return OK;
@@ -4038,7 +4130,13 @@ END
###############################################################
# Menu Phase One
sub print_main_menu {
- my ($permission,$context) = @_;
+ my ($permission,$context,$crstype) = @_;
+ my $linkcontext = $context;
+ my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
+ if (($context eq 'course') && ($crstype eq 'Community')) {
+ $linkcontext = lc($crstype);
+ $stuterm = 'Members';
+ }
my %links = (
domain => {
upload => 'Upload a File of Users',
@@ -4055,17 +4153,40 @@ sub print_main_menu {
singleuser => 'Add/Modify a Course User',
listusers => 'Manage Course Users',
},
+ community => {
+ upload => 'Upload a File of Community Users',
+ singleuser => 'Add/Modify a Community User',
+ listusers => 'Manage Community Users',
+ },
+ );
+ my %linktitles = (
+ domain => {
+ singleuser => 'Add a user to the domain, and/or a course or community in the domain.',
+ listusers => 'Show and manage users in this domain.',
+ },
+ author => {
+ singleuser => 'Add a user with a co- or assistant author role.',
+ listusers => 'Show and manage co- or assistant authors.',
+ },
+ course => {
+ singleuser => 'Add a user with a certain role to this course.',
+ listusers => 'Show and manage users in this course.',
+ },
+ community => {
+ singleuser => 'Add a user with a certain role to this community.',
+ listusers => 'Show and manage users in this community.',
+ },
);
my @menu = ( {categorytitle => 'Single Users',
items =>
[
{
- linktext => $links{$context}{'singleuser'},
+ linktext => $links{$linkcontext}{'singleuser'},
icon => 'edit-redo.png',
#help => 'Course_Change_Privileges',
url => '/adm/createuser?action=singleuser',
permission => $permission->{'cusr'},
- linktitle => 'Add a user with a certain role to this course.',
+ linktitle => $linktitles{$linkcontext}{'singleuser'},
},
]},
@@ -4073,7 +4194,7 @@ sub print_main_menu {
items =>
[
{
- linktext => $links{$context}{'upload'},
+ linktext => $links{$linkcontext}{'upload'},
icon => 'sctr.png',
#help => 'Course_Create_Class_List',
url => '/adm/createuser?action=upload',
@@ -4081,12 +4202,12 @@ sub print_main_menu {
linktitle => 'Upload a CSV or a text file containing users.',
},
{
- linktext => $links{$context}{'listusers'},
+ linktext => $links{$linkcontext}{'listusers'},
icon => 'edit-find.png',
#help => 'Course_View_Class_List',
url => '/adm/createuser?action=listusers',
permission => ($permission->{'view'} || $permission->{'cusr'}),
- linktitle => 'Show and manage users of this course.',
+ linktitle => $linktitles{$linkcontext}{'listusers'},
},
]},
@@ -4110,26 +4231,52 @@ sub print_main_menu {
}elsif ($context eq 'course'){
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-
+
+ my %linktext = (
+ 'Course' => {
+ single => 'Add/Modify a Student',
+ drop => 'Drop Students',
+ groups => 'Course Groups',
+ },
+ 'Community' => {
+ single => 'Add/Modify a Member',
+ drop => 'Drop Members',
+ groups => 'Community Groups',
+ },
+ );
+
+ my %linktitle = (
+ 'Course' => {
+ single => 'Add a user with the role of student to this course',
+ drop => 'Remove a student from this course.',
+ groups => 'Manage course groups',
+ },
+ 'Community' => {
+ single => 'Add a user with the role of member to this community',
+ drop => 'Remove a member from this community.',
+ groups => 'Manage community groups',
+ },
+ );
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
- linktext => 'Add/Modify a Student',
+ linktext => $linktext{$crstype}{'single'},
#help => 'Course_Add_Student',
icon => 'list-add.png',
url => '/adm/createuser?action=singlestudent',
permission => $permission->{'cusr'},
- linktitle => 'Add a user with the role student to this course.',
+ linktitle => $linktitle{$crstype}{'single'},
},
);
push(@{ $menu[1]->{items} }, #Category: Multiple Users
{
- linktext => 'Drop Students',
+ linktext => $linktext{$crstype}{'drop'},
icon => 'edit-undo.png',
#help => 'Course_Drop_Student',
url => '/adm/createuser?action=drop',
permission => $permission->{'cusr'},
- linktitle =>'Remove a student from this course.',
+ linktitle => $linktitle{$crstype}{'drop'},
},
);
push(@{ $menu[2]->{items} }, #Category: Administration
@@ -4142,12 +4289,12 @@ sub print_main_menu {
linktitle => 'Configure a custom role.',
},
{
- linktext => 'Course Groups',
+ linktext => $linktext{$crstype}{'groups'},
icon => 'conf.png',
#help => 'Course_Manage_Group',
url => '/adm/coursegroups?refpage=cusr',
permission => $permission->{'grp_manage'},
- linktitle => 'Manage course groups.',
+ linktitle => $linktitle{$crstype}{'groups'},
},
{
linktext => 'Change Logs',
@@ -4172,27 +4319,29 @@ sub print_main_menu {
}
if (!exists($permission->{'cusr_section'})){
-
- push(@{ $menu[2]->{items} },
- {
- linktext => 'Automated Enrollment',
- icon => 'roles.png',
- #help => 'Course_Automated_Enrollment',
- permission => (&Apache::lonnet::auto_run($cnum,$cdom)
- && $permission->{'cusr'}),
- url => '/adm/populate',
- linktitle => 'Automated enrollment manager.',
- },
+ if ($crstype ne 'Community') {
+ push(@{ $menu[2]->{items} },
+ {
+ linktext => 'Automated Enrollment',
+ icon => 'roles.png',
+ #help => 'Course_Automated_Enrollment',
+ permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+ && $permission->{'cusr'}),
+ url => '/adm/populate',
+ linktitle => 'Automated enrollment manager.',
+ }
+ );
+ }
+ push(@{ $menu[2]->{items} },
{
linktext => 'User Self-Enrollment',
icon => 'cstr.png',
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},
- linktitle => 'Configure user self enrollment.',
+ linktitle => 'Configure user self-enrollment.',
},
);
-
}
};
return Apache::lonhtmlcommon::generate_menu(@menu);
@@ -4665,9 +4814,9 @@ sub visible_in_cat {
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my ($cathash,%settable,@vismsgs,$cansetvis);
my %visactions = &Apache::lonlocal::texthash(
- vis => 'Your course currently appears in the Course Catalog for this domain.',
+ vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
- miss => 'Your course does not currently appear in the Course Catalog for this domain.',
+ miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
@@ -4883,6 +5032,7 @@ sub print_userchangelogs_display {
my $formname = 'roleslog';
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $crstype = &Apache::loncommon::course_type();
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
@@ -4921,7 +5071,7 @@ sub print_userchangelogs_display {
}
my (%whodunit,%changed,$version);
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
- $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
+ $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));
my ($minshown,$maxshown);
$minshown = 1;
my $count = 0;
@@ -4990,7 +5140,7 @@ sub print_userchangelogs_display {
if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
$chgcontext = 'selfenroll';
}
- my %lt = &rolechg_contexts();
+ my %lt = &rolechg_contexts($crstype);
if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
$chgcontext = $lt{$chgcontext};
}
@@ -5000,7 +5150,7 @@ sub print_userchangelogs_display {
.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
.'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
- .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td>'
+ .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>'
.'<td>'.$sec.'</td>'
.'<td>'.$chgcontext.'</td>'
.'<td>'.$rolestart.'</td>'
@@ -5092,8 +5242,9 @@ ENDSCRIPT
}
sub role_display_filter {
- my ($formname,$cdom,$cnum,$curr,$version) = @_;
+ my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
my $context = 'course';
+ my $lctype = lc($crstype);
my $nolink = 1;
my $output = '<table><tr><td valign="top">'.
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
@@ -5108,7 +5259,7 @@ sub role_display_filter {
&Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
$curr->{'rolelog_end_date'},undef,
undef,undef,undef,undef,undef,undef,$nolink);
- my %lt = &rolechg_contexts();
+ my %lt = &rolechg_contexts($crstype);
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
'<table><tr><td>'.&mt('After:').
'</td><td>'.$startform.'</td></tr>'.
@@ -5122,13 +5273,13 @@ sub role_display_filter {
$output .= ' selected="selected"';
}
$output .= '>'.&mt('Any').'</option>'."\n";
- my @roles = &Apache::lonuserutils::course_roles($context,undef,1);
+ my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype);
foreach my $role (@roles) {
my $plrole;
if ($role eq 'cr') {
$plrole = &mt('Custom Role');
} else {
- $plrole=&Apache::lonnet::plaintext($role);
+ $plrole=&Apache::lonnet::plaintext($role,$crstype);
}
my $selstr = '';
if ($role eq $curr->{'role'}) {
@@ -5140,7 +5291,7 @@ sub role_display_filter {
'<td> </td>'.
'<td valign="top"><b>'.
&mt('Context:').'</b><br /><select name="chgcontext">';
- foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
+ foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses') {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
$selstr = ' selected="selected"';
@@ -5170,6 +5321,7 @@ sub role_display_filter {
}
sub rolechg_contexts {
+ my ($crstype) = @_;
my %lt = &Apache::lonlocal::texthash (
any => 'Any',
auto => 'Automated enrollment',
@@ -5178,8 +5330,13 @@ sub rolechg_contexts {
course => 'User Management in course',
domain => 'User Management in domain',
selfenroll => 'Self-enrolled',
- requestcourses => 'Course Request',
+ requestcourses => 'Course Request',
);
+ if ($crstype eq 'Community') {
+ $lt{'createcourse'} = &mt('Community Creation');
+ $lt{'course'} = &mt('User Management in community');
+ $lt{'requestcourses'} = &mt('Community Request');
+ }
return %lt;
}
@@ -5695,7 +5852,7 @@ sub course_level_table {
$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
my $area=$coursedata{'description'};
- my $type=$coursedata{'type'};
+ my $crstype=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
my ($domain,$cnum)=split(/\//,$thiscourse);
my %sections_count;
@@ -5705,9 +5862,9 @@ sub course_level_table {
&Apache::loncommon::get_sections($domain,$cnum);
}
}
- my @roles = &Apache::lonuserutils::roles_by_context('course');
+ my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
foreach my $role (@roles) {
- my $plrole=&Apache::lonnet::plaintext($role);
+ my $plrole=&Apache::lonnet::plaintext($role,$crstype);
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt);
@@ -5800,7 +5957,7 @@ sub course_level_dc {
'<input type="hidden" name="dccourse" value="" />';
my $courseform='<b>'.&Apache::loncommon::selectcourse_link
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
- my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+ my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role');
my %lt=&Apache::lonlocal::texthash(
'rol' => "Role",
'grs' => "Section",