--- loncom/interface/lonmodifycourse.pm	2006/03/23 22:32:10	1.24
+++ loncom/interface/lonmodifycourse.pm	2006/07/18 21:52:01	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # automated enrollment course setup handler
 #
-# $Id: lonmodifycourse.pm,v 1.24 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonmodifycourse.pm,v 1.27 2006/07/18 21:52:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::lonlocal;
 use Apache::londropadd;
 use LONCAPA::Enrollment;
 use lib '/home/httpd/lib/perl';
+use LONCAPA;
 
 sub print_course_selection_page {
     my ($r,$tasklongref) = @_;
@@ -50,7 +51,7 @@ sub print_course_selection_page {
     );
                                                                                       
 # Determine the courses
-    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
+    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'.');
     &print_header($r,$tasklongref);
     $r->print(<<ENDBLOCK);
 <form action="/adm/modifycourse" method="post" name="cmod">
@@ -61,8 +62,8 @@ sub print_course_selection_page {
 </p><p>
 <b>$lt{'ccrs'}:</b>
 <select name="course">
- <option value="0" />$lt{'psac'}
- <option value="-1" />---------------------------------------------------
+ <option value="0">$lt{'psac'}</option>
+ <option value="-1">---------------------------------------------------</option>
 ENDBLOCK
     my $iter = 0;
     my @codes = ();
@@ -101,12 +102,15 @@ ENDBLOCK
             if ($item =~ m/^($dom)_(\w+)$/) {
                 $crs = $2;
                 if ($courseIDs{$item} =~ /^([^:]*):([^:]*):([^:]*)/) {
-                    $description = &Apache::lonnet::unescape($1);
-                    $owner = &Apache::lonnet::unescape($3);
+                    $description = &unescape($1);
+                    $owner = &unescape($3);
+                    if (($owner ne '') && ($owner !~ /^([^:]+):([^:]+)$/)) {
+                        $owner = $owner.':'.$dom;
+                    }
                 } elsif ($courseIDs{$item} =~ /^([^:]*):([^:]*)$/) {
-                    $description = &Apache::lonnet::unescape($1);
+                    $description = &unescape($1);
                 } else {   
-                    $description = &Apache::lonnet::unescape($courseIDs{$item});
+                    $description = &unescape($courseIDs{$item});
                 }
 # Get course owner
                 if ($owner eq '') {
@@ -116,9 +120,18 @@ ENDBLOCK
                     }
                 }
                 unless ($owner eq '') {
-                    $ownername = &Apache::loncommon::plainname($owner,$dom);
+                    my ($owneruname,$ownerdom);
+                    if ($owner =~ /^([^:]+):([^:]+)$/) {
+                        $owneruname = $1;
+                        $ownerdom = $2;             
+                    } else {
+                        $owneruname = $owner;
+                        $ownerdom = $dom;
+                    }
+                    $ownername = &Apache::loncommon::plainname($owneruname,
+                                                               $ownerdom);
                 }
-                $r->print("<option value=\"$crs\">$showcode -- $description ---------- $ownername");
+                $r->print("<option value=\"$crs\">$showcode -- $description ---------- $ownername</option>");
             }
         }
     }
@@ -165,7 +178,7 @@ sub print_course_modification_page {
             'noen' => "No end date",
             'ownr' => "Owner",
             'name' => "Name",
-            'unme' => "Username",
+            'unme' => "Username:Domain",
             '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 ",
@@ -213,10 +226,18 @@ all settings except course code, course
 	    } elsif ($type eq "sectionums") {
 		$enrollvar{$type} = $settings{$item};
 		$enrollvar{$type} =~ s/,/, /g;
-            } elsif ($type eq "courseowner"   || $type eq "authtype" 
+            } elsif ($type eq "authtype" 
 		     || $type eq "autharg"    || $type eq "coursecode"
 		     || $type eq "crosslistings") {
 	        $enrollvar{$type} = $settings{$item};
+            } elsif ($type eq 'courseowner') {
+                if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
+                    $enrollvar{$type} = $settings{$item};
+                } else {
+                    if ($settings{$item} ne '') {
+                        $enrollvar{$type} = $settings{$item}.':'.$dom;
+                    }
+                }
             }
         } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
 	    my $type = $1;
