--- loncom/interface/lonmodifycourse.pm	2010/03/08 22:31:27	1.50
+++ loncom/interface/lonmodifycourse.pm	2010/07/08 23:19:19	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.50 2010/03/08 22:31:27 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.56 2010/07/08 23:19:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,7 +149,7 @@ sub print_course_search_page {
                       'instcodefilter','ownerfilter',
                       'coursefilter'];
     my $filter = {};
-    my ($numtitles,$cctitle,$dctitle);
+    my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';
     if ($type eq 'Community') {
         $ccrole = 'co';
@@ -163,7 +163,8 @@ sub print_course_search_page {
         $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
     }   
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                             undef,undef,$filter,$action,\$numtitles,'modifycourse'));
+                             undef,undef,$filter,$action,\$numtitles,'modifycourse',
+                             undef,undef,undef,\@codetitles));
     if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
@@ -192,14 +193,16 @@ sub print_course_selection_page {
     my %filter;
     my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    my $numtitles;
+    my ($numtitles,@codetitles);
     $r->print(&Apache::lonpickcourse::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                                       undef,undef,\%filter,$action,\$numtitles));
+                                       undef,undef,\%filter,$action,\$numtitles,
+                                       undef,undef,undef,undef,\@codetitles));
     $filter{'domainfilter'} = $dom;
     my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
-                                                         \%filter,$numtitles);
+                                                         \%filter,$numtitles,undef,
+                                                         undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);
     return;
