--- loncom/interface/lonpickcourse.pm	2009/05/01 01:38:20	1.78
+++ loncom/interface/lonpickcourse.pm	2010/03/08 14:43:46	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.78 2009/05/01 01:38:20 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.93 2010/03/08 14:43:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
 use Apache::courseclassifier;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
@@ -50,23 +50,22 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles','fixeddom']);
+                               'multiple','type','setroles','fixeddom','cloner']);
+    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement,
+        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
 
-    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
-        $lastaction,$autosubmit,$submitopener);
-
-    # Get course type - Course or Non-standard Course.
+    # Get course type - Course or Community.
     $type = $env{'form.type'};
     if (!defined($env{'form.type'})) {
         $type = 'Course';
     }
-    $title = &mt('Selecting a [_1]',$type);
+    $title = 'Selecting a '.$type;
 
     # Setup for multiple course selections, if flag for multiples set.
     $multiple = $env{'form.multiple'};
     if ($multiple) {
         ($jscript,$multelement) = &multiples_tag();
-        $title = &mt('Selecting [_1](s)',lc($type));
+        $title = 'Selecting '.$type.'(s)';
     }
 
     # if called when a DC is selecting a course 
@@ -76,6 +75,20 @@ sub handler {
         $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
+    if ($env{'form.typeelement'} ne '') {
+        $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
+    }
+
+    # if called when a DC is creating a course for another user.
+    if ($env{'form.form'} eq 'ccrs') {
+        ($cloneruname,$clonerudom) = ($env{'form.cloner'} =~ /^($match_username):($match_domain)$/);
+    }
+
+    # if called when requesting a course
+    if ($env{'form.form'} eq 'requestcrs') {
+        $cloneruname = $env{'user.name'};
+        $clonerudom =  $env{'user.domain'};
+    }
 
     my $onlyown = 0;
     # if called to assign course-based portfolio access control
@@ -84,15 +97,18 @@ sub handler {
     }
 
     my %loaditem;
-    if ($env{'form.numtitles'}) {
-        $loaditem{'onload'} = 'setElements(); ';
+    if (($env{'form.type'} eq 'Course') && ($env{'form.numtitles'})) {
+        if (($env{'form.official'} eq 'on') && ($env{'form.state'} eq 'listing')) {
+            $loaditem{'onload'} = 'setElements(document.filterpicker); ';
+        }
     }
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-            $loaditem{'onload'} .= 'setSections()';
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
-    $r->print(&Apache::loncommon::start_page($title,undef,
+    my $js = &js_changer();
+    $r->print(&Apache::loncommon::start_page($title,$js,
 					     {'add_entries' => \%loaditem,
 					      'no_nav_bar'  => 1, }));
 
@@ -113,38 +129,84 @@ sub handler {
     }
 
     # print javascript functions for choosing a course 
-    if ($env{'form.gosearch'} || $onlyown) {
+    if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || 
+        $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }
-    $r->print('<script type="text/javascript">'.$jscript.'</script>');
+    $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
+              '</script>');
     $r->print($submitopener);
 
 # ------------------------------------------ Display of filters to limit search
     my $filter = {};
     my $action = '/adm/pickcourse';
-    my $numtitles;
+    my ($numtitles,$showroles,$nohost);
     if (!$onlyown) {
         my $filterlist = ['domainfilter','descriptfilter',
-                          'instcodefilter','ownerfilter',
-                          'ownerdomfilter'];
+                          'instcodefilter'];
+        if ($env{'form.form'} eq 'rules') {
+            push(@{$filterlist},'personfilter');
+            if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) {
+                if (&Apache::lonnet::homeserver($env{'form.personfilter'},
+                                                 $env{'form.persondomfilter'}) eq 'no_host') {
+                    $nohost = 1;
+                } else {
+                    $showroles = 1;
+                } 
+            }
+        } else {
+            push(@{$filterlist},'ownerfilter');
+        }
         # course ID filter for DCs only
         if ($env{'user.adv'} && $env{'form.domainfilter'} &&
             exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) {
             push(@{$filterlist},'coursefilter');
         }
+        if ($cloneruname ne '' && $clonerudom ne '') {
+            push(@{$filterlist},'cloneableonly');
+        }
+
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
-                                 $filter,$action,\$numtitles));
+                                 $filter,$action,\$numtitles,undef,$cloneruname,
+                                 $clonerudom,$typeelement));
     }
 
 # ---------------------------------------------------------------- Get the data
-    if ($env{'form.gosearch'} || $onlyown) {
-        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);
-        &display_matched_courses($r,$type,$multiple,$action,%courses);
+    if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || 
+         $onlyown) {
+        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles,
+                                      $cloneruname,$clonerudom);
+        if ($nohost) {
+            $r->print ('<span class="LC_warning">'.
+                       &mt('User does not exist - username: [_1], domain: [_2].',
+                           '<b>'.$filter->{'personfilter'}.'</b>',
+                           '<b>'.$filter->{'persondomfilter'}.'</b>').'</span>');
+        } else {
+            &display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,
+                                     $clonerudom,%courses);
+        }
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
+sub js_changer {
+    return <<"ENDJS";
+<script type="text/javascript">
+
+function updateFilters(caller) {
+    if (typeof(caller) != "undefined") {
+        document.filterpicker.updater.value = caller.name;
+    }
+    document.filterpicker.submit();
+}
+
+</script>
+
+ENDJS
+
+}
+
 sub processpick {
     my $openerform = 'rolechoice';
     if ($env{'form.form'} eq 'studentform') {
@@ -161,7 +223,12 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            var ccrole = "cc";
+            var pickedType = "$env{'form.type'}";
+            if (pickedType == "Community") {
+                ccrole = "co";
+            }
+            var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse
             opener.document.title='Role selected. Please stand by.';
             opener.status='Role selected. Please stand by.';
             opener.document.rolechoice.newrole.value=courseTarget
@@ -193,7 +260,12 @@ sub create_user_javascript {
     my $output;
     #javascript for reporting sections and groups then closing
     if ($env{'form.pickedcourse'}) {
-        my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
+        my %coursedescription = 
+            &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                               {'one_time' => '1'});
+        my $cdom = $coursedescription{'domain'};
+        my $cnum = $coursedescription{'num'};
+        my $crstype = $coursedescription{'type'};
         my $sec_element = 'currsec';
         my $grplist_element = 'groups';
         my ($sections,$groups) =
@@ -207,7 +279,10 @@ sub create_user_javascript {
 function setSections() {
     opener.document.$env{"form.form"}.$grplist_element.value='$groupslist';
     window.opener.setSect('$seclist');
-    self.close()
+    self.close();
+}
+function setRoles() {
+    window.opener.setRole('$crstype');
 }
 </script>
 |;
@@ -217,7 +292,7 @@ function setSections() {
 }
 
 sub display_matched_courses {
-    my ($r,$type,$multiple,$action,%courses) = @_;
+    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_;
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
@@ -225,25 +300,34 @@ sub display_matched_courses {
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
     if ($env{'form.form'} eq 'modifycourse') {
         if ($numcourses > 0) {
-            my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-            my $dctitle = &Apache::lonnet::plaintext('dc');
-            my $ccrolechk = ' checked="checked" ';
-            my $menuchk = ' ';
-            if ($env{'form.prevphase'} ne '') {
-                 $ccrolechk = ' ';
-                 $menuchk = ' checked="checked" ';
+            my $ccrole = 'cc';
+            if ($type eq 'Community') {
+                $ccrole = 'co';
             }
+            my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
+            my $dctitle = &Apache::lonnet::plaintext('dc');
+            my $ccrolechk = ' ';
+            my $menuchk = ' checked="checked" ';
             $r->print(
                 '<fieldset>'
                .'<legend>'.&mt('Action').'</legend>'
                .'<div class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle)
-               .'</label></div>'
+               .'&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+            } else {
+                $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+            }
+            $r->print('</label></div>'
                .'<div class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'
-               .&mt('View or modify course settings which only a [_1] may modify.',$dctitle)
-               .'</label></div>'
+               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+            } else {
+                $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+            }
+            $r->print('</label></div>'
                .'</fieldset>'
                .'<br />'
             );
@@ -274,26 +358,63 @@ sub display_matched_courses {
     if (%courses) {
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
+        my $titlehdr = &mt('Course Title');
+        if ($type eq 'Community') {
+            $titlehdr = &mt('Community Title');
+        }
         $r->print('<th>'.&mt('Select').'</th>'
-                 .'<th>'.&mt('Course Title').'</th>'
-                 .'<th>'.&mt('Domain').'</th>'
-                 .'<th>'.&mt('Course Code').'</th>'
-                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
-                 .'<th>'.&mt('Type').'</th>'
-                 );
+                 .'<th>'.$titlehdr.'</th>'
+                 .'<th>'.&mt('Domain').'</th>');
+        unless ($type eq 'Community') {
+            $r->print('<th>'.&mt('Course Code').'</th>');
+        }
+        $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
+        if ($showroles) {
+            $r->print('<th>'.&mt("Role(s) for [_1]",
+                &Apache::loncommon::plainname($env{'form.personfilter'},
+                                              $env{'form.persondomfilter'},'firstname')).'</th>');
+        }
         $r->print(&Apache::loncommon::end_data_table_header_row());
     }
+    my %cc_cloneable;
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my ($coord_cloneable,$warning) =
+            &get_coordinator_cloneable($cloneruname,$clonerudom,$type);
+        if ($coord_cloneable) {
+            map {$cc_cloneable{$_} = 1;} split('&',$coord_cloneable);
+        }
+    }
     foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) {
         foreach my $course (@{$by_descrip{$description}}) {
             $r->print(&Apache::loncommon::start_data_table_row());
             my $cleandesc=&HTML::Entities::encode($description,'<>&"');
             $cleandesc=~s/'/\\'/g;
             my ($cdom,$cnum)=split(/\_/,$course);
-            my ($descr,$instcode,$ttype,@owners);
+            my ($descr,$instcode,$ttype,$canclone,@owners);
             if (ref($courses{$course}) eq 'HASH') {
                 $descr = $courses{$course}{'description'};
-                $instcode =  $courses{$course}{'inst_code'};
-                $ttype =  $courses{$course}{'type'};
+                $instcode = $courses{$course}{'inst_code'};
+                $ttype = $courses{$course}{'type'};
+                if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+                    if ($cc_cloneable{$courses{$course}{'cnum'}.':'.$courses{$course}{'domain'}}) {
+                        $canclone = 1;
+                    }
+                    unless ($canclone) {
+                        my $cloners = $courses{$course}{'cloners'};
+                        if ($cloners ne '') { 
+                            my @cloneable = split(',',$cloners);
+                            if (grep(/^\*$/,@cloneable)) {
+                                $canclone = 1;
+                            }
+                            if (grep(/^\*:\Q$env{'form.clonerudom'}\E$/,@cloneable)) {
+                                $canclone = 1;
+                            }
+                            if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
+                                $canclone = 1;
+                            }
+                        }
+                    }
+                }
                 push(@owners,&unescape($courses{$course}{'owner'}));
                 if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') {
                     foreach my $item (@{$courses{$course}{'co-owners'}}) {
@@ -305,28 +426,40 @@ sub display_matched_courses {
                 ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
                 push(@owners,&unescape($singleowner));
             }
-            my $ownerstr = join(', ',@owners);
-            $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc).'</td>');
+            my $ownerstr = join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } @owners);
+            $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone).'</td>');
             $r->print('<td>'.$description.'</td>');
             $r->print('<td>');
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            $r->print('<td>');
-            if ($instcode ne '') {
-                $r->print(&unescape($instcode));
-            } else {
-                $r->print('&nbsp;');
+            unless ($type eq 'Community') { 
+                $r->print('<td>');
+                if ($instcode ne '') {
+                    $r->print(&unescape($instcode));
+                } else {
+                    $r->print('&nbsp;');
+                }
+                $r->print('</td>');
             }
-            $r->print('</td>');
             $r->print('<td>'.$ownerstr.'</td>');
-            $r->print('<td>');
-            if ($ttype ne '') {
-                $r->print(&mt(&unescape($ttype)));
-            } else {
-                $r->print('&nbsp;');
+            if ($showroles) {
+                $r->print('<td>');
+                my $rolestr;
+                if (ref($courses{$course}{'roles'}) eq 'ARRAY') {
+                    my @roles = sort(@{$courses{$course}{'roles'}});
+                    foreach my $role (@roles) {
+                        if ($role =~ /^cr/) {
+                            my (undef,$crdom,$crname,$crtitle) = split('/',$role);
+                            $rolestr .= $crtitle.', ';
+                        } else {
+                            $rolestr .= &Apache::lonnet::plaintext($role,$type).', ';
+                        }
+                    }
+                    $rolestr =~ s/\, $//;
+                }
+                $r->print($rolestr.'</td>');
             }
-            $r->print('</td>');
             if ($multiple) { $r->print("</label>\n"); }
             $r->print(&Apache::loncommon::end_data_table_row());
             # $r->print("<br />\n");
@@ -360,6 +493,11 @@ sub display_matched_courses {
                   $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");
+        if ($env{'form.typeelement'} ne '') {
+            $r->print('<input type="hidden" name="typeelement" value="'.
+                      $env{'form.typeelement'}.'" />'."\n");
+
+        }
     }
     if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
         $r->print('<input type="hidden" name="fixeddom" value="'.
@@ -381,24 +519,47 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref) = @_;
-    my $list;
-    my $formname;
-    my ($fixeddom,$codedom,$jscript);
+        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement) = @_;
+    my ($list,$formname,$fixeddom,$codedom,$jscript);
+    $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {
-         $formname = $env{'form.form'};
+        $formname = $env{'form.form'};
+    } else {
+        $formname = $caller;
+    }
+    my $onchange;
+    unless ($env{'form.interface'} eq 'textual') {
+        $onchange = 'javascript:updateFilters(this)';
     }
-    my ($domainselectform,$sincefilterform,$ownerdomselectform,
+    my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform,
         $instcodeform,$typeselectform,$instcodetitle);
     foreach my $item (@{$filterlist}) {
         $filter->{$item} = $env{'form.'.$item};
         if ($item ne 'descriptfilter' && $item ne 'instcodefilter') {
-	    if ($item eq 'domainfilter' || $item eq 'ownerdomfilter') {
+	    if ($item eq 'domainfilter') {
 		$filter->{$item} = &LONCAPA::clean_domain($filter->{$item});
 	    } elsif ($item eq 'coursefilter') {
 		$filter->{$item} = &LONCAPA::clean_courseid($filter->{$item});
 	    } elsif ($item eq 'ownerfilter') {
 		$filter->{$item} = &LONCAPA::clean_username($filter->{$item});
+                $filter->{'ownerdomfilter'} = 
+                    &LONCAPA::clean_domain($env{'form.ownerdomfilter'});
+                $ownerdomselectform =
+                    &Apache::loncommon::select_dom_form($filter->{'ownerdomfilter'},
+                                                        'ownerdomfilter',1);
+            } elsif ($item eq 'personfilter') {
+                $filter->{$item} = &LONCAPA::clean_username($filter->{$item});
+                if ($env{'form.persondomfilter'} eq '') {
+                    unless ($env{'form.gosearch'}) {
+                        $filter->{'persondomfilter'} = $env{'request.role.domain'};
+                    }
+                } else {
+                    $filter->{'persondomfilter'} =
+                        &LONCAPA::clean_domain($env{'form.persondomfilter'});
+                }
+                $persondomselectform =
+                    &Apache::loncommon::select_dom_form($filter->{'persondomfilter'},
+                                                        'persondomfilter',1);
 	    } else {
 		$filter->{$item} =~ s/\W//g;
 	    }
@@ -421,16 +582,13 @@ sub build_filters {
                                     &Apache::lonnet::domain($env{'request.role.domain'},
                                                             'description');
                 $codedom = $env{'request.role.domain'};
-            } else {    
+            } else {
                 $domainselectform =
 		    &Apache::loncommon::select_dom_form($filter->{$item},
 		    				        'domainfilter',
-						        $allow_blank);
+						        $allow_blank,'',$onchange);
                 $codedom = $filter->{'domainfilter'};
             }
-        } elsif ($item eq 'ownerdomfilter') {
-            $ownerdomselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
         } else {
             $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"');
         }
@@ -440,56 +598,92 @@ sub build_filters {
     $filter->{'sincefilter'} = $env{'form.sincefilter'};
     $filter->{'sincefilter'} =~ s/[^\d-]//g;
     if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; }
-    $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'},
-       'sincefilter',('-1'=>'',
-                      '86400' => 'today',
-                      '604800' => 'last week',
-                      '2592000' => 'last month',
-                      '7776000' => 'last three months',
-                      '15552000' => 'last six months',
-                      '31104000' => 'last year',
-                      'select_form_order' =>
-                      ['-1','86400','604800','2592000','7776000',
-                      '15552000','31104000']));
-
-    my %lt = (
-              'cac' => &mt("$type Activity"),
-              'cde' => &mt("$type Title"),
-              'cdo' => &mt("$type Domain"),
-              'ins' => &mt('Institutional Code'),
-              'inc' => &mt('Institutional Categorization'),
-              'cow' => &mt("$type Owner's Username"),
-              'cod' => &mt("$type Owner's Domain"),
-              'cog' => &mt('Course Type')
+    $sincefilterform=&Apache::loncommon::select_form(
+        $filter->{'sincefilter'},
+        'sincefilter',
+        (      '-1' => '',
+            '86400' => &mt('today'),
+           '604800' => &mt('last week'),
+          '2592000' => &mt('last month'),
+          '7776000' => &mt('last three months'),
+         '15552000' => &mt('last six months'),
+         '31104000' => &mt('last year'),
+         'select_form_order' =>
+            ['-1','86400','604800','2592000','7776000',
+             '15552000','31104000']));
+
+    my %lt = &Apache::lonlocal::texthash(
+                'cac' => "$type Activity",
+                'cde' => "$type Title",
+                'cdo' => "$type Domain",
+                'ins' => 'Institutional Code',
+                'inc' => 'Institutional Categorization',
+                'cow' => "$type Owner/Co-owner",
+                'cop' => "$type Personnel Includes",
+                'cog' => 'Type',
              );
 
-    $typeselectform =  '<select name="type" size="1">'."\n";
-    if ($type eq 'Course') {
-        if ($env{'form.fixeddom'}) {
-            ($instcodeform,$jscript,$$numtitlesref) = 
-                &instcode_selectors($codedom,'filterpicker');
-        }
-        if ($instcodeform eq '') {
-            $instcodeform = 
-                '<input type="text" name="instcodefilter" size="10" value="'.
-                $list->{'instcodefilter'}.'" />';
-            $instcodetitle = $lt{'ins'};
-        } else {
-            $instcodetitle = $lt{'inc'};
-        }
-        if ($env{'form.fixeddom'}) {
-            $instcodetitle .= '<br />('.$codedom.')';
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my $typeval = 'Course';
+        if ($type eq 'Community') {
+            $typeval = 'Community';
         }
-        if ($jscript ne '') {
-            $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.
-                       '</script>'."\n";
+        $typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
+    } else {
+        $typeselectform =  '<select name="type" size="1"';
+        if ($onchange) {
+            $typeselectform .= 'onchange="'.$onchange.'"';
+        }
+        $typeselectform .= '>'."\n";
+        foreach my $posstype ('Course','Community') {
+            $typeselectform.='<option value="'.$posstype.'"'.
+                ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+        }
+        $typeselectform.="</select>";
+    }
+    
+    my ($cloneableonlyform,$cloneabletitle);
+    if (exists($filter->{'cloneableonly'})) {
+        my $cloneableon = '';
+        my $cloneableoff = ' checked="checked"';
+        if ($filter->{'cloneableonly'}) {
+            $cloneableon = $cloneableoff;
+            $cloneableoff = '';
+        }
+        $cloneableonlyform = '<span class="LC_nobreak"><label><input type="radio" name="cloneableonly" value="1" '.$cloneableon.'/>&nbsp;'.&mt('Required').'</label>'.('&nbsp;'x3).'<label><input type="radio" name="cloneableonly" value="" '.$cloneableoff.' />&nbsp;'.&mt('No restriction').'</label></span>';
+        if ($env{'form.form'} eq 'ccrs') {
+            $cloneabletitle = &mt('Cloneable for').' '.$cloneruname.':'.$clonerudom;
+        } else {
+            $cloneabletitle = &mt('Cloneable by you');
         }
     }
-    foreach my $posstype ('Course','Non-standard Course') {
-        $typeselectform.='<option value="'.$posstype.'"'.
-            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+    my $officialjs;
+    if ($type eq 'Course') {
+        if (exists($filter->{'instcodefilter'})) {
+            if (($env{'form.fixeddom'}) || ($formname eq 'requestcrs')
+                || ($formname eq 'modifycourse')) {
+                $officialjs = 1;
+                ($instcodeform,$jscript,$$numtitlesref) = 
+                    &instcode_selectors($codedom,'filterpicker',$officialjs);
+                if ($jscript) {
+                    $jscript = '<script type="text/javascript" language="Javascript">'.
+                               $jscript.'</script>'."\n";
+                }
+            }
+            if ($instcodeform eq '') {
+                $instcodeform = 
+                    '<input type="text" name="instcodefilter" size="10" value="'.
+                    $list->{'instcodefilter'}.'" />';
+                $instcodetitle = $lt{'ins'};
+            } else {
+                $instcodetitle = $lt{'inc'};
+            }
+            if ($env{'form.fixeddom'}) {
+                $instcodetitle .= '<br />('.$codedom.')';
+            }
+        }
     }
-    $typeselectform.="</select>";
+
     my $output = qq|
 <form method="post" name="filterpicker" action="$action">
 <input type="hidden" name="form" value="$formname" />
@@ -510,6 +704,7 @@ sub build_filters {
 $name_input
 $roleelement
 $multelement
+$typeelement
 |;
         if ($formname eq 'portform') {
             $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
@@ -530,9 +725,13 @@ $multelement
                   .&Apache::lonhtmlcommon::row_closure();
     } 
     if ($typeselectform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
-                  .$typeselectform
-                  .&Apache::lonhtmlcommon::row_closure();
+        if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+            $output .= $typeselectform;
+        } else {
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                      .$typeselectform
+                      .&Apache::lonhtmlcommon::row_closure();
+        }
     }
     if ($instcodeform) {
         $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
@@ -540,13 +739,20 @@ $multelement
                   .&Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'ownerfilter'})) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'})
-                  .'<input type="text" name="ownerfilter" size="20" value="'
-                  .$list->{'ownerfilter'}.'" />'
-                  .&Apache::lonhtmlcommon::row_closure()
-                  .&Apache::lonhtmlcommon::row_title($lt{'cod'})
-                  .$ownerdomselectform
-                  .&Apache::lonhtmlcommon::row_closure();
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}).
+                   '<table><tr><td>'.&mt('Username').'<br />'.
+                   '<input type="text" name="ownerfilter" size="20" value="'.
+                   $list->{'ownerfilter'}.'" /></td><td>'.&mt('Domain').'<br />'.
+                   $ownerdomselectform.'</td></tr></table>'.
+                   &Apache::lonhtmlcommon::row_closure();
+    }
+    if (exists($filter->{'personfilter'})) {
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cop'}).
+                   '<table><tr><td>'.&mt('Username').'<br />'.
+                   '<input type="text" name="personfilter" size="20" value="'.
+                   $list->{'personfilter'}.'" /></td><td>'.&mt('Domain').'<br />'.
+                   $persondomselectform.'</td></tr></table>'.
+                   &Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'coursefilter'})) {
         $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID'))
@@ -554,37 +760,93 @@ $multelement
                   .$list->{'coursefilter'}.'" />'
                   .&Apache::lonhtmlcommon::row_closure();
     }
+    if ($cloneableonlyform) {
+        $output .= &Apache::lonhtmlcommon::row_title($cloneabletitle).
+                   $cloneableonlyform.&Apache::lonhtmlcommon::row_closure();
+    }
     if (exists($filter->{'descriptfilter'})) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'})
                   .'<input type="text" name="descriptfilter" size="40" value="'
                   .$list->{'descriptfilter'}.'" />'
                   .&Apache::lonhtmlcommon::row_closure(1);
     }
-    $output .= &Apache::lonhtmlcommon::end_pick_box();
-    $output .= '<p><input type="submit" name="gosearch" value="'. 
+    $output .= &Apache::lonhtmlcommon::end_pick_box().'<p>';
+    my ($coord_cloneable,$warning);
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        ($coord_cloneable,$warning) = 
+            &get_coordinator_cloneable($cloneruname,$clonerudom,$type);
+        if ($env{'form.form'} eq 'ccrs') {
+            $output .= '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
+        }
+        if ($coord_cloneable) {
+            $output .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
+        }
+    }
+    $output .= '<input type="hidden" name="updater" value="">'."\n".
+               '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
-    return $jscript.$output;
+    return $jscript.$warning.$output;
+}
+
+sub get_coordinator_cloneable {
+    my ($cloneruname,$clonerudom,$type) = @_;
+    if (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') {
+        my $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
+                   '</div>';
+        return ('',$warning);
+    } else {
+        my ($cc_clone,$ccrole);
+        if ($type eq 'Community') {
+            $ccrole = 'co';
+        } elsif ($type eq 'Course') {
+            $ccrole = 'cc';
+        }
+        my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
+                                                    'userroles',['active'], [$ccrole]);
+        foreach my $key (sort(keys(%ccroles))) {
+            my ($cnum,$cdom,$role) = split(':',$key);
+            $cc_clone .= $cdom.':'.$cnum.'&';
+        }
+        $cc_clone =~ s/\&$//;
+        return ($cc_clone);
+    }
 }
 
 sub instcode_selectors {
-    my ($codedom,$formname) = @_;
+    my ($codedom,$formname,$officialjs) = @_;
     my ($output,@codetitles,%cat_titles,%cat_order,%cat_items);
     my ($jscript,$totcodes,$numtitles,$lasttitle) =
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order);
+                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs);
     if ($numtitles > 0) {
-        $output = &Apache::courseclassifier::build_instcode_selectors($numtitles,
-                  $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n".
-                  '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
-                  '<input type="hidden" name="state" value="listing" />'."\n";
+        my $official = ' checked="checked" ';
+        my $unofficial = '';
+        if ($env{'form.official'} eq 'off') {
+            $unofficial = $official;
+            $official = '';
+        }
+        $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
+                   '<input type="radio" name="official" value="on"'.$official.' />'.
+                   &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
+                   '<input type="radio" name="official" value="off"'.$unofficial.
+                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
+                   &Apache::courseclassifier::build_instcode_selectors($numtitles,
+                   $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n".
+                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
+                   '<input type="hidden" name="state" value="listing" />'."\n";
  
     }
     return ($output,$jscript,$numtitles);
 }
 
 sub search_courses {
-    my ($r,$type,$onlyown,$filter,$numtitles) = @_;
-    my %courses;
+    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;
+    my (%courses,%showcourses,$cloner,$ccrole);
+    if ($type eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if (!$onlyown) {
         $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
@@ -593,24 +855,34 @@ sub search_courses {
             $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'.
                                            $filter->{'ownerdomfilter'};
         }
-        foreach my $item ('descriptfilter','instcodefilter','coursefilter',
-                          'combownerfilter') {
+        foreach my $item ('descriptfilter','coursefilter','combownerfilter') {
             if (!$filter->{$item}) {
                 $filter->{$item}='.';
             }
         }
-        if ($type eq '') { $type = '.'; }
         my $timefilter = 
            ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});
         my ($instcodefilter,$regexpok);
         if ($numtitles) {
-            $instcodefilter = 
-                &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},
-                                                               $numtitles);
-            $regexpok = 1;
+            if ($env{'form.official'} eq 'on') {
+                $instcodefilter = 
+                    &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                $regexpok = 1;
+            } elsif ($env{'form.official'} eq 'off') {
+                $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                unless ($instcodefilter eq '') {
+                    $regexpok = -1;
+                }
+            }
         } else {
             $instcodefilter = $filter->{'instcodefilter'};
         }
+        if ($instcodefilter eq '') { $instcodefilter = '.'; }
+        if ($type eq '') { $type = '.'; }
+ 
+        if (($clonerudom ne '') && ($cloneruname ne '')) {
+            $cloner = $cloneruname.':'.$clonerudom;  
+        }
         %courses = 
             &Apache::lonnet::courseiddump($filter->{'domainfilter'},
                                           $filter->{'descriptfilter'},
@@ -618,7 +890,33 @@ sub search_courses {
                                           $instcodefilter,
                                           $filter->{'combownerfilter'},
                                           $filter->{'coursefilter'},
-                                          undef,undef,$type,$regexpok);
+                                          undef,undef,$type,$regexpok,undef,undef,
+                                          undef,undef,$cloner,$env{'form.cc_clone'},
+                                          $filter->{'cloneableonly'});
+        if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
+            my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},
+                                                         $filter->{'persondomfilter'},
+                                                         'userroles',undef,
+                                                         [$ccrole,'in','ad','ep','ta','cr'],
+                                                         $filter->{'domainfilter'});
+            foreach my $role (keys(%rolehash)) {
+                my ($cnum,$cdom,$courserole) = split(':',$role);
+                my $cid = $cdom.'_'.$cnum;
+                if (exists($courses{$cid})) {
+                    if (ref($courses{$cid}) eq 'HASH') {
+                        if (ref($courses{$cid}{roles}) eq 'ARRAY') {
+                            if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { 
+                                push (@{$courses{$cid}{roles}},$courserole);
+                            }
+                        } else {
+                            $courses{$cid}{roles} = [$courserole];
+                        }
+                        $showcourses{$cid} = $courses{$cid};
+                    }
+                }
+            }
+            %courses = %showcourses;
+        }
     } else {
         $r->print('<br />');
         my %coursehash = &Apache::loncommon::findallcourses(); 
@@ -630,10 +928,16 @@ sub search_courses {
 }
 
 sub course_chooser {
-    my ($multiple,$cdom,$cnum,$cleandesc) = @_;
+    my ($multiple,$cdom,$cnum,$cleandesc,$canclone) = @_;
     my $output; 
     if ($multiple) {
         $output = '<label><input type="checkbox" name="course_id" value="'.$cdom.'_'.$cnum.'" />'."\n";
+    } elsif ((($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) && (!$canclone))  {
+        if ($env{'form.form'} eq 'ccrs') {
+            $output = &mt('No cloning for ').$env{'form.cloner'}."\n";
+        } else {
+            $output = &mt('No rights to clone')."\n";
+        }
     } else {
         $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
@@ -649,10 +953,10 @@ sub gochoose_javascript {
                                  total => 'coursetotal',
                                  list  => 'courselist',
                                  },
-                     'Non-standard Course' => {
-                                 name  => 'grouppick',
-                                 total => 'grouptotal',
-                                 list  => 'grouplist',
+                     'Community' => {
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
                               },
                     );
     my $output .= qq|
@@ -703,13 +1007,19 @@ function gochoose(cname,cdom,cdesc) {
     }
 ENDSCRIPT
     } else {
-        my $name_code;
+        my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {
             $name_code = 'opener.document.'.$env{'form.form'}.'.'.
                           $env{'form.cnameelement'}.'.value=cdesc;';
         }
+        if ($env{'form.typeelement'} ne '') {
+            $type_code = 'opener.document.'.$env{'form.form'}.'.'.
+                          $env{'form.typeelement'}.'.value=document.courselist.type;';
+        }
+
         $output .= qq|
         $name_code
+        $type_code
         opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
         var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         if (slct.options == undefined) {
@@ -766,7 +1076,7 @@ Course Activity - how recently was cours
 Course Domain - the domain of the course
 
 =item *
-Course Type - Course or Non-standard Course
+Type - Course or Community
 
 =item *
 Course Institutional Code - the institutional identifier assigned to the course
@@ -819,7 +1129,7 @@ Following selection, and/or submission,
 X<create_user_javascript()>
 B<create_user_javascript($type)>:
 
-Input: 1 - $type  - the course type - Course or Non-standard Course
+Input: 1 - $type  - the course type - Course or Community
 
 Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags 
 
@@ -830,9 +1140,9 @@ javascript code for reporting selected s
 
 =item *
 X<display_matched_courses()>
-B<display_matched_courses($r,$type,$multiple,$action,%courses)>:
+B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses)>:
 
-Input: 5 - request object, course type, multiple (0 or 1), form action; hash of courses.
+Input: 7 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), username of new course owner, domain of new course owner, hash of courses.
 
 Output: 0
 
@@ -851,10 +1161,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem)>:
 
 
-Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number).  
+Input: 11 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm), username and domain of new course owner who wants to clone, $tyepelem 
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
 
