--- loncom/interface/lonpopulate.pm	2006/03/15 22:11:04	1.41
+++ loncom/interface/lonpopulate.pm	2009/07/17 22:24:08	1.64
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.41 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpopulate.pm,v 1.64 2009/07/17 22:24:08 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,8 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::loncoursedata;
+use Apache::longroup;
+use Apache::lonuserutils;
 use Apache::Constants qw(:common :http REDIRECT);
 use Time::Local;
 use LONCAPA::Enrollment;
@@ -45,9 +47,9 @@ sub header {
 
 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
@@ -110,6 +112,32 @@ function process(calling,numauto,nummanu
          checker = 0
      }
  }
+ if (calling == "notify") {
+     var totalnote = 0;
+     for (var i=0; i<formName.elements.length; i++) {
+	 var elementname = formName.elements[i].name;
+	 var check_name = elementname.match($notify_check);
+	 if (check_name != null) {
+	     if (formName.elements[i].checked) {
+		 totalnote ++;
+	     }
+	 } 
+     }
+     if (totalnote > 0) {
+	 if (formName.notify[1].checked == true) {
+	     if (confirm("You have indicated that you do not want notification of roster changes messages to be sent, but "+totalnote+" have been checked as recipients.\\nClick 'OK' to erase all recipients, or 'Cancel'.")) {
+		 checker  = 1;
+	     } else {
+		 checker = 0;
+	     }
+	 }
+     } else {
+	 if (formName.notify[0].checked == true) {
+	     alert("You have indicated that you want notification of roster changes messages to be sent, but you have not selected any recipients.");
+	     checker = 0;
+	 }
+     }
+ }
  if (calling == "viewclass") {
      var totcheck = 0
      var numchk = 0
@@ -180,9 +208,9 @@ 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";
@@ -194,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/dropadd">Enrollment Manager</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 Enrollment Manager&nbsp;</font>
+   <font size="+1">$autenrl&nbsp;</font>
   </td>
  </tr>
 </table>
@@ -299,7 +329,7 @@ sub print_main_frame {
               <td>Use <i>"Section settings"</i> to make changes to the choice of sections included for enrollment in your LON-CAPA course.</td>
             </tr>
               <td>&nbsp;</td>
-              <td>Use <i>"Student photos settings"</i> to enable or disable automatic import of photos for registered students in your course.</td>
+              <td>Use <i>"Student photo settings"</i> to enable or disable automatic import of photos for registered students in your course.</td>
             </tr>
             <tr>
               <td>&nbsp;</td>
@@ -340,13 +370,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("
@@ -357,12 +387,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>
@@ -370,7 +400,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>
@@ -478,8 +508,13 @@ ENDTWO
   } elsif ($action eq "notify") {
       my $notifycount = 0;
       my @notified = split(/,/,$enrollvar{notifylist});
-      foreach  (@notified) {
-	  unless ($_ eq '') { $notifycount ++; } 
+      my @domcoord;
+      my @showdom;
+      for (my $i=0; $i<@notified; $i++) {
+          if ($notified[$i] !~ /:/) {
+              $notified[$i] =~ s/\@/:/;
+          }
+	  unless ($notified[$i] eq '') { $notifycount ++; } 
       }
       my $noteset = '';
       if ($notifycount) {
@@ -487,7 +522,15 @@ ENDTWO
       } else {
           $noteset = "OFF";
       }
-    
+      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);
+              }
+          }
+      }
       $r->print("
                   <form name=\"enter\" method=\"post\"><br/>
                    <table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">
@@ -504,124 +547,154 @@ 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("
               </td>
              </tr>
       ");
-      my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$dom,$crs);
-      my @ccs = ();
-      my @oldccs = ();
-      my %pname = ();
-      my %notifystate = ();
-      foreach (@coursepersonnel) {
-          my @roleinfo = split/:/,$_;
-          if ($roleinfo[0] eq 'cc')  {
-              unless (grep/^$roleinfo[1]\@$roleinfo[2]/,@ccs) {
-                  my $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc');
-                  if ($active_cc eq 'active') {
-                      push @ccs, "$roleinfo[1]\@$roleinfo[2]";
-                      $pname{"$roleinfo[1]\@$roleinfo[2]"} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
-                      if (grep/^$roleinfo[1]\@$roleinfo[2]$/,@notified) {
-                          $notifystate{"$roleinfo[1]\@$roleinfo[2]"} = 1;
-                      } else {
-                          $notifystate{"$roleinfo[1]\@$roleinfo[2]"} = 0;
-                      }
+      my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$dom,$crs);
+      my @ccs;
+      my %pname;
+      my %notifystate;
+      my %status;
+      my $now = time;
+      foreach my $person (sort(keys(%coursepersonnel))) {
+          my $match = 0;
+          my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);
+          $user =~ s/:$//;
+          my ($end,$start) = split(/:/,$coursepersonnel{$person});
+          if ($end == -1 || $start == -1) {
+              next;
+          }
+          if ($role eq 'cc')  {
+              unless (grep(/^$user$/,@ccs)) {
+                  if ($end && $end < $now) {
+                      $status{$user} = 'previous';
+                  } elsif ($start > $now) {
+                      $status{$user} = 'future';
                   } else {
-                      push @oldccs, "$roleinfo[1]\@$roleinfo[2]";
+                      $status{$user} = 'active';
+                  }
+                  push(@ccs,$user);
+                  my ($uname,$udom) = split(/:/,$user);
+                  $pname{$user} = 
+                           &Apache::loncommon::plainname($uname,$udom);
+                  if (grep(/^$user$/,@notified)) {
+                      $notifystate{$user} = 1;
+                  } else {
+                      $notifystate{$user} = 0;
                   }
               }
           }
       }
-      if ($notifycount > 0) {
-          foreach my $person (@notified) {
-              unless ( (grep/^$person$/,@ccs) || ($person eq '') || (grep/^$person$/,@oldccs) ) {
-                  push @ccs, $person;
-                  my ($puname,$pdom) = split/\@/,$person;
-                  $pname{$person} =  &Apache::loncommon::plainname($puname,$pdom);
-                  $notifystate{$person} = 1;
-              }
-          }
-      }
-      my $viewer = $env{'user.name'}.'@'.$env{'user.domain'};
-      unless ( (grep/^$viewer$/,@ccs) || ($viewer eq '') )  {
-          push @ccs,$viewer;
-          $pname{$viewer} =  &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-          $notifystate{$viewer} = 0;
-      }
-
-      my $notifyshow = @ccs;
-
+      my $notifyshow = 0; 
+      my %lt = &Apache::lonlocal::texthash(
+                                  name => 'Name',
+                                  usnm => 'username:domain',
+                                  coac => 'Course Access',
+                                  curn => 'Current notification status',
+                                  notf => 'Notification?',
+                                  ntac => 'Notification active',
+                                  ntin => 'Notification inactive',
+      );
       if (@ccs > 0) {
           @ccs = sort @ccs;
           $r->print("
              <tr>
-               <td>The table below contains a list of course coordinators in this course. Uncheck the 'Notification?' checkbox for each person who is to be removed from the list of recipients who are currently informed of roster changes whenever any adds or drops occur during the nightly enrollment check. To include individuals who are not currently recipients, simply check the 'Notification?' checkbox. Click 'Go' to store your changes.
+               <td>".&mt('The table below contains a list of [_1]s in this course.',&Apache::lonnet::plaintext('cc'))."
               </td>
              </tr>
              <tr>
-              <td>
-               <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
-                <tr bgcolor=\"#CCCCFF\">
-                 <td><b>Name</b></td>
-                 <td><b>username</b></td>
-                 <td><b>Current status</b></td>
-                 <td><b>Notification?</b></td>
-                </tr>
-          ");
-          for (my $i=0; $i<@ccs; $i++) {
-              my $colflag = $i%2;
-              $r->print("<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
-                 <td>$pname{$ccs[$i]}</td>
-                 <td><input type=\"hidden\" name=\"notifyname_$i\" value=\"$ccs[$i]\" />$ccs[$i]</td>
-                 <td>
-              ");
-              if ($notifystate{$ccs[$i]} == 1) {
-                  $r->print("Notification active");
-              } else {
-                  $r->print("Notification inactive");
-              }
-              if ($notifystate{$ccs[$i]} == 1) {
-                  $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" checked=\"true\" /></td></tr>");
+              <td>");
+          $r->print(&notifier_tables('cc',\%lt,\@ccs,\%status,\%notifystate,
+                                     \%pname,\$notifyshow));
+          $r->print("</td></tr>");
+      } else {
+          $r->print("
+             <tr>
+              <td>".
+             &mt('No [_1]s found.',&Apache::lonnet::plaintext('cc'))."
+            </td>
+           </tr>");
+      }
+      my $viewer = $env{'user.name'}.':'.$env{'user.domain'};
+      my $showalldc = 0;
+      if (grep(/^$viewer$/,@domcoord)) {
+          $showalldc = 1;
+      }
+      foreach my $dc (@domcoord) {
+          if (!grep(/^$dc$/,@ccs)) {
+              if (grep(/^$dc$/,@notified)) {
+                  $notifystate{$dc} = 1;
               } else {
-                  $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" /></td></tr>");
+                  $notifystate{$dc} = 0;
+                  if (!$showalldc) {
+                      next;
+                  }
               }
+              my ($dcuname,$dcdom) = split(/:/,$dc);
+              $pname{$dc} =  &Apache::loncommon::plainname($dcuname,$dcdom);
+              push(@showdom,$dc);
           }
+      }
+      my $showdomnum = scalar(@showdom);
+      if ($showdomnum) {
           $r->print("
-               </table>
-               <br/>
-               <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">
-                <tr>
-                 <td align=\"right\">
-                  <input type=\"button\" name=\"notifyset\" value=\"Go\" onclick=\"process('notify')\" />
-                 </td>
-                </tr>
-               </table>
+             <tr>
+              <td>&nbsp;</td>
+             </tr><tr>
+              <td>");
+          if ($showalldc) {
+              $r->print(&mt("The table below contains a list of [_1]s from this course's domain who are not also [_2]s.",&Apache::lonnet::plaintext('dc'),&Apache::lonnet::plaintext('cc')));
+          } else {
+              $r->print(&mt("The table below contains a list of [_1] from this course's domain who currently receive notification, and are not also [_2]s.",&Apache::lonnet::plaintext('dc'),&Apache::lonnet::plaintext('cc')));
+          }
+          $r->print(" 
               </td>
              </tr>
-          ");
-      } else {
-          $r->print("
              <tr>
-              <td>
-             No course coordinators found.
-            </td>
-           </tr>");
+              <td>");
+          $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,
+                                     \%pname,\$notifyshow));
+          $r->print("
+             </td>
+          </tr>");
+      }
+      if (@ccs > 0 || @showdom > 0) {
+          $r->print("<tr><td>&nbsp;</td></tr><tr><td>");
+          if ($notifycount) {
+              $r->print(&mt("Uncheck the checkbox(es) to terminate notification for people currently informed of roster changes from the nightly enrollment update.<br />"));
+         }
+         if ((@ccs + @showdom) > $notifycount) {
+             $r->print(&mt("Check the checkbox(es) to initiate notification for people not currently informed of roster changes from the nightly enrollment update.<br />"));
+         }
+         $r->print(&mt("Click 'Go' to save your changes.")."
+           <br/>
+           <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">
+            <tr>
+             <td align=\"right\">
+              <input type=\"button\" name=\"notifyset\" value=\"Go\" onclick=\"process('notify')\" />
+             </td>
+            </tr>
+           </table>
+          </td>
+         </tr>
+      ");
       }
       $r->print("
-          </table>
-          <input type=\"hidden\" name=\"notifyshow\" value=\"$notifyshow\" />
-          <input type=\"hidden\" name=\"action\" value=\"$action\" />
-          <input type=\"hidden\" name=\"state\" value=\"process\" />
-          </form>
+      </table>
+      <input type=\"hidden\" name=\"notifyshow\" value=\"$notifyshow\" />
+      <input type=\"hidden\" name=\"action\" value=\"$action\" />
+      <input type=\"hidden\" name=\"state\" value=\"process\" />
+      </form>
       ");
   } elsif ($action eq "crosslist") {
       my @xlists;
@@ -637,42 +710,37 @@ ENDTWO
       ");
       if ($cross_str > 0) {
           $r->print("
-                Currently, this LON-CAPA course is crosslisted with $cross_str course section(s).  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.  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: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you wish to change the section/group ID assigned in your LON-CAPA course for a crosslisted course, enter the new section/group ID in the appropriate textbox. The LON-CAPA section/group ID can be left (or set to) empty, if you do not wish to tie a section/group ID to this crosslisting. 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. You will provide information about each of the new crosslistings on a subsequent page.  Click 'Go' to store your changes.
+                Currently, this LON-CAPA course is crosslisted with $cross_str course section(s).  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.  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: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. 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. 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. 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. You will provide information about each of the new crosslistings on a subsequent page.  Click 'Go' to save your changes.
               </td>
              </tr>
             </table>
             <br/>
-            <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
-             <tr>
-              <td>
-               <table border=\"0\" width=\"100%\" cellspacing=\"3\" cellpadding=\"3\">
-                <tr bgcolor=\"#CCCCFF\" align=\"left\">
-                 <td><b>Enrollment?</b></td>
-                 <td><b>Crosslisted course</b></td>
-                 <td><b>LON-CAPA section/groupID</b></td>
-                </tr>
+           ");
+           $r->print(&Apache::loncommon::start_data_table());
+           $r->print(&Apache::loncommon::start_data_table_row());
+           $r->print("
+                 <th>Enrollment?</th>
+                 <th>Crosslisted course</th>
+                 <th>LON-CAPA section ID</th>
           ");
+           $r->print(&Apache::loncommon::end_data_table_row());
           for (my $i=0; $i<@xlists; $i++) {
               my $xl = '&nbsp;';
-              my $gp = '&nbsp;';
+              my $lc_sec = '&nbsp;';
               if ($xlists[$i] =~ /^([^:]+):?(.*)$/) {
                   $xl = $1;
-                  $gp = $2;
+                  $lc_sec = $2;
               }               
               my $colflag = $i%2;
+              $r->print(&Apache::loncommon::start_data_table_row());
               $r->print("
-                <tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
-                 <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=\"gp_$i\" value=\"$gp\" /></td>
-                </tr> 
+                 <td><input type=\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>
               ");
+              $r->print(&Apache::loncommon::end_data_table_row());
           }
-          $r->print("  </table>
-              </td>
-             </tr>
-            </table>
-          ");
+          $r->print(&Apache::loncommon::end_data_table());
       }
       else {
           $r->print("
@@ -728,23 +796,25 @@ ENDTWO
               </td>
              </tr>
              <tr>
-              <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you want to change the section/group designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section/group textbox and enter the new value. The LON-CAPA section/group ID can be left (or set to) empty, if you do not wish to tie a section/group ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section/groupID in the appropriate textbox. Click 'Go' to store
-your changes.</td>
+              <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section ID in the appropriate textbox. Click 'Go' to save your changes.</td>
              </tr>
             </table>
             <br/>
-            <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
-             <tr bgcolor=\"#CCCCFF\">
-              <td><b>Section</b></td>
-              <td><b>Current status</b></td>              
-              <td><b>LON-CAPA section/group ID</b></td>
-              <td><b>Enrollment in this course?</b></td>
-             </tr>
           ");
+          $r->print(&Apache::loncommon::start_data_table());
+          $r->print(&Apache::loncommon::start_data_table_row());
+          $r->print("
+              <th>Section</th>
+              <th>Current status</th>              
+              <th>LON-CAPA section ID</th>
+              <th>Enrollment in this course?</th>
+          ");
+          $r->print(&Apache::loncommon::end_data_table_row());
           for (my $i=0; $i<@sections; $i++) {
               my $colflag = $i%2;
               my $shrflag = 0;
-              $r->print("<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
+              $r->print(&Apache::loncommon::start_data_table_row());
+              $r->print("
                    <td>$sections[$i]<input type=\"hidden\" name=\"secnum_$i\" value=\"$sections[$i]\" /></td>
                    <td>
               ");
@@ -755,13 +825,14 @@ your changes.</td>
                   $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></tr>"); 
+                  $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></tr>");
+                  $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");
               }
+              $r->print(&Apache::loncommon::end_data_table_row());
           }
+          $r->print(&Apache::loncommon::end_data_table());
           $r->print("
-            </table>
             <br/>
             <table width=\"100%\" border=\"0\" cellspacing=\"3\" cellpadding=\"3\">
              <tr> 
@@ -785,36 +856,31 @@ your changes.</td>
           if (@currsections) {
               my $secshow = @currsections;
               $r->print("
-                Currently, this LON-CAPA course incorporates enrollment from $secshow sections.  Students enrolling in any of 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. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise leave it checked. If you want to change the section/group designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section/groupID textbox and enter the new value.  If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to store your changes.
+                Currently, this LON-CAPA course incorporates enrollment from $secshow sections.  Students enrolling in any of 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. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise leave it checked. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value.  If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to save your changes.
               </td>
              </tr>
             </table>
             <br/>
-            <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
-             <tr>
-              <td>
-               <table border=\"0\" width=\"100%\" cellspacing=\"3\" cellpadding=\"3\">
-                <tr bgcolor=\"#CCCCFF\">
-                 <td><b>Enrollment?</b></td>
-                 <td><b>Section</b></td>
-                 <td><b>LON-CAPA section/groupID</b></td>
-                </tr>
               ");
+              $r->print(&Apache::loncommon::start_data_table());
+              $r->print(&Apache::loncommon::start_data_table_row());
+              $r->print("
+                 <th>Enrollment?</th>
+                 <th>Section</th>
+                 <th>LON-CAPA section ID</th>
+              ");
+              $r->print(&Apache::loncommon::end_data_table_row());
               for (my $j=0; $j<@currsections; $j++) {
                   my $colflag = $j%2;
+                  $r->print(&Apache::loncommon::start_data_table_row());
                   $r->print("
-                <tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
-                 <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=\"secgp_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
-                </tr> 
+                 <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
                   ");
+                  $r->print(&Apache::loncommon::end_data_table_row());
               }
-              $r->print("  </table>
-              </td>
-             </tr>
-            </table>
-              ");
+              $r->print(&Apache::loncommon::end_data_table());
           } else {
               $r->print("
                 Currently no sections of $realm ($enrollvar{coursecode}) are contributing enrollment to the LON-CAPA class roster.
@@ -865,13 +931,13 @@ your changes.</td>
       ");
       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('
@@ -880,17 +946,17 @@ your changes.</td>
       ');
       my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom);
       my $can_enable = 1;
-      my $institution = $Apache::lonnet::domaindescription{$dom};
+      my $institution = &Apache::lonnet::domain($dom,'description');
       if ($result eq 'ok') {
           if ($perm_reqd eq 'yes') {
               if (!($enrollvar{'photopermission'} eq 'yes')) {
                   $can_enable = 0;
               } else {
-                  if ($env{'user.name'} eq $enrollvar{'courseowner'}) {
+                  if (&user_is_courseowner($enrollvar{'courseowner'})) {
                       $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 Course Coordinators can choose to automatically import student photos into this course.').'<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>
                       ');
@@ -913,13 +979,13 @@ your changes.</td>
                     <tr>
                      <td>
                       <font color="#888888">'.
-&mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos stored by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').'  
+&mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos saved by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').'  
                       </font>
                      </td>
                     </tr>
 ');
       } else {
-          if ($env{'user.name'} eq $enrollvar{'courseowner'}) {
+          if (&user_is_courseowner($enrollvar{'courseowner'})) {
               $r->print('
                     <tr>
                      <td>'.
@@ -936,8 +1002,11 @@ your changes.</td>
               }
               $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>
@@ -1019,13 +1088,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>');
@@ -1053,21 +1123,39 @@ onclick="javascript:document.photoupdate
       if (! exists($env{'form.sortby'})) {
           $env{'form.sortby'} = 'username';
       }
-      if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+      if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
           $env{'form.Status'} = 'Active';
       }
       my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'});
 #  Get current classlist
-      my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+      my %userlist;
+      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();
+      foreach my $student (keys(%{$classlist})) {
+          if (exists($permission->{'view_section'})) {
+              if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
+                  next;
+              } else {
+                  $userlist{$student} = $classlist->{$student};
+              }
+          } else {
+              $userlist{$student} = $classlist->{$student};
+          }
+      }
+
       if (! defined($classlist)) {
-          $r->print(&mt('There are no students either currently or previously enrolled.').
-                      "\n");
+          $r->print(&mt('There are no students either currently or previously enrolled.')."
+                      </td>
+                     </tr>\n");
       } else {
           $r->print(&mt('Student Status: [_1]',$status_select)."\n");
           $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");
-
-          my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist);
+          my $context = 'course';
+          my $mode = 'autoenroll';
+          my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::lonuserutils::show_users_list($r,$context,$mode,$permission,$env{'form.Status'},\%userlist,$keylist);
           $r->print("
                      </td>
                     </tr>
@@ -1080,14 +1168,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
               }
@@ -1097,7 +1185,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
               }
@@ -1107,7 +1195,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
               }
@@ -1122,6 +1210,14 @@ END
                      </td>
                     </tr>
               ");
+          } else {
+              $r->print('
+                    <tr>
+                     <td><br />
+                      '.&mt('There are no students with the selected status.').'
+                     </td>
+                    </tr>
+              ');
           }
           $r->print("
                    </table>
@@ -1133,6 +1229,44 @@ END
   }
 }
 
+sub notifier_tables {
+    my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow) = @_;
+    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') {
+        $output .= "<th>$$lt{coac}</th>";
+    } 
+    $output .=  "<th>$$lt{curn}</th>
+                 <th>$$lt{notf}</th>";
+    $output .= &Apache::loncommon::end_data_table_header_row();
+    for (my $i=0; $i<@{$users}; $i++) {
+        $output .= &Apache::loncommon::start_data_table_row();
+        $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.
+                   '<td><input type="hidden" name="notifyname_'.$$notifyshow.
+                   '" value="'.$$users[$i].'" />'.$$users[$i].'</td>';
+        if ($role eq 'cc') {
+            $output .= '<td>'.$$status{$$users[$i]}.'</td>';
+        }
+        $output .= '<td>';
+        if ($$notifystate{$$users[$i]} == 1) {
+            $output .= $$lt{ntac};
+        } else {
+            $output .= $$lt{ntin};
+        }
+        $output .= '</td><td><input type="checkbox" name="note_'.$$notifyshow.'"'; 
+        if ($$notifystate{$$users[$i]} == 1) {
+            $output .= ' checked="checked"';
+        }
+        $output .= ' /></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+        $$notifyshow ++;
+    }
+    $output .= &Apache::loncommon::end_data_table();
+    return $output;
+}
+
 sub print_accessdate_table {
     my ($r,$enrollvar,$tasktitleref,$action) = @_;
     my ($start_table,$end_table) = &date_setting_table($$enrollvar{'default_enrollment_start_date'},$$enrollvar{'default_enrollment_end_date'},$action);
@@ -1156,8 +1290,8 @@ 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 '') ) {
@@ -1240,7 +1374,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>
         ");
@@ -1480,17 +1614,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.
 	
@@ -1612,7 +1745,7 @@ sub print_notify_response {
 		    }
 		    $response .= "</ul>\n";
 		} else {
-		    $response = "Notification of enrollment changes was <b> not enabled</b> as no course coordinators were selected as recipients.<br/>";
+		    $response = &mt('Notification of enrollment changes was <b> not enabled</b> as no [_1]s were selected as recipients.<br/>',&Apache::lonnet::plaintext('cc'));
 		}
 	    } else {
 		if ($currcount) {
@@ -1644,14 +1777,14 @@ sub print_crosslistings_menu () {
     if (@currxlists > 0) {
 	for (my $i=0; $i<@currxlists; $i++) {
 	    my $xlist = "cross_".$i;
-	    my $gp = "gp_".$i;
+	    my $lc_sec = "lcsec_".$i;
 	    if ( exists($env{"form.$xlist"}) ) {
 		my $xlistentry = '';
 		if ($currxlists[$i] =~ m/^([^:]+)/) {
 		    $xlistentry = $1.':';
 		}
-		if ( exists($env{"form.$gp"}) ) {
-		    $xlistentry .= $env{"form.$gp"};
+		if ( exists($env{"form.$lc_sec"}) ) {
+		    $xlistentry .= $env{"form.$lc_sec"};
 		}
 		push @xlists,$xlistentry;
 		$crosscount ++;
@@ -1674,8 +1807,8 @@ sub print_crosslistings_menu () {
 	if ($crosscount > 0) {
 	    $response .=  "The $crosscount courses listed below remain crosslisted with this LON-CAPA course, and 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.<br/><ul>\n";
 	    foreach (@xlists) {
-		my ($xlist,$gp) = split/:/,$_;
-		$response .= "<li>$xlist - ID: $gp</li>\n";
+		my ($xlist,$lc_sec) = split/:/,$_;
+		$response .= "<li>$xlist - ID: $lc_sec</li>\n";
 	    }
 	    $response .= "</ul><br/>\n";
 	}
@@ -1684,27 +1817,25 @@ sub print_crosslistings_menu () {
 	my $numcross = $env{'form.numcross'};
 	if ($numcross > 0) {
 	    my @bgcolors=("#eeeeee","#cccccc");
-	    $response .= qq(You indicated that you wish to add an additional $numcross crosslisting(s).  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/group 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. The LON-CAPA section/group ID can be left blank, if you do not wish to tie a section/group ID to this crosslisting.  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/>
-           <form name="enter" method="post">
-           <table border="0" cellpadding="2" cellspacing="2" width="100%">
-             <tr>
-              <td>
-               <table border="0" cellspacing="3" cellpadding="3">
-                <tr bgcolor="#CCCCFF" align="left">
-                 <td><b>Crosslisting</b></td>
-                 <td><b>LON-CAPA section/groupID</b></td>
-                </tr>
+	    $response .= qq(You indicated that you wish to add an additional $numcross crosslisting(s).  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. The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.  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/>
+           <form name="enter" method="post">); #' stupid emacs
+           $response .= &Apache::loncommon::start_data_table();
+           $response .= &Apache::loncommon::start_data_table_row();
+           $response .= qq(
+                 <th>Crosslisting</th>
+                 <th>LON-CAPA section ID</th>
 			    );
+           $response .= &Apache::loncommon::end_data_table_row();
 	    for (my $i=0; $i<$numcross; $i++) {
-		my $colflag = $i%2;
+                $response .= &Apache::loncommon::start_data_table_row();
 		$response .= qq(
-                <tr bgcolor="$bgcolors[$colflag]" align="left">
                  <td><input type="text" size="15" name="newcross_$i" /></td>
-                 <td><input type="text" size="10" name="newgroupid_$i" /></td>
-                </tr>
+                 <td align="right"><input type="text" size="10" name="newlcsec_$i" /></td>
 				);
+                $response .= &Apache::loncommon::end_data_table_row();
 	    }
-	    $response .= qq(  </table>
+            $response .= &Apache::loncommon::end_data_table();
+	    $response .= qq(
               </td>
              </tr>
              <tr>
@@ -1732,6 +1863,8 @@ sub print_crosslistings_response () {
     my @allxlists = ();
     my @badxlists = ();
     my @badowner = ();
+    my @reserved = ();
+    my @matchgroup = ();
     my $numcross = 0;
     my $xliststr =  $settings{'internal.crosslistings'};
     my $coursecode = $settings{'internal.coursecode'};
@@ -1749,22 +1882,34 @@ sub print_crosslistings_response () {
     }
 
     if ($numcross > 0) {
+        my %curr_groups = &Apache::longroup::coursegroups();
 	for (my $i=0; $i<$numcross; $i++) {
 	    my $xl = "newcross_".$i;
-	    my $gp = "newgroupid_".$i;
+	    my $lc_sec = "newlcsec_".$i;
 	    if ( exists($env{"form.$xl"}) ) {
+                if (exists($env{"form.$lc_sec"})) {
+                    my $lc_sec_check = &validate_lcsec(\%curr_groups,
+                                                    $env{"form.$lc_sec"});
+                    if ($lc_sec_check eq 'reserved') {
+                        push(@reserved,$env{"form.$xl"}.":".$env{"form.$lc_sec"});
+                        next;
+                    } elsif ($lc_sec_check eq 'group') {
+                        push (@matchgroup,$env{"form.$xl"}.":".$env{"form.$lc_sec"});
+                        next;
+                    }
+                }
 		my $coursecheck = '';
 		$coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$env{"form.$xl"});
 		if ($coursecheck eq 'ok') {
 		    my $addcheck = '';
 		    $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner);
 		    if ($addcheck eq 'ok') {
-			push @xlists,$env{"form.$xl"}.":".$env{"form.$gp"};
+			push @xlists,$env{"form.$xl"}.":".$env{"form.$lc_sec"};
 		    } else {
-			push @badowner,$env{"form.$xl"}.":".$env{"form.$gp"};
+			push @badowner,$env{"form.$xl"}.":".$env{"form.$lc_sec"};
 		    }
 		} else {
-		    push @badxlists, $env{"form.$xl"}.":".$env{"form.$gp"}.":".$coursecheck;
+		    push @badxlists, $env{"form.$xl"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
 		}
 	    }
 	}
@@ -1782,8 +1927,8 @@ sub print_crosslistings_response () {
 	} else {
 	    $response = "The courses listed below are now crosslisted with this LON-CAPA course, and 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.<br/><ul>\n";
 	    foreach (@allxlists) {
-		my ($xlist,$gp) = split/:/,$_;
-		$response .= "<li>$xlist - ID: $gp</li>\n";
+		my ($xlist,$lc_sec) = split/:/,$_;
+		$response .= "<li>$xlist - ID: $lc_sec</li>\n";
 	    }
 	    $response .= "</ul><br/><br/>\n";
 	}
@@ -1792,8 +1937,8 @@ sub print_crosslistings_response () {
 	    my @oldxlists = (split/,/,$xliststr);
 	    $response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.<br/><ul>\n";
 	    foreach (@oldxlists) {
-		my ($xlist,$gp) = split/:/,$_;
-		$response .= "<li>$xlist - ID: $gp</li>\n";
+		my ($xlist,$lc_sec) = split/:/,$_;
+		$response .= "<li>$xlist - ID: $lc_sec</li>\n";
 	    }
 	    $response .= "</ul><br/><br/>\n";
 	}
@@ -1801,8 +1946,8 @@ sub print_crosslistings_response () {
     if (@badxlists > 0) {
 	$response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because they are not valid courses according to your institution's official schedule of classes and sections.<br/><ul>\n";
 	foreach (@badxlists) {
-	    my ($xlist,$gp,$prob) = split/:/,$_;
-	    $response .= "<li>$xlist - ID: $gp - Error: $prob</li>\n";
+	    my ($xlist,$lc_sec,$prob) = split/:/,$_;
+	    $response .= "<li>$xlist - ID: $lc_sec - Error: $prob</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
@@ -1810,11 +1955,28 @@ sub print_crosslistings_response () {
     if (@badowner > 0) {
 	$response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
 	foreach (@badowner) {
-	    my ($xlist,$gp) = split/:/,$_;
-	    $response .= "<li>$xlist - ID: $gp</li>\n";
+	    my ($xlist,$lc_sec) = split/:/,$_;
+	    $response .= "<li>$xlist - ID: $lc_sec</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
+    if (@reserved > 0) {
+        $response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the section ID associated with the crosslisted course is a reserved word. Please <a href=\"javascript:history(-1)\">go back</a> and change the section ID for each of these courses.<br/><ul>\n";  
+        foreach (@reserved) {
+            my ($xlist,$lc_sec) = split/:/,$_;
+            $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+        }
+        $response .= "</ul><br/><br/>\n";
+    }
+
+    if (@matchgroup > 0) {
+        $response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the section ID associated with the crosslisted course is the name of a group in this course. Please <a href=\"javascript:history(-1)\">go back</a> and change the section ID for each of these courses.<br/><ul>\n";
+        foreach (@matchgroup) {
+            my ($xlist,$lc_sec) = split/:/,$_;
+            $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+        }
+        $response .= "</ul><br/><br/>\n";
+    }
 
     if (@allxlists > 0) {
 	$warning = &warning_message($dom,$crs,$action);
@@ -1850,7 +2012,7 @@ sub print_sections_menu () {
     
     if ( exists($env{'form.secshow'}) ) {
 	for (my $i=0; $i<$env{'form.secshow'}; $i++) {
-	    my $gp = "loncapasec_".$i;
+	    my $lc_sec = "loncapasec_".$i;
 	    my $secnum = "secnum_".$i;
 	    my $sec = "sec_".$i;
 	    if ( exists( $env{"form.$sec"} ) ) {
@@ -1858,8 +2020,8 @@ sub print_sections_menu () {
 		if ( exists( $env{"form.$secnum"} ) ) { 
 		    $secentry = $env{"form.$secnum"}.':';
 		}
-		if ( exists( $env{"form.$gp"} ) ) {
-		    $secentry .= $env{"form.$gp"};
+		if ( exists( $env{"form.$lc_sec"} ) ) {
+		    $secentry .= $env{"form.$lc_sec"};
 		}
 		if ( grep/^$env{"form.$secnum"}:/,@currsections) {
 		    push @sections, $secentry;
@@ -1870,14 +2032,14 @@ sub print_sections_menu () {
 		    if ($coursecheck eq 'ok') {
 			my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
 			if ($addcheck eq 'ok') {
-			    push @sections,$env{"form.$secnum"}.":".$env{"form.$gp"};
+			    push @sections,$env{"form.$secnum"}.":".$env{"form.$lc_sec"};
 			    $seccount ++;
 			    $addcount ++;
 			} else {
-			    push @badowner,$env{"form.$secnum"}.":".$env{"form.$gp"};
+			    push @badowner,$env{"form.$secnum"}.":".$env{"form.$lc_sec"};
 			}
 		    } else {
-			push @badsections, $env{"form.$secnum"}.":".$env{"form.$gp"}.":".$coursecheck;
+			push @badsections, $env{"form.$secnum"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
 		    }
 		}
 	    }
@@ -1895,14 +2057,14 @@ sub print_sections_menu () {
     } elsif (@currsections > 0) {
 	for (my $i=0; $i<@currsections; $i++) {
 	    my $sec = "sec_".$i;
-	    my $gp = "secgp_".$i;
+	    my $lc_sec = "lcsec_".$i;
 	    if ( exists($env{"form.$sec"}) ) {
 		my $secentry = '';
 		if ($currsections[$i] =~ m/^(\w+:)/ ) {
 		    $secentry = $1;
 		}
-		if ( exists($env{"form.$gp"}) ) {
-		    $secentry .= $env{"form.$gp"};
+		if ( exists($env{"form.$lc_sec"}) ) {
+		    $secentry .= $env{"form.$lc_sec"};
 		}
 		push @sections,$secentry;
 		$seccount ++;
@@ -1929,8 +2091,8 @@ sections which contribute to enrollment
 	if ($seccount > 0) { 
 	    $response .= "Students enrolling in the $seccount section(s) listed below will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.<br/><ul>\n";
 	    foreach (@sections) {
-		my ($sec,$gp) = split/:/,$_;
-		$response .= "<li>$sec  - ID: $gp</li>\n";
+		my ($sec,$lc_sec) = split/:/,$_;
+		$response .= "<li>$sec  - ID: $lc_sec</li>\n";
 	    }
 	    $response .= "</ul><br/>\n";
 	}
@@ -1939,8 +2101,8 @@ sections which contribute to enrollment
     if (@badsections > 0) {
 	$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because they are not valid section numbers according to your institution's official schedule of classes and sections.<br/><ul>\n";
 	foreach (@badsections) {
-	    my ($secnum,$gp,$prob) = split/:/,$_;
-	    $response .= "<li>$secnum - ID: $gp - Error: $prob</li>\n";
+	    my ($secnum,$lc_sec,$prob) = split/:/,$_;
+	    $response .= "<li>$secnum - ID: $lc_sec - Error: $prob</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
@@ -1948,8 +2110,8 @@ sections which contribute to enrollment
     if (@badowner > 0) {
 	$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
 	foreach (@badowner) {
-	    my ($secnum,$gp) = split/:/,$_;
-	    $response .= "<li>$secnum - ID: $gp</li>\n";
+	    my ($secnum,$lc_sec) = split/:/,$_;
+	    $response .= "<li>$secnum - ID: $lc_sec</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
@@ -1967,27 +2129,30 @@ sections which contribute to enrollment
 	if ($numsec > 0) {
 	    my @bgcolors=("#eeeeee","#cccccc");
 	    $response .= qq(
-			    You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional $numsec section(s).  For each new section enter the insititutional section code (e.g., 004), and the LON-CAPA section/group 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. The LON-CAPA section/group ID can be left blank, if you do not wish to designate a section/group ID for this course section.  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/> 
+			    You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional $numsec section(s).  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. The LON-CAPA section ID can be left blank, if you do not wish to designate a section ID for this course section.  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/> 
            <form name="enter" method="post">
            <table border="0" cellpadding="2" cellspacing="2" width="100%">
              <tr>
-              <td>
-               <table border="0" cellspacing="3" cellpadding="3">
-                <tr bgcolor="#CCCCFF" align="left">
-                 <td><b>Section number</b></td>
-                 <td><b>LON-CAPA section/groupID</b></td>
-                </tr>
-			    );
+              <td>);
+            $response .= &Apache::loncommon::start_data_table();
+            $response .= &Apache::loncommon::start_data_table_row();
+            $response .= qq(
+                 <th>Section number</th>
+                 <th>LON-CAPA section ID</th>
+			 );
+            $response .= &Apache::loncommon::end_data_table_row();
 	    for (my $i=0; $i<$numsec; $i++) {
-		my $colflag = $i%2;
+                $response .= &Apache::loncommon::start_data_table_row();
 		$response .= qq(
-                <tr bgcolor="$bgcolors[$colflag]" align="left">
-                 <td><input type="text" size="15" name="newsec_$i" /></td>
-                 <td><input type="text" size="10" name="newsecgp_$i" /></td>
-                </tr>
-				);
+                 <td><input type="text" size="10" name="newsec_$i" /></td>
+                 <td align="right">
+                   <input type="text" size="10" name="newlcsec_$i" />
+                 </td>
+			     );
+                $response .= &Apache::loncommon::end_data_table_row();
 	    }
-	    $response .= qq(  </table>
+            $response .= &Apache::loncommon::end_data_table();
+	    $response .= qq(
               </td>
              </tr>
              <tr>
@@ -2015,6 +2180,8 @@ sub print_sections_response () {
     my @allsections = ();
     my @badowner = ();
     my @badsections = ();
+    my @reserved = ();
+    my @matchgroup = ();
     my $numsec = 0;
     my $secstr =  $settings{'internal.sectionnums'};
     my $coursecode = $settings{'internal.coursecode'};
@@ -2032,22 +2199,31 @@ sub print_sections_response () {
     }
     
     if ($numsec > 0) {
+        my %curr_groups = &Apache::longroup::coursegroups();
 	for (my $i=0; $i<$numsec; $i++) {
 	    my $sec = "newsec_".$i;
-	    my $gp = "newsecgp_".$i;
+	    my $lc_sec = "newlcsec_".$i;
 	    if ( exists($env{"form.$sec"}) ) {
 		unless ( (grep/^$env{"form.$sec"}:/,@allsections) || (grep/^$env{"form.$sec"}:/,@sections) ) {
+                    my $lc_sec_check = &validate_lcsec(\%curr_groups,                                                     $env{"form.$lc_sec"});
+                    if ($lc_sec_check eq 'reserved') {
+                        push(@reserved,$env{"form.$sec"}.":".$env{"form.$lc_sec"});
+                        next;
+                    } elsif ($lc_sec_check eq 'group') {
+                        push (@matchgroup,$env{"form.$sec"}.":".$env{"form.$lc_sec"});
+                        next;
+                    }
 		    my $newsec = $coursecode.$env{"form.$sec"};
 		    my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec);
 		    if ($coursecheck eq 'ok') {
 			my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
 			if ($addcheck eq 'ok') {
-			    push @sections,$env{"form.$sec"}.":".$env{"form.$gp"};
+			    push @sections,$env{"form.$sec"}.":".$env{"form.$lc_sec"};
 			} else {
-			    push @badowner,$env{"form.$sec"}.":".$env{"form.$gp"};
+			    push @badowner,$env{"form.$sec"}.":".$env{"form.$lc_sec"};
 			}
 		    } else {
-			push @badsections, $env{"form.$sec"}.":".$env{"form.$gp"}.":".$coursecheck;
+			push @badsections, $env{"form.$sec"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
 		    }
 		}
 	    }
@@ -2068,8 +2244,8 @@ sub print_sections_response () {
     if ($putreply =~ /^ok/) {
 	$response = "Students enrolling in the sections listed below will be automatically added to the class roster for LON-CAPA course $realm ($coursecode), if you have chosen to enable a nightly automated enrollment update.<br/><ul>\n";
 	foreach (@allsections) {
-	    my ($sec,$gp) = split/:/,$_;
-	    $response .= "<li>$sec - ID: $gp</li>\n";
+	    my ($sec,$lc_sec) = split/:/,$_;
+	    $response .= "<li>$sec - ID: $lc_sec</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
@@ -2077,8 +2253,8 @@ sub print_sections_response () {
     if (@badsections > 0) {
 	$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because they are not valid section numbers according to your institution's official schedule of classes and sections.<br/><ul>\n";
 	foreach (@badsections) {
-	    my ($secnum,$gp,$prob) = split/:/,$_;
-	    $response .= "<li>$secnum - ID: $gp - Error: $prob</li>\n";
+	    my ($secnum,$lc_sec,$prob) = split/:/,$_;
+	    $response .= "<li>$secnum - ID: $lc_sec - Error: $prob</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
@@ -2086,12 +2262,31 @@ sub print_sections_response () {
     if (@badowner > 0) {
 	$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
 	foreach (@badowner) {
-	    my ($secnum,$gp) = split/:/,$_;
-	    $response .= "<li>$secnum - ID: $gp</li>\n";
+	    my ($secnum,$lc_sec) = split/:/,$_;
+	    $response .= "<li>$secnum - ID: $lc_sec</li>\n";
 	}
 	$response .= "</ul><br/><br/>\n";
     }
 
+    if (@reserved > 0) {
+        $response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the section ID associated with the institutional section is a reserved word. Please <a href=\"javascript:history.go(-1)\">go back</a> and change the section ID for each of these sections.<br/><ul>\n";
+        foreach (@reserved) {
+            my ($xlist,$lc_sec) = split/:/,$_;
+            $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+        }
+        $response .= "</ul><br/><br/>\n";
+    }
+                                                                                 
+    if (@matchgroup > 0) {
+        $response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the section ID associated with the institutional section is the name of a group in this course. Please <a href=\"javascript:history.go(-1)\">go back</a> and change the section ID for each of these sections.<br/><ul>\n";
+        foreach (@matchgroup) {
+            my ($xlist,$lc_sec) = split/:/,$_;
+            $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+        }
+        $response .= "</ul><br/><br/>\n";
+    }
+
+
     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/>";
@@ -2113,7 +2308,7 @@ sub photo_permission {
 					$dom,$crs);
     my ($showphotos,$response);
     if (exists($env{'form.cancel_agreement'})) {
-        if ($env{'user.name'} eq $settings{'internal.courseowner'}) {
+        if (&user_is_courseowner($settings{'internal.courseowner'})) {
             my %cenv = (
                 'internal.photopermission' => 'no',
             );
@@ -2182,10 +2377,10 @@ sub photo_permission {
 sub print_photo_agreement {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_;
     my $response;
-    my $institution = $Apache::lonnet::domaindescription{$dom};
-    if ($env{'user.name'} eq $courseowner) {
+    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) {
@@ -2218,15 +2413,21 @@ 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 {
-        my ($ownername,$owneremail) = &get_oenerinfo($dom,$courseowner);
-        $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 (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail);
+        my ($ownername,$owneremail) = &get_ownerinfo($dom,$courseowner);
+        my $emailstr;
+        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);
     }
     &print_reply($r,$response,$$tasktitleref{$action});
 }
@@ -2270,10 +2471,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>';
                 }
 	    }
@@ -2292,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;
@@ -2312,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);
@@ -2325,7 +2526,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";
@@ -2364,11 +2566,19 @@ function photowindow(photolink) {
 
 sub get_ownerinfo {
     my ($dom,$owner) = @_; 
-    my ($ownername,$owneremail);
+    my ($ownername,$owneremail,$own_uname,$own_udom);
     if ($owner) {
-        $ownername=&Apache::loncommon::plainname($owner,$dom,'firstname');
+        if ($owner =~ /^([^:]+):([^:]+)$/) {
+            $own_uname = $1;
+            $own_udom = $2; 
+        } else {
+            $own_uname = $owner;
+            $own_udom = $dom; 
+        }
+        $ownername=&Apache::loncommon::plainname($own_uname,$own_udom,
+                                                 'firstname');
         my %ownerinfo = &Apache::lonnet::get('environment',['permanentemail'],
-					     $dom,$owner);
+					     $own_udom,$own_uname);
         $owneremail = $ownerinfo{'permanentemail'};
     }
     return ($ownername,$owneremail);
@@ -2408,7 +2618,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);
@@ -2442,48 +2652,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 $gp = $2;
-                unless (grep/^$sec$/,@{$allcourses}) {
-                    push @{$allcourses},$sec;
-                    $$LC_code{$sec} = $gp;
-                }
-            }
-        }
-    }
-    return; 
-}
-
-
 sub print_viewclass_response {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
     my $response;
@@ -2514,7 +2682,7 @@ sub print_viewclass_response {
 		       &Apache::loncommon::get_env_multiple('form.unlockchg'));
 
     foreach my $student (sort @typechglist) {
-        my ($uname,$udom) = split/:/,$student;
+        my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];
@@ -2538,7 +2706,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";
@@ -2552,7 +2720,7 @@ sub print_viewclass_response {
         }
     }
     foreach my $student (@lockchglist) {
-        my ($uname,$udom) = split/:/,$student;
+        my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];
@@ -2570,7 +2738,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;
@@ -2581,31 +2749,31 @@ sub print_viewclass_response {
         }
     }
     if ($chgtotal > 0) {
-        $response = "You requested a change in enrollment type for $chgtotal students.<br /><br />\n";
+        $response = &mt('You requested a change in enrollment type for [quant,_1,student].',$chgtotal).'<br /><br />'."\n";
         $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($chgok > 0) {
-            $response .= "The following $chgok changes were successful:<br />";
+            $response .= &mt('The following [quant,_1,change was,changes were] successful;',$chgtotal).':<br /><br />';
             $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }
         if ($chgfail > 0) {
-            $response .= "The following $chgfail students were not modified successfully:&nbsp;<br />";
+            $response .= &mt('The following [quant,_1,student was,students were] not modified successfully',$chgfail).':&nbsp;<br />';
             $response .= &enrolltype_result(\%nochg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }
         if ($othdom > 0) {
-            $response .= "The following $othdom students were not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto':<br />"; 
+            $response .= &mt("The following [quant,_1,student was,students were] not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto'",$othdom).':<br />'; 
             $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }
         $response .= "<br /><br />";
     }
     if ($locktotal > 0) {
-        $response .= "You requested locking/unlocking for $locktotal manually enrolled students.<br /><br />\n";
+        $response .= &mt('You requested locking/unlocking for [quant,_1,manually enrolled student]',$locktotal).'<br /><br />'."\n";
         $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($lockok > 0) {
-            $response .= "The following $lockok changes were successful:<br />";
+            $response .= &mt('The following [quant,_1,change was,changes were] successful',$lockok).':<br /><br />';
             $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }
         if ($lockfail > 0) {
-            $response .= "The following $lockfail students were not modified successfully:&nbsp;<br />";
+            $response .= &mt('The following [quant,_1,student was,students were] not modified successfully',$lockfail).':&nbsp;<br />';
             $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }
     }
@@ -2615,9 +2783,8 @@ sub print_viewclass_response {
 
 sub enrolltype_result {
     my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;
-    my $reply = "
-            <table border='2'>
-             <tr>
+    my $reply = &Apache::loncommon::start_data_table().
+                &Apache::loncommon::start_data_table_header_row().'
               <th>username</th>
               <th>domain</th>
               <th>ID</th>
@@ -2625,11 +2792,11 @@ sub enrolltype_result {
               <th>section</th>
               <th>start date</th>
               <th>end date</th>
-              <th>enrollment change</th>
-             </tr>";
-    foreach (sort keys %{$changes}) {
-        my $sdata  = $classlist->{$_};
-        my ($uname,$udom) = split/:/,$_;
+              <th>enrollment change</th>'."\n".
+                &Apache::loncommon::end_data_table_header_row();
+    foreach my $chg (sort keys %{$changes}) {
+        my $sdata  = $classlist->{$chg};
+        my ($uname,$udom) = split(/:/,$chg);
         my $section  = $sdata->[$secidx];
         my $uid      = $sdata->[$ididx];
         my $start    = $sdata->[$startidx];
@@ -2646,24 +2813,23 @@ sub enrolltype_result {
             $end = &Apache::lonlocal::locallocaltime($end);
         }
         if (!defined($section) || ($section eq '')) {
-            $section eq '&nbsp;';
+            $section = '&nbsp;';
         }
         if (!defined($uid) || ($uid eq '')) {
-            $uid = '&nbsp';
+            $uid = '&nbsp;';
         }
-        $reply .= "
-             <tr>
-              <td>$uname</td>
-              <td>$udom</td>
-              <td>$uid</td>
-              <td>".&Apache::loncommon::plainname($uname,$udom)."</td>
-              <td>$section</td>
-              <td>$start</td>
-              <td>$end</td>
-              <td>$$changes{$_}</td>
-             </tr>";
+        $reply .= &Apache::loncommon::start_data_table_row().' 
+              <td>'.$uname.'</td>
+              <td>'.$udom.'</td>
+              <td>'.$uid.'</td>
+              <td>'.&Apache::loncommon::plainname($uname,$udom).'</td>
+              <td>'.$section.'</td>
+              <td>'.$start.'</td>
+              <td>'.$end.'</td>
+              <td>'.$$changes{$chg}.'</td>'."\n".
+             &Apache::loncommon::end_data_table_row();
     }
-    $reply .= "</table>";
+    $reply .= &Apache::loncommon::end_data_table();
     return $reply;
 }
 
@@ -2770,11 +2936,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>'.
@@ -2790,6 +2956,29 @@ sub date_setting_table {
     return ($start_table, $end_table);
 }
 
+sub validate_lcsec {
+    my ($curr_groups,$lcsec) = @_;
+    if (($lcsec eq 'all') || ($lcsec eq 'none')) {
+        return 'reserved';
+    } else {
+        if (exists($$curr_groups{$lcsec})) {
+            return 'group'; 
+        }
+    }
+    return 'ok';
+}
+
+sub user_is_courseowner {
+    my ($courseowner) = @_;
+    my $user;
+    if ($courseowner =~ /^[^:]+:[^:]+$/) {
+	$user = $env{'user.name'}.':'.$env{'user.domain'};
+    } else {
+	$user = $env{'user.name'};
+    }
+    return ($user eq $courseowner);
+}
+    
 ###################################################################
 sub handler {
     my $r = shift;