--- loncom/interface/createaccount.pm	2008/07/13 00:51:31	1.18
+++ loncom/interface/createaccount.pm	2008/07/14 10:17:42	1.21
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.18 2008/07/13 00:51:31 raeburn Exp $
+# $Id: createaccount.pm,v 1.21 2008/07/14 10:17:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,16 +87,39 @@ sub handler {
         $r->print($start_page."\n".'<h2>'.&mt('You are already logged in').'</h2>'.
                   '<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_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;
+        return OK;
     }
-    $start_page =
-        &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
-                                       {'no_inline_link'   => 1,});
-    if ($env{'form.phase'} eq 'username_activation') {
+
+    my $courseid;
+    if (defined($env{'form.courseid'})) {
+        $courseid = &validate_course($env{'form.courseid'});
+    }
+    if ($env{'form.phase'} eq 'selfenroll_login') {
         if ($env{'form.udom'} ne '') {
             $domain = $env{'form.udom'};
         }
+        my ($result,$output) =
+            &username_validation($r,$env{'form.uname'},$domain,$domdesc,
+ 
+                                 $contact_name,$contact_email,$courseid,
+                                 $lonhost);
+        if ($result eq 'existingaccount') {
+            $r->print($output);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            $start_page = 
+                &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course','',
+                                               {'no_inline_link'   => 1,});
+            &print_header($r,$start_page);
+            $r->print($output.&Apache::loncommon::end_page());    
+            return OK;
+        }
     }
+
+    $start_page =
+        &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+                                       {'no_inline_link'   => 1,});
     my @cancreate;
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     if (ref($domconfig{'usercreation'}) eq 'HASH') {
@@ -120,11 +143,6 @@ sub handler {
         return OK;
     }
 
-    my $courseid;
-    if (defined($env{'form.courseid'})) {
-        $courseid = &validate_course($env{'form.courseid'});
-    }
-
     if ($sso_username ne '') {
         &print_header($r,$start_page);
         my ($msg,$sso_logout);
@@ -180,19 +198,26 @@ sub handler {
         $r->print($output);
         $r->print(&Apache::loncommon::end_page());
         return OK;
-    }
-
-    &print_header($r,$start_page);
-    if ($env{'form.create_with_email'}) {
+    } elsif ($env{'form.phase'} eq 'username_validation') { 
+        (my $result,$output) = 
+            &username_validation($r,$env{'form.uname'},$domain,$domdesc,
+                                 $contact_name,$contact_email,$courseid,
+                                 $lonhost);
+        if ($result eq 'existingaccount') {
+            $r->print($output);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            &print_header($r,$start_page);
+        }
+    } elsif ($env{'form.create_with_email'}) {
+        &print_header($r,$start_page);
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
                                          $contact_name,$contact_email,\@cancreate,
                                          $lonhost,$domconfig{'usercreation'},
                                          $courseid);
-    } elsif ($env{'form.phase'} eq 'username_validation') {
-        $output = &username_validation($env{'form.uname'},$domain,$domdesc,
-                                       $contact_name,$contact_email,$courseid,
-                                       $lonhost);
     } elsif (!$token) {
+        &print_header($r,$start_page);
         my $now=time;
         if (grep(/^login$/,@cancreate)) {
             my $jsh=Apache::File->new($include."/londes.js");
@@ -318,31 +343,10 @@ sub print_username_form {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
             if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
                 $output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by this institution').'</h3>';
-                $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
-                my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
-                my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
-                my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
-                                                   $lonhost);
-                $output .= &serverform($logtoken,$lonhost,undef,$courseid);
-                my $unameform = '<input type="text" name="uname" size="10" value="" />';
-                my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
                 my $submit_text = &mt('Create LON-CAPA account');
-                $output .= '<form name="client" method="post" action="/adm/createaccount">'."\n". 
-                           &Apache::lonhtmlcommon::start_pick_box()."\n".
-                           &Apache::lonhtmlcommon::row_title(&mt('Log-in ID'),
-                                                        'LC_pick_box_title')."\n".
-                           $unameform."\n".
-                           &Apache::lonhtmlcommon::row_closure(1)."\n".
-                           &Apache::lonhtmlcommon::row_title(&mt('Password'),
-                                                        'LC_pick_box_title')."\n".
-                           $upassform."\n".'<br /><br />'."\n".
-                           '<input type="button" name="username_validation" value="'.
-                           $submit_text.'" onclick="javascript:send()" />'."\n". 
-                           &Apache::lonhtmlcommon::row_closure(1)."\n".
-                           &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\n".
-                           '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
-                           '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
-                           '</form></div>';
+                $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
+                $output .= &login_box($now,$lonhost,$courseid,$submit_text,
+                                      $domain,'createaccount');
             }
         }
         if (grep(/^email$/,@{$cancreate})) {
@@ -382,10 +386,52 @@ sub print_username_form {
     return $output;
 }
 
+sub login_box {
+    my ($now,$lonhost,$courseid,$submit_text,$domain,$context) = @_;
+    my $output;
+    my %titles = &Apache::lonlocal::texthash(
+                                              createaccount => 'Log-in ID',
+                                              selfenroll    => 'Username',
+                                            );
+    my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+    my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
+    my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+                                       $lonhost);
+    $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
+    my $unameform = '<input type="text" name="uname" size="10" value="" />';
+    my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
+    $output .= '<form name="client" method="post" action="/adm/createaccount">'."\n".
+               &Apache::lonhtmlcommon::start_pick_box()."\n";
+    if ($context eq 'selfenroll') {
+        my $udomform =  '<input type="text" name="udom" size="10" value="'.
+                        $domain.'" />';
+        $output .= &Apache::lonhtmlcommon::row_title(&mt('Domain'),
+                                                     'LC_pick_box_title')."\n".
+                   $udomform."\n".
+                   &Apache::lonhtmlcommon::row_closure(1)."\n";
+    }
+
+    $output .= &Apache::lonhtmlcommon::row_title($titles{$context},
+                                                 'LC_pick_box_title')."\n".
+               $unameform."\n".
+               &Apache::lonhtmlcommon::row_closure(1)."\n".
+               &Apache::lonhtmlcommon::row_title(&mt('Password'),
+                                                'LC_pick_box_title')."\n".
+               $upassform."\n".'<br /><br />'."\n".
+               '<input type="button" name="username_validation" value="'.
+               $submit_text.'" onclick="javascript:send()" />'."\n".
+               &Apache::lonhtmlcommon::row_closure(1)."\n".
+               &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\n".
+               '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
+               '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
+               '</form></div>';
+    return $output;
+}
+
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
         $server,$settings,$courseid) = @_;
