--- loncom/interface/lonpickcourse.pm	2014/03/11 21:42:18	1.110
+++ loncom/interface/lonpickcourse.pm	2017/01/05 16:17:11	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.110 2014/03/11 21:42:18 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.125 2017/01/05 16:17:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,26 +36,46 @@ use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
-use Apache::courseclassifier;
 use LONCAPA qw(:DEFAULT :match);
+use JSON::DWIW;
 
 sub handler {
     my $r = shift;
+    if ($env{'form.context'} eq 'adhoc') {
+        &Apache::loncommon::content_type($r,'application/json');
+        $r->send_http_header;
+        my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.cid'},1);
+        if ((ref($possroles) eq 'ARRAY') && (ref($description) eq 'HASH')) {
+            my $response = [];
+            if (@{$possroles}) {
+                foreach my $role (@{$possroles}) {
+                    push(@{$response},
+                                      { name => $role,
+                                        desc => $description->{$role},
+                                      });
+                }
+            }
+            $r->print(JSON::DWIW->to_json({roles => $response}));
+        }
+        return OK;
+    }
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-
+    
 # ------------------------------------------------------------ Print the screen
 
     # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles','fixeddom','cloner']);
+                               'multiple','type','setroles','fixeddom','cloner',
+                               'crscode','crsdom']);
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement,
-        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
+        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom,$crscode,
+        $crsdom,$rolechooser);
 
-    # Get course type - Course or Community.
+    # Get course type - Course, Community or Placement.
     $type = $env{'form.type'};
     if (!defined($env{'form.type'})) {
         $type = 'Course';
@@ -69,12 +89,31 @@ sub handler {
         $title = 'Selecting '.$type.'(s)';
     }
 
-    # if called when a DC is selecting a course 
-    my $roledom = $env{'form.roleelement'};
+    # if called when a DC or DH is selecting a course 
+    my ($roledom,$rolename) = split(/:/,$env{'form.roleelement'});
     if ($roledom) {
-        $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
+        $roleelement = '<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />';
         $submitopener = &processpick();
-        $autosubmit = 'process_pick("'.$roledom.'")';
+        $autosubmit = 'process_pick("'.$roledom.'","'.$rolename.'")';
+        if ($rolename eq 'dh') {
+            my %lt = &Apache::lonlocal::texthash(
+                     title    => 'Ad hoc role selection',
+                     preamble => 'Please choose an ad hoc role in the course.',
+                     cancel   => 'Click "OK" to enter the course, or "Cancel" to choose a different course.',
+            );
+
+            $rolechooser = <<"END";
+<div id="LC_adhocrole_chooser" title="$lt{'title'}">
+  <p>$lt{'preamble'}</p>
+  <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">
+    <div id="LC_choose_adhoc">
+    </div>
+    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
+  </form>
+  <p>$lt{'cancel'}</p>
+</div>
+END
+        }
     }
     if ($env{'form.typeelement'} ne '') {
         $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
@@ -83,12 +122,16 @@ sub handler {
     # 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)$/);
+        $crscode = $env{'form.crscode'};
+        $crsdom = $env{'request.role.domain'};
     }
 
     # if called when requesting a course
     if ($env{'form.form'} eq 'requestcrs') {
         $cloneruname = $env{'user.name'};
         $clonerudom =  $env{'user.domain'};
+        $crscode = $env{'form.crscode'};
+        $crsdom = $env{'form.crsdom'};
     }
 
     my $onlyown = 0;
@@ -106,9 +149,22 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
+        if ($type ne 'Community') {
+            my %coursedescription =
+                &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                                   {'one_time' => '1'});
+            my $cdom = $coursedescription{'domain'};
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            if (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'})) {
+                $loaditem{'onload'} .= 'setDefaultCredits();';
+            }
+        }
+        $loaditem{'onload'} .= 'setRoles();setSections();';
+    }
+    if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) && (!$onlyown)) {
+        $loaditem{'onload'} .=  'hideSearching(); ';
     }
-    my $js = &js_changer();
+    my $js = &Apache::loncommon::js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
 					     {'add_entries' => \%loaditem,
 					      'no_nav_bar'  => 1, }));
@@ -132,7 +188,8 @@ sub handler {
     # print javascript functions for choosing a course 
     if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || 
         $onlyown) {
-        $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
+        $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction,
+                                       $rolename,$rolechooser));
     }
     $r->print(&Apache::lonhtmlcommon::scripttag($jscript));
     $r->print($submitopener);
@@ -141,8 +198,8 @@ sub handler {
     my $filter = {};
     my $action = '/adm/pickcourse';
     my ($numtitles,$showroles,$nohost,@codetitles);
-    if (!$onlyown) {
-        my $filterlist = ['domainfilter'];
+    unless ($onlyown) {
+        my $filterlist = ['domainfilter','sincefilter'];
         # created filter for DCs only
         if ($env{'user.adv'} && $env{'form.domainfilter'} &&
             exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})
@@ -154,7 +211,15 @@ sub handler {
         }
         push(@{$filterlist},('descriptfilter','instcodefilter'));
         if ($env{'form.form'} eq 'rules') {
-            push(@{$filterlist},'personfilter');
+            push(@{$filterlist},('personfilter','persondomfilter'));
+            if ($env{'form.persondomfilter'} eq '') {
+                unless ($env{'form.gosearch'}) {
+                    $filter->{'persondomfilter'} = $env{'request.role.domain'};
+                }
+            } else {
+                $filter->{'persondomfilter'} =
+                    &LONCAPA::clean_domain($env{'form.persondomfilter'});
+            }
             if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) {
                 if (&Apache::lonnet::homeserver($env{'form.personfilter'},
                                                  $env{'form.persondomfilter'}) eq 'no_host') {
@@ -164,7 +229,7 @@ sub handler {
                 } 
             }
         } else {
-            push(@{$filterlist},'ownerfilter');
+            push(@{$filterlist},('ownerfilter','ownerdomfilter'));
         }
         # course ID filter for DCs only
         if ($env{'user.adv'} && $env{'form.domainfilter'} &&
@@ -174,10 +239,46 @@ sub handler {
         if ($cloneruname ne '' && $clonerudom ne '') {
             push(@{$filterlist},'cloneableonly');
         }
-
-        $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
-                                 $filter,$action,\$numtitles,undef,$cloneruname,
-                                 $clonerudom,$typeelement,\@codetitles));
+        if ((ref($filterlist) eq 'ARRAY') && (ref($filter) eq 'HASH')) {
+            foreach my $item (@{$filterlist}) {
+                $filter->{$item} = $env{'form.'.$item};
+            }
+        }
+        if ($env{'form.form'} eq 'portform') {
+            $filter->{'domainfilter'} ||= $env{'user.domain'};
+        } elsif ($env{'form.form'} eq 'studentform') {
+            $filter->{'domainfilter'} ||= $env{'request.role.domain'};
+        }
+        my $codedom;
+        if ($env{'form.fixeddom'}) {
+            $codedom = $env{'request.role.domain'};
+        } else {
+            $codedom = $filter->{'domainfilter'};
+        }
+        my ($clonetext,$clonewarning);
+        if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+            (my $coord_cloneable,$clonewarning) =
+                &get_coordinator_cloneable($cloneruname,$clonerudom,$type);
+            if ($env{'form.form'} eq 'ccrs') {
+                $clonetext = '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
+            }
+            if ($coord_cloneable) {
+                $clonetext .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
+            }
+            if ($crscode ne '') {
+                $clonetext .= '<input type="hidden" name="crscode" value="'.$crscode.'" />';
+            }
+            if ($crsdom ne '') {
+                $clonetext .= '<input type="hidden" name="crsdom" value="'.$crsdom.'" />';
+            }
+        }
+        $r->print(&Apache::loncommon::build_filters($filterlist,$type,$roleelement,$multelement,
+                                                    $filter,$action,\$numtitles,undef,$cloneruname,
+                                                    $clonerudom,$typeelement,\@codetitles,$codedom,
+                                                    $env{'form.form'},$env{'form.fixeddom'},
+                                                    $env{'form.prevphase'},$env{'form.cnameelement'},
+                                                    $env{'form.cnumelement'},$env{'form.cdomelement'},
+                                                    $env{'form.setroles'},$clonetext,$clonewarning));
     }
 
 # ---------------------------------------------------------------- Get the data
