--- loncom/auth/lonauth.pm	2014/05/04 15:16:10	1.121.2.11
+++ loncom/auth/lonauth.pm	2014/01/05 11:04:27	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121.2.11 2014/05/04 15:16:10 raeburn Exp $
+# $Id: lonauth.pm,v 1.130 2014/01/05 11:04:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,23 +120,16 @@ sub success {
         $destination .= 'source=login';
     }
 
-    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,
-                                                   'bread_crumbs' => $brcrum,});
+                                                  $header,
+                                                  {'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
-    my $continuelink;
-    if ($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');
@@ -155,17 +148,13 @@ sub success {
     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
 $loginhelp
-$remoteinfo
-$maincall
 $continuelink
 $end_page
 ENDSUCCESS
-    return;
 }
 
 # --------------------------------------------------------------- Failed login!
@@ -207,19 +196,18 @@ sub failed {
     my $end_page = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    my @actions =
-         (&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>'));
     my $loginhelp = &loginhelpdisplay($udom);
     if ($loginhelp) {
-        push(@actions, '<a href="'.$loginhelp.'">'.&mt('Login problems?').'</a>');
+        $loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';
     }
-    #FIXME: link to helpdesk might be added here
 
     $r->print(
        $start_page
-      .'<h2>'.&mt('Sorry ...').'</h2>'
-      .&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'<br /><br />'
-      .&Apache::lonhtmlcommon::actionbox(\@actions)
+      .'<h1>'.&mt('Sorry ...').'</h1>'
+      .'<p class="LC_warning">'.&mt($message).'</p>'
+      .'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')
+      .'</p>'
+      .$loginhelp
       .$end_page
     );
  }
@@ -322,7 +310,7 @@ sub handler {
     my %sessiondata;
     if ($form{'iptoken'}) {
         %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
-        my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
+        my $delete = &Apache::lonnet::tmpdel($form{'token'});
     }
 
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || 
@@ -408,8 +396,7 @@ sub handler {
                 return OK;
             }
             my $start_page = 
-                &Apache::loncommon::start_page('Create a user account in LON-CAPA',
-                                               '',{'no_inline_link'   => 1,});
+                &Apache::loncommon::start_page('Create a user account in LON-CAPA');
             my $lonhost = $r->dir_config('lonHostID');
             my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
             my $contacts = 
@@ -484,17 +471,7 @@ sub handler {
         if ($otherserver) {
             &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
                      \%form);
-            my $switchto = '/adm/switchserver?otherserver='.$otherserver;
-            if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
-                $switchto .= '&origurl='.$firsturl;
-            }
-            if ($form{'role'}) {
-                $switchto .= '&role='.$form{'role'};
-            }
-            if ($form{'symb'}) {
-                $switchto .= '&symb='.$form{'symb'};
-            }
-            $r->internal_redirect($switchto);
+	    $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
         } else {
             $r->print(&noswitch());
         }
@@ -505,17 +482,7 @@ sub handler {
             if ($otherserver) {
                 &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
                          \%form);
-                my $switchto = '/adm/switchserver?otherserver='.$otherserver;
-                if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
-                    $switchto .= '&origurl='.$firsturl;
-                }
-                if ($form{'role'}) {
-                    $switchto .= '&role='.$form{'role'};
-                }
-                if ($form{'symb'}) {
-                    $switchto .= '&symb='.$form{'symb'};
-                }
-                $r->internal_redirect($switchto);
+                $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
             } else {
                 $r->print(&noswitch());
             }