--- loncom/interface/lonmodifycourse.pm	2003/12/26 16:30:17	1.1
+++ loncom/interface/lonmodifycourse.pm	2003/12/28 01:37:02	1.2
@@ -14,9 +14,11 @@ sub print_course_selection_page {
     my ($r,$tasklongref) = @_;
     my $dom = $ENV{'user.domain'};
     my %lt=&Apache::lonlocal::texthash(
-                    'incs' => "Internal course settings",
-                    'stat' => "Although the majority of course settings for LON-CAPA courses may be modified by a Course Coordinator, there are a small number of settings which may only be modified by a Domain Coordinator.  These particular course parameters control automated student enrollment in LON-CAPA courses based on classlist data available from your institution's student information system.",
-                    'chcs' => "Once you have chosen the course for which you wish to view/modify internal settings, click 'Go' to proceed",
+                    'csae' => "Course settings for automated enrollment",
+                    'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", 
+                    'chcs' => "Choose the course for which you wish to view/modify automated enrollment settings from the select box below and click 'Go' to proceed.",
+                    'eaen' =>  "Each entry in the select box contains: <b>course code</b> -- <b>course title</b> ------- <b>course owner</b>, and entries are ordered alphabetically by course code.",
+                    'psac' => "Please select a course",
                     'ccrs' => "Choose a course",
                     'gobt' => "Go"
     );
@@ -25,14 +27,15 @@ sub print_course_selection_page {
     my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1);
     &print_header($r,$tasklongref);
     $r->print(<<ENDBLOCK);
-<form action="/adm/modifycourse" method="post" name="cmods">
-<h2>$lt{'incs'}</h2>
-<p>$lt{'stat'}
+<form action="/adm/modifycourse" method="post" name="cmod">
+<h2>$lt{'csae'}</h2>
+<p>$lt{'unst'}
 </p><p>$lt{'chcs'}
-</p>
+<br/>$lt{'eaen'}
+</p><p>
 <b>$lt{'ccrs'}:</b>
 <select name="course">
- <option value="0" />Please select a course
+ <option value="0" />$lt{'psac'}
  <option value="-1" />---------------------------------------------------
 ENDBLOCK
     my $iter = 0;
@@ -103,7 +106,42 @@ sub print_course_modification_page {
     my $course = $ENV{'form.course'};
     my $dom = $ENV{'user.domain'};
     my $ownertable;
+    my %lt=&Apache::lonlocal::texthash(
+            'actv' => "Active",
+            'inac' => "Inactive",
+            'ccor' => "Course Coordinator",
+            'noen' => "No end date",
+            'ownr' => "Owner",
+            'name' => "Name",
+            'unme' => "Username",
+            'stus' => "Status",
+            'aecs' => "Automated Enrollment Course Settings",
+            'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ",
+            'aenm' => "Automated Enrollment Manager",
+            'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.",
+            'caes' => 'Current automated enrollment settings',
+            'cour' => "Course settings that control automated enrollment in this LON-CAPA course
+are currently:",
+            'cset' => "Course setting",
+            'valu' => "Current value",
+            'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner.  If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.",    
+            'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change
+all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).",
+            'mkch' => "Make changes to course settings set by Domain Coordinator",
+            'ccod' => "Course Code",
+            'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.",
+            'cown' => "Course Owner",
+            'cous' => "The course owner is used in the retrieval of class lists from your institution's student information system when access to class lists data incorporates validation of instructor status.",
+            'tabl' => 'The table below contains a list of active course coordinators in this course, who are from this domain',
+            'usrd' => 'Use the radio buttons to select a different course owner.',
+            'deam' => "Default Authentication method",
+            'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the &lt;authtype&gt; and &lt;autharg&gt; properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.",
+            'gobt' => "Modify settings",
+    );
+
     my %settings = &Apache::lonnet::dump('environment',$dom,$course);
+    $enrollvar{'autharg'} = '';
+    $enrollvar{'authtype'} = '';
     foreach my $item (keys %settings) {
         if ($item =~ m/^internal\.(.+)$/) {
             if ( ($1 eq "autoadds") || ($1 eq "autodrops") ) {
@@ -114,7 +152,7 @@ sub print_course_modification_page {
 	        }
             } elsif ( ($1 eq "autostart") || ($1 eq "autoend") ) {
 	        if ( ($1 eq "autoend") && ($settings{$item} == 0) ) {
-	            $enrollvar{$1} = "No end date";
+	            $enrollvar{$1} = $lt{'noen'};
 	        } else {
 	            $enrollvar{$1} = localtime($settings{$item});
 	        }
@@ -137,60 +175,49 @@ sub print_course_modification_page {
                 if ($active_cc eq 'ok') {
                     push @local_ccs, $roleinfo[1];
                     $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
-                    $cc_status{$roleinfo[1]} = 'Active';
+                    $cc_status{$roleinfo[1]} = $lt{'actv'};
                 }
             }
         }
     }
     unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {
         push @local_ccs, $enrollvar{'coursecode'};
-        my ($puname,$pdom) = split/\@/,$enrollvar{'courseowner'};
-        $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($puname,$pdom);
-        $active_cc = &LONCAPA::Enrollment::check_user_status($pdom,$enrollvar{'coursecode'},$dom,$course,'cc');
+        $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);
+        $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
         if ($active_cc eq 'ok') {
-            $cc_status{$enrollvar{'courseowner'}} = 'Active';
+            $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
         } else {
-            $cc_status{$enrollvar{'courseowner'}} = 'Inactive';
+            $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};
         }
     }
     my $numlocalcc = @local_ccs;
-    my $bodytag=&Apache::loncommon::bodytag('Modify Course Settings');
-    my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt('Help on Modifying Courses'));
+    my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings"));
+    my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));
     my $defdom=$ENV{'request.role.domain'};
     my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($defdom);
-    my $javascript_validations=&Apache::londropadd::javascript_validations('createcourse',$krbdefdom);
-    my %param = ( formname => 'document.cmods',
+    my $curr_authtype = '';
+    my $curr_authfield = '';
+    if ($enrollvar{'authtype'} =~ /^krb/) {
+        $curr_authtype = 'krb';
+    } elsif ($enrollvar{'authtype'} eq 'internal' ) {
+        $curr_authtype = 'int';
+    } elsif ($enrollvar{'authtype'} eq 'localauth' ) {
+        $curr_authtype = 'loc';
+    }
+    unless ($curr_authtype eq '') {
+        $curr_authfield = $curr_authtype.'arg';
+    } 
+    my $javascript_validations=&Apache::londropadd::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield);
+    my %param = ( formname => 'document.cmod',
 	   kerb_def_dom => $krbdefdom,
-	   kerb_def_auth => $krbdef
+	   kerb_def_auth => $krbdef,
+           mode => 'modifycourse',
+           curr_authtype => $curr_authtype,
+           curr_autharg => $enrollvar{'autharg'} 
 	);
-    my $selscript=&Apache::loncommon::studentbrowser_javascript();
-    my $sellink=&Apache::loncommon::selectstudent_link
-				('cmod','crsown','ccdomain');
     my $krbform = &Apache::loncommon::authform_kerberos(%param);
     my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);
-    my %lt=&Apache::lonlocal::texthash(
-	    'aecs' => "Automated Enrollment Course Settings",
-            'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ", 
-            'aenm' => "Automated Enrollment Manager",
-            'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.",
-            'caes' => 'Current automated enrollment settings',
-	    'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:",
-	    'cset' => "Course setting",
-	    'valu' => "Current value",
-	    'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).",
-	    'mkch' => "Make changes to course settings set by Domain Coordinator", 
-	    'ccod' => "Course Code",
-	    'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.",
-	    'cown' => "Course Owner",
-	    'cous' => "The course owner is used in the retrieval of class lists from your institution's student information system when access to class lists data incorporates validation of instructor status.",
-            'tabl' => 'The table below contains a list of active course coordinators in this course,
-who are from this domain', 
-            'usrd' => 'Use the radio buttons to select a different course owner.', 
-	    'deam' => "Default Authentication method",
-	    'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the &lt;authtype&gt; and &lt;autharg&gt; properties for the new student.",
-	    'gobt' => "Modify settings",
-    );
 
     my $disp_table = qq|<table border="0" cellpadding="0" cellspacing="0">
                 <tr>
@@ -222,8 +249,9 @@ who are from this domain',
               </table>";
 
     if ($numlocalcc == 0) {
-        $ownertable = "No course coordinators";
+        $ownertable = $lt{'nocc'};
     }
