--- loncom/auth/lonauth.pm	2012/02/06 03:27:59	1.101.8.9.2.1
+++ loncom/auth/lonauth.pm	2012/08/06 23:14:04	1.121.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.101.8.9.2.1 2012/02/06 03:27:59 raeburn Exp $
+# $Id: lonauth.pm,v 1.121.2.1 2012/08/06 23:14:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,9 +82,13 @@ sub success {
         my $now=time;
         my $then=$env{'user.login.time'};
         my $refresh=$env{'user.refresh.time'};
+        my $update=$env{'user.update.time'};
+        if (!$update) {
+            $update = $then;
+        }
         if (exists($env{$envkey})) {
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus);
-            &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where,
+            &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
                                          \$trolecode,\$tstatus,\$tstart,\$tend);
             if ($tstatus eq 'is') {
                 $destination  .= ($destination =~ /\?/) ? '&' : '?';
@@ -111,6 +115,10 @@ sub success {
             $destination .= '&destinationurl='.$destsymb;
         }
     }
+    if ($destination =~ m{^/adm/roles}) {
+        $destination  .= ($destination =~ /\?/) ? '&' : '?';
+        $destination .= 'source=login';
+    }
 
     my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
     my $startupremote=&Apache::lonmenu::startupremote($destination);
@@ -140,7 +148,7 @@ sub success {
 				       'pro' => 'Login problems?',
 				       'log' => 'loginproblems.html',
 				       );
-    my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');
+    my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>'); 
     $r->print(<<ENDSUCCESS);
 $start_page
 $setflags
@@ -159,8 +167,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})) {
@@ -198,9 +205,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;
     }
@@ -217,19 +225,19 @@ 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'};
             }
             $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>'
@@ -277,8 +285,8 @@ sub handler {
     my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
                                       $form{'serverid'});
 
-    if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
-       ($tmpinfo eq 'no_such_host')) {
+    if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || 
+        ($tmpinfo eq 'no_such_host')) {
 	&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
         return OK;
     } else {
@@ -343,36 +351,47 @@ sub handler {
         }
     }
     my $clientcancheckhost = 1;
-    my $uname = $form{'uname'};
-    my $authhost=Apache::lonnet::authenticate($uname,$upass,
+    my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
                                               $form{'udom'},$defaultauth,
                                               $clientcancheckhost);
     
 # --------------------------------------------------------------------- Failed?
 
     if ($authhost eq 'no_host') {
-        my $lc_uname = lc($uname);
-        if ($uname eq $lc_uname) {
-            &failed($r,'Username and/or password could not be authenticated.',
-                    \%form);
-            return OK;
-        } else {
-            $authhost=Apache::lonnet::authenticate($lc_uname,$upass,
-                                                   $form{'udom'},$defaultauth);
-            if ($authhost eq 'no_host') {
-                &failed($r,'Username (in lower case) and/or password could not be authenticated.',
-                        \%form);
-                return OK;
-            } elsif ($authhost eq 'no_account_on_host') {
-                &create_account($r,\%form,\@cancreate,$lc_uname,$contact_name);
+	&failed($r,'Username and/or password could not be authenticated.',
+		\%form);
+        return OK;
+    } elsif ($authhost eq 'no_account_on_host') {
+        if ($defaultauth) {
+            my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
+            unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) {
                 return OK;
-            } else {
-                $form{'uname'} = $lc_uname;
             }
+            my $start_page = 
+                &Apache::loncommon::start_page('Create a user account in LON-CAPA',
+                                               '',{'no_inline_link'   => 1,});
+            my $lonhost = $r->dir_config('lonHostID');
+            my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+            my $contacts = 
+                &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,
+                                                       undef,$statustocreate);
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
+            &Apache::createaccount::print_header($r,$start_page);
+            $r->print('<h3>'.&mt('Account creation').'</h3>'.
+                      &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'<br />'.
+                      $output.&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);
+            return OK;
         }
-    } elsif ($authhost eq 'no_account_on_host') {
-        &create_account($r,\%form,\@cancreate,$uname,$contact_name);
-        return OK;
     }
 
     if (($firsturl eq '') || 
@@ -402,15 +421,17 @@ sub handler {
 	}
     }
 
-    if ($r->dir_config("lonBalancer") eq 'yes') {
-        my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'});
-        if (!$otherserver) {
+    my ($is_balancer,$otherserver) = 
+        &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
+
+    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);
+	    $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
         } else {
             $r->print(&noswitch());
         }
@@ -427,6 +448,7 @@ sub handler {
             }
             return OK;
         }
+
 # ------------------------------------------------------- Do the load balancing
 
 # ---------------------------------------------------------- Determine own load
@@ -492,7 +514,7 @@ sub check_can_host {
     unless ($canhost) {
         if ($authhost eq 'no_account_on_host') {
             my $checkloginvia = 1;
-            my ($login_host,$hostname) =
+            my ($login_host,$hostname) = 
                 &Apache::lonnet::choose_server($udom,$checkloginvia);
             &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
@@ -532,38 +554,6 @@ sub noswitch {
     return $result;
 }
 
-sub create_account {
-    my ($r,$form,$cancreate,$uname,$contact_name) = @_;
-    return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY'));
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'});
-    if (&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,});
-        my $domdesc = &Apache::lonnet::domain($form->{'udom'},'description');
-        my $lonhost = $r->dir_config('lonHostID');
-        my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
-        my $contacts =
-            &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
-                                                    $form->{'udom'},$origmail);
-        my ($contact_email) = split(',',$contacts);
-        my $output =
-            &Apache::createaccount::username_check($uname,$form->{'udom'},
-                                                   $domdesc,'',$lonhost,
-                                                   $contact_email,$contact_name);
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-        &Apache::createaccount::print_header($r,$start_page);
-        $r->print('<h3>'.&mt('Account creation').'</h3>'.
-                  &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'<br />'.
-                  $output.&Apache::loncommon::end_page());
-    } else {
-        &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',$form);
-    }
-    return;
-}
-
 1;
 __END__