version 1.42.2.1, 2011/10/02 12:09:57
|
version 1.45.2.1, 2012/08/06 23:14:04
|
Line 90 sub handler {
|
Line 90 sub handler {
|
# -------------------------------------------------------- Menu script and info |
# -------------------------------------------------------- Menu script and info |
|
|
my $windowinfo=&Apache::lonmenu::close(); |
my $windowinfo=&Apache::lonmenu::close(); |
$windowinfo.=&Apache::lonnavmaps::close(); |
|
# ---------------------------------------------------------------- Get handover |
# ---------------------------------------------------------------- Get handover |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']); |
my $switch=''; |
my $switch=''; |
Line 120 sub handler {
|
Line 119 sub handler {
|
$login_url = $domdefaults{'portal_def'}; |
$login_url = $domdefaults{'portal_def'}; |
} else { |
} else { |
my $checkloginvia = 1; |
my $checkloginvia = 1; |
my ($lonhost,$server,$path) = |
my ($lonhost,$server,$path,$isredirect) = |
&Apache::lonnet::choose_server($domain,$checkloginvia); |
&Apache::lonnet::choose_server($domain,$checkloginvia); |
if ($server && $lonhost) { |
if ($server && $lonhost) { |
$login_url = $Apache::lonnet::protocol{$lonhost}. |
$login_url = $Apache::lonnet::protocol{$lonhost}. |
'://'.$server.$path; |
'://'.$server.$path; |
|
if (($path eq '') && (!$isredirect)) { |
|
my $serverhomeID = |
|
&Apache::lonnet::get_server_homeID($server); |
|
my $serverhomedom = |
|
&Apache::lonnet::host_domain($serverhomeID); |
|
if ($serverhomedom ne $domain) { |
|
$path = '/adm/login'; |
|
$login_url .= $path; |
|
} |
|
} |
|
if ($path eq '/adm/login' && $domain ne '') { |
|
$login_url .= '?domain='.$domain; |
|
} |
} |
} |
} |
} |
} |
} |