+
     if ($numlocalcc > 0) {
         @local_ccs = sort @local_ccs;
         $ownertable = qq(
@@ -244,10 +272,10 @@ who are from this domain',
                     <td width="100%" bgcolor="#000000">
                      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
                       <tr bgcolor="#CCCC99" align="center">
-                       <td><b>Owner</b></td>
-                       <td><b>Name</b></td>
-                       <td><b>Username</b></td>
-                       <td><b>Status</b></td>
+                       <td><b>$lt{'ownr'}</b></td>
+                       <td><b>$lt{'name'}</b></td>
+                       <td><b>$lt{'unme'}</b></td>
+                       <td><b>$lt{'stus'}</b></td>
                       </tr>
         );
         for (my $i=0; $i<@local_ccs; $i++) {
@@ -261,7 +289,7 @@ who are from this domain',
             $ownertable .= "
                  <td>$pname{$local_ccs[$i]}</td>
                  <td><input type=\"hidden\" name=\"username_$i\" value=\"$local_ccs[$i]\" />$local_ccs[$i]</td>
-                 <td>$cc_status{$local_ccs[$i]} Course Coordinator</td></tr>";
+                 <td>$cc_status{$local_ccs[$i]} $lt{'ccor'}</td></tr>";
         }
         $ownertable .= "</table>
                     </td>
@@ -302,30 +330,34 @@ $disp_table
  </tr>
 </table>
 </p><p>
-<table width="100%" cellspacing="3" cellpadding="8">
+<table width="100%" cellspacing="6" cellpadding="6">
+ <tr>
+  <td colspan="2">Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator. Click the <b>"$lt{'gobt'}"</b> button to save your changes.</td>
+ </tr>
  <tr>
   <td width="50%" valign="top">
-   <b>$lt{'ccod'}</b>
+   <b>$lt{'ccod'}:</b>&nbsp;&nbsp;
     <input type="text" size="10" name="coursecode" value="$enrollvar{'coursecode'}"/><br/><br/>
     $lt{'ccus'}
   </td>
   <td width="50%" valign="top" rowspan="2">
-   <b>$lt{'cown'}</b><br/><br/>
-   $lt{'cous'}
-   <br/><br/>
+   <b>$lt{'cown'}:</b><br/><br/>
    $ownertable
+   <br/><br/>
+   $lt{'cous'}
   </td>
  </tr>
  <tr>
   <td width="50%" valign="top">
-   <b>$lt{'deam'}.</b><br/><br/>
+   <b>$lt{'deam'}:</b><br/><br/>
+   $krbform
+   <br/>
+   $intform
+   <br/>
+   $locform
+   <br/>
+   <br/>
    $lt{'deus'}.
-</p><p>
-$krbform
-<br />
-$intform
-<br />
-$locform
    </td>
    <td width="50%">&nbsp;</td>
  </tr>
@@ -351,7 +383,7 @@ sub modify_course {
     my ($r,$tasklongref,$typeref) = @_;
     my $dom = $ENV{'user.domain'};
     my $crs = $ENV{'form.course'};
-    my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistngs','description'],$dom,$crs);
+    my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$dom,$crs);
     my %currattr = ();
     my %newattr = ();
     my %cenv = ();
@@ -394,6 +426,7 @@ sub modify_course {
         $newattr{'authtype'} = $ENV{'form.login'};
         $newattr{'authtype'} .= $ENV{'form.krbver'};
         $newattr{'autharg'} = $ENV{'form.krbarg'};
+        $newattr{'autharg'} =~ tr/a-z/A-Z/; 
     } elsif ($ENV{'form.login'} eq 'int') {
         $newattr{'authtype'} ='internal';
         if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
@@ -407,8 +440,8 @@ sub modify_course {
     }
     if ( $newattr{'authtype'}=~ /^krb/) {
         if ($newattr{'autharg'}  eq '') {
-            $warning = qq('<font color="red" size="+1">'.
-	    &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>');
+            $warning = qq(<font color="red" size="+1">).
+	    &mt("As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student").qq(</font></p>);
         }
     }
 
@@ -440,50 +473,50 @@ sub modify_course {
     }
 
     if (@changes > 0) {
-        $chgresponse = "The following automated enrollment parameters have been changed:<br/><ul>";
+        $chgresponse = &mt("The following automated enrollment parameters have been changed:<br/><ul>");
     }
     if (@nochanges > 0) { 
-        $nochgresponse = "The following automated enrollment parameters remain unchanged:<br/><ul>";
+        $nochgresponse = &mt("The following automated enrollment parameters remain unchanged:<br/><ul>");
     }
     if (@changes > 0) { 
         my $putreply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
         if ($putreply !~ /^ok$/) {
-            $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
+            $response = &mt("There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>");
         } else {
             foreach my $attr (@params) {
                 if (grep/^$attr$/,@changes) {
-	            $chgresponse .= "<li>$$typeref{$attr} now set to $newattr{$attr}.</li>";
+	            $chgresponse .= "<li>$$typeref{$attr} ".&mt("now set to \"").$newattr{$attr}."\".</li>";
                 } else {
-	            $nochgresponse .= "<li>$$typeref{$attr} still set to $currattr{$attr}.</li>";
+	            $nochgresponse .= "<li>$$typeref{$attr} ".&mt("still set to \"").$currattr{$attr}."\".</li>";
                 }
             }
             if ($changecode || $changeowner) {
                 if ( $newattr{'courseowner'} eq '') {
-	            $warning .= "There is no owner associated with this LON-CAPA course.  If automated enrollment in LON-CAPA courses at your institution requires validation of course owners, automated enrollment will fail for this course.<br/>";
+	            $warning .= &mt("There is no owner associated with this LON-CAPA course.  If automated enrollment in LON-CAPA courses at your institution requires validation of course owners, automated enrollment will fail for this course.<br/>");
                 } else {
 	            if (@sections > 0) {
-	                foreach my $sec (@sections) {
-		            if ($sec =~ m/^(.+):/) {
-		                my $course_id = $newattr{'coursecode'}.$1;
-		                if ($changecode) {
+                        if ($changecode) {
+	                    foreach my $sec (@sections) {
+		                if ($sec =~ m/^(.+):/) {
+		                    my $course_id = $newattr{'coursecode'}.$1;
 #			            my $course_check = &localenroll::validate_courseID($course_id);
                                     my $course_check = 'ok';
 			            if ($course_check eq 'ok') {  
 #                                        my $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});
 			                my $outcome = 'ok';
 			                unless ($outcome eq 'ok') { 
-				            $warning .= "If automatic enrollment is enabled for LON-CAPA course: $description, automated enrollment may fail for $newattr{'coursecode'} - section $1 for the following reason: $outcome.<br/>";
+				            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
 			                }
 			            } else {
-			                $warning .= "If automatic enrollment is enabled for LON-CAPA course: $description, automated enrollment may fail for $newattr{'coursecode'} - section $1 for the following reason: $course_check.<br/>";
+			                $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $course_check.<br/>");
 			            }
 		                } else {
-			            $warning .= "If automatic enrollment is enabled for LON-CAPA course: $description, automated enrollment may fail for $newattr{'coursecode'} - section $sec because this is not a valid section entry.<br/>";
+			            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
 		                }
 		            }
 	                } 
 	            } else {
-	                $warning .= "As no section numbers are currently listed for LON-CAPA course: $description, automated enrollment will not occur for any sections of coursecode: $newattr{'coursecode'}.<br/>";
+	                $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";
 	            }
 	            if ( (@xlists > 0) && ($changeowner) ) {
 	                foreach my $xlist (@xlists) {
@@ -491,7 +524,7 @@ sub modify_course {
 #                                my $outcome = &localenroll::new_course($1,$newattr{'courseowner'});
 		                my $outcome = 'ok';
 		                unless ($outcome eq 'ok') {
-			            $warning .= "If automatic enrollment is enabled for LON-CAPA course: $description, automated enrollment may fail for crosslisted class: $1 for the following reason: $outcome.<br/>";
+			            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome.<br/>");
 		                }
 		            } 
 	                }
@@ -499,8 +532,13 @@ sub modify_course {
                 }
             }
         }
+    } else {
+        foreach my $attr (@params) {
+            $nochgresponse .= "<li>$$typeref{$attr} ".&mt("still set to \"").$currattr{$attr}."\".</li>";
+        }
     }
 
+
     if (@changes > 0) {
         $chgresponse .= "</ul><br/><br/>";
     }
@@ -508,7 +546,7 @@ sub modify_course {
         $nochgresponse .=  "</ul><br/><br/>";
     }
     unless ($warning eq '') {
-        $warning = "The following warning messages were generated as a result of applying the changes you specified to course settings that can affect the automated enrollment process:<br/><br/>".$warning;
+        $warning = &mt("The following warning messages were generated as a result of applying the changes you specified to course settings that can affect the automated enrollment process:<br/><br/>").$warning;
     }
     if ($response eq '') {
         $reply = $chgresponse.$nochgresponse.$warning;
@@ -523,7 +561,7 @@ sub modify_course {
 
 sub print_header {
     my ($r,$tasklongref,$description,$javascriptref) = @_;
-    my %lt = (
+    my %lt =&Apache::lonlocal::texthash(
              'vmcs' => 'View/Modify Course Settings',
              'chco' => 'Choose a course',
              'main' => 'Main Menu',
@@ -599,7 +637,7 @@ sub handler {
 
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','course']);
         my $dom = $ENV{'user.domain'};
-        my %longtype = (
+        my %longtype=&Apache::lonlocal::texthash(
                        'authtype' => 'Default authentication method',
                        'autharg'  => 'Default authentication parameter',
                        'autoadds' => 'Automated adds',
@@ -613,7 +651,7 @@ sub handler {
                        'crosslistings' => 'Crosslisted class(:groupID)',
                       );
 
-        my %tasklong = (
+        my %tasklong = &Apache::lonlocal::texthash(
                         'display' => 'View/modify settings',
                         'process'  => 'Results of changes',
                        );
@@ -627,7 +665,7 @@ sub handler {
         }
     } else {
         $ENV{'user.error.msg'}=
-        "/adm/createcourse:ccc:0:0:Cannot modify course settings";
+        "/adm/modifycourse:ccc:0:0:Cannot modify course settings";
         return HTTP_NOT_ACCEPTABLE;
     }
     return OK;