[LON-CAPA-cvs] cvs: loncom /auth switchserver.pm /interface loncommon.pm

[raeburn]

raeburn		Mon Oct  7 00:59:43 2024 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
    /loncom/auth	switchserver.pm 
  Log:
  - Disable links in primary menu for switchserver page, because session will
    have been ended on server from which switch is to be made.
  - Eliminate loading of javascript files for switchserver page because they
    will not be used.  
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1437 loncom/interface/loncommon.pm:1.1438
--- loncom/interface/loncommon.pm:1.1437	Tue Sep 17 13:06:49 2024
+++ loncom/interface/loncommon.pm	Mon Oct  7 00:59:43 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1437 2024/09/17 13:06:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.1438 2024/10/07 00:59:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9426,7 +9426,7 @@
         $inhibitprint = &print_suppression();
     }
 
-    if (!$args->{'frameset'}) {
+    if ((!$args->{'frameset'} && !$args->{'switchserver'}) {
 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
     }
     if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
@@ -9434,7 +9434,8 @@
     }
     if (!$args->{'no_nav_bar'} 
 	&& !$args->{'only_body'}
-	&& !$args->{'frameset'}) {
+	&& !$args->{'frameset'}
+	&& !$args->{'switchserver'}) {
 	$result .= &help_menu_js($httphost);
         $result.=&modal_window();
         $result.=&togglebox_script();
Index: loncom/auth/switchserver.pm
diff -u loncom/auth/switchserver.pm:1.65 loncom/auth/switchserver.pm:1.66
--- loncom/auth/switchserver.pm:1.65	Fri Jun  2 01:20:26 2023
+++ loncom/auth/switchserver.pm	Mon Oct  7 00:59:43 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.65 2023/06/02 01:20:26 raeburn Exp $
+# $Id: switchserver.pm,v 1.66 2024/10/07 00:59:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,9 @@
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
 				       {'redirect'       => [$delay,$url,'',$write_to_opener,1],
-					'only_body'      => $only_body,});
+					'only_body'      => $only_body,
+                                        'switchserver'   => 1,
+                                        'links_disabled' => 1,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
     unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {