--- loncom/auth/lonroles.pm	2005/08/09 20:06:40	1.128
+++ loncom/auth/lonroles.pm	2005/11/01 21:59:24	1.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.128 2005/08/09 20:06:40 albertel Exp $
+# $Id: lonroles.pm,v 1.131 2005/11/01 21:59:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -244,7 +244,7 @@ ENDENTERKEY
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-				    '<h1><font color=red>'.
+				    '<h1><font color="red">'.
 			 &mt('Could not initialize course at this time.').
 		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
@@ -362,7 +362,7 @@ ENDHEADER
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
- '<h3><font color=red>'.
+ '<h3><font color="red">'.
  &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
 	}
     }
@@ -479,11 +479,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                         '/adm/login?domain='.$env{'user.domain'}.
-			  '&username='.$env{'user.name'}.
-                          '&firsturl=/priv/'.$trest.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -596,7 +592,7 @@ ENDHEADER
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
 	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
     my $doheaders=-1;
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -772,7 +768,7 @@ sub build_roletext {
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td><a href="/adm/logout?handover='.
+                $roletext.='<td><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
                 $roletext.=('<td>&nbsp;</td>');