--- loncom/auth/lonroles.pm	2014/02/23 20:50:37	1.297
+++ loncom/auth/lonroles.pm	2014/05/04 21:49:05	1.302
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.297 2014/02/23 20:50:37 raeburn Exp $
+# $Id: lonroles.pm,v 1.302 2014/05/04 21:49:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -664,11 +664,22 @@ ENDENTERKEY
 					}
 				    }
 				}
-# Are we allowed to look at the first resource?
-				if ($furl !~ m|^/adm/|) {
-# Guess not ...
-				    $furl=&Apache::lonpageflip::first_accessible_resource();
-				}
+                                # Are we allowed to look at the first resource?
+                                if ($furl =~ m{^(/adm/wrapper|)/ext/}) {
+                                    # If it's an external resource,
+                                    # strip off the symb argument and possible query
+                                    my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$});
+                                    # Unencode $symb
+                                    $symb = &unescape($symb);
+                                    # Then check for permission
+                                    if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) {
+                                        $furl = &Apache::lonpageflip::first_accessible_resource();
+                                    }
+                                # For other resources just check for permission
+                                } elsif (!&Apache::lonnet::allowed('bre',$furl)) {
+                                    $furl = &Apache::lonpageflip::first_accessible_resource();
+                                }
+ 
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
@@ -735,7 +746,12 @@ ENDENTERKEY
 
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
-    my $funcs = &get_roles_functions($showcount);
+    my %domdefs=&Apache::lonnet::get_domain_defaults($env{'user.domain'}); 
+    my $cattype = 'std';
+    if ($domdefs{'catauth'}) {
+        $cattype = $domdefs{'catauth'};
+    }
+    my $funcs = &get_roles_functions($showcount,$cattype);
     $standby=~s/\n/\\n/g;
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
@@ -878,7 +894,7 @@ ENDHEADER
                       \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
-    unless ($env{'user.adv'}) { 
+    if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) {
         if ($countactive > 0) {
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
@@ -907,8 +923,7 @@ ENDHEADER
 	} else {
 	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
-        &findcourse_advice($r);
-        &requestcourse_advice($r); 
+        &requestcourse_advice($r,$cattype); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1137,7 +1152,7 @@ sub gather_roles {
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+                    $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
@@ -1396,7 +1411,7 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r) = @_;
+    my ($r,$cattype) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
@@ -1411,15 +1426,17 @@ 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('<h3>'.&mt('Self-Enrollment').'</h3>'.
-              '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
-              &Apache::loncoursequeueadmin::queued_selfenrollment());
+    if (($cattype eq 'std') || ($cattype eq 'domonly')) {
+        $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
+                  '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+        $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+        &Apache::loncoursequeueadmin::queued_selfenrollment());
+    }
     return;
 }
 
 sub requestcourse_advice {
-    my ($r) = @_;
+    my ($r,$cattype) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     my (%can_request,%request_doms);
@@ -1467,6 +1484,8 @@ sub requestcourse_advice {
             } 
             $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
         }
+    } elsif (!$env{'user.adv'}) {
+        &findcourse_advice($r,$cattype);
     }
     return;
 }
@@ -1739,7 +1758,7 @@ sub check_release_required {
             my $otherserver;
             if (($major eq '' && $minor eq '') || 
                 (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
-                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'});
+                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required);
                 my $switchlcrev = 
                     &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
                                                            $userdomserver);
@@ -2581,7 +2600,7 @@ sub role_desc {
     return unless ($role);
     if ($role =~ /^cr\//) {
         my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-        $tremark = &mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+        $tremark = &mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
     }
     $trole=Apache::lonnet::plaintext($role);
     my ($tdom,$trest,$tsection)=
@@ -2693,7 +2712,7 @@ sub is_active_course {
 }
 
 sub get_roles_functions {
-    my ($rolescount) = @_;
+    my ($rolescount,$cattype) = @_;
     my @links;
     push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
     if ($env{'environment.canrequest.author'}) {
@@ -2719,7 +2738,7 @@ sub get_roles_functions {
             push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
         }
     }
-    if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
+    unless ($cattype eq 'none') {
         push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
     }
     my $funcs = &Apache::lonhtmlcommon::start_funclist();