--- loncom/interface/lonpickcourse.pm	2008/01/20 22:47:37	1.67.2.3
+++ loncom/interface/lonpickcourse.pm	2009/08/19 19:51:22	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.67.2.3 2008/01/20 22:47:37 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.86 2009/08/19 19:51:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,8 @@ use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
-use LONCAPA;
+use Apache::courseclassifier;
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
@@ -49,23 +50,22 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles']);
-
+                               'multiple','type','setroles','fixeddom','cloner']);
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
-        $lastaction,$autosubmit,$submitopener);
+        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
 
-    # 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 +76,17 @@ sub handler {
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
 
+    # if called when a DC is creating a course
+    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
     if ((($env{'form.form'} eq 'portform') && (!$env{'user.adv'}))) {
@@ -83,11 +94,18 @@ sub handler {
     }
 
     my %loaditem;
+    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'} .= '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, }));
 
@@ -108,37 +126,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,$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));
+                                 $filter,$action,\$numtitles,undef,$cloneruname,
+                                 $clonerudom));
     }
 
 # ---------------------------------------------------------------- Get the data
-    if ($env{'form.gosearch'} || $onlyown) {
-        my %courses = &search_courses($r,$type,$onlyown,$filter);
-        &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') {
@@ -211,7 +276,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';
     }
@@ -228,14 +293,19 @@ sub display_matched_courses {
                  $menuchk = ' checked="checked" ';
             }
             $r->print(
-                '<span class="LC_nobreak"><label>'.
-                '<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'.
-                '&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle).
-                '</label>'.('&nbsp;'x3).'</span><br />'.
-                '<span 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></span><br /><br />');
+                '<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>'
+               .'<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>'
+               .'</fieldset>'
+               .'<br />'
+            );
         }
     }
     my %by_descrip;
@@ -251,6 +321,7 @@ sub display_matched_courses {
         my $description = $descr;
         push (@{$by_descrip{$description}}, $course);
     }
+ 
     if ($numcourses > 1 && $multiple) {
         $r->print('<input type="button" value="check all"
                   onclick="javascript:checkAll(document.courselist.course_id)" />
@@ -258,16 +329,50 @@ sub display_matched_courses {
                   onclick="javascript:uncheckAll(document.courselist.course_id)" />
                   <br /><br />');
     }
+
+    if (%courses) {
+        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_data_table_header_row());
+        $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>'
+                 );
+        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());
+    }
     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')) {
+                    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'}}) {
@@ -279,26 +384,54 @@ sub display_matched_courses {
                 ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
                 push(@owners,&unescape($singleowner));
             }
-            my $owner = join(', ',@owners);
-            $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
-            $r->print($description.' ('.
-                      (&Apache::lonnet::domain($cdom,'description')?
-                       &Apache::lonnet::domain($cdom,'description'):$cdom).")");
+            my $ownerstr = join(', ',@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));
-            }
-            if (@owners > 1) {
-                $r->print(', '.&mt('owners').' - ',join(', ',@owners)); 
-            } elsif (@owners == 1) {
-                $r->print(', '.&mt('owner').' - '.$owner);
+                $r->print(&unescape($instcode));
+            } else {
+                $r->print('&nbsp;');
             }
+            $r->print('</td>');
+            $r->print('<td>'.$ownerstr.'</td>');
+            $r->print('<td>');
             if ($ttype ne '') {
-                $r->print(' ('.&unescape($ttype).')');
+                $r->print(&mt(&unescape($ttype)));
+            } else {
+                $r->print('&nbsp;');
+            }
+            $r->print('</td>');
+            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,$ttype).', ';
+                        }
+                    }
+                    $rolestr =~ s/\, $//;
+                }
+                $r->print($rolestr.'</td>');
             }
             if ($multiple) { $r->print("</label>\n"); }
-            $r->print("<br />\n");
+            $r->print(&Apache::loncommon::end_data_table_row());
+            # $r->print("<br />\n");
         }
     }
