--- loncom/enrollment/Enrollment.pm 2006/02/07 17:56:41 1.30 +++ loncom/enrollment/Enrollment.pm 2006/08/11 21:55:15 1.32 @@ -1,5 +1,5 @@ # Automated Enrollment manager -# $Id: Enrollment.pm,v 1.30 2006/02/07 17:56:41 raeburn Exp $ +# $Id: Enrollment.pm,v 1.32 2006/08/11 21:55:15 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,7 @@ package LONCAPA::Enrollment; use Apache::loncoursedata; use Apache::lonnet; +use Apache::loncommon(); use Apache::lonmsg; use Apache::lonlocal; use HTML::Entities; @@ -326,7 +327,7 @@ sub update_LC { } else { &execute_add($context,'newstudent',$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,\$addresult,\$enrollcount,$linefeed,$logmsg); } - if ($courseinfo{'showphotos'}) { + if ($courseinfo{'showphoto'}) { my ($result,$resulttype) = &Apache::lonnet::auto_checkphotos($uname,$dom,$pid); if ($resulttype) { @@ -337,7 +338,7 @@ sub update_LC { } } } - if ($courseinfo{'showphotos'}) { + if ($courseinfo{'showphoto'}) { if (keys(%{$phototypes})>0) { my %lt = &photo_response_types(); foreach my $type (sort(keys(%{$phototypes}))) { @@ -502,7 +503,7 @@ sub create_newuser { if ($context eq 'createowner' || $context eq 'createcourse') { my $result = &Apache::lonnet::modifyuser($udom,$uname,$pid,$auth,$authparam,$first,$middle,$last,$gene,'1',undef,$emailaddr); if ($result eq 'ok' && $context eq 'createcourse') { - $outcome = &Apache::loncreateuser::commit_standardrole($udom,$uname,$userurl,$role,$start,$end,$cdom,$crs,$usec); + $outcome = &Apache::loncommon::commit_standardrole($udom,$uname,$userurl,$role,$start,$end,$cdom,$crs,$usec); unless ($outcome =~ /^Error:/) { $outcome = 'ok'; } @@ -826,15 +827,15 @@ sub get_courseinfo { my ($dom,$crs,$courseinfo) = @_; my $owner; if (defined($dom) && defined($crs)) { - my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphotos','description'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphoto','description'],$dom,$crs); if ( defined($settings{'internal.coursecode'}) ) { $$courseinfo{'inst_code'} = $settings{'internal.coursecode'}; } if ( defined($settings{'description'}) ) { $$courseinfo{'description'} = $settings{'description'}; } - if ( defined($settings{'internal.showphotos'}) ) { - $$courseinfo{'showphotos'} = $settings{'internal.showphotos'}; + if ( defined($settings{'internal.showphoto'}) ) { + $$courseinfo{'showphoto'} = $settings{'internal.showphoto'}; } } return;