--- loncom/interface/lonpopulate.pm	2007/12/14 00:20:53	1.51
+++ loncom/interface/lonpopulate.pm	2009/11/24 14:26:15	1.67
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.51 2007/12/14 00:20:53 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.67 2009/11/24 14:26:15 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,7 @@ sub choose_header {
     my ($action) = @_;
     my $notify_check = '/^note_[0-9]+$/';
     my $scripttag = qq|
-<script language='javascript' type='text/javascript'>
+<script type=\"text/javascript\" language=\"JavaScript\">
 <!--
 function process(calling,numauto,nummanual,numlock,numunlock) {
  var checker = 1
@@ -208,33 +208,37 @@ sub print_mainbox {
     }
     my $page = '';
     if ($action eq "information") {
-        $page = "<b>Automated Enrollment</b>";
+        $page = "<b>".&mt("Automated Enrollment")."</b>";
     } else {
-        $page =  '<a href="/adm/populate">Automated Enrollment</a>';
+        $page =  '<a href="/adm/populate">'.&mt('Automated Enrollment').'</a>';
         if ($reply) {
             if ($action eq "newcross") {
                 $action = "crosslist";
             } elsif ($action eq "newsections") {
                 $action = "sections"; 
             }
-            $page .= "-&gt; <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> -&gt; <b>result</b>";
+            $page .= "&raquo; <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> &raquo; <b>result</b>";
         } else {
-            $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>"; 
+            $page .=  " &raquo; <b>".$$tasklongref{$action}."</b>"; 
         }
     }
+    my $usrmang = &mt('User Management');
+    my $autenrl = &mt('Automated Enrollment Manager');
+    #LC_pick_box is used in the following. This is only a temporary solution to adapt the site to the design.
     $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/>
+  <td bgcolor="#C5DB99"> 
+   <a href="/adm/menu">$realm</a> &raquo; <a href="/adm/createuser">$usrmang</a> &raquo; $page<br/>
   </td>
-  <td align="right" bgcolor="#CCCCFF" valign="top">
-   <font size="+1">Automated Enrollment Manager&nbsp;</font>
+  <td align="right" bgcolor="#C5DB99" valign="top">
+   $autenrl&nbsp;
   </td>
  </tr>
 </table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
+<br/>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="LC_pick_box">
+ <tr class="LC_pick_box_row">
 ENDTHIS
 }
 
@@ -245,9 +249,7 @@ sub print_navmenu {
         $action = $env{'form.action'};
     }
     $r->print(<<ENDONE);
-  <td width="10" valign="top" bgcolor="#DDFFFF">&nbsp;</td>
-  <td width="20%" valign="top" bgcolor="#DDFFFF">
-   <br/>
+    <td valign="top" class="LC_pick_box_title">
 ENDONE
     foreach my $task (@{$tasksref}) {
         if ($task eq $action) {
@@ -270,9 +272,7 @@ ENDONE
     $r->print("
   <p>&nbsp;</p>
   </td>
-  <td width=\"10\" valign=\"top\" bgcolor=\"#CCCCFF\">&nbsp;</td>
-  <td width=\"10\" valign=\"top\" bgcolor=\"#FFFFFF\">&nbsp;</td>
-  <td bgcolor=\"#ffffff\" valign=\"top\">");
+  <td valign=\"top\" class=\"LC_pick_box_value\">");
 }
 
 ###############################################################
@@ -368,13 +368,13 @@ ENDONE
 ENDTWO
       if ($enrollvar{autoadds}) {
           $r->print("
-			    <label><input type=\"radio\" name=\"autoadds\" value=\"1\" checked=\"true\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
+			    <label><input type=\"radio\" name=\"autoadds\" value=\"1\" checked=\"checked\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
 			    <label><input type=\"radio\" name=\"autoadds\" value=\"0\" />&nbsp;Disable</label>
          ");
       } else {
           $r->print("
                             <label><input type=\"radio\" name=\"autoadds\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
-                            <label><input type=\"radio\" name=\"autoadds\" value=\"0\" checked=\"true\" />&nbsp;Disable</label>
+                            <label><input type=\"radio\" name=\"autoadds\" value=\"0\" checked=\"checked\" />&nbsp;Disable</label>
          ");
       }
       $r->print("
@@ -385,12 +385,12 @@ ENDTWO
  	       Removals based on classlist changes:&nbsp;&nbsp;");
       if ($enrollvar{autodrops}) {
           $r->print("
-                <label><input type=\"radio\" name=\"autodrops\" value=\"1\" checked=\"true\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
+                <label><input type=\"radio\" name=\"autodrops\" value=\"1\" checked=\"checked\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
                 <label><input type=\"radio\" name=\"autodrops\" value=\"0\" />&nbsp;Disable</label>");
       } else {
           $r->print("
                 <label><input type=\"radio\" name=\"autodrops\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
-                <label><input type=\"radio\" name=\"autodrops\" value=\"0\" checked=\"true\" />&nbsp;Disable</label>");
+                <label><input type=\"radio\" name=\"autodrops\" value=\"0\" checked=\"checked\" />&nbsp;Disable</label>");
       }
       $r->print("
               </td>
@@ -398,7 +398,7 @@ ENDTWO
              <tr>
               <td>
                <font color=\"#888888\">
-Note: Any students added manually by course coordinators using the Enrollment Manager will be unaffected by the nightly removal process if you choose to enable it.
+Note: Any students added manually by course coordinators using the User Manager will be unaffected by the nightly removal process if you choose to enable it.
                </font>
               </td>
              </tr>
@@ -427,7 +427,7 @@ Note: Any students added manually by cou
       }
       my $dateshow;
       if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
-         $dateshow = "<br/><font size='+1'>Warning</font>. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n";
+         $dateshow = "<br/>Warning. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n";
       } else {
          $dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n";
       }
@@ -506,8 +506,7 @@ ENDTWO
   } elsif ($action eq "notify") {
       my $notifycount = 0;
       my @notified = split(/,/,$enrollvar{notifylist});
-      my @domcoord;
-      my @showdom;
+      my (@domcoord,@showdom,@olddomcoord,@futuredomcoord);
       for (my $i=0; $i<@notified; $i++) {
           if ($notified[$i] !~ /:/) {
               $notified[$i] =~ s/\@/:/;
@@ -520,12 +519,26 @@ ENDTWO
       } else {
           $noteset = "OFF";
       }
+      my $now = time;
       my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
       foreach my $server (keys(%dompersonnel)) {
           foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
               my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
-              if (!grep(/^$uname:$udom$/,@domcoord)) {
-                  push(@domcoord,$uname.':'.$udom);
+              my ($end,$start) = split(':',$dompersonnel{$server}{$user});
+              if (($end eq '') || ($end == 0) || ($end > $now)) {
+                  if ($start > $now) {
+                      if (!grep(/^\Q$uname\E:\Q$udom\E$/,@futuredomcoord)) {
+                          push(@futuredomcoord,$uname.':'.$udom);
+                      }
+                  } else {
+                      if (!grep(/^\Q$uname\E:\Q$udom\E$/,@domcoord)) {
+                          push(@domcoord,$uname.':'.$udom);
+                      }
+                  }
+              } else {
+                  if (!grep(/^\Q$uname\E:\Q$udom\E$/,@olddomcoord)) {
+                      push(@olddomcoord,$uname.':'.$udom);
+                  }
               }
           }
       }
@@ -545,13 +558,13 @@ ENDTWO
       ");
       if ($notifycount) {
           $r->print("
-                        <label><input type=\"radio\" name=\"notify\" value=\"1\" checked=\"true\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
+                        <label><input type=\"radio\" name=\"notify\" value=\"1\" checked=\"checked\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"notify\" value=\"0\" />&nbsp;No</label>
           ");
       } else {
           $r->print("
                         <label><input type=\"radio\" name=\"notify\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
-                        <label><input type=\"radio\" name=\"notify\" value=\"0\" checked=\"true\" />&nbsp;No</label>
+                        <label><input type=\"radio\" name=\"notify\" value=\"0\" checked=\"checked\" />&nbsp;No</label>
           ");
       }
       $r->print("
@@ -563,7 +576,6 @@ ENDTWO
       my %pname;
       my %notifystate;
       my %status;
-      my $now = time;
       foreach my $person (sort(keys(%coursepersonnel))) {
           my $match = 0;
           my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);
@@ -599,6 +611,7 @@ ENDTWO
                                   usnm => 'username:domain',
                                   coac => 'Course Access',
                                   curn => 'Current notification status',
+                                  doms => 'Domain Coordinator status',
                                   notf => 'Notification?',
                                   ntac => 'Notification active',
                                   ntin => 'Notification inactive',
@@ -628,7 +641,7 @@ ENDTWO
       if (grep(/^$viewer$/,@domcoord)) {
           $showalldc = 1;
       }
-      foreach my $dc (@domcoord) {
+      foreach my $dc (@domcoord,@futuredomcoord) {
           if (!grep(/^$dc$/,@ccs)) {
               if (grep(/^$dc$/,@notified)) {
                   $notifystate{$dc} = 1;
@@ -643,6 +656,16 @@ ENDTWO
               push(@showdom,$dc);
           }
       }
+      foreach my $olddc (@olddomcoord) {
+          if (grep(/^$olddc$/,@notified)) {
+              if (!grep(/^\Q$olddc\E$/,@ccs)) {
+                  $notifystate{$olddc} = 1;
+                  my ($dcname,$dcdom) = split(/:/,$olddc);
+                  $pname{$olddc} =  &Apache::loncommon::plainname($dcname,$dcdom);
+                  push(@showdom,$olddc);
+              }
+          }
+      }
       my $showdomnum = scalar(@showdom);
       if ($showdomnum) {
           $r->print("
@@ -660,8 +683,8 @@ ENDTWO
              </tr>
              <tr>
               <td>");
-          $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,
-                                     \%pname,\$notifyshow));
+          $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname,
+                                     \$notifyshow,\@olddomcoord,\@futuredomcoord));
           $r->print("
              </td>
           </tr>");
@@ -732,9 +755,9 @@ ENDTWO
               my $colflag = $i%2;
               $r->print(&Apache::loncommon::start_data_table_row());
               $r->print("
-                 <td><input type=\"checkbox\" name=\"cross_$i\" checked=\"true\" /></td>
+                 <td><input type=\"checkbox\" name=\"cross_$i\" checked=\"checked\" /></td>
                  <td>$xl</td>
-                 <td><input type =\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>
+                 <td><input type=\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>
               ");
               $r->print(&Apache::loncommon::end_data_table_row());
           }
@@ -823,7 +846,7 @@ ENDTWO
                   $r->print("Enrollment inactive");
               }
               if ($shrflag) {
-                  $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\"></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"true\" /></td>"); 
+                  $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"checked\" /></td>"); 
               } else {
                   $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");
               }
@@ -872,7 +895,7 @@ ENDTWO
                   my $colflag = $j%2;
                   $r->print(&Apache::loncommon::start_data_table_row());
                   $r->print("
-                 <td><input type=\"checkbox\" name=\"sec_$j\" checked=\"true\" /></td>
+                 <td><input type=\"checkbox\" name=\"sec_$j\" checked=\"checked\" /></td>
                  <td>$currsections[$j]</td>
                  <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
                   ");
@@ -929,13 +952,13 @@ ENDTWO
       ");
       if ($enrollvar{showphoto}) {
           $r->print("
-                        <label><input type=\"radio\" name=\"showphotos\" value=\"1\" checked=\"true\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
+                        <label><input type=\"radio\" name=\"showphotos\" value=\"1\" checked=\"checked\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"showphotos\" value=\"0\" />&nbsp;No</label>
           ");
       } else {
           $r->print("
                         <label><input type=\"radio\" name=\"showphotos\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
-                        <label><input type=\"radio\" name=\"showphotos\" value=\"0\" checked=\"true\" />&nbsp;No</label>
+                        <label><input type=\"radio\" name=\"showphotos\" value=\"0\" checked=\"checked\" />&nbsp;No</label>
           ");
       }
       $r->print('
@@ -954,7 +977,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 +1023,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 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>
@@ -1083,13 +1109,14 @@ Note: Any students previously added manu
           if ($update) { 
               $r->print('<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">
-<input type ="button" name="retrieve" value="'.&mt('Update photo repository').'"
+<input type="button" name="retrieve" value="'.&mt('Update photo repository').'"
 onclick="javascript:document.photoupdate.submit()" />
-<input type ="hidden" name="action" value="'.$action.'" />
-<input type ="hidden" name="state" value="process" />
+<input type="hidden" name="action" value="'.$action.'" />
+<input type="hidden" name="state" value="process" />
 </form>');
           } else {
-              $r->print(&mt('Update of photos via the Automated 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>');
@@ -1126,7 +1153,8 @@ onclick="javascript:document.photoupdate
       my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array();
       my $classlist = &Apache::loncoursedata::get_classlist();
       my $secidx = &Apache::loncoursedata::CL_SECTION();
-      my ($permission,$allowed) = &Apache::lonuserutils::get_permission();
+      my $crstype =&Apache::loncommon::course_type();
+      my ($permission,$allowed) = &Apache::lonuserutils::get_permission('course',$crstype);
       foreach my $student (keys(%{$classlist})) {
           if (exists($permission->{'view_section'})) {
               if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
@@ -1162,14 +1190,14 @@ onclick="javascript:document.photoupdate
               if ($autocount > 0) {
                   $cellcount ++;
                   $r->print(<<END);
-                       <td><fieldset><legend>&nbsp;<b>Change auto</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgauto)" />&nbsp;&nbsp;
+                       <td><fieldset><legend>Change auto</legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgauto)" />&nbsp;&nbsp;
                        <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgauto)" /></fieldset></td>
 END
               }
               if ($manualcount > 0) {
                   $cellcount ++;
                   $r->print(<<END);
-                       <td><fieldset><legend>&nbsp;<b>Change manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgmanual)" />&nbsp;&nbsp;
+                       <td><fieldset><legend>Change manual</legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgmanual)" />&nbsp;&nbsp;
                        <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgmanual)" /></fieldset></td>
 END
               }
@@ -1179,7 +1207,7 @@ END
                   }
                   $cellcount ++;
                   $r->print(<<END);
-                       <td><fieldset><legend>&nbsp;<b>Lock manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.lockchg)" />&nbsp;&nbsp;
+                       <td><fieldset><legend>Lock manual</legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.lockchg)" />&nbsp;&nbsp;
                        <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.lockchg)" /></fieldset></td>
 END
               }
@@ -1189,7 +1217,7 @@ END
                   }
                   $cellcount ++;
                   $r->print(<<END);
-                       <td><fieldset><legend>&nbsp;<b>Unlock manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.unlockchg)" />&nbsp;&nbsp;
+                       <td><fieldset><legend>Unlock manual</legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.unlockchg)" />&nbsp;&nbsp;
                        <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.unlockchg)" /></fieldset></td>
 END
               }
