--- loncom/interface/lonpopulate.pm	2006/02/07 05:08:32	1.34
+++ loncom/interface/lonpopulate.pm	2006/02/09 00:40:19	1.38
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.34 2006/02/07 05:08:32 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.38 2006/02/09 00:40:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -866,7 +866,7 @@ your changes.</td>
                   <table width=\"100%\" border=\"0\" cellpadding=\"2\" cellspacing=\"2\">
                    <tr>
                     <td align=\"left\"><b>$$tasktitleref{$action}</b><br/>
-                       Currently: Student photo import:  <i>$photosets[$enrollvar{showphotos}]</i>
+                       Currently: Student photo import:  <i>$photosets[$enrollvar{showphoto}]</i>
                     </td>
                    </tr>
                   </table>
@@ -876,7 +876,7 @@ your changes.</td>
                          Automatic import of student photos from institutional data repository:&nbsp;&nbsp;
 
       ");
-      if ($enrollvar{showphotos}) {
+      if ($enrollvar{showphoto}) {
           $r->print("
                         <input type=\"radio\" name=\"showphotos\" value=\"1\" checked=\"true\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;
                         <input type=\"radio\" name=\"showphotos\" value=\"0\" />&nbsp;No
@@ -943,10 +943,14 @@ your changes.</td>
           } else {
               my ($ownername,$owneremail) = &get_ownerinfo($dom,
                                                     $enrollvar{'courseowner'});
+              my $emailstr;
+              if ($owneremail) {
+                  $emailstr = "(e-mail: $owneremail)";
+              }
               $r->print('
                     <tr>
                      <td>'.
-&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).'<br /><br />'.&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).'<br /><br /><input type="button" name=mainmenu" value="Go back" onclick="javascript:history.go(-1);" />
+&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).'<br /><br />'.&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).'<br /><br /><input type="button" name=mainmenu" value="Go back" onclick="javascript:history.go(-1);" />
                     </td>
                    </tr>
                   </form>
@@ -1021,9 +1025,9 @@ Note: Any students previously added manu
                      <td align=\"left\"><b>$$tasktitleref{$action}</b>
                      </td>
                     </tr><tr><td>");
-      if ($enrollvar{'showphotos'}) {
-          my ($update,$commentary) = &Apache::lonnet::auto_photochoice(
-                                                                    $crs,$dom);
+      if ($enrollvar{'showphoto'}) {
+          my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs,
+								       $dom);
           $r->print('<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">
 <input type ="button" name="retrieve" value="'.&mt('Update photo repository').'"
@@ -2111,8 +2115,11 @@ sub print_sections_response () {
 
 sub photo_permission {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
-    my %settings = &Apache::lonnet::get('environment',['internal.courseowner',
-                  'internal.photopermission','internal.showphotos'],$dom,$crs);
+    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'}) {
@@ -2143,25 +2150,27 @@ sub photo_permission {
                 $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.').'<br/>'."\n";
             } else {
                 &print_photos_response($r,$realm,$dom,$crs,$action,
-                $tasktitleref,$showphotos,$env{'form.photopermission'},\%cenv);
+				       $tasktitleref,$showphotos,
+				       $env{'form.photopermission'},\%cenv);
             }
         } else {
             my ($result,$perm_reqd,$conditions) = 
-                             &Apache::lonnet::auto_photo_permission($crs,$dom);
+		&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);
+					       $tasktitleref,$showphotos);
                     } else {
                         return(&print_photo_agreement($r,$realm,$dom,$crs,
-                                           $action,$tasktitleref,$conditions,
-                                           $settings{'internal.courseowner'}));
+						      $action,$tasktitleref,
+						      $conditions,
+						      $settings{'internal.courseowner'}));
                     }
                 } elsif ($perm_reqd eq 'no') {
                     &print_photos_response($r,$realm,$dom,$crs,$action,
-                                                    $tasktitleref,$showphotos);
+					   $tasktitleref,$showphotos);
                 } else {
                     $permcheck = 'fail';
                 }
