--- loncom/interface/lonpopulate.pm	2008/01/02 07:53:47	1.52
+++ loncom/interface/lonpopulate.pm	2008/12/11 14:55:15	1.57
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.52 2008/01/02 07:53:47 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.57 2008/12/11 14:55:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -208,9 +208,9 @@ sub print_mainbox {
     }
     my $page = '';
     if ($action eq "information") {
-        $page = "<b>Automated Student Enrollment</b>";
+        $page = "<b>".&mt("Automated Enrollment")."</b>";
     } else {
-        $page =  '<a href="/adm/populate">Automated Student Enrollment</a>';
+        $page =  '<a href="/adm/populate">'.&mt('Automated Enrollment').'</a>';
         if ($reply) {
             if ($action eq "newcross") {
                 $action = "crosslist";
@@ -222,14 +222,16 @@ sub print_mainbox {
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>"; 
         }
     }
+    my $usrmang = &mt('User Management');
+    my $autenrl = &mt('Automated Enrollment Manager');
     $r->print(<<ENDTHIS);
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
  <tr>
   <td bgcolor="#CCCCFF"> 
-   <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">User Management</a> -&gt; $page</font><br/>
+   <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">$usrmang</a> -&gt; $page</font><br/>
   </td>
   <td align="right" bgcolor="#CCCCFF" valign="top">
-   <font size="+1">Automated Student Enrollment Manager&nbsp;</font>
+   <font size="+1">$autenrl&nbsp;</font>
   </td>
  </tr>
 </table>
@@ -954,7 +956,7 @@ ENDTWO
                       $r->print('
                     <tr>
                      <td>'.
-&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><nobr><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').'&nbsp;<input type="checkbox" name="cancel_agreement" value="1" /></label></nobr>
+&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><span class="LC_nobreak"><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').'&nbsp;<input type="checkbox" name="cancel_agreement" value="1" /></label></span>
                      </td>
                     </tr>
                       ');
@@ -1000,8 +1002,11 @@ ENDTWO
               }
               $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 [_1] to visit the "Student photos" page in the Automated Student 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>'
+                      .&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>
@@ -1089,7 +1094,8 @@ onclick="javascript:document.photoupdate
 <input type ="hidden" name="state" value="process" />
 </form>');
           } else {
-              $r->print(&mt('Update of photos via the Automated Student Enrollment Manager is unavailable in this domain.').'<br /><br /><input type="button" name=mainmenu" value="Go back" onclick="javascript:history.go(-1);" />');
+              $r->print(&mt('Update of photos via the Automated Enrollment Manager is unavailable in this domain.')
+                       .'<br /><br /><input type="button" name=mainmenu" value="'.&mt('Go back').'" onclick="javascript:history.go(-1);" />');
           }
       } else {
           $r->print('Update of photos is unavailable, as import of student photos is currently disabled.<br />Enable this first via: <a href="/adm/populate?action=photos">'.$$tasktitleref{'photos'}.'</a>');
@@ -2419,7 +2425,9 @@ function agreement_result(caller) {
         if ($owneremail) {
             $emailstr = "(e-mail: $owneremail)";
         }
-        $response = &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 Student Enrollment Manager to indicate acceptance of these conditions of use',$emailstr);
+        $response = &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);
     }
     &print_reply($r,$response,$$tasktitleref{$action});
 }
@@ -2485,7 +2493,7 @@ onclick="javascript:document.photoupdate
         }
     }
     if (keys(%newenv) > 0) {
-        &Apache::lonnet::appenv(%newenv);
+        &Apache::lonnet::appenv(\%newenv);
     }
     &print_reply($r,$response,$$tasktitleref{$action});
     return;
@@ -2505,7 +2513,7 @@ sub print_photoupdate_response {
     my %LC_code;
     my %affiliates;
     my $outcome;
-    &get_institutional_codes(\%settings,,\@allcourses,\%LC_code);
+    &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
     if (@allcourses > 0) {
         @{$affiliates{$crs}} = @allcourses;
         $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes);
@@ -2609,7 +2617,7 @@ sub print_update_result () {
     } elsif ($coursecode eq '') {
 	$response = "There was a problem retrieving the course code for this LON-CAPA course.  An update of the class roster has not been carried out, and enrollment remains unchanged";
     } else {
-        &get_institutional_codes(\%settings,\@allcourses,\%LC_code);
+        &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
 	if (@allcourses > 0) {
 	    @{$affiliates{$crs}} = @allcourses;
 	    my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs);
@@ -2643,48 +2651,6 @@ sub print_update_result () {
     return;
 }
 
-sub get_institutional_codes {
-    my ($settings,$allcourses,$LC_code) = @_;
-# Get complete list of course sections to update
-    my @currsections = ();
-    my @currxlists = ();
-    my $coursecode = $$settings{'internal.coursecode'};
-    
-    if ($$settings{'internal.sectionnums'} ne '') {
-        @currsections = split(/,/,$$settings{'internal.sectionnums'});
-    }
-    
-    if ($$settings{'internal.crosslistings'} ne '') {
-        @currxlists = split(/,/,$$settings{'internal.crosslistings'});
-    }
-    
-    if (@currxlists > 0) {
-        foreach (@currxlists) {
-            if (m/^([^:]+):(\w*)$/) {
-                unless (grep/^$1$/,@{$allcourses}) {
-                    push @{$allcourses},$1;
-                    $$LC_code{$1} = $2;
-                }
-            }
-        }
-    }
-                                                                                       
-    if (@currsections > 0) {
-        foreach (@currsections) {
-            if (m/^(\w+):(\w*)$/) {
-                my $sec = $coursecode.$1;
-                my $lc_sec = $2;
-                unless (grep/^$sec$/,@{$allcourses}) {
-                    push @{$allcourses},$sec;
-                    $$LC_code{$sec} = $lc_sec;
-                }
-            }
-        }
-    }
-    return; 
-}
-
-
 sub print_viewclass_response {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
     my $response;
@@ -2739,7 +2705,7 @@ sub print_viewclass_response {
             } elsif ($newtype eq '') {
                 $newlock = '1';
             }
-            my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid);
+            my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid,'','chgtype');
             if ($modreply eq 'ok') {
                 $chgok ++;
                 $chg{$student} = "Changed to $change";
@@ -2771,7 +2737,7 @@ sub print_viewclass_response {
                 $newlockname = &mt('unlocked');
                 $oldlockname = &mt('locked'); 
             }
-            my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid);
+            my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid,'','chgtype');
             if ($lockreply eq 'ok') {
                 $lockok ++;
                 $lockchg{$student} = 'Changed to '.$newlockname;
@@ -2969,11 +2935,11 @@ sub get_dates_from_form {
 sub date_setting_table {
     my ($starttime,$endtime,$action) = @_;
     my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action);
-    my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
+    my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
     if (($action eq 'setdates' && defined($endtime) && $endtime == 0) || (($action eq 'setaccess' || $action eq 'updatenow') && ($endtime eq '' || $endtime == 0)) ) {
         $perpetual .= ' checked';
     }
-    $perpetual.= ' />'.' no ending date</label></nobr>';
+    $perpetual.= ' />'.' no ending date</label></span>';
     my $start_table = '';
     $start_table .= "<table>\n";
     $start_table .= '<tr><td align="right">Starting Date</td>'.