@@ -862,10 +1172,10 @@ Side Effects: None
 
 =item *
 X<search_courses()>
-B<search_courses($r,$type,$onlyown,$filter,$numtitles)>:
+B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom)>:
 
 
-Input: 5 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories).  
+Input: 7 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Last two needed when search is for courses to clone from course request form, or course creation form (DC).   
 
 Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -874,11 +1184,11 @@ Side Effects: None
 
 =item *
 X<course_chooser()>
-B<course_chooser($multiple,$cdom,$cnum,$cleandesc)>:
+B<course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone)>:
 
-Input: 4 - single (0) or multiple (1) courses; course domain, course number; course description. 
+Input: 5 - single (0) or multiple (1) courses; course domain, course number; course description; can clone course (1 if new course owner has cloning rights). 
 
-Output: 1 - HTML for either checkbox (multiple=1) or select button (multiple=0) for user yo indicate course selection.
+Output: 1 - HTML for either checkbox (multiple=1) or select button (multiple=0) for user to indicate course selection.
 
 Side Effects: None
 
@@ -927,6 +1237,10 @@ javascript functions used when user sele
 
 (g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes.
 
+=item
+
+(h) User requesting creation of a course, and selecting a course to clone - course number and domain written to visible form elements in opener window. Child window closes.
+
 =back
      
 =cut