@@ -235,23 +256,31 @@ all settings except course code, course
     my %cc_status = ();
     my %pname = ();
     my $active_cc;
-    foreach (@coursepersonnel) {
-        my @roleinfo = split/:/,$_;
-        if ( ($roleinfo[0] eq 'cc')  && ($roleinfo[2] eq $dom) )  {
-            unless (grep/^$roleinfo[1]$/,@local_ccs) {
-                $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc');
+    foreach my $person (@coursepersonnel) {
+        my ($role,$user) = split(/:/,$person,2);
+        $user =~ s/:$//;
+        if (($role eq 'cc') && ($user ne ''))  {
+            if (!grep(/^\Q$user\E$/,@local_ccs)) {
+                my ($ccname,$ccdom) = split(/:/,$user);
+                $active_cc = 
+                   &Apache::loncommon::check_user_status($ccdom,$ccname,$dom,
+                                                         $course,'cc');
                 if ($active_cc eq 'active') {
-                    push @local_ccs, $roleinfo[1];
-                    $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
-                    $cc_status{$roleinfo[1]} = $lt{'actv'};
+                    push(@local_ccs,$user);
+                    $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom);
+                    $cc_status{$user} = $lt{'actv'};
                 }
             }
         }
     }
-    unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {
-        push @local_ccs, $enrollvar{'courseowner'};
-        $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);
-        $active_cc = &Apache::loncommon::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
+    if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) && 
+             ($enrollvar{'courseowner'} ne '') )  {
+        my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
+        push(@local_ccs,$enrollvar{'courseowner'});
+        $pname{$enrollvar{'courseowner'}} = 
+                         &Apache::loncommon::plainname($owneruname,$ownerdom);
+        $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
+                                                           $dom,$course,'cc');
         if ($active_cc eq 'active') {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
         } else {
@@ -349,7 +378,7 @@ all settings except course code, course
             my $colflag = $i%2;
             $ownertable .= "<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">";
             if ($local_ccs[$i] eq $enrollvar{'courseowner'}) {
-                  $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$local_ccs[$i]\" checked=\"true\"/></td>";
+                  $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$local_ccs[$i]\" checked=\"checked\" /></td>";
             } else {
                 $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$local_ccs[$i]\" /></td>";
             }
@@ -534,7 +563,7 @@ sub modify_course {
         }
     }
     if ($changeowner == 1 || $changecode == 1) {
-        my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($env{'form.coursecode'}).':'.&Apache::lonnet::escape($env{'form.courseowner'});
+        my $courseid_entry = &escape($dom.'_'.$crs).'='.&escape($description).':'.&escape($env{'form.coursecode'}).':'.&escape($env{'form.courseowner'});
         &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom));
     }
 
@@ -704,7 +733,7 @@ sub print_footer {
 
 sub check_course {
     my ($dom,$course) = @_;
-    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
+    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'.');
     foreach my $key (sort keys %courseIDs) {
         if ($key =~ m/^($dom)_(\w+)$/) {
             if ($2 eq $course) {
@@ -740,7 +769,7 @@ sub handler {
                        'default_enrollment_start_date' => 'Date of first student access',
                        'default_enrollment_end_date' => 'Date of last student access',
                        'coursecode' => 'Official course code',
-                       'courseowner' => "Username of course owner (\@$dom)",
+                       'courseowner' => "Username:domain of course owner",
                        'notifylist' => 'Course Coordinators to be notified of enrollment changes',
                        'sectionnums' => 'Course section number(:groupID)',
                        'crosslistings' => 'Crosslisted class(:groupID)',