@@ -1224,12 +1252,15 @@ END
 }
 
 sub notifier_tables {
-    my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow) = @_;
+    my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow,$olddomcoord,
+        $futuredomcoord) = @_;
     my $output = &Apache::loncommon::start_data_table();
     $output .= &Apache::loncommon::start_data_table_header_row();
     $output .= "<th>$$lt{name}</th>
                 <th>$$lt{usnm}</th>";
-    if ($role eq 'cc') {
+    if ($role eq 'dc') {
+        $output .= "<th>$$lt{doms}</th>";
+    } elsif ($role eq 'cc') {
         $output .= "<th>$$lt{coac}</th>";
     } 
     $output .=  "<th>$$lt{curn}</th>
@@ -1240,7 +1271,19 @@ sub notifier_tables {
         $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.
                    '<td><input type="hidden" name="notifyname_'.$$notifyshow.
                    '" value="'.$$users[$i].'" />'.$$users[$i].'</td>';
-        if ($role eq 'cc') {
+        if ($role eq 'dc') {
+            $output .= '<td>';
+            if ((ref($olddomcoord) eq 'ARRAY') && (ref($futuredomcoord) eq 'ARRAY')) {
+                if (grep(/^\Q$users->[$i]\E$/,@{$olddomcoord})) {
+                    $output .= &mt('expired');
+                } elsif (grep(/^\Q$users->[$i]\E$/,@{$futuredomcoord})) {
+                    $output .= &mt('future');
+                } else {
+                    $output .= &mt('active');
+                }
+            }
+            $output .= '</td>';
+        } elsif ($role eq 'cc') {
             $output .= '<td>'.$$status{$$users[$i]}.'</td>';
         }
         $output .= '<td>';
@@ -1284,12 +1327,12 @@ sub print_accessdate_table {
          'freg' => 'for registered students added via automated enrollment',
          'fnew' => 'for new students added when you update the class roster',
          'ifad'  => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access.  These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.',
-         'ncds'  => 'changing default start and end access dates will affect future enrollments and ALSO currently inactive students (i.e., those for whom access will begin in the future).  To change access dates for currently active students, you should change the access dates via this screen, then use Enrollment manager -> Drop Students to drop the students, and then use Automated Enrollment Manager -> Update roster now to re-enroll them with the new access dates.'
-
+         'ncds'  => 'changing default start and end access dates will affect <b>future enrollments</b> and also <b>currently inactive</b> students (i.e., those for whom access will begin in the future).',
+         'tcha' => 'To change access dates for <b>currently active</b> students, use User Management -> "Manage Course Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".',
     );
     my $dateshow;
     if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
-       $dateshow = "<br/><font size='+1'>".&mt('Warning')."</font>.&nbsp;".$lt{'cuno'}." ";
+       $dateshow = "<br/>".&mt('Warning').".&nbsp;".$lt{'cuno'}." ";
        if ($action eq 'setaccess') {
            $dateshow .= $lt{'ifyo'}."\n";
        } elsif ($action eq 'updatenow') {
@@ -1368,7 +1411,7 @@ ENDFOUR
                     <td colspan=\"2\">&nbsp;</td>
                    </tr>
                    <tr>
-                    <td colspan=\"2\"><b>".&mt('Note').":</b> ".$lt{'ncds'}."</td>
+                    <td colspan=\"2\"><b>".&mt('Note').":</b> ".$lt{'ncds'}.' '.$lt{'tcha'}."</td>
                    </tr>
                   </table>
         ");
@@ -1469,7 +1512,7 @@ sub print_chgsettings_response {
 	}
 	if ($autoadds || $autodrops) {
 	    $warning = &warning_message($dom,$crs,$action);
-	    $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you indicated that nightly ";
+	    $warn_prefix = "<br/><b>Warning</b>. Although you indicated that nightly ";
 	    $warn_suffix = " should be enabled, additional action is required.<br/>";
 	}
 	if ($autoadds) {
@@ -1567,7 +1610,7 @@ sub print_setdates_response {
 	        }
 	    }
 	    $warning = &warning_message($dom,$crs,$action);
-	    $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>";
+	    $warn_prefix = "<br/><b>Warning</b>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>";
 	    unless ($warning eq '') {
 	        $response .= $warn_prefix.$warning;
 	    }
@@ -1608,17 +1651,16 @@ start and end access dates for this cour
 	    $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
         } else {
 	    if ($currstart == $startaccess) {
-	        $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.<br/>";
+	        $response = "The first access date for students being added via automated enrollment has been left unchanged as $showstart.<br/>";
 	    } else {
-	        $response = "The first access date for students added via automated enrollment has been changed to
-$showstart.<br/>";
+	        $response = "The first access date for students being added via automated enrollment has been changed to $showstart.<br/>";
 	    }
 	    if ($currend == $endaccess) {
-	        $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.<br/>";
+	        $response .= "The last access date for students being added via automated enrollment has been left unchanged as $showend.<br/>";
 	    } else {
-	        $response .= "The last access date for students automated enrollment has been changed to
-$showend.<br/>";
+	        $response .= "The last access date for students being added via automated enrollment has been changed to $showend.<br/>";
 	    }
+            $response .= '<br />'.&mt('Any change in access dates will only apply to students who are not currently active, i.e., those who currently have access start dates in the future, and to those added by future automated enrollment.').'<br /><br />'.&mt('To change access dates for any currently active students, use User Management -> "Manage Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".').'<br />';
 	
 # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.
 	
@@ -1667,7 +1709,7 @@ $showend.<br/>";
 	        }
 	    }
 	    $warning = &warning_message($dom,$crs,$action);
-	    $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>";
+	    $warn_prefix = "<br/><b>Warning</b>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>";
 	    unless ($warning eq '') {
 	        $response .= $warn_prefix.$warning;
 	    }
@@ -1975,7 +2017,7 @@ sub print_crosslistings_response () {
 
     if (@allxlists > 0) {
 	$warning = &warning_message($dom,$crs,$action);
-	$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>";
+	$warn_prefix = "<br/><b>Warning</b>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>";
 	unless ($warning eq '') {
 	    $response .= $warn_prefix.$warning;
 	}
@@ -2113,7 +2155,7 @@ sections which contribute to enrollment
     
     if ($seccount > 0) {
 	$warning = &warning_message($dom,$crs,$action);
-	$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
+	$warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
 	unless ($warning eq '') {
 	    $response .= $warn_prefix.$warning;
 	}
@@ -2284,7 +2326,7 @@ sub print_sections_response () {
 
     if (@allsections > 0) {
 	$warning = &warning_message($dom,$crs,$action);
-	$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
+	$warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
 	unless ($warning eq '') {
 	    $response .= $warn_prefix.$warning;
 	}
@@ -2375,7 +2417,7 @@ sub print_photo_agreement {
     my $institution = &Apache::lonnet::domain($dom,'description');
     if (&user_is_courseowner($courseowner)) {
         $response = '
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 function agreement_result(caller) {
     document.permission.photopermission.value = caller;
     if (caller == 0) {
@@ -2408,10 +2450,10 @@ function agreement_result(caller) {
       </td>
     </tr>
    </table>
-   <input type ="hidden" name="action" value="'.$action.'" />
-   <input type ="hidden" name="state" value="process" />
-   <input type ="hidden" name="showphotos" value="1" />
-   <input type= "hidden" name="photopermission" value="" />
+   <input type="hidden" name="action" value="'.$action.'" />
+   <input type="hidden" name="state" value="process" />
+   <input type="hidden" name="showphotos" value="1" />
+   <input type="hidden" name="photopermission" value="" />
   </form>
 ';
     } else {
@@ -2420,7 +2462,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 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});
 }
@@ -2464,10 +2508,10 @@ sub print_photos_response {
                 if ($update) {
                     $response .= '<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">
-<input type ="button" name="retrieve" value="'.&mt('Update photo repository').'" 
+<input type="button" name="retrieve" value="'.&mt('Update photo repository').'" 
 onclick="javascript:document.photoupdate.submit()" /> 
-<input type ="hidden" name="action" value="'.$action.'" />
-<input type ="hidden" name="state" value="photoupdate" />
+<input type="hidden" name="action" value="'.$action.'" />
+<input type="hidden" name="state" value="photoupdate" />
 </form>';
                 }
 	    }
@@ -2486,7 +2530,7 @@ onclick="javascript:document.photoupdate
         }
     }
     if (keys(%newenv) > 0) {
-        &Apache::lonnet::appenv(%newenv);
+        &Apache::lonnet::appenv(\%newenv);
     }
     &print_reply($r,$response,$$tasktitleref{$action});
     return;
@@ -2506,7 +2550,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);
@@ -2519,7 +2563,8 @@ sub print_photoupdate_response {
         }
         if ($outcome eq 'ok') {
             if (keys(%changes) > 0) {
-                $response = &mt('Update of photos for registered students resulted in the following ').': <br /><script type="text/javascript">
+                $response = &mt('Update of photos for registered students resulted in the following ').': <br />'
+                           .'<script type="text/javascript" language="JavaScript">
 function photowindow(photolink) {
     var title = "Photo_Viewer";
     var options = "scrollbars=1,resizable=1,menubar=0";
@@ -2610,7 +2655,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);
@@ -2644,48 +2689,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;
@@ -2740,7 +2743,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";
@@ -2772,7 +2775,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;
@@ -2970,11 +2973,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>'.