--- loncom/auth/lonroles.pm	2010/12/05 16:31:53	1.240.2.20
+++ loncom/auth/lonroles.pm	2010/12/05 16:35:58	1.240.2.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.20 2010/12/05 16:31:53 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.21 2010/12/05 16:35:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -500,7 +500,7 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) 
+				if (($cdom !~ /^\w+citest$/) && (($role eq 'cc') || ($role eq 'co')) 
                                     && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
@@ -524,7 +524,7 @@ ENDENTERKEY
 								    .$env{'request.course.sec'})
 					) {
 					my $startpage = &courseloadpage($courseid);
-					unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) {
+					unless (($startpage eq 'firstres') || ($cdom =~ /^\w+citest$/)) {
 					    $msg = &mt('Entering [_1] ...',
 						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
@@ -539,7 +539,7 @@ ENDENTERKEY
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
-                                if (($cdom eq 'gcitest') && ($custommenu)) {
+                                if (($cdom =~ /^\w+citest$/) && ($custommenu)) {
                                     $furl = '/adm/navmaps';
                                 }
                                 $msg = &mt('Entering [_1] ...',
@@ -775,7 +775,7 @@ ENDHEADER
             $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-            unless ($env{'user.domain'} eq 'gcitest') {
+            unless ($env{'user.domain'} =~ /^\w+citest$/) {
                 $r->print(
                     '<p>'
                    .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
@@ -799,23 +799,23 @@ ENDHEADER
 	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
 	} else {
             if ($show_course) {
-                if ($env{'user.domain'} eq 'gcitest') {
+                if ($env{'user.domain'} =~ /^\w+citest$/) {
                     $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
-                } elsif ($env{'user.domain'} eq 'gci') {
+                } elsif ($env{'user.domain'} =~ /ci$/) {
                     $r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>');
                 }
             } else {
 	        $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
             }
 	}
-        unless ($env{'user.domain'} eq 'gcitest') {
+        unless ($env{'user.domain'} =~ /^\w+citest$/) {
             &findcourse_advice($r);
             &requestcourse_advice($r);
         }
 	$r->print('</form>');
         if ($countfuture) {
             if ($show_course) {
-                if ($env{'user.domain'} eq 'gcitest') {
+                if ($env{'user.domain'} =~ /^\w+citest$/) {
                     $r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture));
                 } else {
                     $r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture));