--- loncom/interface/loncreateuser.pm 2009/02/02 00:12:01 1.275
+++ loncom/interface/loncreateuser.pm 2009/04/05 17:04:56 1.289
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.275 2009/02/02 00:12:01 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.289 2009/04/05 17:04:56 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,6 +68,7 @@ use Apache::loncommon;
use Apache::lonlocal;
use Apache::longroup;
use Apache::lonuserutils;
+use Apache::selfenroll();
use LONCAPA qw(:DEFAULT :match);
my $loginscript; # piece of javascript used in two separate instances
@@ -226,9 +227,9 @@ sub build_tools_display {
'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',
);
- if ($context eq 'requestcourse') {
+ if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
- 'requestcourse.official','requestcourse.unofficial');
+ 'requestcourses.official','requestcourses.unofficial');
@usertools = ('official','unofficial');
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
@@ -336,7 +337,7 @@ sub print_username_entry_form {
'dom' => "Domain",
'ecrp' => "Edit Custom Role Privileges",
'nr' => "Name of Role",
- 'cre' => "Custom Role Editor",
+ 'cre' => "Next",
);
$r->print($start_page."\n".$crumbs);
if ($env{'form.action'} eq 'custom') {
@@ -346,7 +347,7 @@ sub print_username_entry_form {
$lt{'ecrp'}
-$lt{'nr'}: $choice
+$choice $lt{'nr'}:
ENDCUSTOM
@@ -869,7 +870,7 @@ ENDCHANGEUSER
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print(''.&mt('User Can Request Creation of Courses?').' '.
&Apache::loncommon::start_data_table().
- &build_tools_display($ccuname,$ccdomain,'requestcourse').
+ &build_tools_display($ccuname,$ccdomain,'requestcourses').
&Apache::loncommon::end_data_table());
}
$r->print('');
@@ -900,7 +901,7 @@ ENDNOPORTPRIV
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(
'utav' => "User Tools Availability",
- 'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.",
+ 'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.",
'ifch' => "If a change is required, contact a domain coordinator for the domain",
);
$user_tools_text = < "Generation",
'permanentemail' => "Permanent e-mail address",
'id' => "Student/Employee ID",
- 'lg' => "Login Data"
+ 'lg' => "Login Data",
+ 'inststatus' => "Affiliation",
);
my %textboxsize = (
firstname => '15',
@@ -1586,11 +1591,15 @@ sub personal_data_display {
}
} else {
if ($context eq 'selfcreate') {
- if ($canmodify{$item}) {
- $row .= ' ';
- $editable ++;
+ if (($item eq 'permanentemail') && ($newuser eq 'email')) {
+ $row .= $ccuname;
} else {
- $hiderow = 1;
+ if ($canmodify{$item}) {
+ $row .= ' ';
+ $editable ++;
+ } else {
+ $hiderow = 1;
+ }
}
} else {
$row .= ' ';
@@ -1612,6 +1621,30 @@ sub personal_data_display {
$rowcount ++;
}
}
+ if (($canmodify_status{'inststatus'}) || ($context ne 'selfcreate')) {
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain);
+ if (ref($types) eq 'ARRAY') {
+ if (@{$types} > 0) {
+ my ($hiderow,$shown);
+ if ($canmodify_status{'inststatus'}) {
+ $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types);
+ } else {
+ $shown .= $userenv{'inststatus'};
+ if ($userenv{'inststatus'} eq '') {
+ $hiderow = 1;
+ }
+ }
+ if (!$hiderow) {
+ my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".
+ $shown.&Apache::lonhtmlcommon::row_closure(1);
+ if ($context eq 'selfcreate') {
+ $rowcount ++;
+ }
+ $output .= $row;
+ }
+ }
+ }
+ }
$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {
if ($context eq 'selfcreate') {
@@ -1624,6 +1657,48 @@ sub personal_data_display {
}
}
+sub pick_inst_statuses {
+ my ($curr,$usertypes,$types) = @_;
+ my ($output,$rem,@currtypes);
+ if ($curr ne '') {
+ @currtypes = map { &unescape($_); } split(/:/,$curr);
+ }
+ my $numinrow = 2;
+ if (ref($types) eq 'ARRAY') {
+ $output = '';
+ }
+ return $output;
+}
+
sub selfcreate_canmodify {
my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
if (ref($inst_results) eq 'HASH') {
@@ -1712,8 +1787,8 @@ sub update_user_data {
}
if ( $env{'form.ccuname'} ne
&LONCAPA::clean_username($env{'form.ccuname'}) ) {
- $r->print($error.&mt('Invalid login name').'. '.
- &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
+ $r->print($error.&mt('Invalid login name.').' '.
+ &mt('Only letters, numbers, periods, dashes, @, and underscores are valid.').
$end.$rtnlink);
return;
}
@@ -1723,8 +1798,8 @@ sub update_user_data {
}
if ( $env{'form.ccdomain'} ne
&LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
- $r->print($error.&mt ('Invalid domain name').'. '.
- &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
+ $r->print($error.&mt('Invalid domain name.').' '.
+ &mt('Only letters, numbers, periods, dashes, and underscores are valid.').
$end.$rtnlink);
return;
}
@@ -1773,6 +1848,8 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @usertools = ('aboutme','blog','portfolio');
my @requestcourses = ('official','unofficial');
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
if ($env{'form.makeuser'}) {
$r->print(''.&mt('Creating new account.').' ');
# Check for the authentication mode and password
@@ -1850,11 +1927,16 @@ sub update_user_data {
\%changeHash,'tools');
}
}
- if (&Apache::lonnet::allowed('ccc',$env{'request.domain'})) {
- foreach my $item (@requestcourses) {
- $newcustom{$item} = $env{'form.requestcourse_'.$item};
- $changed{$item} = &tool_admin($item,$newcustom{$item},
- \%changeHash,'requestcourse');
+ foreach my $item (@requestcourses) {
+ $newcustom{$item} = $env{'form.requestcourses_'.$item};
+ $changed{$item} = &tool_admin($item,$newcustom{$item},
+ \%changeHash,'requestcourses');
+ }
+ if (exists($env{'form.inststatus'})) {
+ my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
+ if (@inststatuses > 0) {
+ $changeHash{'inststatus'} = join(',',@inststatuses);
+ $changed{'inststatus'} = $changeHash{'inststatus'};
}
}
if (keys(%changed)) {
@@ -1901,8 +1983,8 @@ sub update_user_data {
my %userenv = &Apache::lonnet::get
('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
- 'tools.blog','tools.portfolio','requestcourse.official',
- 'requestcourse.unofficial'],
+ 'tools.blog','tools.portfolio','requestcourses.official',
+ 'requestcourses.unofficial'],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -2025,12 +2107,13 @@ sub update_user_data {
}
}
}
- my ($quotachanged,$oldportfolioquota,$newportfolioquota,
- $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
- $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext);
+ my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus,
+ $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext,
+ $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext,
+ $oldinststatuses,$newinststatuses);
my ($defquota,$settingstatus) =
&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
- my ($showquota,$showtools,$showrequestcourses);
+ my ($showquota,$showtools,$showrequestcourses,$showinststatus);
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$showquota = 1;
}
@@ -2040,7 +2123,46 @@ sub update_user_data {
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
$showrequestcourses = 1;
}
+ if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
+ $showinststatus = 1;
+ }
my (%changeHash,%changed);
+ $oldinststatus = $userenv{'inststatus'};
+ if ($oldinststatus eq '') {
+ $oldinststatuses = $othertitle;
+ } else {
+ if (ref($usertypes) eq 'HASH') {
+ $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'})));
+ } else {
+ $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'})));
+ }
+ }
+ $changeHash{'inststatus'} = $userenv{'inststatus'};
+ my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles);
+ if ($canmodify_inststatus{'inststatus'}) {
+ if (exists($env{'form.inststatus'})) {
+ my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
+ if (@inststatuses > 0) {
+ $newinststatus = join(':',map { &escape($_); } @inststatuses);
+ $changeHash{'inststatus'} = $newinststatus;
+ if ($newinststatus ne $oldinststatus) {
+ $changed{'inststatus'} = $newinststatus;
+ }
+ if (ref($usertypes) eq 'HASH') {
+ $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
+ } else {
+ $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
+ }
+ } else {
+ $newinststatus = '';
+ $changeHash{'inststatus'} = $newinststatus;
+ $newinststatuses = $othertitle;
+ if ($newinststatus ne $oldinststatus) {
+ $changed{'inststatus'} = $changeHash{'inststatus'};
+ }
+ }
+ }
+ }
$changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
if ($userenv{'portfolioquota'} ne '') {
$oldportfolioquota = $userenv{'portfolioquota'};
@@ -2057,7 +2179,7 @@ sub update_user_data {
} else {
$changed{'quota'} = "a_admin('',\%changeHash);
$newportfolioquota = $defquota;
- $newisdefault = 1;
+ $newisdefault = 1;
}
} else {
$oldisdefault = 1;
@@ -2083,7 +2205,7 @@ sub update_user_data {
}
&tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
\%changeHash,\%changed,\%newaccess,\%newaccesstext);
- &tool_changes('requestcourse',\@requestcourses,\%oldaccess,\%oldaccesstext,
+ &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);
if ($env{'form.cfirstname'} ne $userenv{'firstname'} ||
$env{'form.cmiddlename'} ne $userenv{'middlename'} ||
@@ -2111,16 +2233,26 @@ sub update_user_data {
my %newenvhash;
foreach my $key (keys(%changed)) {
if (($key eq 'official') || ($key eq 'unofficial')) {
- $newenvhash{'environment.canrequest.'.$key} =
- $changeHash{'requestcourse.'.$key};
- $newenvhash{'environment.canrequest.'.$key} =
- $changeHash{'requestcourse.'.$key};
-
+ $newenvhash{'environment.requestcourses.'.$key} =
+ $changeHash{'requestcourses.'.$key};
+ if ($changeHash{'requestcourses.'.$key} ne '') {
+ $newenvhash{'environment.canrequest.'.$key} =
+ $changeHash{'requestcourses.'.$key};
+ } else {
+ $newenvhash{'environment.canrequest.'.$key} =
+ &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
+ $key,'reload','requestcourses');
+ }
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
$changeHash{'tools.'.$key};
- $newenvhash{'environment.availabletools.'.$key} =
- $changeHash{'tools.'.$key};
+ if ($changeHash{'tools.'.$key} ne '') {
+ $newenvhash{'environment.availabletools.'.$key} =
+ $changeHash{'tools.'.$key};
+ } else {
+ $newenvhash{'environment.availabletools.'.$key} =
+ &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','tools');
+ }
}
}
if (keys(%newenvhash)) {
@@ -2149,21 +2281,22 @@ sub update_user_data {
((keys(%changed) > 0) && $chgresult eq 'ok')) {
# Tell the user we changed the name
my %lt=&Apache::lonlocal::texthash(
- 'uic' => "User Information Changed",
- 'frst' => "First",
- 'mddl' => "Middle",
- 'lst' => "Last",
- 'gen' => "Generation",
- 'id' => "Student/Employee ID",
- 'mail' => "Permanent E-mail",
- 'disk' => "Disk space allocated to portfolio files",
- 'blog' => "Blog Availability",
- 'aboutme' => "Home Page Availability",
- 'portfolio' => "Portfolio Availability",
- 'official' => "Can Request Official Courses",
- 'unofficial' => "Can Request Unofficial Courses",
- 'prvs' => "Previous",
- 'chto' => "Changed To"
+ 'uic' => 'User Information Changed',
+ 'frst' => 'First Name',
+ 'mddl' => 'Middle Name',
+ 'lst' => 'Last Name',
+ 'gen' => 'Generation',
+ 'id' => 'Student/Employee ID',
+ 'mail' => 'Permanent e-mail address',
+ 'disk' => 'Disk space allocated to portfolio files',
+ 'blog' => 'Blog Availability',
+ 'aboutme' => 'Personal Information Page Availability',
+ 'portfolio' => 'Portfolio Availability',
+ 'official' => 'Can Request Official Courses',
+ 'unofficial' => 'Can Request Unofficial Courses',
+ 'inststatus' => "Affiliation",
+ 'prvs' => 'Previous Value:',
+ 'chto' => 'Changed To:'
);
$r->print(''.$lt{'uic'}.' '.
&Apache::loncommon::start_data_table().
@@ -2177,6 +2310,10 @@ sub update_user_data {
$lt{'id'}
$lt{'mail'}
END
+ if ($showinststatus) {
+ $r->print("
+ $lt{'inststatus'} \n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2204,6 +2341,10 @@ END
$userenv{'id'}
$userenv{'permanentemail'}
END
+ if ($showinststatus) {
+ $r->print("
+ $oldinststatuses \n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2231,6 +2372,10 @@ END
$env{'form.cid'}
$env{'form.cpermanentemail'}
END
+ if ($showinststatus) {
+ $r->print("
+ $newinststatuses \n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2280,13 +2425,14 @@ END
# but we can still tell them what the name and quota and availabilities are
my %lt=&Apache::lonlocal::texthash(
'id' => "Student/Employee ID",
- 'mail' => "Permanent e-mail",
+ 'mail' => "Permanent e-mail address",
'disk' => "Disk space allocated to user's portfolio files",
'blog' => "Blog Availability",
- 'aboutme' => "Home Page Availability",
+ 'aboutme' => "Personal Information Page Availability",
'portfolio' => "Portfolio Availability",
'official' => "Can Request Official Courses",
'unofficial' => "Can Request Unofficial Course",
+ 'inststatus' => "Affiliation",
);
$r->print(<<"END");
$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
@@ -2295,6 +2441,9 @@ END
$r->print(' ['.$lt{'mail'}.': '.
$userenv{'permanentemail'}.']');
}
+ if ($showinststatus) {
+ $r->print(' ['.$lt{'inststatus'}.': '.$oldinststatuses.']');
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print(' ['.$lt{$item}.': '.$newaccess{$item}.' '.
@@ -2396,9 +2545,9 @@ sub tool_changes {
} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
- $changeHash->{$context.'.'.$tool} = $userenv->{'tools.'.$tool};
+ $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($env{'form.custom'.$tool} == 1) {
- if ($env{'form.'.$context.'_'.$tool} ne $userenv->{'tools.'.$tool}) {
+ if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
$changeHash,$context);
if ($changed->{$tool}) {
@@ -2822,7 +2971,7 @@ sub quota_admin {
sub tool_admin {
my ($tool,$settool,$changeHash,$context) = @_;
my $canchange = 0;
- if ($context eq 'requestcourse') {
+ if ($context eq 'requestcourses') {
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
$canchange = 1;
}
@@ -2992,14 +3141,14 @@ ENDCCF
my $privtext = &Apache::lonnet::plaintext($priv);
$r->print(&Apache::loncommon::start_data_table_row().
''.$privtext.' '.
- ($courselevel{$priv}?' ':' ').
+ ($courselevel{$priv}?' ':' ').
' '.
- ($domainlevel{$priv}?' ':' ').
+ ($domainlevel{$priv}?' ':' ').
' '.
- ($systemlevel{$priv}?' ':' ').
+ ($systemlevel{$priv}?' ':' ').
' '.
&Apache::loncommon::end_data_table_row());
}
@@ -3008,7 +3157,7 @@ ENDCCF
' '."\n".' '."\n".
' '."\n".
- ' '.
+ ' '.
&Apache::loncommon::end_page());
}
# --------------------------------------------------------
@@ -3191,8 +3340,11 @@ sub handler {
if ($env{'form.action'} ne 'dateselect') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",
- text=>"User Management"});
+ text=>"User Management",
+ help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});
}
+ #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);
if (!$allowed) {
@@ -3409,6 +3561,29 @@ sub handler {
&update_selfenroll_config($r,$context,$permission);
}
$r->print(&Apache::loncommon::end_page());
+ } elsif ($env{'form.action'} eq 'selfenrollqueue') {
+ $r->print(&header());
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=selfenrollqueue',
+ text=>"Enrollment requests"});
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+ if (!exists($env{'form.state'})) {
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests',
+ 'Course_SelfEnrollment_Approval'));
+ $r->print(''.&mt('Pending enrollment requests').' '."\n");
+ &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom);
+ } elsif ($env{'form.state'} eq 'done') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=selfenrollqueue',
+ text=>"Result"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result',
+ 'Course_Self_Enrollment'));
+ $r->print(''.&mt('Enrollment request processing').' '."\n");
+ &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom);
+ }
+ $r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'changelogs') {
$r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
@@ -3551,6 +3726,16 @@ sub print_main_menu {
permission => $permission->{'custom'},
linktitle => 'Configure a custom role.',
});
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
+ push(@{ $menu[1]->{items} },
+ { linktext => 'Enrollment Requests',
+ icon => 'selfenrl-queue.png',
+ #help => 'Course_Approve_Selfenroll',
+ url => '/adm/createuser?action=selfenrollqueue',
+ permission => $permission->{'cusr'},
+ linktitle =>'Approve or reject enrollment requests.',
+ });
+ }
if (!exists($permission->{'cusr_section'})){
@@ -3797,9 +3982,10 @@ ENDSCRIPT
my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
if (ref($visactions) eq 'HASH') {
if ($visible) {
- $output .= ' '.$visactions->{'vis'}.'
';
+ $output .= ''.$visactions->{'vis'}.'
';
} else {
- $output .= $visactions->{'miss'}.' '.$visactions->{'yous'}.
+ $output .= ''.$visactions->{'miss'}.'
'
+ .$visactions->{'yous'}.
''.$visactions->{'gen'}.' '.$visactions->{'coca'};
if (ref($vismsgs) eq 'ARRAY') {
$output .= ' '.$visactions->{'make'}.'
';
@@ -3952,18 +4138,380 @@ ENDSCRIPT
' '."\n".
' '."\n".
''."\n";
+ } elsif ($item eq 'approval') {
+ my ($appon,$appoff);
+ my $cid = $env{'request.course.id'};
+ my $currnotified = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
+ if ($env{'course.'.$cid.'.internal.selfenroll_approval'}) {
+ $appon = ' checked="checked" ';
+ $appoff = ' ';
+ } else {
+ $appon = ' ';
+ $appoff = ' checked="checked" ';
+ }
+ $output .= ''.
+ ' '.
+ &mt('Yes').' '.
+ ' '.
+ &mt('No').' ';
+ my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
+ my (@ccs,%notified);
+ if ($advhash{'cc'}) {
+ @ccs = split(/,/,$advhash{'cc'});
+ }
+ if ($currnotified) {
+ foreach my $current (split(/,/,$currnotified)) {
+ $notified{$current} = 1;
+ if (!grep(/^\Q$current\E$/,@ccs)) {
+ push(@ccs,$current);
+ }
+ }
+ }
+ if (@ccs) {
+ $output .= ' '.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '.&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row();
+ my $count = 0;
+ my $numcols = 4;
+ foreach my $cc (sort(@ccs)) {
+ my $notifyon;
+ my ($ccuname,$ccudom) = split(/:/,$cc);
+ if ($notified{$cc}) {
+ $notifyon = ' checked="checked" ';
+ }
+ if ($count && !$count%$numcols) {
+ $output .= &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::start_data_table_row()
+ }
+ $output .= ''.
+ ' '.
+ &Apache::loncommon::plainname($ccuname,$ccudom).
+ ' ';
+ $count;
+ }
+ my $rem = $count%$numcols;
+ if ($rem) {
+ my $emptycols = $numcols - $rem;
+ for (my $i=0; $i<$emptycols; $i++) {
+ $output .= ' ';
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
+ }
+ } elsif ($item eq 'limit') {
+ my ($crslimit,$selflimit,$nolimit);
+ my $cid = $env{'request.course.id'};
+ my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'};
+ my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
+ my $nolimit = ' checked="checked" ';
+ if ($currlim eq 'allstudents') {
+ $crslimit = ' checked="checked" ';
+ $selflimit = ' ';
+ $nolimit = ' ';
+ } elsif ($currlim eq 'selfenrolled') {
+ $crslimit = ' ';
+ $selflimit = ' checked="checked" ';
+ $nolimit = ' ';
+ } else {
+ $crslimit = ' ';
+ $selflimit = ' ';
+ }
+ $output .= '';
}
$output .= &Apache::lonhtmlcommon::row_closure(1);
}
}
$output .= &Apache::lonhtmlcommon::end_pick_box().
' '
+ .&mt('Save').'" onclick="validate_types(this.form);" />'
.' ';
$r->print($output);
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().
+ ''.
+ ' '.&mt('Approve').' '.
+ ''.
+ ' '.&mt('Reject').' '.
+ ''.$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(''.$userlink.' ');
+ }
+ $r->print(' ');
+ }
+ if (@rejections) {
+ $rejectedlist = join("\n",@rejections);
+ $r->print(''.&mt('The following enrollment requests were rejected:').'
');
+ foreach my $user (@rejections) {
+ $r->print(''.$user.' ');
+ }
+ $r->print(' ');
+ }
+ &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid,
+ $coursedesc,$now,'managers',
+ $sender,$approvedlist,$rejectedlist);
+ }
+ }
+ if (@existing) {
+ $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);
@@ -3974,7 +4522,7 @@ sub visible_in_cat {
miss => 'Your course does not currently appear in the Course 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 changes", then take action to include the course in the Catalog:',
+ make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
take => 'Take the following action to ensure the course appears in the Catalog:',
dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
@@ -5159,6 +5707,74 @@ sub update_selfenroll_config {
$changes{'internal.selfenroll_types'} = $selfenroll_types;
}
}
+ } elsif ($item eq 'limit') {
+ my $newlimit = $env{'form.selfenroll_limit'};
+ my $newcap = $env{'form.selfenroll_cap'};
+ $newcap =~s/\s+//g;
+ my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+ $currlimit = 'none' if ($currlimit eq '');
+ my $currcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+ if ($newlimit ne $currlimit) {
+ if ($newlimit ne 'none') {
+ if ($newcap =~ /^\d+$/) {
+ if ($newcap ne $currcap) {
+ $changes{'internal.selfenroll_cap'} = $newcap;
+ }
+ $changes{'internal.selfenroll_limit'} = $newlimit;
+ } else {
+ $warning{$item} = &mt('Maximum enrollment setting unchanged.').' '.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
+ }
+ } elsif ($currcap ne '') {
+ $changes{'internal.selfenroll_cap'} = '';
+ $changes{'internal.selfenroll_limit'} = $newlimit;
+ }
+ } elsif ($currlimit ne 'none') {
+ if ($newcap =~ /^\d+$/) {
+ if ($newcap ne $currcap) {
+ $changes{'internal.selfenroll_cap'} = $newcap;
+ }
+ } else {
+ $warning{$item} = &mt('Maximum enrollment setting unchanged.').' '.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
+ }
+ }
+ } elsif ($item eq 'approval') {
+ my (@currnotified,@newnotified);
+ my $currapproval = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
+ my $currnotifylist = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+ if ($currnotifylist ne '') {
+ @currnotified = split(/,/,$currnotifylist);
+ @currnotified = sort(@currnotified);
+ }
+ my $newapproval = $env{'form.selfenroll_approval'};
+ @newnotified = &Apache::loncommon::get_env_multiple('form.selfenroll_notify');
+ @newnotified = sort(@newnotified);
+ if ($newapproval ne $currapproval) {
+ $changes{'internal.selfenroll_approval'} = $newapproval;
+ if (!$newapproval) {
+ if ($currnotifylist ne '') {
+ $changes{'internal.selfenroll_notifylist'} = '';
+ }
+ } else {
+ my @differences =
+ &compare_arrays(\@currnotified,\@newnotified);
+ if (@differences > 0) {
+ if (@newnotified > 0) {
+ $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+ } else {
+ $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+ }
+ }
+ }
+ } else {
+ my @differences = &compare_arrays(\@currnotified,\@newnotified);
+ if (@differences > 0) {
+ if (@newnotified > 0) {
+ $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+ } else {
+ $changes{'internal.selfenroll_notifylist'} = '';
+ }
+ }
+ }
} else {
my $curr_val =
$env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
@@ -5231,6 +5847,62 @@ sub update_selfenroll_config {
$title,$type,$newdate).'');
}
}
+ } elsif ($item eq 'limit') {
+ if ((exists($changes{'internal.selfenroll_limit'})) ||
+ (exists($changes{'internal.selfenroll_cap'}))) {
+ my ($newval,$newcap);
+ if ($changes{'internal.selfenroll_cap'} ne '') {
+ $newcap = $changes{'internal.selfenroll_cap'}
+ } else {
+ $newcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+ }
+ if ($changes{'internal.selfenroll_limit'} eq 'none') {
+ $newval = &mt('No limit');
+ } elsif ($changes{'internal.selfenroll_limit'} 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 number of self-enrolled students reaches [_1].',$newcap);
+ } else {
+ my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+ 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);
+ }
+ }
+ $r->print(''.&mt('"[_1]" set to "[_2]".',$title,$newval).' '."\n");
+ }
+ } elsif ($item eq 'approval') {
+ if ((exists($changes{'internal.selfenroll_approval'})) ||
+ (exists($changes{'internal.selfenroll_notifylist'}))) {
+ my ($newval,$newnotify);
+ if (exists($changes{'internal.selfenroll_notifylist'})) {
+ $newnotify = $changes{'internal.selfenroll_notifylist'};
+ } else {
+ $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+ }
+ if ($changes{'internal.selfenroll_approval'}) {
+ $newval = &mt('Yes');
+ } elsif ($changes{'internal.selfenroll_approval'} eq '0') {
+ $newval = &mt('No');
+ } else {
+ my $currapproval =
+ $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
+ if ($currapproval) {
+ $newval = &mt('Yes');
+ } else {
+ $newval = &mt('No');
+ }
+ }
+ $r->print(''.&mt('"[_1]" set to "[_2]".',$title,$newval));
+ if ($newnotify) {
+ $r->print(' '.&mt('The following will be notified when an enrollment request needs approval, or has been approved: [_1].',$newnotify));
+ } else {
+ $r->print(' '.&mt('No notifications sent when an enrollment request needs approval, or has been approved.'));
+ }
+ $r->print(' '."\n");
+ }
} else {
if (exists($changes{'internal.selfenroll_'.$item})) {
my $newval = $changes{'internal.selfenroll_'.$item};
@@ -5284,14 +5956,33 @@ sub update_selfenroll_config {
return;
}
+sub compare_arrays {
+ my ($arrayref1,$arrayref2) = @_;
+ my (@difference,%count);
+ @difference = ();
+ %count = ();
+ if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
+ foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
+ foreach my $element (keys(%count)) {
+ if ($count{$element} == 1) {
+ push(@difference,$element);
+ }
+ }
+ }
+ return @difference;
+}
+
sub get_selfenroll_titles {
- my @row = ('types','registered','enroll_dates','access_dates','section');
+ my @row = ('types','registered','enroll_dates','access_dates','section',
+ 'approval','limit');
my %lt = &Apache::lonlocal::texthash (
types => 'Users allowed to self-enroll in this course',
registered => 'Restrict self-enrollment to students officially registered for the course',
enroll_dates => 'Dates self-enrollment available',
access_dates => 'Course access dates assigned to self-enrolling users',
section => 'Section assigned to self-enrolling users',
+ approval => 'Self-enrollment requests need approval?',
+ limit => 'Enrollment limit',
);
return (\@row,\%lt);
}