[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncreateuser.pm
raeburn
raeburn@source.lon-capa.org
Fri, 14 Aug 2009 16:43:32 -0000
This is a MIME encoded message
--raeburn1250268212
Content-Type: text/plain
raeburn Fri Aug 14 16:43:32 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface loncreateuser.pm
Log:
- Backport 1.306, 1.307,and part of 1.303.
--raeburn1250268212
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090814164332.txt"
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.295.2.6 loncom/interface/loncreateuser.pm:1.295.2.7
--- loncom/interface/loncreateuser.pm:1.295.2.6 Fri Aug 14 15:02:09 2009
+++ loncom/interface/loncreateuser.pm Fri Aug 14 16:43:32 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.295.2.6 2009/08/14 15:02:09 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.7 2009/08/14 16:43:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,7 +68,7 @@
use Apache::lonlocal;
use Apache::longroup;
use Apache::lonuserutils;
-use Apache::selfenroll();
+use Apache::loncoursequeueadmin;
use LONCAPA qw(:DEFAULT :match);
my $loginscript; # piece of javascript used in two separate instances
@@ -216,7 +216,8 @@
sub build_tools_display {
my ($ccuname,$ccdomain,$context) = @_;
- my (@usertools,%userenv,$output);
+ my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
+ $colspan);
my %lt = &Apache::lonlocal::texthash (
'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",
@@ -233,53 +234,123 @@
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial');
@usertools = ('official','unofficial');
+ @options =('norequest','approve','autolimit','validate');
+ %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
+ %reqtitles = &courserequest_titles();
+ %reqdisplay = &courserequest_display();
+ $colspan = ' colspan="2"';
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'tools.aboutme','tools.portfolio','tools.blog');
@usertools = ('aboutme','blog','portfolio');
}
foreach my $item (@usertools) {
- my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
+ my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
+ $currdisp,$custdisp,$custradio);
$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';
$curr_access =
&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
$context);
- if ($userenv{$context.'.'.$item} eq '') {
- $custom_access =
- &mt('Availability determined currently from default setting.');
- if (!$curr_access) {
- $tool_off = 'checked="checked" ';
- $tool_on = '';
- }
- } else {
- $custom_access =
- &mt('Availability determined currently from custom setting.');
+ if ($userenv{$context.'.'.$item} ne '') {
$cust_on = ' checked="checked" ';
$cust_off = '';
- if ($userenv{$context.'.'.$item} == 0) {
- $tool_off = 'checked="checked" ';
- $tool_on = '';
+ }
+ if ($context eq 'requestcourses') {
+ if ($userenv{$context.'.'.$item} eq '') {
+ $custom_access = &mt('Currently from default setting.');
+ } else {
+ $custom_access = &mt('Currently from custom setting.');
+ }
+ } else {
+ if ($userenv{$context.'.'.$item} eq '') {
+ $custom_access =
+ &mt('Availability determined currently from default setting.');
+ if (!$curr_access) {
+ $tool_off = 'checked="checked" ';
+ $tool_on = '';
+ }
+ } else {
+ $custom_access =
+ &mt('Availability determined currently from custom setting.');
+ if ($userenv{$context.'.'.$item} == 0) {
+ $tool_off = 'checked="checked" ';
+ $tool_on = '';
+ }
}
}
$output .= ' <tr class="LC_info_row">'."\n".
- ' <td>'.$lt{$item}.'</td>'."\n".
+ ' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
' </tr>'."\n".
- &Apache::loncommon::start_data_table_row()."\n".
- ' <td>'.$custom_access.(' 'x5).$lt{'avai'}.': '.
- ($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
+ &Apache::loncommon::start_data_table_row()."\n";
+ if ($context eq 'requestcourses') {
+ my ($curroption,$currlimit);
+ $curroption = $userenv{$context.'.'.$item};
+ if (!$curroption) {
+ $curroption = 'norequest';
+ }
+ if ($curroption =~ /^autolimit=(\d*)$/) {
+ $currlimit = $1;
+ $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
+ } else {
+ $currdisp = $reqdisplay{$curroption};
+ }
+ $custdisp = '<table>';
+ foreach my $option (@options) {
+ my $val = $option;
+ if ($option eq 'norequest') {
+ $val = 0;
+ }
+ if ($option eq 'validate') {
+ my $canvalidate = 0;
+ if (ref($validations{$item}) eq 'HASH') {
+ if ($validations{$item}{'_custom_'}) {
+ $canvalidate = 1;
+ }
+ }
+ next if (!$canvalidate);
+ }
+ my $checked = '';
+ if ($option eq $curroption) {
+ $checked = ' checked="checked"';
+ } elsif ($option eq 'autolimit') {
+ if ($curroption =~ /^autolimit/) {
+ $checked = ' checked="checked"';
+ }
+ }
+ $custdisp .= '<tr><td><span class="LC_nobreak"><label>'.
+ '<input type="radio" name="crsreq_'.$item.
+ '" value="'.$val.'"'.$checked.' />'.
+ $reqtitles{$option}.'</label> ';
+ if ($option eq 'autolimit') {
+ $custdisp .= '<input type="text" name="crsreq_'.
+ $item.'_limit" size="1" '.
+ 'value="'.$currlimit.'" />';
+ }
+ $custdisp .= '</span></td></tr>';
+ }
+ $custdisp .= '</table>';
+ $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
+ } else {
+ $currdisp = ($curr_access?&mt('Yes'):&mt('No'));
+ $custdisp = '<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="'.$context.'_'.$item.'"'.
+ ' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'.
+ '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
+ $tool_off.'/>'.&mt('Off').'</label></span>';
+ $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp.
+ '</span>';
+ }
+ $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
+ $lt{'avai'}.': '.$currdisp.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".
- ' <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
+ ' <td style="vertical-align:top;"><span class="LC_nobreak">'.
+ $lt{'chse'}.': <label>'.
'<input type="radio" name="custom'.$item.'" value="0" '.
- $cust_off.'/>'.$lt{'usde'}.'</label> '.
- '<label><input type="radio" name="custom'.$item.'" value="1" '.
- $cust_on.'/>'.$lt{'uscu'}.'</label> -- '.
- $lt{'cusa'}.': <label>'.
- '<input type="radio" name="'.$context.'_'.$item.'" value="1" '.
- $tool_on.'/>'.&mt('On').'</label> <label>'.
- '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
- $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
+ $cust_off.'/>'.$lt{'usde'}.'</label>'.(' ' x3).
+ '<label><input type="radio" name="custom'.$item.'" value="1" '.
+ $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";
}
return $output;
@@ -355,8 +426,10 @@
sub courserequest_titles {
my %titles = &Apache::lonlocal::texthash (
- official => 'Official', unofficial => 'Unofficial',
- community => 'Communities', norequest => 'Not allowed',
+ official => 'Official',
+ unofficial => 'Unofficial',
+ community => 'Communities',
+ norequest => 'Not allowed',
approve => 'Approval by Dom. Coord.',
validate => 'With validation',
autolimit => 'Numerical limit',
@@ -584,7 +657,7 @@
# =================================================================== 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) = @_;
my @fields = ('username','domain','lastname','firstname','permanentemail');
my $sortby = $env{'form.sortby'};
@@ -620,28 +693,32 @@
'firstname' => "first name",
'permanentemail' => "permanent e-mail",
);
- $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+ if ($context eq 'requestcrs') {
+ $r->print('<div>');
+ } else {
+ $r->print(&Apache::loncommon::start_page('User Management',$jscript));
- my %breadcrumb_text = &singleuser_breadcrumb();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:backPage(document.usersrchform,'','')",
- text=>$breadcrumb_text{'search'},
- faq=>282,bug=>'Instructor Interface',},
- {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
- text=>$breadcrumb_text{'userpicked'},
- faq=>282,bug=>'Instructor Interface',});
- if ($env{'form.action'} eq 'singleuser') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ my %breadcrumb_text = &singleuser_breadcrumb();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.usersrchform,'','')",
+ text=>$breadcrumb_text{'search'},
+ faq=>282,bug=>'Instructor Interface',},
+ {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+ text=>$breadcrumb_text{'userpicked'},
+ faq=>282,bug=>'Instructor Interface',});
+ if ($env{'form.action'} eq 'singleuser') {
+ $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('<h3>'.$lt{'usel'}.'</h3>');
- } elsif ($env{'form.action'} eq 'singlestudent') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ $r->print("<b>$lt{'usrch'}</b><br />");
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+ $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>$lt{'stusrch'}</b><br />");
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+ $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+ }
}
$r->print('<form name="usersrchform" method="post">'.
&Apache::loncommon::start_data_table()."\n".
@@ -666,8 +743,20 @@
foreach my $user (@sorted_users) {
my ($uname,$udom) = split(/:/,$user);
+ my $onclick;
+ if ($context eq 'requestcrs') {
+ $onclick =
+ 'onclick="javascript:gochoose('."'$uname','$udom',".
+ "'$srch_results->{$user}->{firstname}',".
+ "'$srch_results->{$user}->{lastname}',".
+ "'$srch_results->{$user}->{permanentemail}'".');"';
+ } else {
+ $onclick =
+ ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
+ }
$r->print(&Apache::loncommon::start_data_table_row().
- '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'.
+ '<td><input type="button" name="seluser" value="'.&mt('Select').'" '.
+ $onclick.' /></td>'.
'<td><tt>'.$uname.'</tt></td>'.
'<td><tt>'.$udom.'</tt></td>');
foreach my $field ('lastname','firstname','permanentemail') {
@@ -687,7 +776,11 @@
' <input type="hidden" name="currstate" value="select" />'."\n".
' <input type="hidden" name="phase" value="get_user_info" />'."\n".
' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
- $r->print($response.'</form>'.&Apache::loncommon::end_page());
+ if ($context eq 'requestcrs') {
+ $r->print($opener_elements.'</form></div>');
+ } else {
+ $r->print($response.'</form>'.&Apache::loncommon::end_page());
+ }
}
sub print_user_query_page {
@@ -978,7 +1071,7 @@
$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?').'</h3>'.
+ $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table());
if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
@@ -2063,7 +2156,13 @@
}
}
foreach my $item (@requestcourses) {
- $newcustom{$item} = $env{'form.requestcourses_'.$item};
+ $newcustom{$item} = $env{'form.crsreq_'.$item};
+ if ($env{'form.crsreq_'.$item} eq 'autolimit') {
+ $newcustom{$item} .= '=';
+ unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {
+ $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
+ }
+ }
$changed{$item} = &tool_admin($item,$newcustom{$item},
\%changeHash,'requestcourses');
}
@@ -2712,8 +2811,7 @@
my $cdom = $env{'request.role.domain'};
foreach my $tool (@{$usertools}) {
$oldaccesstext->{$tool} = &mt('no');
- $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool
-};
+ $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($userenv->{$context.'.'.$tool} eq '') {
if ($env{'form.'.$context.'_'.$tool}) {
$changed->{$tool}=&tool_admin($tool,$cdom,
@@ -2730,8 +2828,7 @@
my $newop = $env{'form.'.$context.'_'.$tool};
if ($newop eq 'autolimit') {
$newop .= '=';
- unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/
-) {
+ unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
$newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
}
}
@@ -2752,7 +2849,6 @@
}
} elsif ($env{'form.'.$context.'_'.$tool}) {
$changedoms = 1;
- $changedoms = 1;
@new = sort(@curr,$cdom.':'.$newop);
}
$newaccesstext->{$tool} = $oldaccesstext->{$tool};
@@ -2784,6 +2880,15 @@
return;
}
foreach my $tool (@{$usertools}) {
+ my $newval;
+ if ($context eq 'requestcourses') {
+ $newval = $env{'form.crsreq_'.$tool};
+ if ($newval eq 'autolimit') {
+ $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
+ }
+ } else {
+ $newval = $env{'form.'.$context.'_'.$tool};
+ }
if ($userenv->{$context.'.'.$tool} ne '') {
$oldaccess->{$tool} = &mt('custom');
if ($userenv->{$context.'.'.$tool}) {
@@ -2793,12 +2898,12 @@
}
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($env{'form.custom'.$tool} == 1) {
- if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
- $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
- $changeHash,$context);
+ if ($newval ne $userenv->{$context.'.'.$tool}) {
+ $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
+ $context);
if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');
- if ($env{'form.'.$context.'_'.$tool}) {
+ if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -2822,20 +2927,20 @@
} else {
$newaccess->{$tool} = $oldaccess->{$tool};
if ($userenv->{$context.'.'.$tool}) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
+ $newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
+ $newaccesstext->{$tool} = &mt("availability set to 'off'");
}
}
}
} else {
$oldaccess->{$tool} = &mt('default');
if ($env{'form.custom'.$tool} == 1) {
- $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
- $changeHash,$context);
+ $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
+ $context);
if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');
- if ($env{'form.'.$context.'_'.$tool}) {
+ if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -3826,11 +3931,14 @@
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
+ my $coursedesc = $env{'course.'.$cid.'.description'};
if (!exists($env{'form.state'})) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests',
'Course_SelfEnrollment_Approval'));
$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
- &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom);
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+ $cdom,$cnum));
+
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=selfenrollqueue',
@@ -3838,7 +3946,8 @@
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result',
'Course_Self_Enrollment'));
$r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
- &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom);
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+ $cdom,$cnum,$coursedesc));
}
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'changelogs') {
@@ -4475,279 +4584,6 @@
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('<form method="post" name="changequeue" action="/adm/createuser" />'.
- '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
- '<input type="hidden" name="state" value="done" />'.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '<th>'.&mt('Action').'</th>'.
- '<th>'.&mt('Requestor').'</th>'.
- '<th>'.&mt('Section').'</th>'.
- '<th>'.&mt('Date requested').'</th>'.
- &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().
- '<td><span class="LC_nobreak"><label>'.
- '<input type="checkbox" value="'.$count.':'.$puname.':'.$pudom.':'.$pusec.'" name="approvereq" />'.&mt('Approve').'</label></span><br />'.
- '<span class="LC_nobreak"><label>'.
- '<input type="checkbox" value="'.$puname.':'.$pudom.'" name="rejectreq" />'.&mt('Reject').'</label></span><br /></td>'.
- '<td>'.$namelink.'</td>'.
- '<td>'.$showsec.'</td>'.
- '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
- &Apache::loncommon::end_data_table_row());
- $count ++;
- }
- }
- }
- $r->print(&Apache::loncommon::end_data_table().
- '<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>');
- } 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('<p>'.&mt('The following were enrolled in the course:').'<ul>');
- foreach my $user (@enrolled) {
- my ($uname,$udom) = split(/:/,$user);
- my $userlink =
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
- $r->print('<li>'.$userlink.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@rejections) {
- $rejectedlist = join("\n",@rejections);
- $r->print('<p>'.&mt('The following enrollment requests were rejected:').'<ul>');
- foreach my $user (@rejections) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid,
- $coursedesc,$now,'managers',
- $sender,$approvedlist,$rejectedlist);
- }
- }
- if (@existing) {
- $r->print('<p>'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'<ul>');
- foreach my $user (@existing) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@missingreq) {
- $r->print('<p>'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'<ul>');
- foreach my $user (@missingreq) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@invalidusers) {
- $r->print('<p>'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'<ul>');
- foreach my $user (@invalidusers) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@limitexceeded) {
- $r->print('<p>'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'<ul>');
- foreach my $user (@limitexceeded) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@enrollerrors) {
- $r->print('<p>'.&mt('The following enrollment requests could not be processed because an error occurred:').'<ul>');
- foreach my $user (@enrollerrors) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@warn_approves) {
- $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
- foreach my $user (@warn_approves) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- if (@warn_rejects) {
- $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
- foreach my $user (@warn_rejects) {
- $r->print('<li>'.$user.'</li>');
- }
- $r->print('</ul></p>');
- }
- 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);
@@ -5182,13 +5018,22 @@
}
$output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
}
- $output .= '</select></td><td> </td><td valign="middle"><input type="submit" value="'.
- &mt('Update Display').'" /></tr></table>'.
- '<span class="LC_roleslog_note">'.
- &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+ $output .= '</select></td>'
+ .'</tr></table>';
+
+ # Update Display button
+ $output .= '<p>'
+ .'<input type="submit" value="'.&mt('Update Display').'" />'
+ .'</p>';
+
+ # Server version info
+ $output .= '<p style="font-size: smaller;" class="LC_info">'
+ .&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].','<b>','</b>',$version); }
- $output .= '</span><hr /><br />';
+ $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+ }
+ $output .= '</p><hr /><br />';
return $output;
}
@@ -5582,22 +5427,20 @@
$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 = '<span class="LC_cusr_emph">'.$createdom.'</span>'
+ &Apache::lonuserutils::can_create_user($createdom,$context);
+ my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
if ($cancreate) {
my $showdom = &display_domain_info($createdom);
$response .= '<br /><br />'
.'<b>'.&mt('To add a new user:').'</b>'
.'<br />';
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 .= '<ul><li>'
.&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')
.'</li><li>'
@@ -5611,8 +5454,7 @@
my $helplink = ' href="javascript:helpMenu('."'display'".')"';
$response .= '<br /><br />';
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);
}
--raeburn1250268212--