@@ -208,53 +211,81 @@ sub print_course_selection_page {
 sub print_modification_menu {
     my ($r,$cdesc,$domdesc,$dom,$type) = @_;
     &print_header($r,$type);
-    my ($ccrole,$setquota_text,$setparams_text,$cat_text);
+    my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text);
     if ($type eq 'Community') {
         $ccrole = 'co';
     } else {
         $ccrole = 'cc';
     } 
-    my $action = '/adm/modifycourse';
     if ($type eq 'Community') {
+        $categorytitle = 'View/Modify Community Settings';
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
         $setparams_text = 'View/Modify community owner';
         $cat_text = 'View/Modify catalog settings for community';
     } else {
+        $categorytitle = 'View/Modify Course Settings';
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
         $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
         $cat_text = 'View/Modify catalog settings for course'; 
     }
-    my @menu =
-        (
-          { text => $setparams_text,
-             phase => 'setparms',
-          },
-          { text  => 'View/Modify quota for group portfolio files',
-            phase => 'setquota',
-          }
-    );
+
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
     my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
-    if (@additional_params > 0) {
-        push (@menu, { text => $cat_text,
-                       phase => 'catsettings',
-                     });
+
+    sub phaseurl {
+        my $phase = shift;
+        return "javascript:changePage(document.menu,'$phase')"
     }
-    unless ($type eq 'Community') {
-        push(@menu,
-           { text  => 'Display current settings for automated enrollment',
-            phase => 'viewparms',
-           }
+    my @menu =
+        ({  categorytitle => $categorytitle,
+        items => [
+            {
+                linktext => $setparams_text,
+                url => &phaseurl('setparms'),
+                permission => 1,
+                #help => '',
+                icon => 'crsconf.png',
+                linktitle => ''
+            },
+            {
+                linktext => 'View/Modify quota for group portfolio files',
+                url => &phaseurl('setquota'),
+                permission => 1,
+                #help => '',
+                icon => 'groupportfolioquota.png',
+                linktitle => ''
+            },
+            {
+                linktext => $cat_text,
+                url => &phaseurl('catsettings'),
+                permission => (@additional_params > 0),
+                #help => '',
+                icon => 'ccatconf.png',
+                linktitle => ''
+            },
+            {
+                linktext => 'Display current settings for automated enrollment',
+                url => &phaseurl('viewparms'),
+                permission => ($type ne 'Community'),
+                #help => '',
+                icon => 'roles.png',
+                linktitle => ''
+            },
+        ]
+        },
         );
-    }
-    my $menu_html = '<h3>'.&mt('View/Modify settings for: ').
-                    ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n";
+
+    my $menu_html =
+        '<h3>'
+       .&mt('View/Modify settings for: [_1]',
+                '<span class="LC_nobreak">'.$cdesc.'</span>')
+       .'</h3>'."\n".'<p>';
     if ($type eq 'Community') {
         $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
     } else {
         $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
     }
-    $menu_html .= '<ul>';
+    $menu_html .= '</p>'."\n".'<ul>';
     if ($type eq 'Community') {
         $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>';
     } else {
@@ -265,30 +296,27 @@ sub print_modification_menu {
     foreach my $item (@additional_params) {
         if ($type eq 'Community') {
             if ($item eq 'togglecats') {
-                $menu_html .= '  <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+                $menu_html .= '  <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
             } elsif ($item eq 'categorize') {
-                $menu_html .= '  <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+                $menu_html .= '  <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
             }
         } else {
             if ($item eq 'togglecats') {
-                $menu_html .= '  <li>'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+                $menu_html .= '  <li>'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
             } elsif ($item eq 'categorize') {
-                $menu_html .= '  <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+                $menu_html .= '  <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
             }
         }
     }
-    $menu_html .= ' </ul>
-<form name="menu" method="post" action="'.$action.'" />'."\n".
-    &hidden_form_elements();
-    foreach my $menu_item (@menu) {
-        $menu_html.='<h3>';
-        $menu_html.=
-                qq|<a href="javascript:changePage(document.menu,'$menu_item->{'phase'}')">|;
-        $menu_html.= &mt($menu_item->{'text'}).'</a>';
-        $menu_html.='</h3>';
-    }
+    $menu_html .=
+        ' </ul>'
+       .'<form name="menu" method="post" action="/adm/modifycourse">'
+       ."\n"
+       .&hidden_form_elements();
     
     $r->print($menu_html);
+    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+    $r->print('</form>');
     return;
 }
 
@@ -779,10 +807,10 @@ sub modify_course {
                                         my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
 			                unless ($outcome eq 'ok') {
                                
-				            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]" automated enrollment may fail for "[_2]" - section: [_3], for the following reason: "[_4]"',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
+				            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
 			                }
 			            } else {
-                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]" automated enrollment may fail for "[_2]" - section: [_3], for the following reason: "[_4]"',$description,$newattr{'coursecode'},$instsec,$course_check));
+                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$course_check));
 			            }
 		                } else {
 			            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
@@ -795,15 +823,15 @@ sub modify_course {
                                     my $inst_course_id = $newattr{'coursecode'}.$instsec;
                                     my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
                                     unless ($outcome eq 'ok') {
-                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
+                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
                                     }
                                 } else {
-                                    push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section [_3] because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
+                                    push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
                                 }
                             }
                         }
 	            } else {
-	                push(@warnings,&mt('As no section numbers are currently listed for "[_1]" automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
+	                push(@warnings,&mt('As no section numbers are currently listed for "[_1]", automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
 	            }
 	            if ( (@xlists > 0) && ($changed{'owner'}) ) {
 	                foreach my $xlist (@xlists) {
@@ -877,20 +905,26 @@ sub update_coowners {
     }
     if ($settings->{'internal.courseowner'} ne $newattr->{'courseowner'}) {
         my $oldowner_to_coowner;
+        my @types = ('co-owners');
         if (($newattr->{'coursecode'}) && ($autocoowners)) {
             my $oldowner = $settings->{'internal.courseowner'};
             if ($cchash{$oldowner.':cc'}) {
-                if ($settings->{'internal.co-owner'}) {
-                    my @current = split(',',$settings->{'internal.co-owners'});
-                    unless (grep(/^\Q$oldowner\E$/,@current)) {
+                my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$oldowner);
+                if ($result eq 'valid') {
+                    if ($settings->{'internal.co-owner'}) {
+                        my @current = split(',',$settings->{'internal.co-owners'});
+                        unless (grep(/^\Q$oldowner\E$/,@current)) {
+                            $oldowner_to_coowner = 1;
+                        }
+                    } else {
                         $oldowner_to_coowner = 1;
                     }
-                } else {
-                    $oldowner_to_coowner = 1;
                 }
             }
+        } else {
+            push(@types,'pendingco-owners');
         }
-        foreach my $type ('co-owners','pendingco-owners') {
+        foreach my $type (@types) {
             if ($settings->{'internal.'.$type}) {
                 my @current = split(',',$settings->{'internal.'.$type});
                 my $newowner = $newattr->{'courseowner'};
@@ -925,10 +959,10 @@ sub update_coowners {
                             my %pendinghash = (
                                 'internal.pendingco-owners' => $pendingcoowners,
                             );
-                            my $putresult = &put('environment',\%pendinghash,$cdom,$cnum);
+                            my $putresult = &Apache::lonnet::put('environment',\%pendinghash,$cdom,$cnum);
                             if ($putresult eq 'ok') {
                                 if ($env{'course.'.$cid.'.num'} eq $cnum) {
-                                    &appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners});
+                                    &Apache::lonnet::appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners});
                                 }
                             }
                         } else {
@@ -960,15 +994,19 @@ sub update_coowners {
                     my @currcoown = split(',',$settings->{'internal.coowners'});
                     my ($updatecoowners,$delcoowners);
                     foreach my $person (@currcoown) {
-                        my ($result,$desc) = &Apache::lonnet::valid_instcode();
+                        my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);
                         if ($result eq 'valid') {
                             push(@newcoowners,$person);
                         }
                     }
                     foreach my $item (sort(keys(%cchash))) {
                         my ($uname,$udom,$urole) = split(':',$item);
+                        next if ($uname.':'.$udom eq $newattr->{'courseowner'});
                         unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) {
-                            push(@newcoowners,$uname.':'.$udom);
+                            my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$uname.':'.$udom);
+                            if ($result eq 'valid') {
+                                push(@newcoowners,$uname.':'.$udom);
+                            }
                         }
                     }
                     if (@newcoowners) {