--- loncom/auth/switchserver.pm	2009/04/14 23:52:07	1.22
+++ loncom/auth/switchserver.pm	2010/07/17 20:02:02	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.22 2009/04/14 23:52:07 raeburn Exp $
+# $Id: switchserver.pm,v 1.26 2010/07/17 20:02:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,6 @@ sub do_redirect {
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
 				       {'redirect'       => [0.5,$url],
-                                        'no_inline_link' => 1,
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
@@ -84,7 +83,7 @@ sub handler {
 	    $env{'form.otherserver'} = 
 		&Apache::lonnet::spareserver(30000,undef,1);
 	}
-
+        
 	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     }
 
@@ -96,6 +95,20 @@ sub handler {
 	return &do_redirect($r,$url,1)
     }
 
+    my $canhost = 1;
+    my @machinedoms = &Apache::lonnet::machine_domains($switch_to);
+    unless (grep(/^\Q$env{'user.domain'}\E/,@machinedoms)) {
+        my $machinedom = &Apache::lonnet::host_domain($env{'form.otherserver'});
+        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($machinedom);
+        my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+        my $remoterev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'form.otherserver'});
+        $canhost = &Apache::lonnet::can_host_session($env{'user.domain'},$machinedom,
+                                                     $remoterev,$udomdefaults{'remotesessions'},
+                                                     $defdomdefaults{'hostedsessions'});
+    }
+
+    unless ($canhost) { return FORBIDDEN; }
+
     if ($env{'form.role'} && 
 	!exists($env{'user.role.'.$env{'form.role'}})) { return FORBIDDEN; }
 
@@ -122,9 +135,6 @@ sub handler {
     }
 # -------------------------------------------------------- Menu script and info
 	   
-    my $windowinfo=
-	&Apache::lonmenu::close().
-	&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
 
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
@@ -151,7 +161,7 @@ sub handler {
 	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
     &Apache::lonnet::flushcourselogs();
-    return &do_redirect($r,$url,0,$windowinfo);
+    return &do_redirect($r, $url, 0);
 }
 
 1;