--- loncom/auth/lonroles.pm	2008/06/04 19:14:20	1.195
+++ loncom/auth/lonroles.pm	2008/07/08 20:16:16	1.200
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.195 2008/06/04 19:14:20 bisitz Exp $
+# $Id: lonroles.pm,v 1.200 2008/07/08 20:16:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -501,13 +501,6 @@ ENDHEADER
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
     }
-    if ($env{'user.adv'}) {
-	$r->print(
-	      '<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
-	if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-	$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>');
-    }
-
     my (%roletext,%sortrole,%roleclass);
     my $countactive=0;
     my $countfuture=0;
@@ -674,6 +667,18 @@ ENDHEADER
 	    }
         }
     }
+    if ($env{'user.adv'}) {
+        $r->print(
+              '<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+        if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
+        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>');
+    } else {
+        if ($countactive > 0) {
+            my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+            $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
+        }
+    }
+
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
@@ -789,7 +794,9 @@ ENDHEADER
 	$r->print('<p><small><i>'
                  .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
 		 .'</i><br />'
-		 .'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
+		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+                 .'<a href="/adm/coursecatalog">'.&mt('Course Catalog')
+                 .'</small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -859,7 +866,7 @@ sub print_rolerows {
 sub findcourse_advice {
     my ($r) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
-    if (&check_autoenroll($env{'user.domain'})) {
+    if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
 <ul>
  <li>'.&mt('The course has yet to be created.').'</li>
@@ -1066,22 +1073,22 @@ sub adhoc_course_role {
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (&check_forcc($cdom,$cnum,$then)) {
         my $setprivs;
-        if (!defined($env{'user.role.'.$env{'form.selectrole'}})) {
+        if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
         } else {
-            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}});
+            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
             if (($start && ($start>$then || $start == -1)) ||
                 ($end && $end<$then)) {
                 $setprivs = 1;
             }
         } 
         if ($setprivs) {
-            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
                 my $custom_role = $2;
                 my $usec = $3;
                 if ($role eq 'cr') {
-                    if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) {
+                    if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) {
                         $role .= $custom_role;
                     } else {
                         return;
@@ -1281,24 +1288,6 @@ sub courseloadpage {
     return $startpage;
 }
 
-sub check_autoenroll {
-    my ($dom) = @_;
-    my $run_enroll = 0;
-    my $settings;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom);
-    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-        $settings = $domconfig{'autoenroll'};
-        if ($settings->{'run'} eq '1') {
-            $run_enroll = 1;
-        }
-    } else {
-        $run_enroll = &localenroll::run($dom);
-    }
-    return $run_enroll;
-}
-
-
 1;
 __END__