--- loncom/auth/lonauth.pm	2010/05/23 21:20:11	1.101.4.2
+++ loncom/auth/lonauth.pm	2010/03/17 17:51:06	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.101.4.2 2010/05/23 21:20:11 raeburn Exp $
+# $Id: lonauth.pm,v 1.103 2010/03/17 17:51:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,21 +111,17 @@ sub success {
         }
     }
 
-    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 $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
+    my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
+    my $brcrum = [{'href' => '',
+                   'text' => 'Successful Login'},];
     my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $startupremote,
-                                                  {'no_inline_link' => 1,});
+                                                  $header,
+                                                  {'no_inline_link' => 1,
+                                                   'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
-    my $continuelink;
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) {
-	$continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
-    }
+	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
 # ------------------------------------------------- Output for successful login
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -140,13 +136,10 @@ sub success {
 				       );
     $r->print(<<ENDSUCCESS);
 $start_page
-$setflags
 $windowinfo
 <h1>$lt{'wel'}</h1>
 $lt{'mes'}<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
-$remoteinfo
-$maincall
 $continuelink
 $end_page
 ENDSUCCESS
@@ -220,15 +213,11 @@ sub handler {
 	        &Apache::loncommon::start_page('Already logged in');
 	    my $end_page = 
 	        &Apache::loncommon::end_page();
-            my $dest = '/adm/roles';
-            if ($env{'form.firsturl'} ne '') {
-                $dest = $env{'form.firsturl'};
-            }
             $r->print(
-                $start_page
-               .'<h1>'.&mt('You are already logged in!').'</h1>'
-               .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
-                        ,'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>')
+               $start_page
+              .'<h1>'.&mt('You are already logged in!').'</h1>'
+              .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
+                    ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')
               .'</p>'
               .$end_page
             );