[LON-CAPA-cvs] cvs: loncom /auth lonauth.pm lonlogout.pm /interface loncommon.pm lonremote.pm
www
lon-capa-cvs@mail.lon-capa.org
Fri, 23 May 2003 21:18:56 -0000
www Fri May 23 17:18:56 2003 EDT
Modified files:
/loncom/auth lonauth.pm lonlogout.pm
/loncom/interface loncommon.pm lonremote.pm
Log:
Slow steps toward Bug #1472 - closing remote while being at external site
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.49 loncom/auth/lonauth.pm:1.50
--- loncom/auth/lonauth.pm:1.49 Tue May 6 17:45:25 2003
+++ loncom/auth/lonauth.pm Fri May 23 17:18:56 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.49 2003/05/06 21:45:25 albertel Exp $
+# $Id: lonauth.pm,v 1.50 2003/05/23 21:18:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -172,7 +172,7 @@
my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
my $setflags=&Apache::lonmenu::setflags();
my $maincall=&Apache::lonmenu::maincall();
- my $bodytag=&Apache::loncommon::bodytag('Successful Login');
+ my $bodytag=&Apache::loncommon::bodytag('Successful Login',undef,' ');
# ------------------------------------------------- Output for successful login
$r->send_cgi_header(<<ENDHEADER);
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.8 loncom/auth/lonlogout.pm:1.9
--- loncom/auth/lonlogout.pm:1.8 Mon Mar 17 12:53:09 2003
+++ loncom/auth/lonlogout.pm Fri May 23 17:18:56 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Logout Handler
#
-# $Id: lonlogout.pm,v 1.8 2003/03/17 17:53:09 matthew Exp $
+# $Id: lonlogout.pm,v 1.9 2003/05/23 21:18:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,7 +86,7 @@
$ENV{'form.handover'}.'">';
$bodytag=&Apache::loncommon::bodytag('Switching Server ...');
} else {
- $bodytag=&Apache::loncommon::bodytag('Logged Out');
+ $bodytag=&Apache::loncommon::bodytag('Logged Out',undef,' ');
$relogmessage=(<<ENDRELOG);
<h1>Goodbye!</h1>
Please either <a href="javascript:self.close();">close this window</a> or
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.100 loncom/interface/loncommon.pm:1.101
--- loncom/interface/loncommon.pm:1.100 Thu May 15 09:32:55 2003
+++ loncom/interface/loncommon.pm Fri May 23 17:18:56 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.100 2003/05/15 13:32:55 sakharuk Exp $
+# $Id: loncommon.pm,v 1.101 2003/05/23 21:18:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1731,10 +1731,20 @@
unless ($realm) { $realm=' '; }
# Set messages
my $messages=&domainlogo($domain);
-# Output
+# Signal existance to Remote unless already done so
+ my $addscript='';
+ unless (($ENV{'browser.interface'} eq 'textual') ||
+ ($ENV{'environment.remote'} eq 'off') || ($addentries)) {
+ $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
+ '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
+ $addscript=&Apache::lonmenu::registerurl();
+ }
+# Port for miniserver
my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+# construct main body tag
my $bodytag = <<END;
+$addscript
<body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
$addentries>
END
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.6 loncom/interface/lonremote.pm:1.7
--- loncom/interface/lonremote.pm:1.6 Thu Apr 3 11:50:46 2003
+++ loncom/interface/lonremote.pm Fri May 23 17:18:56 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonremote.pm,v 1.6 2003/04/03 16:50:46 www Exp $
+# $Id: lonremote.pm,v 1.7 2003/05/23 21:18:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,7 +50,7 @@
my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
my $setflags=&Apache::lonmenu::setflags();
my $maincall=&Apache::lonmenu::maincall();
- my $bodytag=&Apache::loncommon::bodytag('Launch Remote Control');
+ my $bodytag=&Apache::loncommon::bodytag('Launch Remote Control',undef,' ');
$r->print(<<ENDLAUNCH);
<html>
<head>
@@ -69,7 +69,8 @@
sub collapseremote {
my ($r,$lowerurl)=@_;
# -------------------------------------------------------- Menu script and info
- my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control');
+ my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control',undef,
+ ' ');
my $windowinfo=&Apache::lonmenu::close();
my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'">';
$r->print(<<ENDCOLLAPSE);