--- loncom/interface/lonpopulate.pm	2013/07/22 18:06:51	1.77
+++ loncom/interface/lonpopulate.pm	2014/12/12 14:30:47	1.82
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.77 2013/07/22 18:06:51 bisitz Exp $
+# $Id: lonpopulate.pm,v 1.82 2014/12/12 14:30:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,7 +290,7 @@ sub print_main_frame {
 # Get course settings
   my %enrollvar;
   my %settings = &Apache::lonnet::dump('environment',$dom,$crs);
-  foreach my $item (keys %settings) {
+  foreach my $item (keys(%settings)) {
       if ($item =~ m/^internal\.(.+)$/) {
           $enrollvar{$1} = $settings{$item};
       } elsif ($item =~ /^default_enrollment_(start|end)_date$/) {
@@ -749,7 +749,7 @@ sub print_main_frame {
           $r->print(
               &mt('Currently, this LON-CAPA course is crosslisted with [quant,_1,course section,course sections].',$cross_str).' '.
               &mt('Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.').' '.
-              &mt('For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: [_1; otherwise uncheck it.',"<b>$realm ($enrollvar{coursecode})</b>").' '.
+              &mt('For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: [_1]; otherwise uncheck it.',"<b>$realm ($enrollvar{coursecode})</b>").' '.
               &mt('If you wish to change the section ID assigned in your LON-CAPA course for a crosslisted course, enter the new section ID in the appropriate textbox.').' '.
               &mt('The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this crosslisting.').' '.
               &mt('If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page.').' '.
@@ -1920,7 +1920,7 @@ sub print_crosslistings_menu {
 	if ($numcross) {
 	    $response .= 
                 &mt('You indicated that you wish to add an additional [quant,_1,crosslisting].',$numcross).' '.
-                &mt('For each new crosslisting enter the insititutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '.
+                &mt('For each new crosslisting enter the institutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section.').' '.
                 &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '.
                 &mt("The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution's student information system.").
                 '<br /><br />
@@ -2250,7 +2250,7 @@ sub print_sections_menu {
 	if ($numsec > 0) {
 	    $response .= 
                 &mt('You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional [quant,_1,section].',$numsec).' '.
-               &mt('For each new section enter the insititutional section code (e.g., 004), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in this particular section.').' '.
+               &mt('For each new section enter the institutional section code (e.g., 004), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in this particular section.').' '.
                &mt('The LON-CAPA section ID can be left blank, if you do not wish to designate a section ID for this course section.').' '.
                &mt("The institutional section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course section numbers to your institution's student information system.").'
                <br /><br />
@@ -2356,7 +2356,7 @@ sub print_sections_response {
 	}
     }
 
-    if ($putreply ne 'ok') {
+    if ($putreply eq 'ok') {
 	$response = &mt('Students enrolling in the sections listed below will be automatically added to the class roster for LON-CAPA course [_1], if you have chosen to enable a nightly automated enrollment update.',
                         "$realm ($coursecode)").'<br /><ul>'."\n";
 	foreach my $section (@allsections) {
@@ -2726,20 +2726,24 @@ sub print_update_result {
     my %settings = 
         &Apache::lonnet::get('environment',
             ['internal.coursecode','internal.sectionnums','internal.crosslistings',
-             'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits'],
+             'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits',
+             'internal.textbook'],
             $dom,$crs);
     my $coursecode = $settings{'internal.coursecode'};
     my $authtype = $settings{'internal.authtype'};
     my $autharg = $settings{'internal.autharg'};
     my $showphotos = $settings{'internal.showphoto'};
+    my $textbook = $settings{'internal.textbook'};
     my ($showcredits,$defaultcredits);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+    if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
         $showcredits = 1;
         $defaultcredits = $settings{'internal.defaultcredits'};
         if ($defaultcredits eq '') {
             if ($coursecode ne '') {
                 $defaultcredits = $domdefaults{'officialcredits'};   
+            } elsif ($textbook ne '') {
+                $defaultcredits = $domdefaults{'textbookcredits'};
             } else {
                 $defaultcredits = $domdefaults{'unofficialcredits'};
             }
@@ -3034,7 +3038,7 @@ sub warning_message {
     unless ( $caller eq 'chgsettings') {
         if ( (!$curradds) && (!$currdrops) ) {
             $warning .= '<li>'.
-                &mt('You [_1]must[_2] now use [_3]Automated adds/drops[_4] to enable automated adds and/or drops if you want automatic enrollment updates to occur in this course.','<b>','</b>','<a href="/adm/populate?action=chgsettings">').'</li>';
+                &mt('You [_1]must[_2] now use [_3]Automated adds/drops[_4] to enable automated adds and/or drops if you want automatic enrollment updates to occur in this course.','<b>','</b>','<a href="/adm/populate?action=chgsettings">','</a>').'</li>';
         }
     }
     if ($warning) {