--- loncom/auth/lonroles.pm	2008/07/04 14:19:16	1.196
+++ loncom/auth/lonroles.pm	2008/07/14 10:21:52	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.196 2008/07/04 14:19:16 raeburn Exp $
+# $Id: lonroles.pm,v 1.201 2008/07/14 10:21:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,7 @@ use Apache::lonpageflip();
 use Apache::lonnavdisplay();
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
  
 
 sub redirect_user {
@@ -675,7 +676,8 @@ ENDHEADER
     } 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>');
+            my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
+            $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</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>');
         }
     }
 
@@ -791,10 +793,14 @@ ENDHEADER
     }
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
+        my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
 	$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?showdom='.$esc_dom.'">'
+                 .&mt('Course Catalog')
+                 .'</small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -864,7 +870,8 @@ sub print_rolerows {
 sub findcourse_advice {
     my ($r) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
-    if (&check_autoenroll($env{'user.domain'})) {
+    my $esc_dom = &HTML::Entities::encode($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>
@@ -876,7 +883,7 @@ sub findcourse_advice {
     } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }
-    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog">','</a>',$domdesc).'<br />');
+    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
     $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
     return;
 }
@@ -1067,26 +1074,26 @@ sub check_fordc {
 sub adhoc_course_role {
     my ($then) = @_; 
     my ($cdom,$cnum);
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    $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;
@@ -1286,24 +1293,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__