';
foreach my $option (@options) {
if ($option eq 'validate') {
my $canvalidate = 0;
@@ -336,18 +420,21 @@ sub coursereq_externaluser {
if ($option eq $curroption) {
$checked = ' checked="checked"';
}
- $output .= ''."\n".
+ $output .= '
'."\n".
&Apache::loncommon::end_data_table_row()."\n";
}
return $output;
@@ -355,28 +442,31 @@ sub coursereq_externaluser {
sub courserequest_titles {
my %titles = &Apache::lonlocal::texthash (
- official => 'Official', unofficial => 'Unofficial',
- community => 'Communities', norequest => 'Not allowed',
- approve => 'Approval by Dom. Coord.',
+ official => 'Official',
+ unofficial => 'Unofficial',
+ community => 'Communities',
+ norequest => 'Not allowed',
+ approval => 'Approval by Dom. Coord.',
validate => 'With validation',
autolimit => 'Numerical limit',
+ unlimited => '(blank for unlimited)',
);
- return %titles;
-}
-
+ return %titles;
+}
+
sub courserequest_display {
my %titles = &Apache::lonlocal::texthash (
- approve => 'Yes, need approval',
+ approval => 'Yes, need approval',
validate => 'Yes, with validation',
norequest => 'No',
- );
+ );
return %titles;
}
# =================================================================== 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'})) {
@@ -398,7 +488,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,});
@@ -425,6 +515,8 @@ 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",
@@ -448,20 +540,23 @@ 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("
-
$actiontext
");
+ $r->print("
$actiontext
");
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') {
@@ -501,6 +596,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",
@@ -513,7 +609,11 @@ ENDBLOCK
my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
my ($title,$buttontext,$showresponse);
if ($env{'form.action'} eq 'singlestudent') {
- $title = $lt{'enro'};
+ if ($crstype eq 'Community') {
+ $title = $lt{'enrm'};
+ } else {
+ $title = $lt{'enro'};
+ }
$buttontext = $lt{'enrl'};
} else {
$title = $lt{'admo'};
@@ -584,7 +684,7 @@ END
# =================================================================== Phase two
sub print_user_selection_page {
- my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_;
+ my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;
my @fields = ('username','domain','lastname','firstname','permanentemail');
my $sortby = $env{'form.sortby'};
@@ -612,36 +712,54 @@ 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",
'firstname' => "first name",
'permanentemail' => "permanent e-mail",
);
- $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+ if ($context eq 'requestcrs') {
+ $r->print('
');
# Remove non alphanumeric values from section
$env{'form.sections'}=~s/\W//g;
@@ -3151,7 +3341,13 @@ sub enroll_single_student {
}
$r->print('. '.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {
- $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('
');
+ 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('
');
}
} else {
$r->print(&mt('unable to enroll').": ".$enroll_result);
@@ -3346,10 +3542,19 @@ sub custom_role_editor {
my $head_script = "\n";
$head_script .= ''."\n";
}
@@ -3897,7 +4113,14 @@ 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',
@@ -3914,8 +4137,12 @@ sub print_main_menu {
singleuser => 'Add/Modify a Single Course User',
listusers => 'Display Class Lists and Manage Multiple Users',
},
+ community => {
+ upload => 'Upload a File of Community Users',
+ singleuser => 'Add/Modify a Community User',
+ listusers => 'Manage Community Users',
+ },
);
-
my @menu =
(
{ text => $links{$context}{'upload'},
@@ -3957,18 +4184,21 @@ sub print_main_menu {
permission => $permission->{'cusr'},
});
if (!exists($permission->{'cusr_section'})) {
- push(@courselinks,
- { text => 'Automated Enrollment Manager',
- help => 'Course_Automated_Enrollment',
- permission => (&Apache::lonnet::auto_run($cnum,$cdom)
- && $permission->{'cusr'}),
- url => '/adm/populate',
- },
- { text => 'Configure User Self-enrollment',
- help => 'Course_Self_Enrollment',
- action => 'selfenroll',
- permission => $permission->{'cusr'},
- });
+ if ($crstype ne 'Community') {
+ push(@courselinks,
+ { text => 'Automated Enrollment Manager',
+ help => 'Course_Automated_Enrollment',
+ permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+ && $permission->{'cusr'}),
+ url => '/adm/populate',
+ });
+ }
+ push(@courselinks,
+ { text => 'Configure User Self-enrollment',
+ help => 'Course_Self_Enrollment',
+ action => 'selfenroll',
+ permission => $permission->{'cusr'},
+ });
}
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
push(@courselinks,
@@ -4475,287 +4705,14 @@ ENDSCRIPT
return;
}
-sub display_selfenroll_queue {
- my ($r,$context,$permission,$cnum,$cdom) = @_;
- my $namespace = 'selfenrollrequests';
- my ($output,%queue_by_date);
- my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
- if (keys(%requesthash) > 0) {
- $r->print(''.
- ''.
- ''.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '
'.&mt('Action').'
'.
- '
'.&mt('Requestor').'
'.
- '
'.&mt('Section').'
'.
- '
'.&mt('Date requested').'
'.
- &Apache::loncommon::end_data_table_header_row());
- foreach my $item (keys(%requesthash)) {
- my ($timestamp,$usec) = split(/:/,$requesthash{$item});
- if (exists($queue_by_date{$timestamp})) {
- if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
- push(@{$queue_by_date{$timestamp}},$item.':'.$usec);
- }
- } else {
- @{$queue_by_date{$timestamp}} = ($item.':'.$usec);
- }
- }
- my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- my $count = 0;
- foreach my $item (@sortedtimes) {
- if (ref($queue_by_date{$item}) eq 'ARRAY') {
- foreach my $request (sort(@{$queue_by_date{$item}})) {
- my ($puname,$pudom,$pusec) = split(/:/,$request);
- my $showsec = $pusec;
- if ($showsec eq '') {
- $showsec = &mt('none');
- }
- my $namelink = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($puname,$pudom),
- $puname,$pudom);
- $r->print(&Apache::loncommon::start_data_table_row().
- '
'.
- '
'.
- '
'.$namelink.'
'.
- '
'.$showsec.'
'.
- '
'.&Apache::lonlocal::locallocaltime($item).'
'.
- &Apache::loncommon::end_data_table_row());
- $count ++;
- }
- }
- }
- $r->print(&Apache::loncommon::end_data_table().
- '');
- } else {
- $r->print(&mt('There are currently no enrollment requests.'));
- }
- return;
-}
-
-sub update_selfenroll_queue {
- my ($r,$context,$permission,$cid,$cnum,$cdom) = @_;
- my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
- my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
- my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};
- my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};
- my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
- my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
- my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
- my $namespace = 'selfenrollrequests';
- my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
- my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
- my $coursedesc = $env{'course.'.$cid.'.description'};
- my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
- my $hostname = &Apache::lonnet::hostname($chome);
- my $protocol = $Apache::lonnet::protocol{$chome};
- $protocol = 'http' if ($protocol ne 'https');
- my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,
- @enrollerrors,@warn_approves,@warn_rejects);
- my $now = time;
- my $sender = $env{'user.name'}.':'.$env{'user.domain'};
- my $approvedmsg = [{
- mt => 'Your request for enrollment has been approved.',
- },
- {
- mt => 'Visit [_1], to log-in and access the course',
- args => [$protocol.'://'.$hostname],
- }];
-
- my $rejectedmsg = [{
- mt => 'Your request for enrollment has not been approved.',
- }];
- foreach my $item (sort {$a <=> $b} @approvals) {
- my ($num,$uname,$udom,$usec) = split(/:/,$item);
- my $uhome = &Apache::lonnet::homeserver($uname,$udom);
- if ($uhome ne 'no_host') {
- if (exists($requesthash{$uname.':'.$udom})) {
-
- if (exists($classlist->{$uname.':'.$udom})) {
- if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
- if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
- ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) {
- push(@existing,$uname.':'.$udom);
- next;
- }
- }
- }
- } else {
- push(@missingreq,$uname.':'.$udom);
- next;
- }
- if (!grep(/^\Q$item\E$/,@rejections)) {
- if ($limit eq 'allstudents') {
- if ($stucounts->{$limit} >= $cap) {
- push(@limitexceeded,$uname.':'.$udom);
- last;
- }
- } elsif ($limit eq 'selfenrolled') {
- if ($stucounts->{$limit} >= $cap) {
- push(@limitexceeded,$uname.':'.$udom);
- last;
- }
- }
- my $result =
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
- if ($result eq 'ok') {
- push(@enrolled,$uname.':'.$udom);
- $stucounts->{'allstudents'} ++;
- $stucounts->{'selfenrolled'} ++;
- &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid,
- $coursedesc,$now,'enroller',$sender);
- my %userrequest = (
- $cdom.'_'.$cnum => {
- timestamp => $now,
- section => $usec,
- adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
- status => 'approved',
- }
- );
- my $userresult =
- &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
- if ($userresult ne 'ok') {
- push(@warn_approves,$uname.':'.$udom);
- }
- } else {
- push(@enrollerrors,$uname.':'.$udom);
- }
- }
- } else {
- push(@invalidusers,$uname.':'.$udom);
- }
- }
- my @changes = (@enrolled,@rejections);
- if (@rejections) {
- foreach my $user (@rejections) {
- &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid,
- $coursedesc,$now,'enroller',$sender);
- my ($uname,$udom) = split(/:/,$user);
- my %userrequest = (
- $cdom.'_'.$cnum => {
- timestamp => $now,
- adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
- status => 'rejected',
- }
- );
- my $userresult =
- &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
- if ($userresult ne 'ok') {
- push(@warn_rejects,$user);
- }
- }
- }
- if (@changes) {
- my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);
- if ($delresult eq 'ok') {
- my $namelink =
- &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
- my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
- my ($approvedlist,$rejectedlist);
- if (@enrolled) {
- $approvedlist = join("\n",@enrolled);
- $r->print('
'.&mt('The following were enrolled in the course:').'
');
- foreach my $user (@enrolled) {
- my ($uname,$udom) = split(/:/,$user);
- my $userlink =
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
- $r->print('
'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'
');
- foreach my $user (@existing) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@missingreq) {
- $r->print('
'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'
');
- foreach my $user (@missingreq) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@invalidusers) {
- $r->print('
'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'
');
- foreach my $user (@invalidusers) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@limitexceeded) {
- $r->print('
'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'
');
- foreach my $user (@limitexceeded) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@enrollerrors) {
- $r->print('
'.&mt('The following enrollment requests could not be processed because an error occurred:').'
');
- foreach my $user (@enrollerrors) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@warn_approves) {
- $r->print('
'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'
');
- foreach my $user (@warn_approves) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- if (@warn_rejects) {
- $r->print('
'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'
');
- foreach my $user (@warn_rejects) {
- $r->print('
'.$user.'
');
- }
- $r->print('
');
- }
- return;
-}
-
-sub get_student_counts {
- my ($cdom,$cnum) = @_;
- my (%idx,%stucounts);
- my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
- $idx{'type'} = &Apache::loncoursedata::CL_TYPE();
- $idx{'status'} = &Apache::loncoursedata::CL_STATUS();
- while (my ($student,$data) = each(%$classlist)) {
- if (($data->[$idx{'status'}] eq 'Active') ||
- ($data->[$idx{'status'}] eq 'Future')) {
- if ($data->[$idx{'type'}] eq 'selfenroll') {
- $stucounts{'selfenroll'} ++;
- }
- $stucounts{'allstudents'} ++;
- }
- }
- return (\%stucounts,\%idx,$classlist);
-}
-
sub visible_in_cat {
my ($cdom,$cnum) = @_;
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:',
@@ -4971,6 +4928,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); }
@@ -5009,7 +4967,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 $showntablehdr = 0;
my $tablehdr = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
@@ -5085,11 +5043,11 @@ 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};
}
- $r->print(&Apache::loncommon::start_data_table_row().'
'.&Apache::loncommon::end_data_table_row()."\n");
}
if ($showntablehdr) {
$r->print(&Apache::loncommon::end_data_table().' ');
@@ -5130,8 +5088,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 = '
'.
''.&mt('Changes/page:').' '.
@@ -5146,7 +5105,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 .= '
'.&mt('Window during which changes occurred:').'
'.&mt('After:').
'
'.$startform.'
'.&mt('Before:').'
'.
$endform.'
'.
@@ -5156,13 +5115,13 @@ sub role_display_filter {
$output .= ' selected="selected"';
}
$output .= '>'.&mt('Any').''."\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'}) {
@@ -5172,7 +5131,7 @@ sub role_display_filter {
}
$output .= '
'.
&mt('Context:').'
'.
- ''.
- &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+ $output .= ''
+ .'';
+
+ # Update Display button
+ $output .= '
'
+ .''
+ .'
';
+
+ # Server version info
+ $output .= '
'
+ .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+ ,'2.6.99.0');
if ($version) {
- $output .= ' '.&mt('This server is version [_3].','','',$version); }
- $output .= '
';
+ $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+ }
+ $output .= ' ';
return $output;
}
sub rolechg_contexts {
+ my ($crstype) = @_;
my %lt = &Apache::lonlocal::texthash (
any => 'Any',
auto => 'Automated enrollment',
@@ -5200,8 +5169,14 @@ sub rolechg_contexts {
createcourse => 'Course Creation',
course => 'User Management in course',
domain => 'User Management in domain',
- selfenroll => 'Self-enrolled',
+ selfenroll => 'Self-enrolled',
+ 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;
}
@@ -5285,6 +5260,15 @@ sub user_search_result {
&build_search_response($context,$srch,%srch_results);
} else {
$currstate = 'modify';
+ my $uname = $srch->{'srchterm'};
+ my $udom = $srch->{'srchdomain'};
+ $srch_results{$uname.':'.$udom} =
+ { &Apache::lonnet::get('environment',
+ ['firstname',
+ 'lastname',
+ 'permanentemail'],
+ $udom,$uname)
+ };
}
} else {
%srch_results = &Apache::lonnet::usersearch($srch);
@@ -5582,22 +5566,20 @@ sub build_search_response {
$createdom = $env{'form.coursedom'};
}
}
-
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) {
my $cancreate =
- &Apache::lonuserutils::can_create_user($cretedom,$context);
- my $targetdom = ''.$createdom.''
+ &Apache::lonuserutils::can_create_user($createdom,$context);
+ my $targetdom = ''.$createdom.'';
if ($cancreate) {
my $showdom = &display_domain_info($createdom);
$response .= '
'
.''.&mt('To add a new user:').''
.' ';
if ($context eq 'requestcrs') {
- $response .= &mt("(You can only define new users i
-n the new course's domain - [_1])",$targetdom);
+ $response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom);
} else {
- $response .= &mt("(You can only create new users i
-n your current role's domain - [_1])",$targetdom); }
+ $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom);
+ }
$response .= '
'
.&mt("Set 'Domain/institution to search' to: [_1]",''.$showdom.'')
.'
'
@@ -5611,8 +5593,7 @@ n your current role's domain - [_1])",$t
my $helplink = ' href="javascript:helpMenu('."'display'".')"';
$response .= '
';
if ($context eq 'requestcrs') {
- $response .= &mt("You are not authorized to define
-d new users in the new course's domain - [_1].",$targetdom);
+ $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
} else {
$response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
}
@@ -5711,7 +5692,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;
@@ -5723,7 +5704,7 @@ sub course_level_table {
}
my @roles = &Apache::lonuserutils::roles_by_context('course');
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);
@@ -5816,7 +5797,7 @@ sub course_level_dc {
'';
my $courseform=''.&Apache::loncommon::selectcourse_link
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'';
- my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+ my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser');
my %lt=&Apache::lonlocal::texthash(
'rol' => "Role",
'grs' => "Section",
@@ -6124,7 +6105,7 @@ sub update_selfenroll_config {
if ($currlimit eq 'allstudents') {
$newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
} elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
- $newval = &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap);
+ $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap);
}
}
$r->print('