@@ -190,8 +291,22 @@ sub handler {
                 $domcloner = 1;
             }
         }
-        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles,
-                                      $cloneruname,$clonerudom,$domcloner,\@codetitles);
+        my %courses;
+        if (!$onlyown) {
+            $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
+            $r->rflush();
+            my $srchdom = $filter->{'domainfilter'};
+            %courses = &Apache::loncommon::search_courses($srchdom,$type,$filter,$numtitles,
+                                                          $cloneruname,$clonerudom,$domcloner,
+                                                          \@codetitles,$env{'form.cc_clone'},
+                                                          $crsdom,$crscode);
+        } else {
+            $r->print('<br />');
+            my %coursehash = &Apache::loncommon::findallcourses();
+            foreach my $cid (sort(keys(%coursehash))) {
+                $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'};
+            }
+        }
         if ($nohost) {
             $r->print ('<span class="LC_warning">'.
                        &mt('User does not exist - username: [_1], domain: [_2].',
@@ -199,29 +314,13 @@ sub handler {
                            '<b>'.$filter->{'persondomfilter'}.'</b>').'</span>');
         } else {
             &display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,
-                                     $clonerudom,%courses);
+                                     $clonerudom,$crsdom,$crscode,%courses);
         }
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
-sub js_changer {
-    return <<ENDJS;
-<script type="text/javascript">
-// <![CDATA[
-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') {
@@ -229,7 +328,7 @@ sub processpick {
     }
     my $process_pick = <<"ENDONE";
 <script type="text/javascript">
-function process_pick(dom) {
+function process_pick(dom,rolename) {
     var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
     var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
     var okDomain = 0;
@@ -238,18 +337,30 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (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
-            opener.document.rolechoice.submit();
+            var courseTarget; 
+            if (rolename == 'cc') {
+                var ccrole = "cc";
+                var pickedType = "$env{'form.type'}";
+                if (pickedType == "Community") {
+                    ccrole = "co";
+                }
+                courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse;
+            } else {
+                if (!/\\W/.test(rolename)) {
+                    courseTarget = "cr/"+pickedDomain+"/"+pickedDomain+"-domainconfig/"+rolename+"./"+pickedDomain+"/"+pickedCourse;
+                }
+            }
+            if ((courseTarget != '') && (courseTarget != undefined)) { 
+                opener.document.title='Role selected. Please stand by.';
+                opener.status='Role selected. Please stand by.';
+                opener.document.rolechoice.newrole.value=courseTarget;
+                opener.document.rolechoice.submit();
+            } else {
+                alert("Invalid role selection");
+                return;
+            }
         }
-    } 
+    }
     else {
         alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
@@ -324,12 +435,12 @@ function setDefaultCredits() {
 }
 
 sub display_matched_courses {
-    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_;
+    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,$crsdom,$crscode,%courses) = @_;
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
     my $numcourses = keys(%courses);
-    $r->print('<form name="courselist" method="post" action="'.$action.'">');
+    $r->print('<form name="courselist" method="post" action="'.$action.'" id="LCcoursepicker">');
     if ($env{'form.form'} eq 'modifycourse') {
         if ($numcourses > 0) {
             my $ccrole = 'cc';
@@ -339,31 +450,80 @@ sub display_matched_courses {
             my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' ';
+            my $possrole;
             my $menuchk = ' checked="checked" ';
             $r->print(
                 '<div class="LC_left_float">'
                .'<fieldset>'
-               .'<legend>'.&mt('Pick action').'</legend>'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&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));
+               .'<legend>'.&mt('Pick action').'</legend>');
+            my $roleradio = '<span class="LC_nobreak"><label>'.
+                            '<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'.'&nbsp;';
+            if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                $possrole = 1;
+                $r->print($roleradio);
+                if ($type eq 'Community') {
+                    $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('Enter the placement test with the role of [_1].',$cctitle));
+                } else {
+                    $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+                }
+            } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
+                my ($roles_by_num,$description,$accessref,$accessinfo) = &Apache::lonnet::get_all_adhocroles($crsdom);
+                if ((ref($roles_by_num) eq 'ARRAY') && (ref($description) eq 'HASH')) {
+                    if (@{$roles_by_num} > 1) {
+                        $r->print($roleradio);
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with one of the available ad hoc roles.'));
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with one of the available ad hoc roles.'));
+                        } else {
+                            $r->print(&mt('Enter the course with one of the available ad hoc roles.'));
+                        }
+                        $possrole = 1;
+                    } elsif (@{$roles_by_num} == 1) {
+                        $r->print($roleradio);
+                        my $rolename = $description->{$roles_by_num->[0]};
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with the ad hoc role of: [_1]',$rolename));
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with the ad hoc role of: [_1]',$rolename));
+                        } else {
+                            $r->print(&mt('Enter the course with the ad hoc role of: [_1]',$rolename));
+                        }
+                        $possrole = 1;
+                    }
+                    if ($possrole) {
+                        $r->print('<input type="hidden" name="adhocrole" value="" />');
+                    }
+                }
             }
-            $r->print('</label></span><br />'
-               .'<span class="LC_nobreak"><label>'
-               .'<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));
+            if ($possrole) {
+                $r->print('</label></span><br />');
+            }
+            $r->print('<span class="LC_nobreak"><label>'
+                     .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                if ($type eq 'Community') {
+                    $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('View or modify placement test settings which only a [_1] may modify.',$dctitle));
+                } else {
+                    $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+                }
+            } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
+                if ($type eq 'Community') {
+                    $r->print(&mt('View community settings which only a [_1] may modify.',$dctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('View placement test settings which only a [_1] may modify.',$dctitle));
+                } else {
+                    $r->print(&mt('View course settings which only a [_1] may modify.',$dctitle));
+                }
             }
             $r->print('</label></span>'
-               .'</fieldset></div>'
-               .'<br clear="all" />'
-            );
+                     .'</fieldset></div>'
+                     .'<br clear="all" />'
+                     );
         }
     }
     my %by_descrip;
@@ -398,7 +558,7 @@ sub display_matched_courses {
         $r->print('<th>'.&mt('Select').'</th>'
                  .'<th>'.$titlehdr.'</th>'
                  .'<th>'.&mt('Domain').'</th>');
-        unless ($type eq 'Community') {
+        unless (($type eq 'Community') || ($type eq 'Placement')) {
             $r->print('<th>'.&mt('Course Code').'</th>');
         }
         $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
@@ -417,6 +577,7 @@ sub display_matched_courses {
             map {$cc_cloneable{$_} = 1;} split('&',$coord_cloneable);
         }
     }
+    my (%gotdomdefaults,%gotcodedefaults);
     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());
