@@ -876,7 +876,7 @@ your changes.
Automatic import of student photos from institutional data repository:
");
- if ($enrollvar{showphotos}) {
+ if ($enrollvar{showphoto}) {
$r->print("
Yes
No
@@ -943,10 +943,14 @@ your changes.
} 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 (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail).'
+&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).'
@@ -1021,7 +1025,7 @@ Note: Any students previously added manu
$$tasktitleref{$action}
");
- if ($enrollvar{'showphotos'}) {
+ if ($enrollvar{'showphoto'}) {
my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs,
$dom);
$r->print(' '.$commentary.'
@@ -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. ";
@@ -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'};