--- loncom/auth/lonauth.pm	2011/06/11 17:50:35	1.114
+++ loncom/auth/lonauth.pm	2012/04/11 11:40:07	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.114 2011/06/11 17:50:35 raeburn Exp $
+# $Id: lonauth.pm,v 1.121 2012/04/11 11:40:07 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ use Apache::lonmenu();
 use Apache::createaccount;
 use Fcntl qw(:flock);
 use Apache::lonlocal;
-use Apache::File ();
+use Apache::File();
 use HTML::Entities;
  
 # ------------------------------------------------------------ Successful login
@@ -195,9 +195,10 @@ sub reroute {
 
 sub handler {
     my $r = shift;
+    my $londocroot = $r->dir_config('lonDocRoot');
     my $form;
 # Are we re-routing?
-    if (-e '/home/httpd/html/lon-status/reroute.txt') {
+    if (-e "$londocroot/lon-status/reroute.txt") {
 	&reroute($r);
 	return OK;
     }
@@ -226,7 +227,7 @@ sub handler {
             }
             $r->print(
                $start_page
-              .'<h1>'.&mt('You are already logged in!').'</h1>'
+              .'<p class="LC_warning>"'.&mt('You are already logged in!').'</p>'
               .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
                     ,'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>')
               .'</p>'
@@ -329,21 +330,15 @@ sub handler {
     }
 
 # ---------------------------------------------------------------- Authenticate
-    my @cancreate;
+
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
-    if (ref($domconfig{'usercreation'}) eq 'HASH') {
-        if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
-            if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
-                @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}};
-            } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && 
-                     ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) {
-                @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'});
-            }
-        }
-    }
+    my ($cancreate,$statustocreate) =
+        &Apache::createaccount::get_creation_controls($form{'udom'},$domconfig{'usercreation'});
     my $defaultauth;
-    if (grep(/^login$/,@cancreate)) {
-        $defaultauth = 1;
+    if (ref($cancreate) eq 'ARRAY') {
+        if (grep(/^login$/,@{$cancreate})) {
+            $defaultauth = 1;
+        }
     }
     my $clientcancheckhost = 1;
     my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
@@ -357,9 +352,7 @@ sub handler {
 		\%form);
         return OK;
     } elsif ($authhost eq 'no_account_on_host') {
-        my %domconfig = 
-            &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
-        if (grep(/^login$/,@cancreate)) {
+        if ($defaultauth) {
             my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
             unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) {
                 return OK;
@@ -372,9 +365,11 @@ sub handler {
                 &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                         $form{'udom'},$origmail);
             my ($contact_email) = split(',',$contacts); 
-            my $output = &Apache::createaccount::username_check($form{'uname'}, 
-                                                                $form{'udom'},$domdesc,'',
-                                                                $lonhost,$contact_email,$contact_name);
+            my $output = 
+                &Apache::createaccount::username_check($form{'uname'},$form{'udom'},
+                                                       $domdesc,'',$lonhost,
+                                                       $contact_email,$contact_name,
+                                                       undef,$statustocreate);
             &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
             &Apache::createaccount::print_header($r,$start_page);
@@ -415,17 +410,34 @@ sub handler {
 	}
     }
 
-    unless (&check_can_host($r,\%form,$authhost)) {
-        return OK;
-    }
+    my ($is_balancer,$otherserver) = 
+        &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
 
-    if ($r->dir_config("lonBalancer") eq 'yes') {
-	&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
-		 \%form);
-        my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'});
-	$r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+    if ($is_balancer) {
+        if (!$otherserver) { 
+            ($otherserver) = &Apache::lonnet::choose_server($form{'udom'});
+        }
+        if ($otherserver) {
+            &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
+                     \%form);
+	    $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+        } else {
+            $r->print(&noswitch());
+        }
         return OK;
     } else {
+        if (!&check_can_host($r,\%form,$authhost)) {
+            my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'});
+            if ($otherserver) {
+                &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
+                         \%form);
+                $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+            } else {
+                $r->print(&noswitch());
+            }
+            return OK;
+        }
+
 # ------------------------------------------------------- Do the load balancing
 
 # ---------------------------------------------------------- Determine own load
@@ -442,6 +454,9 @@ sub handler {
 # ---------------------------------------------------------- Are we overloaded?
         if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
             my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent,1,$form{'udom'});
+            if (!$unloaded) {
+                ($unloaded) = &Apache::lonnet::choose_server($form{'udom'});
+            }
             if ($unloaded) {
                 &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',
                          undef,\%form);
@@ -487,7 +502,9 @@ sub check_can_host {
     }
     unless ($canhost) {
         if ($authhost eq 'no_account_on_host') {
-            my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom);
+            my $checkloginvia = 1;
+            my ($login_host,$hostname) = 
+                &Apache::lonnet::choose_server($udom,$checkloginvia);
             &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
             if ($login_host ne '') {
@@ -517,6 +534,15 @@ sub check_can_host {
     return $canhost;
 }
 
+sub noswitch {
+    my $result = &Apache::loncommon::start_page('Access to LON-CAPA unavailable').
+                 '<h3>'.&mt('Session unavailable').'</h3>'.
+                 &mt('This LON-CAPA server is unable to host your session.').'<br />'.
+                 '<p>'.&mt('Currently no other LON-CAPA server is available to host your session either.').'</p>'.
+                 &Apache::loncommon::end_page();
+    return $result;
+}
+
 1;
 __END__