[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonauth.pm lonlogout.pm

[raeburn]

raeburn		Mon Aug  6 23:14:04 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonauth.pm lonlogout.pm 
  Log:
  - For 2.11.
    - Remote Control retained in 2.11.
    - Reverse changes in lonauth.pm rev 1.102, 1.104.
    - reverse changes in lonlogout.pm rev 1.38, 1.39, 1.40, 1.41.
  
  
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.121 loncom/auth/lonauth.pm:1.121.2.1
--- loncom/auth/lonauth.pm:1.121	Wed Apr 11 11:40:07 2012
+++ loncom/auth/lonauth.pm	Mon Aug  6 23:14:04 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121 2012/04/11 11:40:07 goltermann Exp $
+# $Id: lonauth.pm,v 1.121.2.1 2012/08/06 23:14:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,16 +120,23 @@
         $destination .= 'source=login';
     }
 
-    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
-    my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
+    my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
+    my $startupremote=&Apache::lonmenu::startupremote($destination);
+    my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
+    my $setflags=&Apache::lonmenu::setflags();
+    my $maincall=&Apache::lonmenu::maincall();
     my $brcrum = [{'href' => '',
                    'text' => 'Successful Login'},];
     my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $header,
-                                                  {'bread_crumbs' => $brcrum,});
+                                                  $startupremote,
+                                                  {'no_inline_link' => 1,
+                                                   'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
-	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
+    my $continuelink;
+    if ($env{'environment.remote'} eq 'off') {
+	$continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
+    }
 # ------------------------------------------------- Output for successful login
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -144,10 +151,13 @@
     my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>'); 
     $r->print(<<ENDSUCCESS);
 $start_page
+$setflags
 $windowinfo
 <h1>$lt{'wel'}</h1>
 $welcome<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
+$remoteinfo
+$maincall
 $continuelink
 $end_page
 ENDSUCCESS
@@ -358,7 +368,8 @@
                 return OK;
             }
             my $start_page = 
-                &Apache::loncommon::start_page('Create a user account in LON-CAPA');
+                &Apache::loncommon::start_page('Create a user account in LON-CAPA',
+                                               '',{'no_inline_link'   => 1,});
             my $lonhost = $r->dir_config('lonHostID');
             my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
             my $contacts = 
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.45 loncom/auth/lonlogout.pm:1.45.2.1
--- loncom/auth/lonlogout.pm:1.45	Mon Feb 13 16:59:24 2012
+++ loncom/auth/lonlogout.pm	Mon Aug  6 23:14:04 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.45 2012/02/13 16:59:24 raeburn Exp $
+# $Id: lonlogout.pm,v 1.45.2.1 2012/08/06 23:14:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,6 +89,7 @@
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
 
+    my $windowinfo=&Apache::lonmenu::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -101,7 +102,8 @@
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-                           {'no_nav_bar'     => 1,});
+                           {'no_inline_link' => 1,
+                            'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -175,6 +177,7 @@
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
+$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT