--- loncom/interface/lonpickcourse.pm	2016/10/03 18:46:29	1.118
+++ loncom/interface/lonpickcourse.pm	2016/10/05 13:59:46	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.118 2016/10/03 18:46:29 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.119 2016/10/05 13:59:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -404,29 +404,70 @@ sub display_matched_courses {
                .'<fieldset>'
                .'<legend>'.&mt('Pick action').'</legend>'
                .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
+               .'<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'
                .'&nbsp;');
-            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));
+            if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                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 %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                                                                  'adhocroles.'.$crsdom);
+                if (keys(%adhocroles)) {
+                    my @adhoc = split(/,/,$adhocroles{'adhocroles.'.$crsdom});
+                    if (@adhoc > 1) {
+                        my %adhochash;
+                        map { $adhochash{$_} = $_; } @adhoc; 
+                        my $selector = &Apache::loncommon::select_form($adhoc[0],'adhocrole',\%adhochash);
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with one of the available ad hoc roles: [_1].',
+                                          $selector)); 
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with one of the available ad hoc roles: [_1].',
+                                          $selector));
+                        } else {
+                            $r->print(&mt('Enter the course with one of the available ad hoc roles: [_1].',
+                                          $selector));
+                        }
+                    } else {
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]));
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]));
+                        } else {
+                            $r->print(&mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]));
+                        }
+                    }
+                }
             }
             $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));
-            } 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));
+            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;