Diff for /loncom/interface/lonpopulate.pm between versions 1.44 and 1.67

version 1.44, 2006/07/27 23:24:19 version 1.67, 2009/11/24 14:26:15
Line 33  use Apache::lonhtmlcommon; Line 33  use Apache::lonhtmlcommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::loncoursedata;  use Apache::loncoursedata;
 use Apache::longroup;  use Apache::longroup;
   use Apache::lonuserutils;
 use Apache::Constants qw(:common :http REDIRECT);  use Apache::Constants qw(:common :http REDIRECT);
 use Time::Local;  use Time::Local;
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
Line 46  sub header { Line 47  sub header {
   
 sub choose_header {  sub choose_header {
     my ($action) = @_;      my ($action) = @_;
       my $notify_check = '/^note_[0-9]+$/';
     my $scripttag = qq|      my $scripttag = qq|
 <script language='javascript' type='text/javascript'>  <script type=\"text/javascript\" language=\"JavaScript\">
 <!--  <!--
 function process(calling,numauto,nummanual,numlock,numunlock) {  function process(calling,numauto,nummanual,numlock,numunlock) {
  var checker = 1   var checker = 1
Line 111  function process(calling,numauto,nummanu Line 112  function process(calling,numauto,nummanu
          checker = 0           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") {   if (calling == "viewclass") {
      var totcheck = 0       var totcheck = 0
      var numchk = 0       var numchk = 0
Line 181  sub print_mainbox { Line 208  sub print_mainbox {
     }      }
     my $page = '';      my $page = '';
     if ($action eq "information") {      if ($action eq "information") {
         $page = "<b>Automated Enrollment</b>";          $page = "<b>".&mt("Automated Enrollment")."</b>";
     } else {      } else {
         $page =  '<a href="/adm/populate">Automated Enrollment</a>';          $page =  '<a href="/adm/populate">'.&mt('Automated Enrollment').'</a>';
         if ($reply) {          if ($reply) {
             if ($action eq "newcross") {              if ($action eq "newcross") {
                 $action = "crosslist";                  $action = "crosslist";
             } elsif ($action eq "newsections") {              } elsif ($action eq "newsections") {
                 $action = "sections";                   $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 {          } 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);      $r->print(<<ENDTHIS);
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <table width="100%" border="0" cellpadding="0" cellspacing="0">
  <tr>   <tr>
   <td bgcolor="#CCCCFF">     <td bgcolor="#C5DB99"> 
    <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/dropadd">Enrollment Manager</a> -&gt; $page</font><br/>     <a href="/adm/menu">$realm</a> &raquo; <a href="/adm/createuser">$usrmang</a> &raquo; $page<br/>
   </td>    </td>
   <td align="right" bgcolor="#CCCCFF" valign="top">    <td align="right" bgcolor="#C5DB99" valign="top">
    <font size="+1">Automated Enrollment Manager&nbsp;</font>     $autenrl&nbsp;
   </td>    </td>
  </tr>   </tr>
 </table>  </table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <br/>
  <tr>  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="LC_pick_box">
    <tr class="LC_pick_box_row">
 ENDTHIS  ENDTHIS
 }  }
   
Line 218  sub print_navmenu { Line 249  sub print_navmenu {
         $action = $env{'form.action'};          $action = $env{'form.action'};
     }      }
     $r->print(<<ENDONE);      $r->print(<<ENDONE);
   <td width="10" valign="top" bgcolor="#DDFFFF">&nbsp;</td>      <td valign="top" class="LC_pick_box_title">
   <td width="20%" valign="top" bgcolor="#DDFFFF">  
    <br/>  
 ENDONE  ENDONE
     foreach my $task (@{$tasksref}) {      foreach my $task (@{$tasksref}) {
         if ($task eq $action) {          if ($task eq $action) {
Line 243  ENDONE Line 272  ENDONE
     $r->print("      $r->print("
   <p>&nbsp;</p>    <p>&nbsp;</p>
   </td>    </td>
   <td width=\"10\" valign=\"top\" bgcolor=\"#CCCCFF\">&nbsp;</td>    <td valign=\"top\" class=\"LC_pick_box_value\">");
   <td width=\"10\" valign=\"top\" bgcolor=\"#FFFFFF\">&nbsp;</td>  
   <td bgcolor=\"#ffffff\" valign=\"top\">");  
 }  }
   
 ###############################################################  ###############################################################
Line 341  ENDONE Line 368  ENDONE
 ENDTWO  ENDTWO
       if ($enrollvar{autoadds}) {        if ($enrollvar{autoadds}) {
           $r->print("            $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>      <label><input type=\"radio\" name=\"autoadds\" value=\"0\" />&nbsp;Disable</label>
          ");           ");
       } else {        } else {
           $r->print("            $r->print("
                             <label><input type=\"radio\" name=\"autoadds\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>                              <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("        $r->print("
Line 358  ENDTWO Line 385  ENDTWO
         Removals based on classlist changes:&nbsp;&nbsp;");          Removals based on classlist changes:&nbsp;&nbsp;");
       if ($enrollvar{autodrops}) {        if ($enrollvar{autodrops}) {
           $r->print("            $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>");                  <label><input type=\"radio\" name=\"autodrops\" value=\"0\" />&nbsp;Disable</label>");
       } else {        } else {
           $r->print("            $r->print("
                 <label><input type=\"radio\" name=\"autodrops\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>                  <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("        $r->print("
               </td>                </td>
Line 371  ENDTWO Line 398  ENDTWO
              <tr>               <tr>
               <td>                <td>
                <font color=\"#888888\">                 <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>                 </font>
               </td>                </td>
              </tr>               </tr>
Line 400  Note: Any students added manually by cou Line 427  Note: Any students added manually by cou
       }        }
       my $dateshow;        my $dateshow;
       if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {        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 {        } else {
          $dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n";           $dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n";
       }        }
Line 479  ENDTWO Line 506  ENDTWO
   } elsif ($action eq "notify") {    } elsif ($action eq "notify") {
       my $notifycount = 0;        my $notifycount = 0;
       my @notified = split(/,/,$enrollvar{notifylist});        my @notified = split(/,/,$enrollvar{notifylist});
       my @domcoord;        my (@domcoord,@showdom,@olddomcoord,@futuredomcoord);
       my @showdom;  
       for (my $i=0; $i<@notified; $i++) {        for (my $i=0; $i<@notified; $i++) {
           if ($notified[$i] !~ /:/) {            if ($notified[$i] !~ /:/) {
               $notified[$i] =~ s/\@/:/;                $notified[$i] =~ s/\@/:/;
Line 493  ENDTWO Line 519  ENDTWO
       } else {        } else {
           $noteset = "OFF";            $noteset = "OFF";
       }        }
         my $now = time;
       my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);        my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
       foreach my $server (keys %dompersonnel) {        foreach my $server (keys(%dompersonnel)) {
           foreach my $user (sort(keys %{$dompersonnel{$server}})) {            foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
               my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);                my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
               if (!grep/^$uname:$udom$/,@domcoord) {                my ($end,$start) = split(':',$dompersonnel{$server}{$user});
                   push(@domcoord,$uname.':'.$udom);                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);
                     }
               }                }
           }            }
       }        }
Line 518  ENDTWO Line 558  ENDTWO
       ");        ");
       if ($notifycount) {        if ($notifycount) {
           $r->print("            $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>                          <label><input type=\"radio\" name=\"notify\" value=\"0\" />&nbsp;No</label>
           ");            ");
       } else {        } else {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"notify\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <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("        $r->print("
Line 536  ENDTWO Line 576  ENDTWO
       my %pname;        my %pname;
       my %notifystate;        my %notifystate;
       my %status;        my %status;
       my $now = time;  
       foreach my $person (sort(keys(%coursepersonnel))) {        foreach my $person (sort(keys(%coursepersonnel))) {
           my $match = 0;            my $match = 0;
           my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);            my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);
Line 546  ENDTWO Line 585  ENDTWO
               next;                next;
           }            }
           if ($role eq 'cc')  {            if ($role eq 'cc')  {
               unless (grep/^$user$/,@ccs) {                unless (grep(/^$user$/,@ccs)) {
                   if ($end && $end < $now) {                    if ($end && $end < $now) {
                       $status{$user} = 'previous';                        $status{$user} = 'previous';
                   } elsif ($start > $now) {                    } elsif ($start > $now) {
Line 558  ENDTWO Line 597  ENDTWO
                   my ($uname,$udom) = split(/:/,$user);                    my ($uname,$udom) = split(/:/,$user);
                   $pname{$user} =                     $pname{$user} = 
                            &Apache::loncommon::plainname($uname,$udom);                             &Apache::loncommon::plainname($uname,$udom);
                   if (grep/^$user$/,@notified) {                    if (grep(/^$user$/,@notified)) {
                       $notifystate{$user} = 1;                        $notifystate{$user} = 1;
                   } else {                    } else {
                       $notifystate{$user} = 0;                        $notifystate{$user} = 0;
Line 566  ENDTWO Line 605  ENDTWO
               }                }
           }            }
       }        }
       my $notifyshow = @ccs;        my $notifyshow = 0; 
       my %lt = &Apache::lonlocal::texthash(        my %lt = &Apache::lonlocal::texthash(
                                   name => 'Name',                                    name => 'Name',
                                   usnm => 'username:domain',                                    usnm => 'username:domain',
                                   coac => 'Course Access',                                    coac => 'Course Access',
                                   curn => 'Current notification status',                                    curn => 'Current notification status',
                                     doms => 'Domain Coordinator status',
                                   notf => 'Notification?',                                    notf => 'Notification?',
                                   ntac => 'Notification active',                                    ntac => 'Notification active',
                                   ntin => 'Notification inactive',                                    ntin => 'Notification inactive',
Line 601  ENDTWO Line 641  ENDTWO
       if (grep(/^$viewer$/,@domcoord)) {        if (grep(/^$viewer$/,@domcoord)) {
           $showalldc = 1;            $showalldc = 1;
       }        }
       foreach my $dc (@domcoord) {        foreach my $dc (@domcoord,@futuredomcoord) {
           if (!grep(/^$dc$/,@ccs)) {            if (!grep(/^$dc$/,@ccs)) {
               if (grep(/^$dc$/,@notified)) {                if (grep(/^$dc$/,@notified)) {
                   $notifystate{$dc} = 1;                    $notifystate{$dc} = 1;
Line 616  ENDTWO Line 656  ENDTWO
               push(@showdom,$dc);                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);        my $showdomnum = scalar(@showdom);
       if ($showdomnum) {        if ($showdomnum) {
           $r->print("            $r->print("
Line 633  ENDTWO Line 683  ENDTWO
              </tr>               </tr>
              <tr>               <tr>
               <td>");                <td>");
           $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,            $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname,
                                      \%pname,\$notifyshow));                                       \$notifyshow,\@olddomcoord,\@futuredomcoord));
           $r->print("            $r->print("
              </td>               </td>
           </tr>");            </tr>");
       }        }
       if ($notifycount || @showdom > 0) {        if (@ccs > 0 || @showdom > 0) {
           $r->print("<tr><td>&nbsp;</td></tr><tr><td>".            $r->print("<tr><td>&nbsp;</td></tr><tr><td>");
                 &mt("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.").' '.&mt("To include individuals who are not currently recipients, simply check the 'Notification?' checkbox. Click 'Go' to store your changes.")."            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/>             <br/>
            <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">             <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">
             <tr>              <tr>
Line 675  ENDTWO Line 731  ENDTWO
       ");        ");
       if ($cross_str > 0) {        if ($cross_str > 0) {
           $r->print("            $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 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 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>                </td>
              </tr>               </tr>
             </table>              </table>
Line 699  ENDTWO Line 755  ENDTWO
               my $colflag = $i%2;                my $colflag = $i%2;
               $r->print(&Apache::loncommon::start_data_table_row());                $r->print(&Apache::loncommon::start_data_table_row());
               $r->print("                $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>$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());                $r->print(&Apache::loncommon::end_data_table_row());
           }            }
Line 761  ENDTWO Line 817  ENDTWO
               </td>                </td>
              </tr>               </tr>
              <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 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 store                <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>
 your changes.</td>  
              </tr>               </tr>
             </table>              </table>
             <br/>              <br/>
Line 791  your changes.</td> Line 846  your changes.</td>
                   $r->print("Enrollment inactive");                    $r->print("Enrollment inactive");
               }                }
               if ($shrflag) {                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 {                } else {
                   $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");                    $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");
               }                }
Line 822  your changes.</td> Line 877  your changes.</td>
           if (@currsections) {            if (@currsections) {
               my $secshow = @currsections;                my $secshow = @currsections;
               $r->print("                $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 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 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>                </td>
              </tr>               </tr>
             </table>              </table>
Line 840  your changes.</td> Line 895  your changes.</td>
                   my $colflag = $j%2;                    my $colflag = $j%2;
                   $r->print(&Apache::loncommon::start_data_table_row());                    $r->print(&Apache::loncommon::start_data_table_row());
                   $r->print("                    $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>$currsections[$j]</td>
                  <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>                   <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
                   ");                    ");
Line 897  your changes.</td> Line 952  your changes.</td>
       ");        ");
       if ($enrollvar{showphoto}) {        if ($enrollvar{showphoto}) {
           $r->print("            $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>                          <label><input type=\"radio\" name=\"showphotos\" value=\"0\" />&nbsp;No</label>
           ");            ");
       } else {        } else {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"showphotos\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <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('        $r->print('
Line 912  your changes.</td> Line 967  your changes.</td>
       ');        ');
       my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom);        my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom);
       my $can_enable = 1;        my $can_enable = 1;
       my $institution = $Apache::lonnet::domaindescription{$dom};        my $institution = &Apache::lonnet::domain($dom,'description');
       my $user;  
       if ($enrollvar{'courseowner'} =~ /^[^:]+:[^:]+$/) {  
           $user = $env{'user.name'}.':'.$env{'user.domain'};  
       } else {  
           $user = $env{'user.name'};  
       }  
       if ($result eq 'ok') {        if ($result eq 'ok') {
           if ($perm_reqd eq 'yes') {            if ($perm_reqd eq 'yes') {
               if (!($enrollvar{'photopermission'} eq 'yes')) {                if (!($enrollvar{'photopermission'} eq 'yes')) {
                   $can_enable = 0;                    $can_enable = 0;
               } else {                } else {
                   if ($user eq $enrollvar{'courseowner'}) {                    if (&user_is_courseowner($enrollvar{'courseowner'})) {
                       $r->print('                        $r->print('
                     <tr>                      <tr>
                      <td>'.                       <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>                       </td>
                     </tr>                      </tr>
                       ');                        ');
Line 951  your changes.</td> Line 1000  your changes.</td>
                     <tr>                      <tr>
                      <td>                       <td>
                       <font color="#888888">'.                        <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>                        </font>
                      </td>                       </td>
                     </tr>                      </tr>
 ');  ');
       } else {        } else {
           if ($user eq $enrollvar{'courseowner'}) {            if (&user_is_courseowner($enrollvar{'courseowner'})) {
               $r->print('                $r->print('
                     <tr>                      <tr>
                      <td>'.                       <td>'.
Line 974  your changes.</td> Line 1023  your changes.</td>
               }                }
               $r->print('                $r->print('
                     <tr>                      <tr>
                      <td>'.                       <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);" />                        .&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>                      </td>
                    </tr>                     </tr>
                   </form>                    </form>
Line 1057  Note: Any students previously added manu Line 1109  Note: Any students previously added manu
           if ($update) {             if ($update) { 
               $r->print('<br />'.$commentary.'<br /><br />                $r->print('<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">  <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()" />  onclick="javascript:document.photoupdate.submit()" />
 <input type ="hidden" name="action" value="'.$action.'" />  <input type="hidden" name="action" value="'.$action.'" />
 <input type ="hidden" name="state" value="process" />  <input type="hidden" name="state" value="process" />
 </form>');  </form>');
           } else {            } 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 {        } 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>');            $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>');
Line 1091  onclick="javascript:document.photoupdate Line 1144  onclick="javascript:document.photoupdate
       if (! exists($env{'form.sortby'})) {        if (! exists($env{'form.sortby'})) {
           $env{'form.sortby'} = 'username';            $env{'form.sortby'} = 'username';
       }        }
       if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) {        if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
           $env{'form.Status'} = 'Active';            $env{'form.Status'} = 'Active';
       }        }
       my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'});        my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'});
 #  Get current classlist  #  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 $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'}) {
                     next;
                 } else {
                     $userlist{$student} = $classlist->{$student};
                 }
             } else {
                 $userlist{$student} = $classlist->{$student};
             }
         }
   
       if (! defined($classlist)) {        if (! defined($classlist)) {
           $r->print(&mt('There are no students either currently or previously enrolled.').            $r->print(&mt('There are no students either currently or previously enrolled.')."
                       "\n");                        </td>
                        </tr>\n");
       } else {        } else {
           $r->print(&mt('Student Status: [_1]',$status_select)."\n");            $r->print(&mt('Student Status: [_1]',$status_select)."\n");
           $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.            $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");                "\n</p>\n");
             my $context = 'course';
           my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist);            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("            $r->print("
                      </td>                       </td>
                     </tr>                      </tr>
Line 1118  onclick="javascript:document.photoupdate Line 1190  onclick="javascript:document.photoupdate
               if ($autocount > 0) {                if ($autocount > 0) {
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgauto)" /></fieldset></td>
 END  END
               }                }
               if ($manualcount > 0) {                if ($manualcount > 0) {
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgmanual)" /></fieldset></td>
 END  END
               }                }
Line 1135  END Line 1207  END
                   }                    }
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.lockchg)" /></fieldset></td>
 END  END
               }                }
Line 1145  END Line 1217  END
                   }                    }
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.unlockchg)" /></fieldset></td>
 END  END
               }                }
Line 1160  END Line 1232  END
                      </td>                       </td>
                     </tr>                      </tr>
               ");                ");
             } else {
                 $r->print('
                       <tr>
                        <td><br />
                         '.&mt('There are no students with the selected status.').'
                        </td>
                       </tr>
                 ');
           }            }
           $r->print("            $r->print("
                    </table>                     </table>
Line 1172  END Line 1252  END
 }  }
   
 sub notifier_tables {  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();      my $output = &Apache::loncommon::start_data_table();
     $output .= &Apache::loncommon::start_data_table_header_row();      $output .= &Apache::loncommon::start_data_table_header_row();
     $output .= "<th>$$lt{name}</th>      $output .= "<th>$$lt{name}</th>
                 <th>$$lt{usnm}</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{coac}</th>";
     }       } 
     $output .=  "<th>$$lt{curn}</th>      $output .=  "<th>$$lt{curn}</th>
Line 1188  sub notifier_tables { Line 1271  sub notifier_tables {
         $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.          $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.
                    '<td><input type="hidden" name="notifyname_'.$$notifyshow.                     '<td><input type="hidden" name="notifyname_'.$$notifyshow.
                    '" value="'.$$users[$i].'" />'.$$users[$i].'</td>';                     '" 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>'.$$status{$$users[$i]}.'</td>';
         }          }
         $output .= '<td>';          $output .= '<td>';
Line 1232  sub print_accessdate_table { Line 1327  sub print_accessdate_table {
          'freg' => 'for registered students added via automated enrollment',           'freg' => 'for registered students added via automated enrollment',
          'fnew' => 'for new students added when you update the class roster',           '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.',           '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;      my $dateshow;
     if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {      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') {         if ($action eq 'setaccess') {
            $dateshow .= $lt{'ifyo'}."\n";             $dateshow .= $lt{'ifyo'}."\n";
        } elsif ($action eq 'updatenow') {         } elsif ($action eq 'updatenow') {
Line 1316  ENDFOUR Line 1411  ENDFOUR
                     <td colspan=\"2\">&nbsp;</td>                      <td colspan=\"2\">&nbsp;</td>
                    </tr>                     </tr>
                    <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>                     </tr>
                   </table>                    </table>
         ");          ");
Line 1417  sub print_chgsettings_response { Line 1512  sub print_chgsettings_response {
  }   }
  if ($autoadds || $autodrops) {   if ($autoadds || $autodrops) {
     $warning = &warning_message($dom,$crs,$action);      $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/>";      $warn_suffix = " should be enabled, additional action is required.<br/>";
  }   }
  if ($autoadds) {   if ($autoadds) {
Line 1515  sub print_setdates_response { Line 1610  sub print_setdates_response {
         }          }
     }      }
     $warning = &warning_message($dom,$crs,$action);      $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 '') {      unless ($warning eq '') {
         $response .= $warn_prefix.$warning;          $response .= $warn_prefix.$warning;
     }      }
Line 1556  start and end access dates for this cour Line 1651  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/>";      $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
         } else {          } else {
     if ($currstart == $startaccess) {      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 {      } else {
         $response = "The first access date for students added via automated enrollment has been changed to          $response = "The first access date for students being added via automated enrollment has been changed to $showstart.<br/>";
 $showstart.<br/>";  
     }      }
     if ($currend == $endaccess) {      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 {      } else {
         $response .= "The last access date for students automated enrollment has been changed to          $response .= "The last access date for students being added via automated enrollment has been changed to $showend.<br/>";
 $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.  # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.
   
Line 1615  $showend.<br/>"; Line 1709  $showend.<br/>";
         }          }
     }      }
     $warning = &warning_message($dom,$crs,$action);      $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 '') {      unless ($warning eq '') {
         $response .= $warn_prefix.$warning;          $response .= $warn_prefix.$warning;
     }      }
Line 1761  sub print_crosslistings_menu () { Line 1855  sub print_crosslistings_menu () {
  if ($numcross > 0) {   if ($numcross > 0) {
     my @bgcolors=("#eeeeee","#cccccc");      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 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/>      $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">);             <form name="enter" method="post">); #' stupid emacs
            $response .= &Apache::loncommon::start_data_table();             $response .= &Apache::loncommon::start_data_table();
            $response .= &Apache::loncommon::start_data_table_row();             $response .= &Apache::loncommon::start_data_table_row();
            $response .= qq(             $response .= qq(
Line 1923  sub print_crosslistings_response () { Line 2017  sub print_crosslistings_response () {
   
     if (@allxlists > 0) {      if (@allxlists > 0) {
  $warning = &warning_message($dom,$crs,$action);   $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 '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2061  sections which contribute to enrollment Line 2155  sections which contribute to enrollment
           
     if ($seccount > 0) {      if ($seccount > 0) {
  $warning = &warning_message($dom,$crs,$action);   $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 '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2232  sub print_sections_response () { Line 2326  sub print_sections_response () {
   
     if (@allsections > 0) {      if (@allsections > 0) {
  $warning = &warning_message($dom,$crs,$action);   $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 '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2251  sub photo_permission { Line 2345  sub photo_permission {
  $dom,$crs);   $dom,$crs);
     my ($showphotos,$response);      my ($showphotos,$response);
     if (exists($env{'form.cancel_agreement'})) {      if (exists($env{'form.cancel_agreement'})) {
         if ($env{'user.name'} eq $settings{'internal.courseowner'}) {          if (&user_is_courseowner($settings{'internal.courseowner'})) {
             my %cenv = (              my %cenv = (
                 'internal.photopermission' => 'no',                  'internal.photopermission' => 'no',
             );              );
Line 2320  sub photo_permission { Line 2414  sub photo_permission {
 sub print_photo_agreement {  sub print_photo_agreement {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_;      my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_;
     my $response;      my $response;
     my $institution = $Apache::lonnet::domaindescription{$dom};      my $institution = &Apache::lonnet::domain($dom,'description');
     if ($env{'user.name'} eq $courseowner) {      if (&user_is_courseowner($courseowner)) {
         $response = '          $response = '
 <script type="text/javascript">  <script type="text/javascript" language="JavaScript">
 function agreement_result(caller) {  function agreement_result(caller) {
     document.permission.photopermission.value = caller;      document.permission.photopermission.value = caller;
     if (caller == 0) {      if (caller == 0) {
Line 2356  function agreement_result(caller) { Line 2450  function agreement_result(caller) {
       </td>        </td>
     </tr>      </tr>
    </table>     </table>
    <input type ="hidden" name="action" value="'.$action.'" />     <input type="hidden" name="action" value="'.$action.'" />
    <input type ="hidden" name="state" value="process" />     <input type="hidden" name="state" value="process" />
    <input type ="hidden" name="showphotos" value="1" />     <input type="hidden" name="showphotos" value="1" />
    <input type= "hidden" name="photopermission" value="" />     <input type="hidden" name="photopermission" value="" />
   </form>    </form>
 ';  ';
     } else {      } else {
Line 2368  function agreement_result(caller) { Line 2462  function agreement_result(caller) {
         if ($owneremail) {          if ($owneremail) {
             $emailstr = "(e-mail: $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});      &print_reply($r,$response,$$tasktitleref{$action});
 }  }
Line 2412  sub print_photos_response { Line 2508  sub print_photos_response {
                 if ($update) {                  if ($update) {
                     $response .= '<br />'.$commentary.'<br /><br />                      $response .= '<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">  <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()" />   onclick="javascript:document.photoupdate.submit()" /> 
 <input type ="hidden" name="action" value="'.$action.'" />  <input type="hidden" name="action" value="'.$action.'" />
 <input type ="hidden" name="state" value="photoupdate" />  <input type="hidden" name="state" value="photoupdate" />
 </form>';  </form>';
                 }                  }
     }      }
Line 2434  onclick="javascript:document.photoupdate Line 2530  onclick="javascript:document.photoupdate
         }          }
     }      }
     if (keys(%newenv) > 0) {      if (keys(%newenv) > 0) {
         &Apache::lonnet::appenv(%newenv);          &Apache::lonnet::appenv(\%newenv);
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
     return;      return;
Line 2454  sub print_photoupdate_response { Line 2550  sub print_photoupdate_response {
     my %LC_code;      my %LC_code;
     my %affiliates;      my %affiliates;
     my $outcome;      my $outcome;
     &get_institutional_codes(\%settings,,\@allcourses,\%LC_code);      &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
     if (@allcourses > 0) {      if (@allcourses > 0) {
         @{$affiliates{$crs}} = @allcourses;          @{$affiliates{$crs}} = @allcourses;
         $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes);          $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes);
Line 2467  sub print_photoupdate_response { Line 2563  sub print_photoupdate_response {
         }          }
         if ($outcome eq 'ok') {          if ($outcome eq 'ok') {
             if (keys(%changes) > 0) {              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) {  function photowindow(photolink) {
     var title = "Photo_Viewer";      var title = "Photo_Viewer";
     var options = "scrollbars=1,resizable=1,menubar=0";      var options = "scrollbars=1,resizable=1,menubar=0";
Line 2558  sub print_update_result () { Line 2655  sub print_update_result () {
     } elsif ($coursecode eq '') {      } 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";   $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 {      } else {
         &get_institutional_codes(\%settings,\@allcourses,\%LC_code);          &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
  if (@allcourses > 0) {   if (@allcourses > 0) {
     @{$affiliates{$crs}} = @allcourses;      @{$affiliates{$crs}} = @allcourses;
     my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs);      my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs);
Line 2592  sub print_update_result () { Line 2689  sub print_update_result () {
     return;      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 {  sub print_viewclass_response {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;      my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
     my $response;      my $response;
Line 2664  sub print_viewclass_response { Line 2719  sub print_viewclass_response {
        &Apache::loncommon::get_env_multiple('form.unlockchg'));         &Apache::loncommon::get_env_multiple('form.unlockchg'));
   
     foreach my $student (sort @typechglist) {      foreach my $student (sort @typechglist) {
         my ($uname,$udom) = split/:/,$student;          my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};          my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];          my $uid       = $sdata->[$ididx];
Line 2688  sub print_viewclass_response { Line 2743  sub print_viewclass_response {
             } elsif ($newtype eq '') {              } elsif ($newtype eq '') {
                 $newlock = '1';                  $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') {              if ($modreply eq 'ok') {
                 $chgok ++;                  $chgok ++;
                 $chg{$student} = "Changed to $change";                  $chg{$student} = "Changed to $change";
Line 2702  sub print_viewclass_response { Line 2757  sub print_viewclass_response {
         }          }
     }      }
     foreach my $student (@lockchglist) {      foreach my $student (@lockchglist) {
         my ($uname,$udom) = split/:/,$student;          my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};          my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];          my $uid       = $sdata->[$ididx];
Line 2720  sub print_viewclass_response { Line 2775  sub print_viewclass_response {
                 $newlockname = &mt('unlocked');                  $newlockname = &mt('unlocked');
                 $oldlockname = &mt('locked');                   $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') {              if ($lockreply eq 'ok') {
                 $lockok ++;                  $lockok ++;
                 $lockchg{$student} = 'Changed to '.$newlockname;                  $lockchg{$student} = 'Changed to '.$newlockname;
Line 2731  sub print_viewclass_response { Line 2786  sub print_viewclass_response {
         }          }
     }      }
     if ($chgtotal > 0) {      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);          $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($chgok > 0) {          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);              $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         if ($chgfail > 0) {          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);              $response .= &enrolltype_result(\%nochg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         if ($othdom > 0) {          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 .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         $response .= "<br /><br />";          $response .= "<br /><br />";
     }      }
     if ($locktotal > 0) {      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);          $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($lockok > 0) {          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);              $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }          }
         if ($lockfail > 0) {          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);              $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }          }
     }      }
Line 2765  sub print_viewclass_response { Line 2820  sub print_viewclass_response {
   
 sub enrolltype_result {  sub enrolltype_result {
     my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;      my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;
     my $reply = "      my $reply = &Apache::loncommon::start_data_table().
             <table border='2'>                  &Apache::loncommon::start_data_table_header_row().'
              <tr>  
               <th>username</th>                <th>username</th>
               <th>domain</th>                <th>domain</th>
               <th>ID</th>                <th>ID</th>
Line 2775  sub enrolltype_result { Line 2829  sub enrolltype_result {
               <th>section</th>                <th>section</th>
               <th>start date</th>                <th>start date</th>
               <th>end date</th>                <th>end date</th>
               <th>enrollment change</th>                <th>enrollment change</th>'."\n".
              </tr>";                  &Apache::loncommon::end_data_table_header_row();
     foreach (sort keys %{$changes}) {      foreach my $chg (sort keys %{$changes}) {
         my $sdata  = $classlist->{$_};          my $sdata  = $classlist->{$chg};
         my ($uname,$udom) = split/:/,$_;          my ($uname,$udom) = split(/:/,$chg);
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid      = $sdata->[$ididx];          my $uid      = $sdata->[$ididx];
         my $start    = $sdata->[$startidx];          my $start    = $sdata->[$startidx];
Line 2796  sub enrolltype_result { Line 2850  sub enrolltype_result {
             $end = &Apache::lonlocal::locallocaltime($end);              $end = &Apache::lonlocal::locallocaltime($end);
         }          }
         if (!defined($section) || ($section eq '')) {          if (!defined($section) || ($section eq '')) {
             $section eq '&nbsp;';              $section = '&nbsp;';
         }          }
         if (!defined($uid) || ($uid eq '')) {          if (!defined($uid) || ($uid eq '')) {
             $uid = '&nbsp';              $uid = '&nbsp;';
         }          }
         $reply .= "          $reply .= &Apache::loncommon::start_data_table_row().' 
              <tr>                <td>'.$uname.'</td>
               <td>$uname</td>                <td>'.$udom.'</td>
               <td>$udom</td>                <td>'.$uid.'</td>
               <td>$uid</td>                <td>'.&Apache::loncommon::plainname($uname,$udom).'</td>
               <td>".&Apache::loncommon::plainname($uname,$udom)."</td>                <td>'.$section.'</td>
               <td>$section</td>                <td>'.$start.'</td>
               <td>$start</td>                <td>'.$end.'</td>
               <td>$end</td>                <td>'.$$changes{$chg}.'</td>'."\n".
               <td>$$changes{$_}</td>               &Apache::loncommon::end_data_table_row();
              </tr>";  
     }      }
     $reply .= "</table>";      $reply .= &Apache::loncommon::end_data_table();
     return $reply;      return $reply;
 }  }
   
Line 2920  sub get_dates_from_form { Line 2973  sub get_dates_from_form {
 sub date_setting_table {  sub date_setting_table {
     my ($starttime,$endtime,$action) = @_;      my ($starttime,$endtime,$action) = @_;
     my ($startform,$endform) = &setup_date_selectors($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)) ) {      if (($action eq 'setdates' && defined($endtime) && $endtime == 0) || (($action eq 'setaccess' || $action eq 'updatenow') && ($endtime eq '' || $endtime == 0)) ) {
         $perpetual .= ' checked';          $perpetual .= ' checked';
     }      }
     $perpetual.= ' />'.' no ending date</label></nobr>';      $perpetual.= ' />'.' no ending date</label></span>';
     my $start_table = '';      my $start_table = '';
     $start_table .= "<table>\n";      $start_table .= "<table>\n";
     $start_table .= '<tr><td align="right">Starting Date</td>'.      $start_table .= '<tr><td align="right">Starting Date</td>'.
Line 2952  sub validate_lcsec { Line 3005  sub validate_lcsec {
     return 'ok';      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 {  sub handler {
     my $r = shift;      my $r = shift;

Removed from v.1.44  
changed lines
  Added in v.1.67


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>