--- loncom/auth/lonroles.pm	2003/12/08 14:25:15	1.79
+++ loncom/auth/lonroles.pm	2004/01/27 23:07:13	1.80.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.79 2003/12/08 14:25:15 sakharuk Exp $
+# $Id: lonroles.pm,v 1.80.2.1 2004/01/27 23:07:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -402,7 +402,10 @@ ENDHEADER
                 # First, Co-Authorship roles
                 if ($role eq 'ca') {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
-                    if ($home ne $r->dir_config('lonHostID')) {
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
 			$button=0;
                         $switchserver=&Apache::lonnet::escape('http://'.
                          $Apache::lonnet::hostname{$home}.
@@ -422,7 +425,10 @@ ENDHEADER
                     # Authors
                     my $home = &Apache::lonnet::homeserver
                         ($ENV{'user.name'},$ENV{'user.domain'});
-                    if ($home ne $r->dir_config('lonHostID')) {
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
 			$button=0;
                         $switchserver=&Apache::lonnet::escape('http://'.
                          $Apache::lonnet::hostname{$home}.
@@ -445,7 +451,7 @@ ENDHEADER
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
                         $twhere=$ENV{'course.'.$tcourseid.'.description'};
-			$sortkey=$tdom."\0".$twhere."\0".$envkey;
+			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         unless ($twhere eq &mt('Currently not available')) {
 			    $twhere.=' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -455,7 +461,7 @@ ENDHEADER
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-			    $sortkey=$tdom."\0".$newhash{'description'}.
+			    $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
 				"\0".$envkey;
                             $twhere=$newhash{'description'}.
                               ' <font size="-2">'.
@@ -464,7 +470,7 @@ ENDHEADER
                         } else {
                             $twhere=&mt('Currently not available');
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$tdom."\0".$twhere."\0".$envkey;
+			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }