--- loncom/auth/lonauth.pm 2014/05/04 15:16:10 1.121.2.11
+++ loncom/auth/lonauth.pm 2014/01/22 18:00:37 1.132
@@ -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.132 2014/01/22 18:00:37 bisitz 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 = '';
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=''.&mt('Continue').'';
- }
+ my $continuelink=''.&mt('Continue').'';
# ------------------------------------------------- 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.','','');
$r->print(<$lt{'wel'}
$welcome
$loginhelp
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
- return;
}
# --------------------------------------------------------------- Failed login!
@@ -322,7 +311,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 +397,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 =