--- loncom/interface/lonpopulate.pm 2004/08/23 16:53:06 1.19 +++ loncom/interface/lonpopulate.pm 2006/03/15 22:11:04 1.41 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.19 2004/08/23 16:53:06 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.41 2006/03/15 22:11:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,21 +38,14 @@ use LONCAPA::Enrollment; ############################################################### sub header { - my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); - return(< - -LON-CAPA Classlist Manager - -$bodytag -ENDHEAD + return &Apache::loncommon::start_page('Classlist Manager'); } ############################################################### sub choose_header { - my $action = shift; - my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); + my ($action) = @_; + my $scripttag = qq| |; - return(< - -LON-CAPA Classlist Manager -$scripttag -$bodytag -ENDHEAD + + return &Apache::loncommon::start_page('Classlist Manager', + $scripttag); } 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") { @@ -227,8 +213,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(<  @@ -266,8 +252,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 @@ -313,7 +299,7 @@ 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.   @@ -321,6 +307,10 @@ sub print_main_frame {   + 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. @@ -350,13 +340,13 @@ ENDONE ENDTWO if ($enrollvar{autoadds}) { $r->print(" -  Enable    -  Disable + + "); } else { $r->print(" -  Enable    -  Disable + + "); } $r->print(" @@ -367,12 +357,12 @@ ENDTWO Removals based on classlist changes:  "); if ($enrollvar{autodrops}) { $r->print(" -  Enable    -  Disable"); + + "); } else { $r->print(" -  Enable    -  Disable"); + + "); } $r->print(" @@ -386,12 +376,12 @@ Note: Any students added manually by cou - + - - + + "); } elsif ($action eq "setdates") { @@ -463,12 +453,12 @@ Note: Any students added manually by cou
- +
- - + + ENDTWO } elsif ($action eq "setaccess") { @@ -477,24 +467,19 @@ 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) { @@ -519,13 +504,13 @@ ENDTWO "); if ($notifycount) { $r->print(" -  Yes    -  No + + "); } else { $r->print(" -  Yes    -  No + + "); } $r->print(" @@ -541,8 +526,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) { @@ -566,10 +551,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; } @@ -616,7 +601,7 @@ ENDTWO
- +
@@ -633,17 +618,15 @@ ENDTWO } $r->print(" - - - + + + "); } 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(" @@ -672,16 +655,16 @@ ENDTWO for (my $i=0; $i<@xlists; $i++) { my $xl = ' '; my $gp = ' '; - if ($xlists[$i] =~ /(\w+):?(.*)$/) { + if ($xlists[$i] =~ /^([^:]+):?(.*)$/) { $xl = $1; $gp = $2; } my $colflag = $i%2; $r->print(" - + $xl - + "); } @@ -713,25 +696,20 @@ 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; @@ -779,7 +757,7 @@ your changes. if ($shrflag) { $r->print(""); } else { - $r->print(""); + $r->print(""); } } $r->print(" @@ -789,12 +767,12 @@ your changes. - + - - + + "); } else { @@ -826,9 +804,9 @@ your changes. my $colflag = $j%2; $r->print(" - + $currsections[$j] - + "); } @@ -859,12 +837,12 @@ your changes.
- +
- - + + "); } @@ -875,7 +853,7 @@ your changes.
$$tasktitleref{$action}
- Currently: Student photo import: $photosets[$enrollvar{showphotos}] + Currently: Student photo import: $photosets[$enrollvar{showphoto}]
@@ -885,40 +863,102 @@ your changes. Automatic import of student photos from institutional data repository:   "); - if ($enrollvar{showphotos}) { + if ($enrollvar{showphoto}) { $r->print(" -  Yes    -  No + + "); } else { $r->print(" -  Yes    -  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'}); + my $emailstr; + if ($owneremail) { + $emailstr = "(e-mail: $owneremail)"; + } + $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 [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr).'

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

@@ -932,14 +972,15 @@ Note: if you enable automatic import of 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).
-  Yes  -  No 
+ +
@@ -957,7 +998,7 @@ Note: Any students previously added manu - + @@ -965,6 +1006,33 @@ Note: Any students previously added manu
"); + } elsif ($action eq 'updatephotos') { + $r->print(" + + + + + +
$$tasktitleref{$action} +
"); + if ($enrollvar{'showphoto'}) { + my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs, + $dom); + if ($update) { + $r->print('
'.$commentary.'

+
+ + + +
'); + } else { + $r->print(&mt('Update of photos via the Automated Enrollment Manager is unavailable in this domain.').'

'); + } + } 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("

@@ -982,13 +1050,13 @@ Note: Any students previously added manu "); - 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)) { @@ -999,7 +1067,7 @@ Note: Any students previously added manu $r->print(''. "\n

\n"); - my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &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(" @@ -1050,7 +1118,7 @@ END - + "); @@ -1186,15 +1254,14 @@ ENDFOUR ############################################################### sub print_doc_base { - my $r = shift; + my ($r) = @_; $r->print(< -
- - +
ENDBASE + $r->print(&Apache::loncommon::end_page()); } ################################################################### @@ -1228,11 +1295,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 = ""; @@ -1261,13 +1328,13 @@ sub print_chgsettings_response { } if ($autodrops) { if ($currdrops) { - $response .= "Nightly removals based on classlist changes still enabled
"; + $response .= "Nightly removals based on classlist changes still enabled
"; } else { $response .= "Nightly removals based on classlist changes now enabled
"; } } else { if ($currdrops) { - $response .= "Nightly removals based on classlist changes now disabled
"; + $response .= "Nightly removals based on classlist changes now disabled
"; } else { $response .= "Nightly removals based on classlist changes still disabled"; } @@ -1368,7 +1435,7 @@ sub print_setdates_response { $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.
|; + $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); @@ -1468,7 +1535,7 @@ $showend.
"; $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.
|; + $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); @@ -1489,33 +1556,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"}; } } } @@ -1575,23 +1637,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 ++; @@ -1601,11 +1661,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$/) { @@ -1623,8 +1680,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.

