--- loncom/interface/lonpickcourse.pm	2009/07/29 22:32:44	1.84
+++ loncom/interface/lonpickcourse.pm	2009/11/03 14:32:44	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.84 2009/07/29 22:32:44 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.89 2009/11/03 14:32:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
 use Apache::courseclassifier;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
@@ -50,9 +50,9 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles','fixeddom']);
+                               'multiple','type','setroles','fixeddom','cloner']);
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
-        $lastaction,$autosubmit,$submitopener);
+        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
 
     # Get course type - Course or Community.
     $type = $env{'form.type'};
@@ -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'}))) {
@@ -91,9 +102,10 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-            $loaditem{'onload'} .= 'setSections()';
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
-    $r->print(&Apache::loncommon::start_page($title,undef,
+    my $js = &js_changer();
+    $r->print(&Apache::loncommon::start_page($title,$js,
 					     {'add_entries' => \%loaditem,
 					      'no_nav_bar'  => 1, }));
 
@@ -114,7 +126,8 @@ sub handler {
     }
 
     # print javascript functions for choosing a course 
-    if (($env{'form.command'} eq '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" language="Javascript">'.$jscript.
@@ -146,26 +159,51 @@ sub handler {
             exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) {
             push(@{$filterlist},'coursefilter');
         }
+        if ($cloneruname ne '' && $clonerudom ne '') {
+            push(@{$filterlist},'cloneableonly');
+        }
+
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
-                                 $filter,$action,\$numtitles));
+                                 $filter,$action,\$numtitles,undef,$cloneruname,
+                                 $clonerudom));
     }
 
 # ---------------------------------------------------------------- Get the data
-    if (($env{'form.command'} eq 'gosearch') || $onlyown) {
-        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);
+    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,%courses);
+            &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') {
@@ -182,7 +220,12 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            var ccrole = "cc";
+            var pickedType = "$env{'form.type'}";
+            if (pickedType == "Community") {
+                ccrole = "co";
+            }
+            var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse
             opener.document.title='Role selected. Please stand by.';
             opener.status='Role selected. Please stand by.';
             opener.document.rolechoice.newrole.value=courseTarget
@@ -214,7 +257,12 @@ sub create_user_javascript {
     my $output;
     #javascript for reporting sections and groups then closing
     if ($env{'form.pickedcourse'}) {
-        my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
+        my %coursedescription = 
+            &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                               {'one_time' => '1'});
+        my $cdom = $coursedescription{'domain'};
+        my $cnum = $coursedescription{'num'};
+        my $crstype = $coursedescription{'type'};
         my $sec_element = 'currsec';
         my $grplist_element = 'groups';
         my ($sections,$groups) =
@@ -228,7 +276,10 @@ sub create_user_javascript {
 function setSections() {
     opener.document.$env{"form.form"}.$grplist_element.value='$groupslist';
     window.opener.setSect('$seclist');
-    self.close()
+    self.close();
+}
+function setRoles() {
+    window.opener.setRole('$crstype');
 }
 </script>
 |;
@@ -238,7 +289,7 @@ function setSections() {
 }
 
 sub display_matched_courses {
-    my ($r,$type,$multiple,$action,$showroles,%courses) = @_;
+    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_;
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
@@ -246,7 +297,11 @@ sub display_matched_courses {
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
     if ($env{'form.form'} eq 'modifycourse') {
         if ($numcourses > 0) {
-            my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+            my $ccrole = 'cc';
+            if ($type eq 'Community') {
+                $ccrole = 'co';
+            }
+            my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' checked="checked" ';
             my $menuchk = ' ';
@@ -259,12 +314,21 @@ sub display_matched_courses {
                .'<legend>'.&mt('Action').'</legend>'
                .'<div class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle)
-               .'</label></div>'
+               .'&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+            } else {
+                $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+            }
+            $r->print('</label></div>'
                .'<div class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'
-               .&mt('View or modify course settings which only a [_1] may modify.',$dctitle)
-               .'</label></div>'
+               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+            } else {
+                $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+            }
+            $r->print('</label></div>'
                .'</fieldset>'
                .'<br />'
             );
@@ -295,13 +359,17 @@ sub display_matched_courses {
     if (%courses) {
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
+        my $titlehdr = &mt('Course Title');
+        if ($type eq 'Community') {
+            $titlehdr = &mt('Community Title');
+        }
         $r->print('<th>'.&mt('Select').'</th>'
-                 .'<th>'.&mt('Course Title').'</th>'
-                 .'<th>'.&mt('Domain').'</th>'
-                 .'<th>'.&mt('Course Code').'</th>'
-                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
-                 .'<th>'.&mt('Type').'</th>'
-                 );
+                 .'<th>'.$titlehdr.'</th>'
+                 .'<th>'.&mt('Domain').'</th>');
+        unless ($type eq 'Community') {
+            $r->print('<th>'.&mt('Course Code').'</th>');
+        }
+        $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
         if ($showroles) {
             $r->print('<th>'.&mt("Role(s) for [_1]",
                 &Apache::loncommon::plainname($env{'form.personfilter'},
@@ -315,11 +383,26 @@ sub display_matched_courses {
             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'}}) {
@@ -332,27 +415,22 @@ sub display_matched_courses {
                 push(@owners,&unescape($singleowner));
             }
             my $ownerstr = join(', ',@owners);
-            $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc).'</td>');
+            $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone).'</td>');
             $r->print('<td>'.$description.'</td>');
             $r->print('<td>');
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            $r->print('<td>');
-            if ($instcode ne '') {
-                $r->print(&unescape($instcode));
-            } else {
-                $r->print('&nbsp;');
+            unless ($type eq 'Community') { 
+                $r->print('<td>');
+                if ($instcode ne '') {
+                    $r->print(&unescape($instcode));
+                } else {
+                    $r->print('&nbsp;');
+                }
+                $r->print('</td>');
             }
-            $r->print('</td>');
             $r->print('<td>'.$ownerstr.'</td>');
-            $r->print('<td>');
-            if ($ttype ne '') {
-                $r->print(&mt(&unescape($ttype)));
-            } else {
-                $r->print('&nbsp;');
-            }
-            $r->print('</td>');
             if ($showroles) {
                 $r->print('<td>');
                 my $rolestr;
@@ -363,7 +441,7 @@ sub display_matched_courses {
                             my (undef,$crdom,$crname,$crtitle) = split('/',$role);
                             $rolestr .= $crtitle.', ';
                         } else {
-                            $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', ';
+                            $rolestr .= &Apache::lonnet::plaintext($role,$type).', ';
                         }
                     }
                     $rolestr =~ s/\, $//;
@@ -397,7 +475,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','command']));
+        $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".  
@@ -424,10 +502,9 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref,$caller) = @_;
-    my $list;
-    my $formname;
-    my ($fixeddom,$codedom,$jscript);
+        $numtitlesref,$caller,$cloneruname,$clonerudom) = @_;
+    my ($list,$formname,$fixeddom,$codedom,$jscript);
+    $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {
         $formname = $env{'form.form'};
     } else {
@@ -435,7 +512,7 @@ sub build_filters {
     }
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 1;
+        $onchange = 'javascript:updateFilters(this)';
     }
     my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform,
         $instcodeform,$typeselectform,$instcodetitle);
@@ -456,7 +533,7 @@ sub build_filters {
             } elsif ($item eq 'personfilter') {
                 $filter->{$item} = &LONCAPA::clean_username($filter->{$item});
                 if ($env{'form.persondomfilter'} eq '') {
-                    unless ($env{'form.command'} eq 'gosearch') {
+                    unless ($env{'form.gosearch'}) {
                         $filter->{'persondomfilter'} = $env{'request.role.domain'};
                     }
                 } else {
@@ -527,49 +604,69 @@ sub build_filters {
               'cog' => &mt('Type')
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    if ($onchange) {
-        $typeselectform .= 'onchange=" javascript:submit()"';
+    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');
+        }
     }
-    $typeselectform .= '>'."\n";
     my $officialjs;
     if ($type eq 'Course') {
-        if (($env{'form.fixeddom'}) || ($env{'form.form'} eq 'requestcrs')) {
-            $officialjs = 1;
-            ($instcodeform,$jscript,$$numtitlesref) = 
-                &instcode_selectors($codedom,'filterpicker',$officialjs);
-        }
-        if ($instcodeform eq '') {
-            $instcodeform = 
-                '<input type="text" name="instcodefilter" size="10" value="'.
-                $list->{'instcodefilter'}.'" />';
-            $instcodetitle = $lt{'ins'};
-        } else {
-            $instcodetitle = $lt{'inc'};
-        }
-        if ($env{'form.fixeddom'}) {
-            $instcodetitle .= '<br />('.$codedom.')';
+        if (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.')';
+            }
         }
     }
-    $jscript .= <<"END_JS";
-
-function setCommand() {
-    document.filterpicker.command.value = 'gosearch';
-    return;
-}
-
-END_JS
-
-    $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.
-               '</script>'."\n";
 
-    foreach my $posstype ('Course','Community') {
-        $typeselectform.='<option value="'.$posstype.'"'.
-            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
-    }
-    $typeselectform.="</select>";
     my $output = qq|
-<form method="post" name="filterpicker" action="$action" onsubmit="setCommand()">
+<form method="post" name="filterpicker" action="$action">
 <input type="hidden" name="form" value="$formname" />
 |;
     if ($formname eq 'modifycourse') {
@@ -608,9 +705,13 @@ $multelement
                   .&Apache::lonhtmlcommon::row_closure();
     } 
     if ($typeselectform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
-                  .$typeselectform
-                  .&Apache::lonhtmlcommon::row_closure();
+        if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+            $output .= $typeselectform;
+        } else {
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                      .$typeselectform
+                      .&Apache::lonhtmlcommon::row_closure();
+        }
     }
     if ($instcodeform) {
         $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
@@ -639,17 +740,50 @@ $multelement
                   .$list->{'coursefilter'}.'" />'
                   .&Apache::lonhtmlcommon::row_closure();
     }
+    if ($cloneableonlyform) {
+        $output .= &Apache::lonhtmlcommon::row_title($cloneabletitle).
+                   $cloneableonlyform.&Apache::lonhtmlcommon::row_closure();
+    }
     if (exists($filter->{'descriptfilter'})) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'})
                   .'<input type="text" name="descriptfilter" size="40" value="'
                   .$list->{'descriptfilter'}.'" />'
                   .&Apache::lonhtmlcommon::row_closure(1);
     }
-    $output .= &Apache::lonhtmlcommon::end_pick_box();
-    $output .= '<p><input type="hidden" name="command" value="">'."\n".
+    $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 {
+            my $ccrole;
+            if ($type eq 'Community') {
+                $ccrole = 'co';
+            } elsif ($type eq 'Course') {
+                $ccrole = 'cc';
+            }
+            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'], [$ccrole]);
+            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 .= '<input type="hidden" name="updater" value="">'."\n".
                '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
-    return $jscript.$output;
+    return $jscript.$warning.$output;
 }
 
 sub instcode_selectors {
@@ -680,8 +814,13 @@ sub instcode_selectors {
 }
 
 sub search_courses {
-    my ($r,$type,$onlyown,$filter,$numtitles) = @_;
-    my (%courses,%showcourses);
+    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;
+    my (%courses,%showcourses,$cloner,$ccrole);
+    if ($type eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if (!$onlyown) {
         $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
@@ -714,6 +853,10 @@ sub search_courses {
         }
         if ($instcodefilter eq '') { $instcodefilter = '.'; }
         if ($type eq '') { $type = '.'; }
+ 
+        if (($clonerudom ne '') && ($cloneruname ne '')) {
+            $cloner = $cloneruname.':'.$clonerudom;  
+        }
         %courses = 
             &Apache::lonnet::courseiddump($filter->{'domainfilter'},
                                           $filter->{'descriptfilter'},
@@ -721,12 +864,14 @@ sub search_courses {
                                           $instcodefilter,
                                           $filter->{'combownerfilter'},
                                           $filter->{'coursefilter'},
-                                          undef,undef,$type,$regexpok);
+                                          undef,undef,$type,$regexpok,undef,undef,
+                                          undef,undef,$cloner,$env{'form.cc_clone'},
+                                          $filter->{'cloneableonly'});
         if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
             my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},
                                                          $filter->{'persondomfilter'},
                                                          'userroles',undef,
-                                                         ['cc','in','ad','ep','ta','cr'],
+                                                         [$ccrole,'in','ad','ep','ta','cr'],
                                                          $filter->{'domainfilter'});
             foreach my $role (keys(%rolehash)) {
                 my ($cnum,$cdom,$courserole) = split(':',$role);
@@ -757,10 +902,16 @@ sub search_courses {
 }
 
 sub course_chooser {
-    my ($multiple,$cdom,$cnum,$cleandesc) = @_;
+    my ($multiple,$cdom,$cnum,$cleandesc,$canclone) = @_;
     my $output; 
     if ($multiple) {
         $output = '<label><input type="checkbox" name="course_id" value="'.$cdom.'_'.$cnum.'" />'."\n";
+    } elsif ((($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) && (!$canclone))  {
+        if ($env{'form.form'} eq 'ccrs') {
+            $output = &mt('No cloning for ').$env{'form.cloner'}."\n";
+        } else {
+            $output = &mt('No rights to clone')."\n";
+        }
     } else {
         $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
@@ -777,9 +928,9 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                                  },
                      'Community' => {
-                                 name  => 'grouppick',
-                                 total => 'grouptotal',
-                                 list  => 'grouplist',
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
                               },
                     );
     my $output .= qq|
@@ -957,9 +1108,9 @@ javascript code for reporting selected s
 
 =item *
 X<display_matched_courses()>
-B<display_matched_courses($r,$type,$multiple,$action,$showroles,%courses)>:
+B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses)>:
 
-Input: 7 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), 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
 
@@ -978,7 +1129,7 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom)>:
 
 
 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).
@@ -989,10 +1140,10 @@ Side Effects: None
 
 =item *
 X<search_courses()>
-B<search_courses($r,$type,$onlyown,$filter,$numtitles)>:
+B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom)>:
 
 
-Input: 5 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories).  
+Input: 7 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Last two needed when search is for courses to clone from course request form, or course creation form (DC).   
 
 Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -1001,11 +1152,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