+    if (%courses) {
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+
     if (!%courses) {
         $r->print(&mt('None found'));
     } elsif ($multiple) {
@@ -317,18 +450,25 @@ sub display_matched_courses {
         $r->print('<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />');
         $r->print('<input type="hidden" name="action" value="rolepicker" />');
     } elsif ($env{'form.form'} eq 'modifycourse') {
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form']));
+        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state']));
     } else {
         $r->print('<input type="hidden" name="cnumelement" value="'.
                   $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");
     }
+    if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
+        $r->print('<input type="hidden" name="fixeddom" value="'.
+                  $env{'form.fixeddom'}.'" />');
+    }
+    if ($env{'form.numtitles'}) {
+        $r->print('<input type="hidden" name="numtitles" value="'.
+                  $env{'form.numtitles'}.'" />');
+    }
     $r->print("</form>\n");
     return;
 }
 
-
 sub multiples_tag {
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     my $multelement = '<input type="hidden" name="multiple" value="1" />';
@@ -337,25 +477,47 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $caller) = @_;
-    my $list;
-    my $formname;
+        $numtitlesref,$caller,$cloneruname,$clonerudom) = @_;
+    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;
+        $formname = $caller;
+    }
+    my $onchange;
+    unless ($env{'form.interface'} eq 'textual') {
+        $onchange = 'javascript:updateFilters(this)';
     }
-    my ($domainselectform,$sincefilterform,$ownerdomselectform,
-        $instcodeform,$typeselectform);
+    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;
 	    }
@@ -372,13 +534,19 @@ sub build_filters {
                 $filter->{$item} ||= $env{'request.role.domain'};
                 $allow_blank=0;
             }
-            $domainselectform =
-		&Apache::loncommon::select_dom_form($filter->{$item},
-						    'domainfilter',
-						    $allow_blank);
-        } elsif ($item eq 'ownerdomfilter') {
-            $ownerdomselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
+            if ($env{'form.fixeddom'}) {
+                $domainselectform = '<input type="hidden" name="domainfilter"'.
+                                    'value="'.$env{'request.role.domain'}.'" />'.
+                                    &Apache::lonnet::domain($env{'request.role.domain'},
+                                                            'description');
+                $codedom = $env{'request.role.domain'};
+            } else {
+                $domainselectform =
+		    &Apache::loncommon::select_dom_form($filter->{$item},
+		    				        'domainfilter',
+						        $allow_blank,'',$onchange);
+                $codedom = $filter->{'domainfilter'};
+            }
         } else {
             $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"');
         }
@@ -401,24 +569,67 @@ sub build_filters {
                       '15552000','31104000']));
 
     my %lt = (
-              'cac' => &mt('[_1] Activity',$type),
-              'cde' => &mt('[_1] Description',$type),
-              'cdo' => &mt('[_1] Domain',$type),
-              'cin' => &mt('Course Institutional Code'),
-              'cow' => &mt("[_1] Owner's Username",$type),
-              'cod' => &mt("[_1] Owner's Domain", $type),
-              'cog' => &mt('Course Type')
+              'cac' => &mt("$type Activity"),
+              'cde' => &mt("$type Title"),
+              'cdo' => &mt("$type Domain"),
+              'ins' => &mt('Institutional Code'),
+              'inc' => &mt('Institutional Categorization'),
+              'cow' => &mt("$type Owner/Co-owner"),
+              'cop' => &mt("$type Personnel Includes"),
+              'cog' => &mt('Type')
              );
 
-    $typeselectform =  '<select name="type" size="1">'."\n";
+    $typeselectform =  '<select name="type" size="1"';
+    if ($onchange) {
+        $typeselectform .= 'onchange="'.$onchange.'"';
+    }
+    $typeselectform .= '>'."\n";
+    
+    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');
+        }
+    }
+    my $officialjs;
     if ($type eq 'Course') {
-        $instcodeform = 
-                '<input type="text" name="instcodefilter" size="10" value="'.
-                $list->{'instcodefilter'}.'" />';
-    }
-    foreach my $posstype ('Course','Non-standard Course') {
-        $typeselectform.='<option value="'.$posstype.'" "'.
-            ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
+        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.')';
+            }
+        }
+    }
+
+    foreach my $posstype ('Course','Community') {
+        $typeselectform.='<option value="'.$posstype.'"'.
+            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
     }
     $typeselectform.="</select>";
     my $output = qq|
@@ -443,70 +654,195 @@ $roleelement
 $multelement
 |;
         if ($formname eq 'portform') {
-            $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />';
+            $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
         }
     }