@@ -1652,13 +1709,13 @@ sub print_crosslistings_menu () { - + - - - + + + ); } @@ -1683,33 +1740,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; } } } @@ -1718,11 +1773,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$/) { @@ -1737,12 +1789,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/:/,$_; @@ -1797,42 +1844,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; } } } @@ -1851,13 +1896,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 ++; @@ -1867,11 +1912,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$/) { @@ -1920,8 +1962,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( @@ -1950,13 +1992,13 @@ sections which contribute to enrollment - + - - - + + + ); } @@ -1981,33 +2023,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; } } } @@ -2017,11 +2057,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$/) { @@ -2068,39 +2104,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.showphoto'], + $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.showphoto'], + $dom,$crs); + my $currphotos = $settings{'internal.showphoto'}; my $response = ""; - my %cenv = ('internal.showphotos' => $showphotos); + 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.showphoto' => $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 = ''; @@ -2113,17 +2386,18 @@ 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.showphoto'],$dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; my $autharg = $settings{'internal.autharg'}; + my $showphotos = $settings{'internal.showphoto'}; 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 (($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.
    "; @@ -2134,46 +2408,7 @@ sub print_update_result () { } 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); @@ -2181,11 +2416,11 @@ sub print_update_result () { &Apache::lonnet::logthis("lonpopulate:update roster". "failed to retrieve classlist". " data for ".$crs."\@".$dom." by ". - $ENV{'user.name'}." \@ ".$ENV{'user.domain'}. + $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."; } @@ -2207,6 +2442,48 @@ sub print_update_result () { 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; @@ -2223,44 +2500,19 @@ sub print_viewclass_response { my %otherdom = (); my %lockchg = (); my %nolockchg = (); - my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + 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; my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE; - my @typechglist = (); - my @lockchglist = (); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chgauto','chgmanual','lockchg','unlockchg']); - if ($ENV{'form.chgauto'}) { - if (ref($ENV{'form.chgauto'}) eq 'ARRAY') { - push @typechglist, @{$ENV{'form.chgauto'}}; - } else { - push @typechglist, $ENV{'form.chgauto'}; - } - } - if ($ENV{'form.chgmanual'}) { - if (ref($ENV{'form.chgmanual'}) eq 'ARRAY') { - push @typechglist, @{$ENV{'form.chgmanual'}}; - } else { - push @typechglist, $ENV{'form.chgmanual'}; - } - } - if ($ENV{'form.lockchg'}) { - if (ref($ENV{'form.lockchg'}) eq 'ARRAY') { - push @lockchglist, @{$ENV{'form.lockchg'}}; - } else { - push @lockchglist, $ENV{'form.lockchg'}; - } - } - if ($ENV{'form.unlockchg'}) { - if (ref($ENV{'form.unlockchg'}) eq 'ARRAY') { - push @lockchglist, @{$ENV{'form.unlockchg'}}; - } else { - push @lockchglist, $ENV{'form.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}; @@ -2330,7 +2582,7 @@ sub print_viewclass_response { } 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); @@ -2347,7 +2599,7 @@ sub print_viewclass_response { } if ($locktotal > 0) { $response .= "You requested locking/unlocking for $locktotal manually enrolled students.

    \n"; - $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + $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); @@ -2478,9 +2730,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'}; } } @@ -2488,9 +2740,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'}; } } @@ -2509,7 +2761,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); @@ -2518,11 +2770,11 @@ sub get_dates_from_form { sub date_setting_table { my ($starttime,$endtime,$action) = @_; my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action); - my $perpetual = ''; + $perpetual.= ' />'.' no ending date'; my $start_table = ''; $start_table .= "\n"; $start_table .= ''. @@ -2542,22 +2794,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", @@ -2567,7 +2819,8 @@ 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", @@ -2581,7 +2834,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", @@ -2589,25 +2843,25 @@ 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") { @@ -2617,8 +2871,8 @@ sub handler { $r->print(&choose_header($action)); } else { if ($action eq "crosslist") { - if ( exists($ENV{'form.numcross'}) ) { - if ( $ENV{'form.numcross'} > 0 ) { + if ( exists($env{'form.numcross'}) ) { + if ( $env{'form.numcross'} > 0 ) { $r->print(&choose_header($action)); } else { $r->print(&header()); @@ -2627,8 +2881,8 @@ sub handler { $r->print(&header()); } } elsif ($action eq "sections") { - if ( exists($ENV{'form.numsec'}) ) { - if ( $ENV{'form.numsec'} > 0 ) { + if ( exists($env{'form.numsec'}) ) { + if ( $env{'form.numsec'} > 0 ) { $r->print(&choose_header($action)); } else { $r->print(&header()); @@ -2665,7 +2919,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") {
    Starting Date