--- loncom/enrollment/Enrollment.pm 2003/12/08 15:51:40 1.5 +++ loncom/enrollment/Enrollment.pm 2003/12/09 00:31:51 1.6 @@ -3,7 +3,6 @@ package LONCAPA::Enrollment; use Apache::loncoursedata; use Apache::lonnet; use HTML::Entities; -use XML::Simple; use LONCAPA::Configuration; use strict; @@ -114,7 +113,7 @@ sub update_LC { $$logmsg .= " $_,"; } chop($$logmsg); - $$logmsg .= " Because of this ambiguity, no enrollment action was taken for this student.".$linefeed; + $$logmsg .= ". Because of this ambiguity, no enrollment action was taken for this student.".$linefeed; } } else { @{$enrollinfo{$uname}} = @{$allenrolled{$uname}[0]}; @@ -148,7 +147,7 @@ sub update_LC { # Check for studentID changes if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) ) { unless ( ($uidhash{$uname}) eq ($stuinfo[ $place{studentID} ]) ) { - $$logmsg .= "Change in ID for $uname in class: $crs. StudentID in LON-CAPA system is $uidhash{$uname}, StudentID in institutional data is $stuinfo[ $place{studentID} ]".$linefeed; + $$logmsg .= "Change in ID for $uname. StudentID in LON-CAPA system is $uidhash{$uname}; StudentID in institutional data is $stuinfo[ $place{studentID} ]".$linefeed; } } @@ -157,7 +156,7 @@ sub update_LC { if ( ($$currlist{$uname}[$type] eq "auto") && ($adds == 1) ) { my $modify_section_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$$currlist{$uname}[$cend],$$currlist{$uname}[$cstart],'auto',$cid); if ($modify_section_result =~ /^ok/) { - $$logmsg .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ."to new section: ".$stuinfo[ $place{groupID} ]." in class $crs".$linefeed; + $$logmsg .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ." to new section: ".$stuinfo[ $place{groupID} ].".".$linefeed; } else { $$logmsg .= "Error when attempting section change for $uname from old section ".$$currlist{$uname}[$sec]." to new section: ".$stuinfo[ $place{groupID} ]." -error: $modify_section_result".$linefeed; } @@ -169,7 +168,7 @@ sub update_LC { if (grep/^$$currlist{$uname}[ $place{'studentID'} ]$/,@allINids) { foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } } ) { if (grep/^$match$/,@okusers) { - $$logmsg .= "A possible change in username has been detected for a student enrolled in $crs. The existing LON-CAPA classlist contains user: $uname and student ID: ".$$currlist{$uname}[ $place{studentID} ].". This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match".$linefeed; + $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $uname and student ID: ".$$currlist{$uname}[ $place{studentID} ].". This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to contact your Domain Coordinator to request a move of the student data files for user: $uname to $match".$linefeed; } } } @@ -231,12 +230,12 @@ sub update_LC { } } elsif ($authtype =~ m/^krb/) { if ($authparam eq '') { - $$logmsg .= "No Kerberos domain available for the new user - $uname in course $crs - no enrollment occurred.".$linefeed; + $$logmsg .= "No Kerberos domain was provided for the new user - $uname, so the new student was not enrolled in the course.".$linefeed; $authchk = 'invalid'; } } else { $authchk = 'invalid'; - $$logmsg .= "Invalid authentication type for new user - $uname in course $crs - no enrollment occurred.".$linefeed; + $$logmsg .= "An invalid authentication type was provided for the new user - $uname, so the student was not enrolled in the course.".$linefeed; } if ($authchk eq 'ok') { # Now create user. @@ -244,7 +243,9 @@ sub update_LC { if ($reply eq 'ok') { $enrollcount ++; $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed; - $$logmsg .= "New user $uname added successfully. "; + if ($context eq 'automated') { + $$logmsg .= "New $dom user $uname added successfully.".$linefeed; + } unless ($emailenc eq '') { my %emailHash; $emailHash{'critnotification'} = $emailenc; @@ -295,7 +296,7 @@ sub update_LC { } # Report if authentication methods are different. if ($currentauth ne $auth ) { - $$logmsg .= "Authentication mismatch for $uname - $currentauth in system, $auth for class $crs".$linefeed; + $$logmsg .= "Authentication mismatch for $uname - $currentauth in system, $auth based on information in classlist or default for this course.".$linefeed; } # Check user data if ($first ne $userenv{'firstname'} || @@ -323,8 +324,9 @@ sub update_LC { if ($classlist_reply eq 'ok') { $enrollcount ++; $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed; - $$logmsg .= "Existing user $uname enrolled successfully.".$linefeed; - + if ($context eq 'automated') { + $$logmsg .= "Existing $dom user $uname enrolled successfully.".$linefeed; + } } else { $$logmsg .= "There was a problem updating the classlist db file for user $uname to show the new enrollment -error: $classlist_reply, so no enrollment occurred for this user.".$linefeed; } @@ -342,7 +344,7 @@ sub update_LC { # Check for changed usernames by checking studentIDs if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) { foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) { - $$logmsg .= "A possible change in username has been detected for a student enrolled in $crs. The existing LON-CAPA classlist contains user: $uname and student ID: $$currlist{$uname}[ $place{studentID} ]. This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match.".$linefeed; + $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $uname and student ID: $$currlist{$uname}[ $place{studentID} ]. This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match.".$linefeed; push @saved,$uname; } } elsif (@saved == 0) { @@ -366,6 +368,7 @@ sub update_LC { } if ($enrollcount > 0) { if ($context eq "updatenow") { + $addresult = substr($addresult,0,rindex($addresult,"