version 1.122, 2009/05/22 17:01:28
|
version 1.129, 2009/10/23 16:14:36
|
Line 46 sub handler {
|
Line 46 sub handler {
|
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, |
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, |
$ENV{'REDIRECT_QUERY_STRING'}), |
$ENV{'REDIRECT_QUERY_STRING'}), |
['interface','username','domain','firsturl','localpath','localres', |
['interface','username','domain','firsturl','localpath','localres', |
'token']); |
'token','role','symb']); |
if (!defined($env{'form.firsturl'})) { |
if (!defined($env{'form.firsturl'})) { |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
} |
} |
Line 81 sub handler {
|
Line 81 sub handler {
|
&Apache::loncommon::start_page('Already logged in'); |
&Apache::loncommon::start_page('Already logged in'); |
my $end_page = |
my $end_page = |
&Apache::loncommon::end_page(); |
&Apache::loncommon::end_page(); |
|
my $dest = '/adm/roles'; |
|
if ($env{'form.firsturl'} ne '') { |
|
$dest = $env{'form.firsturl'}; |
|
} |
$r->print( |
$r->print( |
$start_page |
$start_page |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
.'<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>' |
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.$end_page |
.$end_page |
); |
); |
Line 107 sub handler {
|
Line 111 sub handler {
|
my $iconpath= |
my $iconpath= |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
|
|
|
my $lonhost = $r->dir_config('lonHostID'); |
my $domain = &Apache::lonnet::default_login_domain(); |
my $domain = &Apache::lonnet::default_login_domain(); |
|
my %domconfhash = &Apache::loncommon::get_domainconf($domain); |
|
if ($lonhost ne '') { |
|
my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; |
|
if (($loginvia ne '') && ($loginvia ne $lonhost)) { |
|
if (&Apache::lonnet::hostname($loginvia) ne '') { |
|
$r->print(&redirect_page($loginvia)); |
|
return OK; |
|
} |
|
} |
|
} |
|
|
if (($env{'form.domain'}) && |
if (($env{'form.domain'}) && |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
$domain=$env{'form.domain'}; |
$domain=$env{'form.domain'}; |
Line 115 sub handler {
|
Line 131 sub handler {
|
my $role = $r->dir_config('lonRole'); |
my $role = $r->dir_config('lonRole'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $lonhost = $r->dir_config('lonHostID'); |
|
my $tabdir = $r->dir_config('lonTabDir'); |
my $tabdir = $r->dir_config('lonTabDir'); |
my $include = $r->dir_config('lonIncludes'); |
my $include = $r->dir_config('lonIncludes'); |
my $expire = $r->dir_config('lonExpire'); |
my $expire = $r->dir_config('lonExpire'); |
Line 170 sub handler {
|
Line 185 sub handler {
|
if ($uextkey>2147483647) { $uextkey-=4294967296; } |
if ($uextkey>2147483647) { $uextkey-=4294967296; } |
|
|
# -------------------------------------------------------- Store away log token |
# -------------------------------------------------------- Store away log token |
|
my $tokenextras; |
|
if ($env{'form.role'}) { |
|
$tokenextras = '&role='.&escape($env{'form.role'}); |
|
} |
|
if ($env{'form.symb'}) { |
|
if (!$tokenextras) { |
|
$tokenextras = '&'; |
|
} |
|
$tokenextras .= '&symb='.&escape($env{'form.symb'}); |
|
} |
my $logtoken=Apache::lonnet::reply( |
my $logtoken=Apache::lonnet::reply( |
'tmpput:'.$ukey.$lkey.'&'.$firsturl, |
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, |
$lonhost); |
$lonhost); |
|
|
# ------------------- If we cannot talk to ourselves, we are in serious trouble |
# ------------------- If we cannot talk to ourselves, we are in serious trouble |
Line 312 $r->print(&Apache::loncommon::start_page
|
Line 337 $r->print(&Apache::loncommon::start_page
|
# ----------------------------------------------------------------------- Texts |
# ----------------------------------------------------------------------- Texts |
|
|
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'un' => 'Username', |
'un' => 'Username', |
'pw' => 'Password', |
'pw' => 'Password', |
'dom' => 'Domain', |
'dom' => 'Domain', |
'perc' => 'percent', |
'perc' => 'percent', |
'load' => 'Server Load', |
'load' => 'Server Load', |
'userload' => 'User Load', |
'userload' => 'User Load', |
'catalog' => 'Course Catalog', |
'catalog' => 'Course/Community Catalog', |
'log' => 'Log in', |
'log' => 'Log in', |
'help' => 'Log-in Help', |
'help' => 'Log-in Help', |
'serv' => 'Server', |
'serv' => 'Server', |
'servadm' => 'Server Administration', |
'servadm' => 'Server Administration', |
'helpdesk' => 'Contact Helpdesk', |
'helpdesk' => 'Contact Helpdesk', |
'forgotpw' => 'Forgot password?', |
'forgotpw' => 'Forgot password?', |
'newuser' => 'New User?', |
'newuser' => 'New User?', |
); |
); |
# -------------------------------------------------- Change password field name |
# -------------------------------------------------- Change password field name |
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
Line 492 ENDDOCUMENT
|
Line 517 ENDDOCUMENT
|
return OK; |
return OK; |
} |
} |
|
|
|
sub redirect_page { |
|
my ($desthost) = @_; |
|
my $protocol = $Apache::lonnet::protocol{$desthost}; |
|
$protocol = 'http' if ($protocol ne 'https'); |
|
my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/'; |
|
if ($env{'form.firsturl'} ne '') { |
|
$url .='?firsturl='.$env{'form.firsturl'}; |
|
} |
|
my $start_page = &Apache::loncommon::start_page('Switching Server',undef, |
|
{'redirect' => [0,$url],}); |
|
my $end_page = &Apache::loncommon::end_page(); |
|
return $start_page.$end_page; |
|
} |
|
|
sub contactdisplay { |
sub contactdisplay { |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my $contactblock; |
my $contactblock; |