--- loncom/interface/lonpopulate.pm	2006/02/07 16:21:26	1.35
+++ 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.35 2006/02/07 16:21:26 albertel 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,7 +1025,7 @@ Note: Any students previously added manu
                      <td align=\"left\"><b>$$tasktitleref{$action}</b>
                      </td>
                     </tr><tr><td>");
-      if ($enrollvar{'showphotos'}) {
+      if ($enrollvar{'showphoto'}) {
           my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs,
 								       $dom);
           $r->print('<br />'.$commentary.'<br /><br />
@@ -2114,7 +2118,7 @@ sub photo_permission {
     my %settings = &Apache::lonnet::get('environment',
 					['internal.courseowner',
 					 'internal.photopermission',
-					 'internal.showphotos'],
+					 'internal.showphoto'],
 					$dom,$crs);
     my ($showphotos,$response);
     if (exists($env{'form.cancel_agreement'})) {
@@ -2248,9 +2252,9 @@ sub print_photos_response {
             }
         }
     }
-    my %settings = &Apache::lonnet::get('environment',['internal.showphotos'],
+    my %settings = &Apache::lonnet::get('environment',['internal.showphoto'],
 					$dom,$crs);
-    my $currphotos = $settings{'internal.showphotos'};
+    my $currphotos = $settings{'internal.showphoto'};
     my $response = "";
     if (defined($photopermission)) {
         if ($photopermission eq 'yes') {
@@ -2260,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/>";
@@ -2372,7 +2376,7 @@ sub get_ownerinfo {
     my ($ownername,$owneremail);
     if ($owner) {
         $ownername=&Apache::loncommon::plainname($owner,$dom,'firstname');
-        my %ownerinfo = &Apache::lonnet::get('environment','permanentemail',
+        my %ownerinfo = &Apache::lonnet::get('environment',['permanentemail'],
 					     $dom,$owner);
         $owneremail = $ownerinfo{'permanentemail'};
     }
@@ -2392,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'};