--- loncom/auth/lonauth.pm 2010/08/26 08:15:59 1.101.8.4 +++ loncom/auth/lonauth.pm 2010/07/20 02:42:33 1.106 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.101.8.4 2010/08/26 08:15:59 raeburn Exp $ +# $Id: lonauth.pm,v 1.106 2010/07/20 02:42:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,23 +111,16 @@ sub success { } } - 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'); @@ -142,13 +135,10 @@ sub success { ); $r->print(<$lt{'wel'} $lt{'mes'}

$lt{'pro'}

-$remoteinfo -$maincall $continuelink $end_page ENDSUCCESS @@ -158,8 +148,7 @@ ENDSUCCESS sub failed { my ($r,$message,$form) = @_; - my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef, - {'no_inline_link' => 1,}); + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef); my $retry = '/adm/login?username='.$form->{'uname'}. '&domain='.$form->{'udom'}; if (exists($form->{role})) { @@ -216,12 +205,12 @@ sub handler { } else { # Indeed, a valid token is found &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { $dest = $env{'form.firsturl'}; @@ -364,8 +353,7 @@ sub handler { my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); &check_can_host($r,\%form,'no_account_on_host',$domdesc); 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 = @@ -420,33 +408,11 @@ sub handler { if ($r->dir_config("lonBalancer") eq 'yes') { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); - $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + my ($otherserver) = &choose_server($form{'udom'}); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } else { -# ------------------------------------------------------- Do the load balancing - -# ---------------------------------------------------------- Determine own load - my $loadlim = $r->dir_config('lonLoadLim'); - my $loadavg; - { - my $loadfile=Apache::File->new('/proc/loadavg'); - $loadavg=<$loadfile>; - } - $loadavg =~ s/\s.*//g; - my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); - my $userloadpercent=&Apache::lonnet::userload(); - -# ---------------------------------------------------------- Are we overloaded? - if ((($userloadpercent>100.0)||($loadpercent>100.0))) { - my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent,1,$form{'udom'}); - if ($unloaded) { - &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect', - undef,\%form); - $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl); - } - } - &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, - \%form); + &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, + \%form); } return OK; } @@ -457,11 +423,7 @@ sub check_can_host { my $canhost = 1; my $lonhost = $r->dir_config('lonHostID'); my $udom = $form->{'udom'}; - my @intdoms; - my $internet_names = &Apache::lonnet::get_internet_names($lonhost); - if (ref($internet_names) eq 'ARRAY') { - @intdoms = @{$internet_names}; - } + my @intdoms = &Apache::lonnet::get_internet_names($lonhost); my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) { @@ -483,7 +445,7 @@ sub check_can_host { } unless ($canhost) { if ($authhost eq 'no_account_on_host') { - my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom); + my ($login_host,$hostname) = &choose_server($udom); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($login_host ne '') { @@ -507,12 +469,31 @@ sub check_can_host { } else { &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef, $form); - my ($otherserver) = &Apache::lonnet::choose_server($udom); + my ($otherserver) = &choose_server($udom); $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } } } +sub choose_server { + my ($udom) = @_; + my %domconfhash = &Apache::loncommon::get_domainconf($udom); + my %servers = &Apache::lonnet::get_servers($udom); + my $lowest_load = 30000; + my ($login_host,$hostname); + foreach my $lonhost (keys(%servers)) { + my $loginvia = $domconfhash{$udom.'.login.loginvia_'.$lonhost}; + if ($loginvia eq '') { + ($login_host, $lowest_load) = + &Apache::lonnet::compare_server_load($lonhost, $login_host, $lowest_load); + } + } + if ($login_host ne '') { + $hostname = $servers{$login_host}; + } + return ($login_host,$hostname); +} + 1; __END__