--- loncom/interface/lonpopulate.pm 2004/06/28 15:41:20 1.15 +++ loncom/interface/lonpopulate.pm 2006/02/07 16:21:26 1.35 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.15 2004/06/28 15:41:20 albertel Exp $ +# $Id: lonpopulate.pm,v 1.35 2006/02/07 16:21:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,13 +35,13 @@ use Apache::loncoursedata; use Apache::Constants qw(:common :http REDIRECT); use Time::Local; use LONCAPA::Enrollment; -use localenroll; ############################################################### sub header { + my $html=&Apache::lonxml::xmlbegin(); my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); return(< +$html LON-CAPA Classlist Manager @@ -52,11 +52,12 @@ ENDHEAD ############################################################### sub choose_header { + my $action = shift; my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); my $scripttag = qq| |; + my $html=&Apache::lonxml::xmlbegin(); return(< +$html LON-CAPA Classlist Manager $scripttag @@ -140,8 +188,8 @@ ENDHEAD sub print_mainbox { my ($r,$tasklongref,$realm,$reply) = @_; my $action = "information"; - if ( exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if ( exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } my $page = ''; if ($action eq "information") { @@ -178,8 +226,8 @@ ENDTHIS sub print_navmenu { my ($r,$tasksref,$tasklongref) = @_; my $action = "information"; - if (exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if (exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } $r->print(<  @@ -217,8 +265,8 @@ ENDONE sub print_main_frame { my ($r,$realm,$dom,$crs,$tasktitleref) = @_; my $action = "information"; - if (exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if (exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } # Get course settings @@ -241,7 +289,7 @@ sub print_main_frame { Use the menu on the left to choose an enrollment management task.

  - Use "Automated adds/drops" to enable or disable automatic nightly adds or drops in your LON-CAPA course based on instututional enrollment information. + Use "Automated adds/drops" to enable or disable automatic nightly adds or drops in your LON-CAPA course based on institutional enrollment information.   @@ -264,13 +312,21 @@ sub print_main_frame { Use "Section settings" to make changes to the choice of sections included for enrollment in your LON-CAPA course.   - Use "Student photos" to enable or disable automatic upload of student photos to your course. + Use "Student photos settings" to enable or disable automatic import of photos for registered students in your course.   Use "Update roster now" to add and/or drop students from your course based on the most current institutional classlist information. +   + Use "Update student photos" to import your institution's most current digital photos for registered students in your course. + + +   + Use "View students and change type" to display the current course roster, and (optionally) change enrollment type for selected students from 'auto' to 'manual' and vice versa. + +   @@ -433,15 +489,10 @@ ENDTWO ENDTWO } elsif ($action eq "notify") { - my @notified = (); - if ($enrollvar{notifylist} =~ m/,/) { - @notified = split/,/,$enrollvar{notifylist}; - } else { - @notified = $enrollvar{notifylist}; - } my $notifycount = 0; + my @notified = split(/,/,$enrollvar{notifylist}); foreach (@notified) { - unless ($_ eq '') { $notifycount ++; } + unless ($_ eq '') { $notifycount ++; } } my $noteset = ''; if ($notifycount) { @@ -488,8 +539,8 @@ ENDTWO my @roleinfo = split/:/,$_; if ($roleinfo[0] eq 'cc') { unless (grep/^$roleinfo[1]\@$roleinfo[2]/,@ccs) { - my $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc'); - if ($active_cc eq 'ok') { + my $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc'); + if ($active_cc eq 'active') { push @ccs, "$roleinfo[1]\@$roleinfo[2]"; $pname{"$roleinfo[1]\@$roleinfo[2]"} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]); if (grep/^$roleinfo[1]\@$roleinfo[2]$/,@notified) { @@ -513,10 +564,10 @@ ENDTWO } } } - my $viewer = $ENV{'user.name'}.'@'.$ENV{'user.domain'}; + my $viewer = $env{'user.name'}.'@'.$env{'user.domain'}; unless ( (grep/^$viewer$/,@ccs) || ($viewer eq '') ) { push @ccs,$viewer; - $pname{$viewer} = &Apache::loncommon::plainname($ENV{'user.name'},$ENV{'user.domain'}); + $pname{$viewer} = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); $notifystate{$viewer} = 0; } @@ -586,11 +637,9 @@ ENDTWO "); } elsif ($action eq "crosslist") { - my @xlists = (); - if ($enrollvar{crosslistings} =~ m/,/) { - @xlists = split/,/,$enrollvar{crosslistings}; - } elsif ($enrollvar{crosslistings} ne '') { - $xlists[0] = $enrollvar{crosslistings}; + my @xlists; + if ($enrollvar{crosslistings} ne '') { + @xlists = split(/,/,$enrollvar{crosslistings}); } my $cross_str = @xlists; $r->print(" @@ -619,7 +668,7 @@ ENDTWO for (my $i=0; $i<@xlists; $i++) { my $xl = ' '; my $gp = ' '; - if ($xlists[$i] =~ /(\w+):?(.*)$/) { + if ($xlists[$i] =~ /^([^:]+):?(.*)$/) { $xl = $1; $gp = $2; } @@ -671,14 +720,9 @@ ENDTWO } elsif ($action eq "sections") { my @sections = (); @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode}); - my @storedsections = (); + my @storedsections = split(/,/,$enrollvar{sectionnums}); my @currsections = (); my %sec_id = (); - if ($enrollvar{sectionnums} =~ m/,/) { - @storedsections = split/,/,$enrollvar{sectionnums}; - } else { - $storedsections[0] = $enrollvar{sectionnums}; - } foreach (@storedsections) { if ($_ =~ m/^(\w+):(\w*)$/) { push @currsections, $1; @@ -843,29 +887,87 @@ your changes.  No "); } - $r->print(" + $r->print(' + '); + my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom); + my $can_enable = 1; + my $institution = $Apache::lonnet::domaindescription{$dom}; + if ($result eq 'ok') { + if ($perm_reqd eq 'yes') { + if (!($enrollvar{'photopermission'} eq 'yes')) { + $can_enable = 0; + } else { + if ($env{'user.name'} eq $enrollvar{'courseowner'}) { + $r->print(' + + '. +&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'
'.&mt('As a result Course Coordinators can choose to automatically import student photos into this course.').'
+ + + '); + } + } + } + } else { + $r->print(' + + '. +&mt('There was a problem determining whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('As a result you will not be able to configure access to student photos at this time').'

+ + + + '); + return; + } + if ($can_enable) { + $r->print(' - -Note: if you enable automatic import of student photos, your course will automatically have access to photos stored by your institution for all officially registered students, via a conduit established by your LON-CAPA domain coordinator. + '. +&mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos stored by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').' +'); + } else { + if ($env{'user.name'} eq $enrollvar{'courseowner'}) { + $r->print(' + + '. +&mt('[_1] requires a course owner to indicate acceptance of conditions of use of digital student photos before enabling automatic import into a course. If you choose to enable import of photos you will be prompted for your agreement on the next page.',$institution).' + + + '); + } else { + my ($ownername,$owneremail) = &get_ownerinfo($dom, + $enrollvar{'courseowner'}); + $r->print(' + + '. +&mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'

'.&mt('Please direct the course owner (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail).'

+ + + + '); + return; + } + } + $r->print('   - - + + - - + + - "); + '); } elsif ($action eq "updatenow") { $r->print("

@@ -878,14 +980,13 @@ Note: if you enable automatic import of @@ -913,6 +1014,29 @@ Note: Any students previously added manu "); + } elsif ($action eq 'updatephotos') { + $r->print(" +
- Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course. -  Yes  -  No  + Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.
+  Yes  No 
- Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s). + Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s).
 Yes   No 
+ + + + +
$$tasktitleref{$action} +
"); + if ($enrollvar{'showphotos'}) { + my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs, + $dom); + $r->print('
'.$commentary.'

+
+ + + +
'); + } else { + $r->print('Update of photos is unavailable, as import of student photos is currently disabled.
Enable this first via: '.$$tasktitleref{'photos'}.''); + } + $r->print('
 
'); } elsif ($action eq 'viewclass') { $r->print("

@@ -921,18 +1045,22 @@ Note: Any students previously added manu $$tasktitleref{$action} + + Section changes, name changes, and class drops that can be set to occur either automatically or when using the 'Update roster now' feature, will affect only those students with an enroll type of 'auto'. Students with an enroll type of 'manual', will be converted automatically to the 'auto' type, when they first appear in the institutional classlist for the course - as long as nightly adds are enabled and active, or the update roster utility is used. Use the 'Lock' checkbox for any manually enrolled students for whom you wish to prevent type conversion. Use the 'Change' checkbox to switch the enroll type from auto to manual, and vice versa. Use the 'Unlock' checkbox for any maually enrolled students for whom you no longer wish to lock the enroll type. Click the 'Go' button at the end of the page to process your desired changes. + +   "); if ($studentcount > 0) { $r->print(" - + "); @@ -992,7 +1159,9 @@ sub print_accessdate_table { 'setl' => 'Set date of last access', 'freg' => 'for registered students added via automated enrollment', 'fnew' => 'for new students added when you update the class roster', - 'ifad' => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access. These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.' + 'ifad' => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access. These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.', + 'ncds' => 'changing default start and end access dates will affect future enrollments and ALSO currently inactive students (i.e., those for whom access will begin in the future). To change access dates for currently active students, you should change the access dates via this screen, then use Enrollment manager -> Drop Students to drop the students, and then use Automated Enrollment Manager -> Update roster now to re-enroll them with the new access dates.' + ); my $dateshow; if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { @@ -1071,6 +1240,12 @@ ENDFOUR + + + + + +
"); - if (! exists($ENV{'form.sortby'})) { - $ENV{'form.sortby'} = 'username'; + if (! exists($env{'form.sortby'})) { + $env{'form.sortby'} = 'username'; } - if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) { - $ENV{'form.Status'} = 'Active'; + if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) { + $env{'form.Status'} = 'Active'; } - my $status_select = &Apache::lonhtmlcommon::StatusOptions($ENV{'form.Status'}); + my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'}); # Get current classlist my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { @@ -943,19 +1071,58 @@ Note: Any students previously added manu $r->print(''. "\n

\n"); - my $studentcount = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$ENV{'form.Status'},$classlist,$keylist); + my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist); $r->print("
+ "); + my $cellcount = 0; + if ($autocount > 0) { + $cellcount ++; + $r->print(<
 Change auto   +
+END + } + if ($manualcount > 0) { + $cellcount ++; + $r->print(<
 Change manual   +
+END + } + if ($lockcount > 0) { + if ($cellcount == 2) { + $r->print(""); + } + $cellcount ++; + $r->print(<
 Lock manual   +
+END + } + if ($unlockcount > 0) { + if ($cellcount == 2) { + $r->print(""); + } + $cellcount ++; + $r->print(<
 Unlock manual   +
+END + } + $r->print(" + +
 
- +
$lt{'ifad'}
 
".&mt('Note').": ".$lt{'ncds'}."
"); } elsif ($action eq 'updatenow') { @@ -1125,11 +1300,11 @@ sub print_chgsettings_response { my $autoadds = ''; my $autodrops = ''; - if ( exists($ENV{'form.autoadds'}) ) { - $autoadds=$ENV{'form.autoadds'}; + if ( exists($env{'form.autoadds'}) ) { + $autoadds=$env{'form.autoadds'}; } - if ( exists($ENV{'form.autodrops'}) ) { - $autodrops=$ENV{'form.autodrops'}; + if ( exists($env{'form.autodrops'}) ) { + $autodrops=$env{'form.autodrops'}; } my $response = ""; @@ -1199,74 +1374,81 @@ sub print_setdates_response { my $currstart = $settings{'internal.autostart'}; my $currend = $settings{'internal.autoend'}; my $response = ''; - my ($autostart,$autoend) = &get_dates_from_form(); - my $showstart = &Apache::lonlocal::locallocaltime($autostart); + my $showstart = ''; my $showend = ''; my $warning = ''; my $warn_prefix = ''; - if ($autoend) { - $showend = &Apache::lonlocal::locallocaltime($autoend); - } else { - $showend = "'No end date'"; - } + my ($autostart,$autoend) = &get_dates_from_form(); + if ( ($autostart eq '') || ($autoend eq '') ) { + $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + } elsif (($autoend > 0) && ($autoend <= $autostart)) { + $response = 'The date/time selected for starting auto-enrollment was the same or later than the date/time selected for ending auto-enrollment. As this means auto-enrollment will never be active, your requested changes have not been processed, and the existing values remain in effect. Please go back to the previous page to try your changes again.'."\n"; + } else { + $showstart = &Apache::lonlocal::locallocaltime($autostart); + if ($autoend) { + $showend = &Apache::lonlocal::locallocaltime($autoend); + } else { + $showend = "'No end date'"; + } - my %cenv = ('internal.autostart' => $autostart, - 'internal.autoend' => $autoend); - my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; - } else { - if ($currstart == $autostart) { - $response = "The first date for automated enrollment has been left unchanged as $showstart.
"; - } else { - $response = "The first date for automated enrollment has been changed to $showstart.
"; - } - if ($currend == $autoend) { - $response .= "The last date for automated enrollment has been left unchanged as $showend.
"; - } else { - $response .= "The last date for automated enrollment has been changed to $showend.
"; - } + my %cenv = ('internal.autostart' => $autostart, + 'internal.autoend' => $autoend); + my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + if ($reply !~ /^ok$/) { + $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + } else { + if ($currstart == $autostart) { + $response = "The first date for automated enrollment has been left unchanged as $showstart.
"; + } else { + $response = "The first date for automated enrollment has been changed to $showstart.
"; + } + if ($currend == $autoend) { + $response .= "The last date for automated enrollment has been left unchanged as $showend.
"; + } else { + $response .= "The last date for automated enrollment has been changed to $showend.
"; + } # Generate message in case where old first enrollment date was later than today, but new first enrollment date is now today or earlier. - my $rosterupdated = 0; - my $firstaccess = ""; - my $nextupdate = ""; - my $lastupdate = ""; - - my $nowstamp = time; - my @date_list=localtime(time); - my $cur_year = $date_list[5]; - my $curday = $date_list[3]; - my $curmonth = $date_list[4]; - my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); - my $nextmidnt = 86400 + $lastmidnt; - - my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); - my $lastupdate = $todayupdate - 86400; - if ($nowstamp < $todayupdate) { - $nextupdate = "today"; - } else { - $nextupdate = "tomorrow"; - } - if ($currstart < $lastupdate) { - $rosterupdated = 1; - } - if ($autostart < $nextmidnt ) { - if ( $autostart >= $lastmidnt) { - $firstaccess = "today"; + my $rosterupdated = 0; + my $firstaccess = ""; + my $nextupdate = ""; + my $lastupdate = ""; + + my $nowstamp = time; + my @date_list=localtime(time); + my $cur_year = $date_list[5]; + my $curday = $date_list[3]; + my $curmonth = $date_list[4]; + my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); + my $nextmidnt = 86400 + $lastmidnt; + + my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); + my $lastupdate = $todayupdate - 86400; + if ($nowstamp < $todayupdate) { + $nextupdate = "today"; } else { - $firstaccess = "a date prior to today"; + $nextupdate = "tomorrow"; } - if (($nowstamp >= $autostart) && ($rosterupdated == 0)) { - $response .= qq|
Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page.
|; + if ($currstart < $lastupdate) { + $rosterupdated = 1; } - } - $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; - } + if ($autostart < $nextmidnt ) { + if ( $autostart >= $lastmidnt) { + $firstaccess = "today"; + } else { + $firstaccess = "a date prior to today"; + } + if (($nowstamp >= $autostart) && ($rosterupdated == 0)) { + $response .= qq|
Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page.
|; + } + } + $warning = &warning_message($dom,$crs,$action); + $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; + unless ($warning eq '') { + $response .= $warn_prefix.$warning; + } + } } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -1280,86 +1462,93 @@ sub print_setaccess_response { my $autostart = $settings{'internal.autostart'}; my $response = ''; my ($startaccess,$endaccess) = &get_dates_from_form(); - my $showstart = &Apache::lonlocal::locallocaltime($startaccess); - my $showend = ''; - my $warning = ''; - my $warn_prefix = ''; - if ($endaccess) { - $showend = &Apache::lonlocal::locallocaltime($endaccess); + if (($startaccess eq '') || ($endaccess eq '')) { + $response = "There was a problem processing your requested changes. The default +start and end access dates for this course have been left unchanged.
"; + } elsif (($endaccess > 0) && ($endaccess <= $startaccess)) { + $response = 'The default start access date/time you chose was the same or later than the default end access date/time. As this means that roles will never be active, your requested changes have not been processed, and the existing values remain in effect. Please go back to the previous page to try your changes again.'."\n"; } else { - $showend = "'No end date'"; - } + my $showstart = &Apache::lonlocal::locallocaltime($startaccess); + my $showend = ''; + my $warning = ''; + my $warn_prefix = ''; + if ($endaccess) { + $showend = &Apache::lonlocal::locallocaltime($endaccess); + } else { + $showend = "'No end date'"; + } - my %cenv = ('default_enrollment_start_date' => $startaccess, + my %cenv = ('default_enrollment_start_date' => $startaccess, 'default_enrollment_end_date' => $endaccess); - my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; - } else { - if ($currstart == $startaccess) { - $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.
"; - } else { - $response = "The first access date for students added via automated enrollment has been changed to + my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + if ($reply !~ /^ok$/) { + $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + } else { + if ($currstart == $startaccess) { + $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.
"; + } else { + $response = "The first access date for students added via automated enrollment has been changed to $showstart.
"; - } - if ($currend == $endaccess) { - $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.
"; - } else { - $response .= "The last access date for students automated enrollment has been changed to + } + if ($currend == $endaccess) { + $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.
"; + } else { + $response .= "The last access date for students automated enrollment has been changed to $showend.
"; - } + } # Generate message in case where old first access date was later than today, but new first access date is now today or earlier. - my $accessgiven= 0; - my $firstaccess = ""; - my $nextupdate = ""; - my $lastupdate = ""; - - my $nowstamp = time; - my @date_list=localtime(time); - my $cur_year = $date_list[5]; - my $curday = $date_list[3]; - my $curmonth = $date_list[4]; - my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); - my $nextmidnt = 86400 + $lastmidnt; - - my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); - my $tomorrowupdate = $todayupdate + 86400; - my $lastupdate = $todayupdate - 86400; - - if ($autostart < $nextmidnt) { - if ($nowstamp < $todayupdate) { - $nextupdate = "at 1.30 am today"; + my $accessgiven= 0; + my $firstaccess = ""; + my $nextupdate = ""; + my $lastupdate = ""; + + my $nowstamp = time; + my @date_list=localtime(time); + my $cur_year = $date_list[5]; + my $curday = $date_list[3]; + my $curmonth = $date_list[4]; + my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); + my $nextmidnt = 86400 + $lastmidnt; + + my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); + my $tomorrowupdate = $todayupdate + 86400; + my $lastupdate = $todayupdate - 86400; + + if ($autostart < $nextmidnt) { + if ($nowstamp < $todayupdate) { + $nextupdate = "at 1.30 am today"; + } else { + $nextupdate = "at 1.30 am tomorrow"; + } } else { - $nextupdate = "at 1.30 am tomorrow"; + my @enrollstart = localtime($autostart); + $nextupdate = timelocal(0,30,1,$enrollstart[3],$enrollstart[4],$enrollstart[5]); + unless (($enrollstart[2] < 1) || ($enrollstart[2] == 1 && $enrollstart[1] <=30)) { + $nextupdate += 86400; + } + $nextupdate = &Apache::lonlocal::locallocaltime($nextupdate); + } + if (($currstart < $lastupdate) && ($autostart < $lastupdate)) { + $accessgiven = 1; + } + if ($startaccess < $nextmidnt ) { + if ( $startaccess >= $lastmidnt) { + $firstaccess = "today"; + } else { + $firstaccess = "a date prior to today"; + } + if (($nowstamp >= $startaccess) && ($accessgiven == 0)) { + $response .= qq|
Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page.
|; + } } - } else { - my @enrollstart = &Apache::lonlocal::locallocaltime($autostart); - $nextupdate = timelocal(0,30,1,$enrollstart[3],$enrollstart[4],$enrollstart[5]); - unless (($enrollstart[2] < 1) || ($enrollstart[2] == 1 && $enrollstart[1] <=30)) { - $nextupdate += 86400; - } - $nextupdate = &Apache::lonlocal::locallocaltime($nextupdate); - } - if (($currstart < $lastupdate) && ($autostart < $lastupdate)) { - $accessgiven = 1; - } - if ($startaccess < $nextmidnt ) { - if ( $startaccess >= $lastmidnt) { - $firstaccess = "today"; - } else { - $firstaccess = "a date prior to today"; - } - if (($nowstamp >= $startaccess) && ($accessgiven == 0)) { - $response .= qq|
Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page.
|; + $warning = &warning_message($dom,$crs,$action); + $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; + unless ($warning eq '') { + $response .= $warn_prefix.$warning; } - } - $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; - } + } } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -1372,33 +1561,28 @@ sub print_notify_response { my %settings = &Apache::lonnet::get('environment',['internal.notifylist','internal.coursecode'],$dom,$crs); my $notifylist = $settings{'internal.notifylist'}; my $coursecode = $settings{'internal.coursecode'}; - my @currpeople = (); + my @currpeople = split(/,/,$notifylist); my $notify = 0; my @people = (); my $peoplestr = ""; my $response = ""; my $noprocess = 0; - if ($notifylist =~ m/,/) { - @currpeople = split/,/,$notifylist; - } else { - $currpeople[0] = $notifylist; - } my $currcount = 0; foreach (@currpeople) { unless ($_ eq '') { $currcount ++; } } - if ( exists($ENV{'form.notify'}) ) { - $notify=$ENV{'form.notify'}; + if ( exists($env{'form.notify'}) ) { + $notify=$env{'form.notify'}; } - if ( exists($ENV{'form.notifyshow'}) ) { - my $notifyshow = $ENV{'form.notifyshow'}; + if ( exists($env{'form.notifyshow'}) ) { + my $notifyshow = $env{'form.notifyshow'}; for (my $i=0; $i<$notifyshow; $i++) { - if ( exists($ENV{"form.note_$i"}) ) { - if ( exists($ENV{"form.notifyname_$i"}) ) { - unless ( $ENV{"form.notifyname_$i"} eq '' ) { - push @people, $ENV{"form.notifyname_$i"}; + if ( exists($env{"form.note_$i"}) ) { + if ( exists($env{"form.notifyname_$i"}) ) { + unless ( $env{"form.notifyname_$i"} eq '' ) { + push @people, $env{"form.notifyname_$i"}; } } } @@ -1458,23 +1642,21 @@ sub print_crosslistings_menu () { my $xliststr = ''; my $response = ''; my $coursecode = $settings{'internal.coursecode'}; - if ($settings{'internal.crosslistings'} =~ m/,/) { - @currxlists = split/,/,$settings{'internal.crosslistings'}; - } elsif ($settings{'internal.crosslistings'} ne '') { - $currxlists[0] = $settings{'internal.crosslistings'}; + if ($settings{'internal.crosslistings'} ne '') { + @currxlists = split(/,/,$settings{'internal.crosslistings'}); } if (@currxlists > 0) { for (my $i=0; $i<@currxlists; $i++) { my $xlist = "cross_".$i; my $gp = "gp_".$i; - if ( exists($ENV{"form.$xlist"}) ) { + if ( exists($env{"form.$xlist"}) ) { my $xlistentry = ''; if ($currxlists[$i] =~ m/^([^:]+)/) { $xlistentry = $1.':'; } - if ( exists($ENV{"form.$gp"}) ) { - $xlistentry .= $ENV{"form.$gp"}; + if ( exists($env{"form.$gp"}) ) { + $xlistentry .= $env{"form.$gp"}; } push @xlists,$xlistentry; $crosscount ++; @@ -1484,11 +1666,8 @@ sub print_crosslistings_menu () { } } - if ($crosscount > 1) { - $xliststr = join(",",@xlists); - } else { - $xliststr = $xlists[0]; - } + $xliststr = join(",",@xlists); + my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { @@ -1506,8 +1685,8 @@ sub print_crosslistings_menu () { $response .= "
\n"; } } - if ( exists($ENV{'form.numcross'}) ) { - my $numcross = $ENV{'form.numcross'}; + if ( exists($env{'form.numcross'}) ) { + my $numcross = $env{'form.numcross'}; if ($numcross > 0) { my @bgcolors=("#eeeeee","#cccccc"); $response .= qq(You indicated that you wish to add an additional $numcross crosslisting(s). For each new crosslisting enter the insititutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section/group ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section. The LON-CAPA section/group ID can be left blank, if you do not wish to tie a section/group ID to this crosslisting. The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution\'s student information system.

@@ -1566,33 +1745,31 @@ sub print_crosslistings_response () { my $warning = ''; my $warn_prefix = ''; - if ($xliststr =~ m/,/) { - @allxlists = split/,/,$xliststr; - } else { - unless ($xliststr eq '') { $allxlists[0] = $xliststr; } + if ($xliststr ne '') { + @allxlists = split(/,/,$xliststr); } - if ( exists($ENV{'form.numcross'}) ) { - $numcross = $ENV{'form.numcross'}; + if ( exists($env{'form.numcross'}) ) { + $numcross = $env{'form.numcross'}; } if ($numcross > 0) { for (my $i=0; $i<$numcross; $i++) { my $xl = "newcross_".$i; my $gp = "newgroupid_".$i; - if ( exists($ENV{"form.$xl"}) ) { + if ( exists($env{"form.$xl"}) ) { my $coursecheck = ''; - $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$ENV{"form.$xl"}); + $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$env{"form.$xl"}); if ($coursecheck eq 'ok') { my $addcheck = ''; - $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$ENV{"form.$xl"},$owner); + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner); if ($addcheck eq 'ok') { - push @xlists,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; + push @xlists,$env{"form.$xl"}.":".$env{"form.$gp"}; } else { - push @badowner,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; + push @badowner,$env{"form.$xl"}.":".$env{"form.$gp"}; } } else { - push @badxlists, $ENV{"form.$xl"}.":".$ENV{"form.$gp"}.":".$coursecheck; + push @badxlists, $env{"form.$xl"}.":".$env{"form.$gp"}.":".$coursecheck; } } } @@ -1601,11 +1778,8 @@ sub print_crosslistings_response () { if (@xlists > 0 ) { unless ($xliststr eq '') { $xliststr .= ","; } - if (@xlists > 1) { - $xliststr .= join(",",@xlists); - } else { - $xliststr .= $xlists[0]; - } + $xliststr .= join(",",@xlists); + my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { @@ -1620,12 +1794,7 @@ sub print_crosslistings_response () { } } else { if ($xliststr =~ m/:/) { - my @oldxlists = (); - if ($xliststr =~ m/,/) { - @oldxlists = split/,/,$xliststr; - } else { - $oldxlists[0] = $xliststr; - } + my @oldxlists = (split/,/,$xliststr); $response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.
    \n"; foreach (@oldxlists) { my ($xlist,$gp) = split/:/,$_; @@ -1680,42 +1849,40 @@ sub print_sections_menu () { my $warn_prefix = ""; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; - if ($settings{'internal.sectionnums'} =~ m/,/) { - @currsections = split/,/,$settings{'internal.sectionnums'}; - } elsif ($settings{'internal.sectionnums'} ne '') { - $currsections[0] = $settings{'internal.sectionnums'}; + if ($settings{'internal.sectionnums'} ne '') { + @currsections = split(/,/,$settings{'internal.sectionnums'}); } - if ( exists($ENV{'form.secshow'}) ) { - for (my $i=0; $i<$ENV{'form.secshow'}; $i++) { + if ( exists($env{'form.secshow'}) ) { + for (my $i=0; $i<$env{'form.secshow'}; $i++) { my $gp = "loncapasec_".$i; my $secnum = "secnum_".$i; my $sec = "sec_".$i; - if ( exists( $ENV{"form.$sec"} ) ) { + if ( exists( $env{"form.$sec"} ) ) { my $secentry; - if ( exists( $ENV{"form.$secnum"} ) ) { - $secentry = $ENV{"form.$secnum"}.':'; + if ( exists( $env{"form.$secnum"} ) ) { + $secentry = $env{"form.$secnum"}.':'; } - if ( exists( $ENV{"form.$gp"} ) ) { - $secentry .= $ENV{"form.$gp"}; + if ( exists( $env{"form.$gp"} ) ) { + $secentry .= $env{"form.$gp"}; } - if ( grep/^$ENV{"form.$secnum"}:/,@currsections) { + if ( grep/^$env{"form.$secnum"}:/,@currsections) { push @sections, $secentry; $seccount ++; } else { - my $newsec = $coursecode.$ENV{"form.$secnum"}; + my $newsec = $coursecode.$env{"form.$secnum"}; my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner); if ($addcheck eq 'ok') { - push @sections,$ENV{"form.$secnum"}.":".$ENV{"form.$gp"}; + push @sections,$env{"form.$secnum"}.":".$env{"form.$gp"}; $seccount ++; $addcount ++; } else { - push @badowner,$ENV{"form.$secnum"}.":".$ENV{"form.$gp"}; + push @badowner,$env{"form.$secnum"}.":".$env{"form.$gp"}; } } else { - push @badsections, $ENV{"form.$secnum"}.":".$ENV{"form.$gp"}.":".$coursecheck; + push @badsections, $env{"form.$secnum"}.":".$env{"form.$gp"}.":".$coursecheck; } } } @@ -1734,13 +1901,13 @@ sub print_sections_menu () { for (my $i=0; $i<@currsections; $i++) { my $sec = "sec_".$i; my $gp = "secgp_".$i; - if ( exists($ENV{"form.$sec"}) ) { + if ( exists($env{"form.$sec"}) ) { my $secentry = ''; if ($currsections[$i] =~ m/^(\w+:)/ ) { $secentry = $1; } - if ( exists($ENV{"form.$gp"}) ) { - $secentry .= $ENV{"form.$gp"}; + if ( exists($env{"form.$gp"}) ) { + $secentry .= $env{"form.$gp"}; } push @sections,$secentry; $seccount ++; @@ -1750,11 +1917,8 @@ sub print_sections_menu () { } } - if ($seccount > 1) { - $secstr = join(",",@sections); - } else { - $secstr = $sections[0]; - } + $secstr = join(",",@sections); + my %cenv = ('internal.sectionnums' => $secstr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { @@ -1803,8 +1967,8 @@ sections which contribute to enrollment } } - if ( exists($ENV{'form.numsec'}) ) { - my $numsec = $ENV{'form.numsec'}; + if ( exists($env{'form.numsec'}) ) { + my $numsec = $env{'form.numsec'}; if ($numsec > 0) { my @bgcolors=("#eeeeee","#cccccc"); $response .= qq( @@ -1864,33 +2028,31 @@ sub print_sections_response () { my $putreply = ''; my $warning = ''; my $warn_prefix = ''; - if ($secstr =~ m/,/) { - @allsections = split/,/,$secstr; - } else { - unless ($secstr eq '') { $allsections[0] = $secstr; } + if ($secstr ne '') { + @allsections = split(/,/,$secstr); } - if ( exists($ENV{'form.numsec'}) ) { - $numsec = $ENV{'form.numsec'}; + if ( exists($env{'form.numsec'}) ) { + $numsec = $env{'form.numsec'}; } if ($numsec > 0) { for (my $i=0; $i<$numsec; $i++) { my $sec = "newsec_".$i; my $gp = "newsecgp_".$i; - if ( exists($ENV{"form.$sec"}) ) { - unless ( (grep/^$ENV{"form.$sec"}:/,@allsections) || (grep/^$ENV{"form.$sec"}:/,@sections) ) { - my $newsec = $coursecode.$ENV{"form.$sec"}; + if ( exists($env{"form.$sec"}) ) { + unless ( (grep/^$env{"form.$sec"}:/,@allsections) || (grep/^$env{"form.$sec"}:/,@sections) ) { + my $newsec = $coursecode.$env{"form.$sec"}; my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner); if ($addcheck eq 'ok') { - push @sections,$ENV{"form.$sec"}.":".$ENV{"form.$gp"}; + push @sections,$env{"form.$sec"}.":".$env{"form.$gp"}; } else { - push @badowner,$ENV{"form.$sec"}.":".$ENV{"form.$gp"}; + push @badowner,$env{"form.$sec"}.":".$env{"form.$gp"}; } } else { - push @badsections, $ENV{"form.$sec"}.":".$ENV{"form.$gp"}.":".$coursecheck; + push @badsections, $env{"form.$sec"}.":".$env{"form.$gp"}.":".$coursecheck; } } } @@ -1900,11 +2062,7 @@ sub print_sections_response () { if (@sections > 0 ) { unless ($secstr eq '') { $secstr .= ","; } - if (@sections > 1) { - $secstr .= join(",",@sections); - } else { - $secstr .= $sections[0]; - } + $secstr .= join(",",@sections); my %cenv = ('internal.sectionnums' => $secstr); $putreply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($putreply !~ /^ok$/) { @@ -1951,39 +2109,276 @@ sub print_sections_response () { return; } -sub print_photos_response () { +sub photo_permission { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.showphotos'],$dom,$crs); - my $currphotos = $settings{'internal.showphotos'}; - my $showphotos = ''; - if ( exists($ENV{'form.showphotos'}) ) { - $showphotos=$ENV{'form.showphotos'}; + my %settings = &Apache::lonnet::get('environment', + ['internal.courseowner', + 'internal.photopermission', + 'internal.showphotos'], + $dom,$crs); + my ($showphotos,$response); + if (exists($env{'form.cancel_agreement'})) { + if ($env{'user.name'} eq $settings{'internal.courseowner'}) { + my %cenv = ( + 'internal.photopermission' => 'no', + ); + my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + if ($reply !~ /^ok$/) { + $response = &mt('There was a problem processing the record of your agreement to the conditions of use. Settings for this course have been left unchanged.').'
    '."\n"; + &print_reply($r,$response,$$tasktitleref{$action}); + } else { + &print_photos_response($r,$realm,$dom,$crs,$action, + $tasktitleref,$showphotos,'no',\%cenv); + } + return; + } + } + if (exists($env{'form.showphotos'})) { + $showphotos=$env{'form.showphotos'}; } - + if ($showphotos) { + if ($env{'form.photopermission'}) { + my %cenv = ( + 'internal.photopermission' => $env{'form.photopermission'}, + ); + my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); + if ($reply !~ /^ok$/) { + $response = &mt('There was a problem processing the record of your agreement to the conditions of use. Settings for this course have been left unchanged.').'
    '."\n"; + } else { + &print_photos_response($r,$realm,$dom,$crs,$action, + $tasktitleref,$showphotos, + $env{'form.photopermission'},\%cenv); + } + } else { + my ($result,$perm_reqd,$conditions) = + &Apache::lonnet::auto_photo_permission($crs,$dom); + my $permcheck; + if ($result eq 'ok') { + if ($perm_reqd eq 'yes') { + if ($settings{'internal.photopermission'} eq 'yes') { + &print_photos_response($r,$realm,$dom,$crs,$action, + $tasktitleref,$showphotos); + } else { + return(&print_photo_agreement($r,$realm,$dom,$crs, + $action,$tasktitleref, + $conditions, + $settings{'internal.courseowner'})); + } + } elsif ($perm_reqd eq 'no') { + &print_photos_response($r,$realm,$dom,$crs,$action, + $tasktitleref,$showphotos); + } else { + $permcheck = 'fail'; + } + } else { + $permcheck = 'fail'; + } + if ($permcheck eq 'fail') { + my $response = &mt('There was a problem processing your requested change, because it could not be determined whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('The student photo import setting for this course has been left unchanged.').'
    '; + &print_reply($r,$response,$$tasktitleref{$action}); + } + } + } else { + &print_photos_response($r,$realm,$dom,$crs,$action,$tasktitleref); + } + return; +} + +sub print_photo_agreement { + my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_; + my $response; + my $institution = $Apache::lonnet::domaindescription{$dom}; + if ($env{'user.name'} eq $courseowner) { + $response = ' + + + + + + +
    Use of student photos
    '."\n". + &mt('Acceptance by the course owner of the conditions of use of photos is currently [_1] set.','not').'
    '.&mt('Please indicate your acceptance of the conditions of use of digital photos of registered students in courses at [_1].',$institution).' +
    + + + + + + + +
    + +
    + + + +
    + + + + + +'; + } else { + my ($ownername,$owneremail) = &get_oenerinfo($dom,$courseowner); + $response = &mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'

    '.&mt('Please direct the course owner (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail); + } + &print_reply($r,$response,$$tasktitleref{$action}); +} + +sub print_photos_response { + my ($r,$realm,$dom,$crs,$action,$tasktitleref,$showphotos,$photopermission, + $permissionenv)=@_; + my %newenv; + if (defined($permissionenv)) { + foreach my $key (keys(%{$permissionenv})) { + if (exists($env{'request.course.id'})) { + $newenv{$env{'request.course.id'}.'.'.$key} = + $$permissionenv{$key}; + } + } + } + my %settings = &Apache::lonnet::get('environment',['internal.showphotos'], + $dom,$crs); + my $currphotos = $settings{'internal.showphotos'}; my $response = ""; + if (defined($photopermission)) { + if ($photopermission eq 'yes') { + $response = &mt('Acceptance of photo use policy recorded.').'
    '."\n"; + } else { + $response = &mt('Non-acceptance of photo use policy recorded.').'
    '."\n"; + $showphotos = 0; + } + } my %cenv = ('internal.showphotos' => $showphotos); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested change. The student photo import setting for this course has been left unchanged.
    "; + $response .= "There was a problem processing your requested change. The student photo retrieval setting for this course has been left unchanged.
    "; } else { if ($showphotos) { if ($currphotos) { - $response = "Retrieval of student photos is still enabled
    "; + $response .= "Retrieval of student photos is still enabled.
    "; } else { - $response = "Retrieval of student photos in now enabled
    "; + $response .= "Retrieval of student photos in now enabled.
    "; + my ($update,$commentary) = + &Apache::lonnet::auto_photochoice($crs,$dom); + if ($update) { + $response .= '
    '.$commentary.'

    +
    + + + +
    '; + } } } else { if ($currphotos) { - $response = "Retrieval of student photos is now disabled
    "; + $response .= "Retrieval of student photos is now disabled.
    "; } else { - $response = "Retrieval of student photos is still disabled
    "; + $response .= "Retrieval of student photos is still disabled.
    "; } } + foreach my $key (keys(%cenv)) { + if (exists($env{'request.course.id'})) { + $newenv{'course.'.$env{'request.course.id'}.'.'.$key} = + $cenv{$key}; + } + } + } + if (keys(%newenv) > 0) { + &Apache::lonnet::appenv(%newenv); + } + &print_reply($r,$response,$$tasktitleref{$action}); + return; +} + +sub print_photoupdate_response { + my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; + my $response; + my %changes; + my %lt = &LONCAPA::Enrollment::photo_response_types(); + my %settings = &Apache::lonnet::get('environment', + ['internal.coursecode', + 'internal.sectionnums', + 'internal.crosslistings'], + $dom,$crs); + my @allcourses = (); + my %LC_code; + my %affiliates; + my $outcome; + &get_institutional_codes(\%settings,,\@allcourses,\%LC_code); + if (@allcourses > 0) { + @{$affiliates{$crs}} = @allcourses; + $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes); + unless ($outcome eq 'ok') { + &Apache::lonnet::logthis("lonpopulate::print_photoupdate_response". + "failed to update student photos". + " for ".$crs."\@".$dom." by ". + $env{'user.name'}." \@ ".$env{'user.domain'}. + ": ".$outcome); + } + if ($outcome eq 'ok') { + if (keys(%changes) > 0) { + $response = &mt('Update of photos for registered students resulted in the following ').':
    +'; + foreach my $type (sort(keys(%changes))) { + my @usernames = sort(split(/\&/,$changes{$type})); + my $count = @usernames; + $response .= ''.&mt('For [_1] students, photos ', + $count).$lt{$type}.'
      '; + foreach my $username (@usernames) { + $response .= '
    • '.$username; + if (($type eq 'new') || ($type eq 'same') || ($type eq 'update')) { + $response .= ' View
      • '; + } + } + $response .= '

    '; + } + } else { + $response = &mt('No updates of photos of registered students occurred'). + '
    '; + } + } else { + $response = "There was a problem updating student photos for registered students in this course.
    "; + } + } else { + $response = "No institutional course sections are currently associated with this course so there are no registered students for whom photos can be imported/updated"; } &print_reply($r,$response,$$tasktitleref{$action}); return; } +sub get_ownerinfo { + my ($dom,$owner) = @_; + my ($ownername,$owneremail); + if ($owner) { + $ownername=&Apache::loncommon::plainname($owner,$dom,'firstname'); + my %ownerinfo = &Apache::lonnet::get('environment','permanentemail', + $dom,$owner); + $owneremail = $ownerinfo{'permanentemail'}; + } + return ($ownername,$owneremail); +} + sub print_update_result () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; my $response = ''; @@ -1996,69 +2391,41 @@ sub print_update_result () { my %LC_code = (); my $logmsg = ''; my $newusermsg = ''; - - my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg'],$dom,$crs); + my %phototypes = (); + my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg','internal.showphotos'],$dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; my $autharg = $settings{'internal.autharg'}; + my $showphotos = $settings{'internal.showphotos'}; my ($startaccess,$endaccess) = &get_dates_from_form(); - - if ( exists($ENV{'form.updateadds'}) ) { - $updateadds = $ENV{'form.updateadds'}; + if ( exists($env{'form.updateadds'}) ) { + $updateadds = $env{'form.updateadds'}; } - if ( exists($ENV{'form.updatedrops'}) ) { - $updatedrops = $ENV{'form.updatedrops'}; + if ( exists($env{'form.updatedrops'}) ) { + $updatedrops = $env{'form.updatedrops'}; } - if (!$updateadds && !$updatedrops) { + if (($startaccess eq '') || ($endaccess eq '')) { + $response = "There was a problem processing your requested roster update because start and and access dates could not be determined. No changes have been made to the class roster.
    "; + } elsif ($updateadds && (($endaccess > 0) && ($endaccess <= $startaccess))) { + $response = 'The start access date/time is the same or later than the end access date/time. As this means that new roles will never be active, your requested roster update has not been carried out, and the roster remains unchanged. Please go back to the previous page to try your changes again.'."\n"; + } elsif (!$updateadds && !$updatedrops) { $response = "An update of the class roster has not been carried out because you indicated that you wanted to neither add new students, nor expire dropped students based on a comparison between the institutional class lists for the course sections and crosslisted courses that contribure enrollment to this LON-CAPA course."; } elsif ($coursecode eq '') { $response = "There was a problem retrieving the course code for this LON-CAPA course. An update of the class roster has not been carried out, and enrollment remains unchanged"; } else { -# Get complete list of course sections to update - my @currsections = (); - my @currxlists = (); - - if ($settings{'internal.sectionnums'} =~ m/,/) { - @currsections = split/,/,$settings{'internal.sectionnums'}; - } elsif ($settings{'internal.sectionnums'} ne '') { - $currsections[0] = $settings{'internal.sectionnums'}; - } - - if ($settings{'internal.crosslistings'} =~ m/,/) { - @currxlists = split/,/,$settings{'internal.crosslistings'}; - } elsif ($settings{'internal.crosslistings'} ne '') { - $currxlists[0] = $settings{'internal.crosslistings'}; - } - - if (@currxlists > 0) { - foreach (@currxlists) { - if (m/^(\w+):(\w*)$/) { - unless (grep/^$1$/,@allcourses) { - push @allcourses,$1; - $LC_code{$1} = $2; - } - } - } - } - - if (@currsections > 0) { - foreach (@currsections) { - if (m/^(\w+):(\w*)$/) { - my $sec = $coursecode.$1; - my $gp = $2; - unless (grep/^$sec$/,@allcourses) { - push @allcourses,$sec; - $LC_code{$sec} = $gp; - } - } - } - } - + &get_institutional_codes(\%settings,\@allcourses,\%LC_code); if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs); + unless ($outcome eq 'ok') { + &Apache::lonnet::logthis("lonpopulate:update roster". + "failed to retrieve classlist". + " data for ".$crs."\@".$dom." by ". + $env{'user.name'}." \@ ".$env{'user.domain'}. + ": ".$outcome); + } if ($reply{$crs} > 0) { - ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow"); + ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); } else { $response = "There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course. No updates have been carried out, and the roster remains unchanged."; } @@ -2073,13 +2440,55 @@ sub print_update_result () { } unless ($newusermsg eq '') { $newusermsg = substr( $newusermsg,0,rindex($newusermsg,'
  • ') ); - $newusermsg = "

    The following new system user(s) who was/were created will be using internal authentication with an initial randomly generated password. A valid e-mail address was not available for this/these user(s) so LON-CAPA account credentials could not be sent via e-mail.
    • ".$newusermsg."

    "; + $newusermsg = "

    The following new system user(s) who was/were created will be using local or internal authentication with an initial randomly generated password. A valid e-mail address was not available for this/these user(s) so LON-CAPA account credentials could not be sent via e-mail.
    • ".$newusermsg."

    "; } $response .= $logmsg.$newusermsg; &print_reply($r,$response,$$tasktitleref{$action}); return; } +sub get_institutional_codes { + my ($settings,$allcourses,$LC_code) = @_; +# Get complete list of course sections to update + my @currsections = (); + my @currxlists = (); + my $coursecode = $$settings{'internal.coursecode'}; + + if ($$settings{'internal.sectionnums'} ne '') { + @currsections = split(/,/,$$settings{'internal.sectionnums'}); + } + + if ($$settings{'internal.crosslistings'} ne '') { + @currxlists = split(/,/,$$settings{'internal.crosslistings'}); + } + + if (@currxlists > 0) { + foreach (@currxlists) { + if (m/^([^:]+):(\w*)$/) { + unless (grep/^$1$/,@{$allcourses}) { + push @{$allcourses},$1; + $$LC_code{$1} = $2; + } + } + } + } + + if (@currsections > 0) { + foreach (@currsections) { + if (m/^(\w+):(\w*)$/) { + my $sec = $coursecode.$1; + my $gp = $2; + unless (grep/^$sec$/,@{$allcourses}) { + push @{$allcourses},$sec; + $$LC_code{$sec} = $gp; + } + } + } + } + return; +} + + sub print_viewclass_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; my $response; @@ -2087,54 +2496,98 @@ sub print_viewclass_response { my $chgok = 0; my $chgfail = 0; my $othdom = 0; + my $locktotal = 0; + my $lockok = 0; + my $lockfail = 0; my $cid = $dom."_".$crs; my %chg = (); my %nochg = (); my %otherdom = (); - my $modreply = ''; - my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + my %lockchg = (); + my %nolockchg = (); + my $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); my $endidx = &Apache::loncoursedata::CL_END; my $startidx = &Apache::loncoursedata::CL_START; my $ididx=&Apache::loncoursedata::CL_ID; my $secidx=&Apache::loncoursedata::CL_SECTION; my $typeidx=&Apache::loncoursedata::CL_TYPE; - foreach (sort keys %ENV) { - if (/^form\.switch:(.+)$/) { - my $student = $1; - my ($uname,$udom) = split/:/,$student; - my $sdata = $classlist->{$student}; - my $section = $sdata->[$secidx]; - my $uid = $sdata->[$ididx]; - my $start = $sdata->[$startidx]; - my $end = $sdata->[$endidx]; - my $type = $sdata->[$typeidx]; - $chgtotal ++; - my $newtype = 'auto'; - my $change = 'auto'; - my $oldtype = 'manual'; - if ($type eq 'auto') { - $oldtype = 'auto'; - $newtype = ''; - $change = 'manual'; + my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chgauto','chgmanual','lockchg','unlockchg']); + my @typechglist = (&Apache::loncommon::get_env_multiple('form.chgauto'), + &Apache::loncommon::get_env_multiple('form.chgmanual')); + my @lockchglist = (&Apache::loncommon::get_env_multiple('form.lockchg'), + &Apache::loncommon::get_env_multiple('form.unlockchg')); + + foreach my $student (sort @typechglist) { + my ($uname,$udom) = split/:/,$student; + my $sdata = $classlist->{$student}; + my $section = $sdata->[$secidx]; + my $uid = $sdata->[$ididx]; + my $start = $sdata->[$startidx]; + my $end = $sdata->[$endidx]; + my $type = $sdata->[$typeidx]; + my $lock = $sdata->[$lockedidx]; + my $newlock = $lock; + $chgtotal ++; + my $newtype = 'auto'; + my $change = 'auto'; + my $oldtype = 'manual'; + if ($type eq 'auto') { + $oldtype = 'auto'; + $newtype = ''; + $change = 'manual'; + } + if ($udom eq $dom) { + if ($newtype eq 'auto') { + $newlock = ''; + } elsif ($newtype eq '') { + $newlock = '1'; } - if ($udom eq $dom) { - $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$cid); - if ($modreply eq 'ok') { - $chgok ++; - $chg{$student} = "Changed to $change"; - } else { - $chgfail ++; - $nochg{$student} = "Still set to $oldtype"; - } + my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid); + if ($modreply eq 'ok') { + $chgok ++; + $chg{$student} = "Changed to $change"; } else { - $othdom ++; - $otherdom{$student} = "Still set to $oldtype"; + $chgfail ++; + $nochg{$student} = "Still set to $oldtype"; + } + } else { + $othdom ++; + $otherdom{$student} = "Still set to $oldtype"; + } + } + foreach my $student (@lockchglist) { + my ($uname,$udom) = split/:/,$student; + my $sdata = $classlist->{$student}; + my $section = $sdata->[$secidx]; + my $uid = $sdata->[$ididx]; + my $start = $sdata->[$startidx]; + my $end = $sdata->[$endidx]; + my $type = $sdata->[$typeidx]; + my $lock = $sdata->[$lockedidx]; + my $newlock = 1; + my $oldlockname = &mt('unlocked'); + my $newlockname = &mt('locked'); + $locktotal++; + unless ($type eq 'auto') { + if ($lock) { + $newlock = ''; + $newlockname = &mt('unlocked'); + $oldlockname = &mt('locked'); + } + my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid); + if ($lockreply eq 'ok') { + $lockok ++; + $lockchg{$student} = 'Changed to '.$newlockname; + } else { + $lockfail ++; + $nolockchg{$student} = 'Still set to '.$oldlockname; } } } if ($chgtotal > 0) { $response = "You requested a change in enrollment type for $chgtotal students.

    \n"; - $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); if ($chgok > 0) { $response .= "The following $chgok changes were successful:
    "; $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); @@ -2147,13 +2600,26 @@ sub print_viewclass_response { $response .= "The following $othdom students were not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto':
    "; $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); } + $response .= "

    "; + } + if ($locktotal > 0) { + $response .= "You requested locking/unlocking for $locktotal manually enrolled students.

    \n"; + $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); + if ($lockok > 0) { + $response .= "The following $lockok changes were successful:
    "; + $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx); + } + if ($lockfail > 0) { + $response .= "The following $lockfail students were not modified successfully: 
    "; + $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx); + } } &print_reply($r,$response,$$tasktitleref{$action}); return; } sub enrolltype_result { - my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx) = @_; + my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_; my $reply = " @@ -2269,9 +2735,9 @@ sub setup_date_selectors { if (! defined($starttime)) { $starttime = time; if ($action eq 'setdates') { - if (exists($ENV{'course.'.$ENV{'request.course.id'}. + if (exists($env{'course.'.$env{'request.course.id'}. '.default_enrollment_start_date'})) { - $starttime = $ENV{'course.'.$ENV{'request.course.id'}. + $starttime = $env{'course.'.$env{'request.course.id'}. '.default_enrollment_start_date'}; } } @@ -2279,9 +2745,9 @@ sub setup_date_selectors { if (! defined($endtime)) { $endtime = time+(6*30*24*60*60); # 6 months from now, approx if ($action eq 'setdates') { - if (exists($ENV{'course.'.$ENV{'request.course.id'}. + if (exists($env{'course.'.$env{'request.course.id'}. '.default_enrollment_end_date'})) { - $endtime = $ENV{'course.'.$ENV{'request.course.id'}. + $endtime = $env{'course.'.$env{'request.course.id'}. '.default_enrollment_end_date'}; } } @@ -2300,7 +2766,7 @@ sub get_dates_from_form { my $enddate; $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate'); - if ( exists ($ENV{'form.no_end_date'}) ) { + if ( exists ($env{'form.no_end_date'}) ) { $enddate = 0; } return ($startdate,$enddate); @@ -2333,22 +2799,22 @@ sub date_setting_table { sub handler { my $r = shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','state']); # Needs to be in a course - if (! (($ENV{'request.course.fn'}) && (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'})))) { + if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('cst',$env{'request.course.id'})))) { # Not in a course, or not allowed to modify parms - $ENV{'user.error.msg'}="/adm/populate:cst:0:0:Cannot drop or add students"; - return HTTP_NOT_ACCEPTABLE; + $env{'user.error.msg'}="/adm/populate:cst:0:0:Cannot drop or add students"; + return HTTP_NOT_ACCEPTABLE; } # Start page - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my @tasks = ("information","chgsettings","setdates","setaccess","notify","crosslist","sections","photos","updatenow","viewclass"); + my @tasks = ("information","chgsettings","setdates","setaccess","notify","crosslist","sections","photos","updatenow","updatephotos","viewclass"); my %tasklong = ( information => "Task information", @@ -2358,11 +2824,12 @@ sub handler { notify => "Notification of changes", crosslist => "Change crosslistings", sections => "Section settings", - photos => "Student photos", + photos => "Student photo settings", + updatephotos => "Update student photos", updatenow => "Update roster now", newcross => "Add crosslistings", newsections => "Add sections", - viewclass => "View students and type", + viewclass => "View students and change type", ); my %tasktitle = ( @@ -2372,7 +2839,8 @@ sub handler { notify => "Notification of enrollment changes", crosslist => "Changes to crosslistings", sections => "Changes to section settings", - photos => "Automatic import of student photos", + photos => "Student photo settings", + updatephotos => "Update student photos", updatenow => "Immediate course roster update", newcross => "Adding new crosslisted courses", newsections => "Adding new course sections", @@ -2380,37 +2848,37 @@ sub handler { ); my $realm = ''; - if ( exists($ENV{'request.course.id'}) ) { - $realm= $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + if ( exists($env{'request.course.id'}) ) { + $realm= $env{'course.'.$env{'request.course.id'}.'.description'}; } unless ($realm) { $realm=' '; } - my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; - my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; # # Main switch on form.action and form.state, as appropriate # my $action = "information"; - if ( exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if ( exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } my $state = "choose"; - if ( exists($ENV{'form.state'}) ) { - $state = $ENV{'form.state'}; + if ( exists($env{'form.state'}) ) { + $state = $env{'form.state'}; } if ($action eq "information") { $r->print(&header()); } else { if ($state eq "choose") { - $r->print(&choose_header()); + $r->print(&choose_header($action)); } else { if ($action eq "crosslist") { - if ( exists($ENV{'form.numcross'}) ) { - if ( $ENV{'form.numcross'} > 0 ) { - $r->print(&choose_header()); + if ( exists($env{'form.numcross'}) ) { + if ( $env{'form.numcross'} > 0 ) { + $r->print(&choose_header($action)); } else { $r->print(&header()); } @@ -2418,9 +2886,9 @@ sub handler { $r->print(&header()); } } elsif ($action eq "sections") { - if ( exists($ENV{'form.numsec'}) ) { - if ( $ENV{'form.numsec'} > 0 ) { - $r->print(&choose_header()); + if ( exists($env{'form.numsec'}) ) { + if ( $env{'form.numsec'} > 0 ) { + $r->print(&choose_header($action)); } else { $r->print(&header()); } @@ -2456,7 +2924,13 @@ sub handler { } elsif ($action eq "updatenow") { &print_update_result($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "photos") { - &print_photos_response($r,$realm,$dom,$crs,$action,\%tasktitle); + if ($state eq "photoupdate") { + &print_photoupdate_response($r,$realm,$dom,$crs,$action,\%tasktitle); + } else { + &photo_permission($r,$realm,$dom,$crs,$action,\%tasktitle); + } + } elsif ($action eq "updatephotos") { + &print_photoupdate_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "newcross") { &print_crosslistings_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "newsections") {