--- loncom/auth/lonauth.pm	2008/07/10 00:26:40	1.93
+++ loncom/auth/lonauth.pm	2010/03/17 17:51:06	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.93 2008/07/10 00:26:40 raeburn Exp $
+# $Id: lonauth.pm,v 1.103 2010/03/17 17:51:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lonmenu();
 use Apache::createaccount;
 use Fcntl qw(:flock);
 use Apache::lonlocal;
+use HTML::Entities;
  
 # ------------------------------------------------------------ Successful login
 sub success {
@@ -73,21 +74,54 @@ sub success {
 # ------------------------------------------------------------ Get cookie ready
     $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info
-    my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
-    my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
-    my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
-    my $setflags=&Apache::lonmenu::setflags();
-    my $maincall=&Apache::lonmenu::maincall();
+    my $destination = $lowerurl;
+
+    if (defined($form->{role})) {
+        my $envkey = 'user.role.'.$form->{role};
+        my $now=time;
+        my $then=$env{'user.login.time'};
+        my $refresh=$env{'user.refresh.time'};
+        if (exists($env{$envkey})) {
+            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus);
+            &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where,
+                                         \$trolecode,\$tstatus,\$tstart,\$tend);
+            if ($tstatus eq 'is') {
+                $destination  .= ($destination =~ /\?/) ? '&' : '?';
+                my $newrole = &HTML::Entities::encode($form->{role},'"<>&');
+                $destination .= 'selectrole=1&'.$newrole.'=1';
+            }
+        }
+    }
+    if (defined($form->{symb})) {
+        my $destsymb = $form->{symb};
+        $destination  .= ($destination =~ /\?/) ? '&' : '?';
+        if ($destsymb =~ /___/) {
+            # FIXME Need to deal with encrypted symbs and urls as needed.
+            my ($map,$resid,$desturl)=split(/___/,$destsymb);
+            unless ($desturl=~/^(adm|uploaded|editupload|public)/) {
+                $desturl = &Apache::lonnet::clutter($desturl);
+            }
+            $desturl = &HTML::Entities::encode($desturl,'"<>&');
+            $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
+            $destination .= '&destinationurl='.$desturl.
+                            '&destsymb='.$destsymb;
+        } else {
+            $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
+            $destination .= '&destinationurl='.$destsymb;
+        }
+    }
+
+    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
+    my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
+    my $brcrum = [{'href' => '',
+                   'text' => 'Successful Login'},];
     my $start_page=&Apache::loncommon::start_page('Successful Login',
-						  $startupremote,
-						  {'no_inline_link' => 1,});
+                                                  $header,
+                                                  {'no_inline_link' => 1,
+                                                   'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
-    my $continuelink;
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) {
-	$continuelink="<a href=\"$lowerurl\">".&mt('Continue')."</a>";
-    }
+	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
 # ------------------------------------------------- Output for successful login
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -102,13 +136,10 @@ sub success {
 				       );
     $r->print(<<ENDSUCCESS);
 $start_page
-$setflags
 $windowinfo
 <h1>$lt{'wel'}</h1>
 $lt{'mes'}<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
-$remoteinfo
-$maincall
 $continuelink
 $end_page
 ENDSUCCESS
@@ -120,15 +151,22 @@ sub failed {
     my ($r,$message,$form) = @_;
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
 						    {'no_inline_link' => 1,});
+    my $retry = '/adm/login?username='.$form->{'uname'}.
+                '&domain='.$form->{'udom'};
+    if (exists($form->{role})) {
+        $retry .= '&role='.$form->{role};
+    }
+    if (exists($form->{symb})) {
+        $retry .= '&symb='.$form->{symb};
+    }
     my $end_page   = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     $r->print(
        $start_page
       .'<h1>'.&mt('Sorry ...').'</h1>'
-      .'<p><b>'.&mt($message).'</b></p>'
-      .'<p>'.&mt('Please [_1]log in again[_2].'
-                ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
+      .'<p class="LC_warning">'.&mt($message).'</p>'
+      .'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')
       .'</p>'
       .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
       .$end_page
@@ -162,23 +200,29 @@ sub handler {
 # -------------------------------- Prevent users from attempting to login twice
     my $handle = &Apache::lonnet::check_for_valid_session($r);
     if ($handle ne '') {
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+        if ($handle=~/^publicuser\_/) {
+# For "public user" - remove it, we apparently really want to login
+            unlink($r->dir_config('lonIDsDir')."/$handle.id");
+        } else {
 # Indeed, a valid token is found
-	&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();
-        $r->print(
-           $start_page
-          .'<h1>'.&mt('You are already logged in!').'</h1>'
-          .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].'
+            &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();
+            $r->print(
+               $start_page
+              .'<h1>'.&mt('You are already logged in!').'</h1>'
+              .'<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>'
-          .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
-          .$end_page
-        );
-        return OK;
+              .'</p>'
+              .$end_page
+            );
+            return OK;
+        }
     }
 
 # ---------------------------------------------------- No valid token, continue
@@ -231,11 +275,25 @@ sub handler {
 	    return OK;
 	}
     }
+
     if (!&Apache::lonnet::domain($form{'udom'})) {
         &failed($r,'The domain you provided is not a valid LON-CAPA domain.',\%form);
         return OK;
     }
-    my ($key,$firsturl)=split(/&/,$tmpinfo);
+
+    my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo);
+    if ($rolestr) {
+        $rolestr = &unescape($rolestr);
+    }
+    if ($symbstr) {
+        $symbstr= &unescape($symbstr);
+    }
+    if ($rolestr =~ /^role=/) {
+        (undef,$form{'role'}) = split('=',$rolestr);
+    }
+    if ($symbstr =~ /^symb=/) { 
+        (undef,$form{'symb'}) = split('=',$symbstr);
+    }
 
     my $keybin=pack("H16",$key);
 
@@ -298,32 +356,15 @@ sub handler {
                 &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                         $form{'udom'},$origmail);
             my ($contact_email) = split(',',$contacts); 
-            my ($output,$checkfail) = 
-                &Apache::createaccount::username_check($form{'uname'},$form{'udom'},
-                                                      $domdesc,undef,$lonhost,
-                                                      $contact_email);
+            my $output = &Apache::createaccount::username_check($form{'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);
-            my $msg = '<h3>'.&mt('Account creation').'</h3>'.
-                      '<span class="LC_cusr_emph">'.&mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain.').'</span><br />';
-            if ($checkfail) {
-                $msg .= '<h4>'.&mt('Account creation unavailable').'</h4>';
-                if ($checkfail eq 'username') {
-                    $msg .= '<span class="LC_warning">'.
-                            &mt('A LON-CAPA account may not be created with the username you use.').'</span>';
-                } elsif ($checkfail eq 'authtoken') {
-                    $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>';
-                }
-                &Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $form{'uname'}, in domain $form{'udom'}");
-                $msg .= '<br /><br />'.
-                         &mt('Please contact the [_1] ([_2]) for assistance.',
-                             $contact_name,$contact_email);
-            } else {
-                $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
-            }
-            $r->print($msg.$output);
-            $r->print(&Apache::loncommon::end_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);