+    if ($env{'form.fixeddom'}) { 
+        $output .= '<input type="hidden" name="fixeddom" value="'.$env{'form.fixeddom'}.'" />'."\n";
+    }
+    $output .= "<br />\n".&Apache::lonhtmlcommon::start_pick_box();
     if ($sincefilterform) { 
-        $output .= $lt{'cac'}.': '.$sincefilterform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cac'})
+                  .$sincefilterform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if ($domainselectform) {
-        $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'})
+                  .$domainselectform
+                  .&Apache::lonhtmlcommon::row_closure();
+    } 
+    if ($typeselectform) {
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                  .$typeselectform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
-#    if ($typeselectform) {
-#        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
-#    }
     if ($instcodeform) {
-        $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
+                  .$instcodeform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'ownerfilter'})) {
-        $output .= $lt{'cow'}.': '.
-                   '<input type="text" name="ownerfilter" size="10" value="'.
-                   $list->{'ownerfilter'}.'" /><br />'."\n".
-                   $lt{'cod'}.': '.$ownerdomselectform.'<br />'."\n";
+        $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 .= &mt('LON-CAPA course ID').': '.
-                   '<input type="text" name="coursefilter" size="25" value="'.
-                    $list->{'coursefilter'}.'" /><br />';
+        $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID'))
+                  .'<input type="text" name="coursefilter" size="25" value="'
+                  .$list->{'coursefilter'}.'" />'
+                  .&Apache::lonhtmlcommon::row_closure();
+    }
+    if ($cloneableonlyform) {
+        $output .= &Apache::lonhtmlcommon::row_title($cloneabletitle).
+                   $cloneableonlyform.&Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'descriptfilter'})) {
-        $output .=$lt{'cde'}.': '.
-                  '<input type="text" name="descriptfilter" size="40" value="'.
-                  $list->{'descriptfilter'}.'" />'."\n";
+        $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().'<p>';
+    my $warning;
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my $cloneruhome=&Apache::lonnet::homeserver($cloneruname,$clonerudom);
+        my $cc_clone;
+        if ($cloneruhome eq 'no_host') {
+            $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
+                       '</div>';
+        } else {
+            if ($env{'form.form'} eq 'ccrs') {
+                $output .= '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
+            }
+            my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
+                                                        'userroles',['active'], ['cc']);
+            foreach my $key (sort(keys(%ccroles))) {
+                my ($cnum,$cdom,$role) = split(':',$key);
+                $cc_clone .= $cdom.':'.$cnum.'&';
+            }
+            $cc_clone =~ s/\&$//;
+        }
+        if ($cc_clone ne '') {
+            $output .= '<input type="hidden" name="cc_clone" value="'.$cc_clone.'" />';
+        }
     }
-    $output .= '<p><input type="submit" name="gosearch" value="'. 
+    $output .= '<input type="hidden" name="updater" value="">'."\n".
+               '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
-    return $output; 
+    return $jscript.$warning.$output;
+}
+
+sub instcode_selectors {
+    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,$officialjs);
+    if ($numtitles > 0) {
+        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) = @_;
-    my %courses;
+    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;
+    my (%courses,%showcourses,$cloner);
     if (!$onlyown) {
-        $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
+        $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
         if (($filter->{'ownerfilter'} ne '') ||
             ($filter->{'ownerdomfilter'} ne '')) {
             $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) {
+            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'},
                                           $timefilter,
-                                          $filter->{'instcodefilter'},
+                                          $instcodefilter,
                                           $filter->{'combownerfilter'},
                                           $filter->{'coursefilter'},
-                                          undef,undef,$type);
+                                          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,
+                                                         ['cc','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(); 
@@ -518,12 +854,18 @@ 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="Select" onClick="gochoose('.
+        $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
     }
     return $output;
@@ -537,7 +879,7 @@ sub gochoose_javascript {
                                  total => 'coursetotal',
                                  list  => 'courselist',
                                  },
-                     'Non-standard Course' => {
+                     'Community' => {
                                  name  => 'grouppick',
                                  total => 'grouptotal',
                                  list  => 'grouplist',
@@ -654,7 +996,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
@@ -666,7 +1008,7 @@ Course Owner's Username - the username o
 Course Owner's Domain - the domain of the owner of the course
 
 =item * 
-Course Description - text which appears in the Course Description (or title), as set in the Course Parameters.
+Course Title - text which appears in the Course Title, as set in the Course Parameters.
 
 =item *
 Course ID - the internal course number (course ID part after initial 'domain_') used by LON-CAPA (this criterion is only displayed to Domain Coordinators selecting a course in the same domain as their DC role).
@@ -707,7 +1049,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 
 
@@ -718,9 +1060,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
 
@@ -739,10 +1081,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom)>:
 
 
-Input: 6 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action.
+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); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm).
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
 
@@ -750,10 +1092,10 @@ Side Effects: None
 
 =item *
 X<search_courses()>
-B<search_courses($r,$type,$onlyown,$filter)>:
+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.
+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.
 
@@ -762,11 +1104,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
 
@@ -815,6 +1157,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