-    my $useremail = $env{'form.useremail'};
+    $useremail = $env{'form.useremail'};
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
@@ -568,7 +614,9 @@ sub start_session {
     if ($r->dir_config('lonBalancer') eq 'yes') {
         &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
                                   $lonhost,'noredirect',undef,\%form);
-        my $delete = &Apache::lonnet::tmpdel($token);
+        if ($token ne '') { 
+            my $delete = &Apache::lonnet::tmpdel($token);
+        }
         $r->internal_redirect('/adm/switchserver');
     } else {
         &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
@@ -707,21 +755,32 @@ sub create_account {
 }
 
 sub username_validation {
-    my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_;
+    my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
+        $lonhost) = @_;
     my ($retrieved,$output,$upass);
 
     $username= &LONCAPA::clean_username($username);
     $domain = &LONCAPA::clean_domain($domain);
     my $uhome = &Apache::lonnet::homeserver($username,$domain);
 
-    if ($uhome ne 'no_host') {
-        $output = &invalid_state('existinguser',$domdesc,
-                                 $contact_name,$contact_email);
-        return $output;
-    }
     ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
                                                        $env{'form.serverid'});
-    if ($retrieved eq 'ok') {
+    if ($retrieved ne 'ok') {
+        return ('fail',$output);
+    }
+    if ($uhome ne 'no_host') {
+        my $result = &Apache::lonnet::authenticate($username,$upass,$domain);
+        if ($result ne 'no_host') { 
+            my %form = &start_session($r,$username,$domain,$lonhost,$courseid);
+            $output = '<br /><br />'.&mt('A LON-CAPA account already exists for username [_1] at this institution ([_2]).','<tt>'.$username.'</tt>',$domdesc).'<br />'.&mt('The password entered was also correct so you have been logged in.');
+            return ('existingaccount',$output);
+        } else {
+            $output = '<div class="LC_warning">'.
+                      &mt('Username and/or password could not be authenticated.').
+                      '</div>'.
+                      &mt('Please check the username and password.');
+        }
+    } else {
         my $primlibserv = &Apache::lonnet::domain($domain,'primary');
         my $authok;
         my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
@@ -736,13 +795,13 @@ sub username_validation {
             $output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
                                       $contact_email,$contact_name);
         } else {
-            $output = '<div class="LC_warning">'
-                     .&mt('Username and/or password could not be authenticated.')
-                     .'</div>'
-                     .&mt('Please check the username and password.'); 
+            $output = '<div class="LC_warning">'.
+                      &mt('Username and/or password could not be authenticated.').
+                      '</div>'.
+                      &mt('Please check the username and password.'); 
         }
     }
-    return $output;
+    return ('ok',$output);
 }
 
 sub username_check {
@@ -996,15 +1055,19 @@ sub getkeys {
 }
 
 sub serverform {
-    my ($logtoken,$lonhost,$mailtoken,$courseid) = @_;
+    my ($logtoken,$lonhost,$mailtoken,$courseid,$context) = @_;
+    my $phase = 'username_validation"';
+    if ($context eq 'selfenroll') {
+        $phase = 'selfenroll_login';
+    }
     my $output .= <<ENDSERVERFORM;
-  <form name="server" method="post" target="_top">
+  <form name="server" method="post" action="/adm/createaccount">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="token" value="$mailtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass" value="" />
-   <input type="hidden" name="phase" value="username_validation" />
+   <input type="hidden" name="phase" value="$phase" />
    <input type="hidden" name="courseid" value="$courseid" />
   </form>
 ENDSERVERFORM