@@ -2233,19 +2242,19 @@ function agreement_result(caller) {
 
 sub print_photos_response {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref,$showphotos,$photopermission,
-                                                            $permissionenv)=@_;
+	$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};
+		    $$permissionenv{$key};
             }
         }
     }
-    my %settings = &Apache::lonnet::get('environment',['internal.showphotos'],
-                                                                    $dom,$crs);
-    my $currphotos = $settings{'internal.showphotos'};
+    my %settings = &Apache::lonnet::get('environment',['internal.showphoto'],
+					$dom,$crs);
+    my $currphotos = $settings{'internal.showphoto'};
     my $response = "";
     if (defined($photopermission)) {
         if ($photopermission eq 'yes') {
@@ -2255,7 +2264,7 @@ sub print_photos_response {
             $showphotos = 0;
         }
     }
-    my %cenv = ('internal.showphotos' => $showphotos);
+    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 retrieval setting for this course has been left unchanged.<br/>";
@@ -2265,8 +2274,8 @@ sub print_photos_response {
 		$response .= "Retrieval of student photos is still <b>enabled</b>.<br/>";
 	    } else {
 		$response .= "Retrieval of student photos in now <b>enabled</b>.<br/>";
-                my ($update,$commentary) = &Apache::lonnet::auto_photochoice(
-                                                                    $crs,$dom);
+                my ($update,$commentary) = 
+		    &Apache::lonnet::auto_photochoice($crs,$dom);
                 if ($update) {
                     $response .= '<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">
@@ -2287,7 +2296,7 @@ onclick="javascript:document.photoupdate
         foreach my $key (keys(%cenv)) {
             if (exists($env{'request.course.id'})) {
                 $newenv{'course.'.$env{'request.course.id'}.'.'.$key} = 
-                                                                   $cenv{$key};
+		    $cenv{$key};
             }
         }
     }
@@ -2303,8 +2312,11 @@ sub print_photoupdate_response {
     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 %settings = &Apache::lonnet::get('environment',
+					['internal.coursecode',
+					 'internal.sectionnums',
+					 'internal.crosslistings'],
+					$dom,$crs);
     my @allcourses = ();
     my %LC_code;
     my %affiliates;
@@ -2315,10 +2327,10 @@ sub print_photoupdate_response {
         $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);
+				     "failed to update student photos".
+				     " for ".$crs."\@".$dom." by ".
+				     $env{'user.name'}." \@ ".$env{'user.domain'}.
+				     ": ".$outcome);
         }
         if ($outcome eq 'ok') {
             if (keys(%changes) > 0) {
@@ -2336,7 +2348,7 @@ function photowindow(photolink) {
                     my @usernames = sort(split(/\&/,$changes{$type})); 
                     my $count = @usernames; 
                     $response .= '<b>'.&mt('For [_1] students, photos ',
-                                            $count).$lt{$type}.'</b><ul>';
+					   $count).$lt{$type}.'</b><ul>';
                     foreach my $username (@usernames) {
                         $response .= '<li>'.$username;
                         if (($type eq 'new') || ($type eq 'same') || ($type eq 'update')) {
@@ -2364,8 +2376,8 @@ sub get_ownerinfo {
     my ($ownername,$owneremail);
     if ($owner) {
         $ownername=&Apache::loncommon::plainname($owner,$dom,'firstname');
-        my %ownerinfo = &Apache::lonnet::get('environment','permanentemail',
-                                                                  $dom,$owner);
+        my %ownerinfo = &Apache::lonnet::get('environment',['permanentemail'],
+					     $dom,$owner);
         $owneremail = $ownerinfo{'permanentemail'};
     }
     return ($ownername,$owneremail);
@@ -2384,11 +2396,11 @@ sub print_update_result () {
     my $logmsg = '';
     my $newusermsg = '';
     my %phototypes = ();
-    my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg','internal.showphotos'],$dom,$crs);
+    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.showphotos'};
+    my $showphotos = $settings{'internal.showphoto'};
     my ($startaccess,$endaccess) = &get_dates_from_form();
     if ( exists($env{'form.updateadds'}) ) {
         $updateadds = $env{'form.updateadds'};