@@ -442,7 +603,7 @@ sub display_matched_courses {
                     }
                     unless ($canclone) {
                         my $cloners = $courses{$course}{'cloners'};
-                        if ($cloners ne '') { 
+                        if ($cloners ne '') {
                             my @cloneable = split(',',$cloners);
                             if (grep(/^\*$/,@cloneable)) {
                                 $canclone = 1;
@@ -453,6 +614,80 @@ sub display_matched_courses {
                             if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
                                 $canclone = 1;
                             }
+                            unless ($canclone) {
+                                if (($instcode) && ($crscode) && ($cdom eq $crsdom)) {
+                                    foreach my $cloner (@cloneable) {
+                                        if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
+                                            ($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
+                                            if ($cloner =~ /\=/) {
+                                                my (%codedefaults,@code_order);
+                                                if (ref($gotcodedefaults{$cdom}) eq 'HASH') {
+                                                    if (ref($gotcodedefaults{$cdom}{'defaults'}) eq 'HASH') {
+                                                        %codedefaults = %{$gotcodedefaults{$cdom}{'defaults'}};
+                                                    }
+                                                    if (ref($gotcodedefaults{$cdom}{'order'}) eq 'ARRAY') {
+                                                        @code_order = @{$gotcodedefaults{$cdom}{'order'}};
+                                                    }
+                                                } else {
+                                                    &Apache::lonnet::auto_instcode_defaults($cdom,
+                                                                                            \%codedefaults,
+                                                                                            \@code_order);
+                                                    $gotcodedefaults{$cdom}{'defaults'} = \%codedefaults;
+                                                    $gotcodedefaults{$cdom}{'order'} = \@code_order;
+                                                }
+                                                if (@code_order > 0) {
+                                                    if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
+                                                                                                $cloner,$instcode,$crscode)) {
+                                                        $canclone = 1;
+                                                        last;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            my %domdefs;
+                            if (ref($gotdomdefaults{$cdom}) eq 'HASH') {
+                                %domdefs = %{$gotdomdefaults{$cdom}};
+                            } else {
+                                %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+                                $gotdomdefaults{$cdom} = \%domdefs;
+                            }
+                            if ($domdefs{'canclone'}) {
+                                unless ($domdefs{'canclone'} eq 'none') {
+                                    if ($domdefs{'canclone'} eq 'domain') {
+                                        if ($clonerudom eq $cdom) {
+                                            $canclone = 1;
+                                        }
+                                    } elsif (($instcode) && ($crscode) &&
+                                             ($cdom eq $crsdom)) {
+                                        my (%codedefaults,@code_order); 
+                                        if (ref($gotcodedefaults{$cdom}) eq 'HASH') {
+                                            if (ref($gotcodedefaults{$cdom}{'defaults'}) eq 'HASH') {
+                                                %codedefaults = %{$gotcodedefaults{$cdom}{'defaults'}};
+                                            }
+                                            if (ref($gotcodedefaults{$cdom}{'order'}) eq 'ARRAY') {
+                                                @code_order = @{$gotcodedefaults{$cdom}{'order'}};
+                                            }
+                                        } else {
+                                            &Apache::lonnet::auto_instcode_defaults($cdom,
+                                                                                    \%codedefaults,
+                                                                                    \@code_order);
+                                            $gotcodedefaults{$cdom}{'defaults'} = \%codedefaults;
+                                            $gotcodedefaults{$cdom}{'order'} = \@code_order;
+                                        }
+                                        if (@code_order > 0) {
+                                            if (&Apache::lonnet::default_instcode_cloning($cdom,$domdefs{'canclone'},
+                                                                                          $instcode,$crscode,\%codedefaults,
+                                                                                          \@code_order)) {
+                                                $canclone = 1;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -474,7 +709,7 @@ sub display_matched_courses {
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            unless ($type eq 'Community') { 
+            unless (($type eq 'Community') || ($type eq 'Placement')) { 
                 $r->print('<td>');
                 if ($instcode ne '') {
                     $r->print(&unescape($instcode));
@@ -528,7 +763,7 @@ 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','numtitles','state']));
+        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state','adhocrole']));
     } else {
         $r->print('<input type="hidden" name="cnumelement" value="'.
                   $env{'form.cnumelement'}.'" />'."\n".  
@@ -558,294 +793,6 @@ sub multiples_tag {
     return ($jscript,$multelement);
 }
 
-sub build_filters {
-    my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement,$codetitlesref) = @_;
-    my ($list,$formname,$fixeddom,$codedom,$jscript);
-    $codedom = $env{'request.role.domain'};
-    if (defined($env{'form.form'})) {
-        $formname = $env{'form.form'};
-    } else {
-        $formname = $caller;
-    }
-    my $onchange = 'javascript:updateFilters(this)';
-    my ($domainselectform,$sincefilterform,$createdfilterform,
-        $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') {
-		$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;
-	    }
-            if (!$filter->{$item}) {
-                $filter->{$item} = '';
-            }
-        }
-        if ($item eq 'domainfilter') {
-	    my $allow_blank = 1;
-	    if ($formname eq 'portform') {
-		$filter->{$item} ||= $env{'user.domain'};
-		$allow_blank=0;
-	    } elsif ($formname eq 'studentform') {
-                $filter->{$item} ||= $env{'request.role.domain'};
-                $allow_blank=0;
-            }
-            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},'<>&"');
-        }
-    }
-
-    # last course activity filter and selection
-    $sincefilterform = &timebased_select_form('sincefilter',$filter);
-
-    # course created filter and selection
-    if (exists($filter->{'createdfilter'})) {
-        $createdfilterform = &timebased_select_form('createdfilter',$filter);
-    }
-
-    my %lt = &Apache::lonlocal::texthash(
-                'cac' => "$type Activity",
-                'ccr' => "$type Created", 
-                'cde' => "$type Title",
-                'cdo' => "$type Domain",
-                'ins' => 'Institutional Code',
-                'inc' => 'Institutional Categorization',
-                'cow' => "$type Owner/Co-owner",
-                'cop' => "$type Personnel Includes",
-                'cog' => 'Type',
-             );
-
-    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
-        my $typeval = 'Course';
-        if ($type eq 'Community') {
-            $typeval = 'Community';
-        }
-        $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');
-        }
-    }
-    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) = 
-                    &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker',
-                                                                  $officialjs,$codetitlesref);
-                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.')';
-            }
-        }
-    }
-
-    my $output = qq|
-<form method="post" name="filterpicker" action="$action">
-<input type="hidden" name="form" value="$formname" />
-|;
-    if ($formname eq 'modifycourse') {
-        $output .= '<input type="hidden" name="phase" value="courselist" />'."\n".
-                   '<input type="hidden" name="prevphase" value="'.
-                   $env{'form.prevphase'}.'" />'."\n";
-    } else {
-        my $name_input;
-        if ($env{'form.cnameelement'} ne '') {
-            $name_input = '<input type="hidden" name="cnameelement" value="'.
-                          $env{'form.cnameelement'}.'" />';
-        }
-        $output .= qq|
-<input type="hidden" name="cnumelement" value="$env{'form.cnumelement'}" />
-<input type="hidden" name="cdomelement" value="$env{'form.cdomelement'}" />
-$name_input
-$roleelement
-$multelement
-$typeelement
-|;
-        if ($formname eq 'portform') {
-            $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 .= &Apache::lonhtmlcommon::row_title($lt{'cac'})
-                  .$sincefilterform
-                  .&Apache::lonhtmlcommon::row_closure();
-    }
-    if ($createdfilterform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'ccr'})
-                  .$createdfilterform
-                  .&Apache::lonhtmlcommon::row_closure();
-    }
-    if ($domainselectform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'})
-                  .$domainselectform
-                  .&Apache::lonhtmlcommon::row_closure();
-    } 
-    if ($typeselectform) {
-        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)
-                  .$instcodeform
-                  .&Apache::lonhtmlcommon::row_closure();
-    }
-    if (exists($filter->{'ownerfilter'})) {
-        $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'))
-                  .'<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 .= &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 ($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.$warning.$output;
-}
-
-sub timebased_select_form {
-    my ($item,$filter) = @_;
-    if (ref($filter) eq 'HASH') {
-        $filter->{$item} = $env{'form.'.$item};
-        $filter->{$item} =~ s/[^\d-]//g;
-        if (!$filter->{$item}) { $filter->{$item}=-1; }
-        return &Apache::loncommon::select_form( 
-                            $filter->{$item},
-                            $item,
-                            {      '-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']});
-    }
-}
-
 sub get_coordinator_cloneable {
     my ($cloneruname,$clonerudom,$type) = @_;
     if (($cloneruname!~/\w/) || ($clonerudom!~/\w/)) {
@@ -860,7 +807,7 @@ sub get_coordinator_cloneable {
         my ($cc_clone,$ccrole);
         if ($type eq 'Community') {
             $ccrole = 'co';
-        } elsif ($type eq 'Course') {
+        } else {
             $ccrole = 'cc';
         }
         my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
@@ -874,102 +821,6 @@ sub get_coordinator_cloneable {
     }
 }
 
-sub search_courses {
-    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;
-    my (%courses,%showcourses,$cloner,$ccrole);
-    if ($type eq 'Community') {
-        $ccrole = 'co';
-    } else {
-        $ccrole = 'cc';
-    }
-    if (!$onlyown) {
-        $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
-        $r->rflush();
-        if (($filter->{'ownerfilter'} ne '') ||
-            ($filter->{'ownerdomfilter'} ne '')) {
-            $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'.
-                                           $filter->{'ownerdomfilter'};
-        }
-        foreach my $item ('descriptfilter','coursefilter','combownerfilter') {
-            if (!$filter->{$item}) {
-                $filter->{$item}='.';
-            }
-        }
-        my $now = time;
-        my $timefilter = 
-           ($filter->{'sincefilter'}==-1?1:$now-$filter->{'sincefilter'});
-        my ($createdbefore,$createdafter);
-        if (($filter->{'createdfilter'} ne '') && ($filter->{'createdfilter'} !=-1)) {
-            $createdbefore = $now;
-            $createdafter = $now-$filter->{'createdfilter'};
-        }
-        my ($instcodefilter,$regexpok);
-        if ($numtitles) {
-            if ($env{'form.official'} eq 'on') {
-                $instcodefilter = 
-                    &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles,$codetitles);
-                $regexpok = 1;
-            } elsif ($env{'form.official'} eq 'off') {
-                $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles,$codetitles);
-                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,
-                                          $instcodefilter,
-                                          $filter->{'combownerfilter'},
-                                          $filter->{'coursefilter'},
-                                          undef,undef,$type,$regexpok,undef,undef,
-                                          undef,undef,$cloner,$env{'form.cc_clone'},
-                                          $filter->{'cloneableonly'},
-                                          $createdbefore,$createdafter,undef,
-                                          $domcloner);
-        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(); 
-        foreach my $cid (sort(keys(%coursehash))) {
-            $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'};
-        }
-    }
-    return %courses;
-}
-
 sub course_chooser {
     my ($multiple,$cdom,$cnum,$cleandesc,$canclone) = @_;
     my $output; 
@@ -977,7 +828,7 @@ sub course_chooser {
         $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";
+            $output = &mt('No cloning for [_1]',$env{'form.cloner'})."\n";
         } else {
             $output = &mt('No rights to clone')."\n";
         }
@@ -989,7 +840,7 @@ sub course_chooser {
 }
 
 sub gochoose_javascript {
-    my ($type,$multiple,$autosubmit,$lastaction) = @_;
+    my ($type,$multiple,$autosubmit,$lastaction,$rolename,$rolechooser) = @_;
     my %elements = (
                      'Course' => {
                                  name  => 'coursepick',
@@ -1001,10 +852,32 @@ sub gochoose_javascript {
                                  total => 'coursetotal',
                                  list  => 'courselist',
                               },
+                     'Placement' => {
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
+                                 },
                     );
-    my $output = qq|
+
+    my %lt = &Apache::lonlocal::texthash (
+        none => 'You are not eligible to use an ad hoc role for the selected course',
+        ok => 'OK',
+        exit => 'Cancel',       
+    );
+    &js_escape(\%lt);
+
+    my $output;
+    if ($rolechooser) {
+        $output .= qq|
+\$(document).ready(function(){
+    \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+});
+|;
+    }
+    $output .= qq|
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
+    var openerRole = "$rolename";
     courseCount = 0;
     var courses = '';
 |;
@@ -1080,16 +953,80 @@ ENDNAMECODE
         }
 |;
     }
-    $output .= qq|
+    $output .= <<ENDJS;
     if (openerForm == 'portform') {
         document.courselist.cnum.value = cname;
         document.courselist.cdom.value = cdom;
     }
-    $autosubmit
-    $lastaction
+    if ((openerForm == 'rolechoice') && (openerRole == 'dh')) {
+\$("#LC_choose_adhoc").empty();
+var http = new XMLHttpRequest();
+var url = "/adm/pickcourse";
+var params = "cid="+cdom+"_"+cname+"&context=adhoc";
+http.open("POST", url, true);
+http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+http.onreadystatechange = function() {
+    if(http.readyState == 4 && http.status == 200) {
+        var data = \$.parseJSON(http.responseText);
+        var len = data.roles.length;
+        if (len == '' || len == null || len == 0) {
+            alert('$lt{none}');  
+        } else {
+            if (len == 1) {
+                process_pick(cdom,data.roles[0].name);
+                $lastaction;
+            } else {
+                var str = '';
+                for (var i=0; i<data.roles.length; i++) { 
+                    \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span>&nbsp;&nbsp;</span>")
+                    .appendTo("#LC_choose_adhoc");
+                }
+                \$( "#LC_get_role_0").prop("checked", true);
+                \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+                \$( "#LC_adhocrole_chooser" ).dialog("open");
+                \$( "#LC_adhocrole_chooser" ).dialog({
+                 height: 400,
+                 width: 500,
+                 modal: true,
+                 resizable: false,
+                 buttons: [
+                       {
+                         text: "$lt{'ok'}",
+                         click: function() {
+                                     var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val();
+                                     process_pick(cdom,rolename);
+                                     \$("#LC_adhocrole_chooser").dialog( "close" );
+                                     $lastaction;
+                                } 
+                       },
+                       {
+                         text: "$lt{'exit'}",
+                         click: function() {
+                                     \$("#LC_adhocrole_chooser").dialog( "close" );
+                                }
+                       }
+                     ],
+                });
+                \$( "#LC_adhocrole_chooser" ).find( "form" ).on( "submit", function( event ) {
+                   event.preventDefault();
+                   var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val()
+                   process_pick(cdom,rolename);
+                   \$("#LC_adhocrole_chooser").dialog( "close" );
+                   $lastaction;
+                   });
+            }
+        }
+    }
 }
-|;
-    return &Apache::lonhtmlcommon::scripttag($output);
+http.send(params);
+    } else {
+        $autosubmit
+        $lastaction
+    }
+}
+
+ENDJS
+    return $rolechooser.&Apache::lonhtmlcommon::scripttag($output);
 }
 
 1;
@@ -1122,7 +1059,7 @@ Course Activity - how recently was cours
 Course Domain - the domain of the course
 
 =item *
-Type - Course or Community
+Type - Course, Community or Placement
 
 =item *
 Course Institutional Code - the institutional identifier assigned to the course
@@ -1175,7 +1112,7 @@ Following selection, and/or submission,
 X<create_user_javascript()>
 B<create_user_javascript($type)>:
 
-Input: 1 - $type  - the course type - Course or Community
+Input: 1 - $type  - the course type - Course, Community, or Placement
 
 Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags 
 
@@ -1186,9 +1123,9 @@ javascript code for reporting selected s
 
 =item *
 X<display_matched_courses()>
-B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses)>:
+B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,$crsdom,$crscode,%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.
+Input: 8 - 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, domain of new course, institutional code of new course, hash of courses.
 
 Output: 0
 
@@ -1205,30 +1142,6 @@ Output: 2 - $jscript - javascript for ch
 
 Side Effects: None
 
-=item *
-X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem,$codetitlesref>:
-
-
-Input: 12 - 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, $typeelem; reference to array of titles of components in institutional codes (official courses). 
-
-Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
-
-Side Effects: None
-
-=item *
-X<search_courses()>
-B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,
-                 $domcloner,$codetitles)>:
-
-
-Input: 9 -  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). Seventh and eighth needed when search is for courses to clone from course request form, or course creation form (DC). Optional "domcloner" flag (has value=1 if user has ccc priv in  
-domain being filtered by (used when DC is using course creation form). Ninth is reference to array of titles of components in institutional codes (official courses).
-
-Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
-
-Side Effects: None
-
 
 =item *
 X<course_chooser()>
@@ -1243,9 +1156,9 @@ Side Effects: None
 
 =item *
 X<gochoose_javascript()>
-B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction)>:
+B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction,$rolename)>:
 
-Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
+Input: 5 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.; rolename (e.g., dh) of user's current role.
 
 Output: 1  $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags