--- loncom/auth/lonauth.pm 2014/01/05 11:38:43 1.121.2.8
+++ loncom/auth/lonauth.pm 2013/11/26 01:19:12 1.128
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.121.2.8 2014/01/05 11:38:43 raeburn Exp $
+# $Id: lonauth.pm,v 1.128 2013/11/26 01:19:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,11 +108,11 @@ sub success {
}
$desturl = &HTML::Entities::encode($desturl,'"<>&');
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
- $destination .= 'destinationurl='.$desturl.
+ $destination .= '&destinationurl='.$desturl.
'&destsymb='.$destsymb;
} else {
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
- $destination .= 'destinationurl='.$destsymb;
+ $destination .= '&destinationurl='.$destsymb;
}
}
if ($destination =~ m{^/adm/roles}) {
@@ -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,13 +148,10 @@ 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
@@ -179,31 +169,22 @@ sub failed {
}
my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
- my $uname = &Apache::loncommon::cleanup_html($form->{'uname'});
- my $udom = &Apache::loncommon::cleanup_html($form->{'udom'});
- if (&Apache::lonnet::domain($udom,'description') eq '') {
- undef($udom);
- }
- my $retry = '/adm/login';
- if ($uname eq $form->{'uname'}) {
- $retry .= '?username='.$uname;
- }
+ my $uname = $form->{'uname'};
+ my $udom;
+ if (&Apache::lonnet::domain($form->{'udom'},'description') ne '') {
+ $udom = $form->{'udom'};
+ }
+ my $retry = '/adm/login?username='.$form->{'uname'};
if ($udom) {
- $retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom;
+ $retry .= '&domain='.$form->{'udom'}
}
if (exists($form->{role})) {
- my $role = &Apache::loncommon::cleanup_html($form->{role});
- if ($role ne '') {
- $retry .= (($retry=~/\?/)?'&':'?').'role='.$role;
- }
+ $retry .= '&role='.$form->{role};
}
if (exists($form->{symb})) {
- my $symb = &Apache::loncommon::cleanup_html($form->{symb});
- if ($symb ne '') {
- $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb;
- }
+ $retry .= '&symb='.$form->{symb};
}
- my $end_page = &Apache::loncommon::end_page();
+ my $end_page = &Apache::loncommon::end_page();
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $loginhelp = &loginhelpdisplay($udom);
@@ -406,8 +387,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 =
@@ -482,17 +462,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());
}
@@ -503,17 +473,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());
}