--- loncom/interface/createaccount.pm	2009/04/01 14:43:06	1.33
+++ loncom/interface/createaccount.pm	2010/12/24 20:36:11	1.40.2.3
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.33 2009/04/01 14:43:06 hauer Exp $
+# $Id: createaccount.pm,v 1.40.2.3 2010/12/24 20:36:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,10 +112,16 @@ sub handler {
         if ($env{'form.udom'} ne '') {
             $domain = $env{'form.udom'};
         }
+
+        my %domconfig = 
+            &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+        my ($cancreate,$statustocreate) = 
+            &get_creation_controls($domain,$domconfig{'usercreation'});
+
         my ($result,$output) =
             &username_validation($r,$env{'form.uname'},$domain,$domdesc,
                                  $contact_name,$contact_email,$courseid,
-                                 $lonhost);
+                                 $lonhost,$statustocreate);
         if ($result eq 'existingaccount') {
             $r->print($output);
             &print_footer($r);
@@ -133,20 +139,10 @@ sub handler {
     $start_page =
         &Apache::loncommon::start_page($title,$js,
                                        {'no_inline_link'   => 1,});
-    my @cancreate;
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
-    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'});
-            }
-        }
-    }
-
-    if (@cancreate == 0) {
+    my %domconfig = 
+        &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+    my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
+    if (@{$cancreate} == 0) {
         &print_header($r,$start_page,$courseid);
         my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                      '<span class="LC_warning">'.
@@ -160,12 +156,13 @@ sub handler {
         &print_header($r,$start_page,$courseid);
         my ($msg,$sso_logout);
         $sso_logout = &sso_logout_frag($r,$domain);
-        if (grep(/^sso$/,@cancreate)) {
+        if (grep(/^sso$/,@{$cancreate})) {
             $msg = '<h3>'.&mt('Account creation').'</h3>'.
                    &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br />';
 
             $msg .= &username_check($sso_username,$domain,$domdesc,$courseid, 
-                                    $lonhost,$contact_email,$contact_name,$sso_logout);
+                                    $lonhost,$contact_email,$contact_name,
+                                    $sso_logout,$statustocreate);
         } else {
             $msg = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                    '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
@@ -215,7 +212,7 @@ sub handler {
         (my $result,$output) = 
             &username_validation($r,$env{'form.uname'},$domain,$domdesc,
                                  $contact_name,$contact_email,$courseid,
-                                 $lonhost);
+                                 $lonhost,$statustocreate);
         if ($result eq 'existingaccount') {
             $r->print($output);
             &print_footer($r);
@@ -226,21 +223,21 @@ sub handler {
     } elsif ($env{'form.create_with_email'}) {
         &print_header($r,$start_page,$courseid);
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
-                                         $contact_name,$contact_email,\@cancreate,
+                                         $contact_name,$contact_email,$cancreate,
                                          $lonhost,$domconfig{'usercreation'},
                                          $courseid);
     } elsif (!$token) {
         &print_header($r,$start_page,$courseid);
         my $now=time;
-        if (grep(/^login$/,@cancreate)) {
+        if (grep(/^login$/,@{$cancreate})) {
             my $jsh=Apache::File->new($include."/londes.js");
             $r->print(<$jsh>);
             $r->print(&javascript_setforms($now));
         }
-        if (grep(/^email$/,@cancreate)) {
+        if (grep(/^email$/,@{$cancreate})) {
             $r->print(&javascript_validmail());
         }
-        $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
+        $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost,
                                        $courseid);
     }
     $r->print($output);
@@ -280,7 +277,7 @@ sub selfenroll_crumbs {
     my ($r,$courseid,$desc) = @_;
     &Apache::lonhtmlcommon::add_breadcrumb
          ({href=>"javascript:ToCatalog('backupcrumbs','')",
-           text=>"Course Catalog"});
+           text=>"Course/Community Catalog"});
     if ($env{'form.coursenum'} ne '') {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:ToCatalog('backupcrumbs','details')",
@@ -288,7 +285,7 @@ sub selfenroll_crumbs {
     }
     my $last_crumb;
     if ($desc ne '') {
-        $last_crumb = &mt('Self-enroll in [_1]','<span class="LC_cusr_emph">'.$desc.'</span>');
+        $last_crumb = &mt('Self-enroll in [_1]',"<span class='LC_cusr_emph'>$desc</span>");
     } else {
         $last_crumb = &mt('Self-enroll');
     }
@@ -463,7 +460,7 @@ sub login_box {
                                             );
     my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
     my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
-    my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+    my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
                                        $lonhost);
     $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
     my $unameform = '<input type="text" name="uname" size="20" value="" />';
@@ -499,8 +496,8 @@ sub login_box {
     }
     $output .= &Apache::lonhtmlcommon::row_closure(1)."\n".
                &Apache::lonhtmlcommon::end_pick_box().'<br />'."\n";
-    $output .= '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
-               '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
+    $output .= '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
+               '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
                '</form>';
     return $output;
 }
@@ -549,7 +546,7 @@ sub process_email_request {
                 if ($uhome eq 'no_host') {
                     my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
                     &call_rulecheck($useremail,$domain,\%alerts,\%rulematch,
-                                    \%inst_results,\%curr_rules,%got_rules,'username');
+                                    \%inst_results,\%curr_rules,\%got_rules,'username');
                     if (ref($alerts{'username'}) eq 'HASH') {
                         if (ref($alerts{'username'}{$domain}) eq 'HASH') {
                             if ($alerts{'username'}{$domain}{$useremail}) {
@@ -601,7 +598,7 @@ sub send_token {
                 'domain'     => $domain,
                 'username'   => $email,
                 'courseid'   => $courseid);
-    my $token = &Apache::lonnet::tmpput(\%info,$server);
+    my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount');
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
         my $showtime = localtime(time);
@@ -647,7 +644,7 @@ sub process_mailtoken {
                 if ($result eq 'ok') {
                     $msg = $output; 
                     my $shownow = &Apache::lonlocal::locallocaltime($now);
-                    my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+                    my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                     my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,
                                                                  $contact_email);
@@ -725,7 +722,7 @@ sub print_dataentry_form {
         $output .= &javascript_setforms($now)."\n".&javascript_checkpass($now);
         my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
-        my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+        my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
                                            $lonhost);
         my $formtag = '<form name="server" method="post" target="_top" action="/adm/createaccount">';
         my ($datatable,$rowcount) =
@@ -792,6 +789,32 @@ ENDSERVERFORM
     return $output;
 }
 
+sub get_creation_controls {
+    my ($domain,$usercreation) = @_;
+    my (@cancreate,@statustocreate);
+    if (ref($usercreation) eq 'HASH') {
+        if (ref($usercreation->{'cancreate'}) eq 'HASH') {
+            if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
+                @statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
+            } else {
+                @statustocreate = ('default');
+                my ($othertitle,$usertypes,$types) =
+                    &Apache::loncommon::sorted_inst_types($domain);
+                if (ref($types) eq 'ARRAY') {
+                    push(@statustocreate,@{$types});
+                }
+            }
+            if (ref($usercreation->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+                @cancreate = @{$usercreation->{'cancreate'}{'selfcreate'}};
+            } elsif (($usercreation->{'cancreate'}{'selfcreate'} ne 'none') &&
+                     ($usercreation->{'cancreate'}{'selfcreate'} ne '')) {
+                @cancreate = ($usercreation->{'cancreate'}{'selfcreate'});
+            }
+        }
+    }
+    return (\@cancreate,\@statustocreate);
+}
+
 sub create_account {
     my ($r,$domain,$lonhost,$username,$domdesc) = @_;
     my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
@@ -829,7 +852,7 @@ sub create_account {
 
 sub username_validation {
     my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
-        $lonhost) = @_;
+        $lonhost,$statustocreate) = @_;
     my ($retrieved,$output,$upass);
 
     $username= &LONCAPA::clean_username($username);
@@ -863,7 +886,8 @@ sub username_validation {
         }
         if ($authok eq 'authorized') {
             $output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
-                                      $contact_email,$contact_name);
+                                      $contact_email,$contact_name,undef,
+                                      $statustocreate);
         } else {
             $output = &login_failure_msg($courseid);
         }
@@ -888,12 +912,12 @@ sub login_failure_msg {
 }
 
 sub username_check {
-    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
-        $sso_logout) = @_;
+    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,
+        $contact_name,$sso_logout,$statustocreate) = @_;
     my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg,
         %alerts,%curr_rules,%got_rules);
     &call_rulecheck($username,$domain,\%alerts,\%rulematch,
-                    \%inst_results,\%curr_rules,%got_rules,'username');
+                    \%inst_results,\%curr_rules,\%got_rules,'username');
     if (ref($alerts{'username'}) eq 'HASH') {
         if (ref($alerts{'username'}{$domain}) eq 'HASH') {
             if ($alerts{'username'}{$domain}{$username}) {
@@ -909,6 +933,21 @@ sub username_check {
         }
     }
     if (!$checkfail) {
+        if (ref($statustocreate) eq 'ARRAY') {
+            $checkfail = 'inststatus';
+            if (ref($inst_results{$username.':'.$domain}{inststatus}) eq 'ARRAY') {
+                foreach my $inststatus (@{$inst_results{$username.':'.$domain}{inststatus}}) {
+                    if (grep(/^\Q$inststatus\E$/,@{$statustocreate})) {
+                        undef($checkfail);
+                        last;
+                    }
+                }
+            } elsif (grep(/^default$/,@{$statustocreate})) {
+                undef($checkfail);
+            }
+        }
+    }
+    if (!$checkfail) {
         $output = '<form method="post" action="/adm/createaccount">';
         (my $datatable,$rowcount,$editable) = 
             &Apache::loncreateuser::personal_data_display($username,$domain,1,'selfcreate',
@@ -924,7 +963,7 @@ sub username_check {
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $username);
-        my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
+        my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost,'createaccount');
         if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
             $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
         } else {
@@ -943,6 +982,10 @@ sub username_check {
         } elsif ($checkfail eq 'authtoken') {
             $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'.
                     '<br />'.$output;
+        } elsif ($checkfail eq 'inststatus') {
+            $msg .= '<span class="LC_warning">'.
+                     &mt('You are not permitted to create a LON-CAPA account.').
+                     '</span><br /><br />'.$output;
         }
         $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',
                 $contact_name,$contact_email).'<br /><hr />'.
@@ -1021,7 +1064,7 @@ sub username_activation {
         # Call modifyuser
         my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info);
         &call_rulecheck($username,$domain,\%alerts,\%rulematch,
-                        \%inst_results,\%curr_rules,%got_rules);
+                        \%inst_results,\%curr_rules,\%got_rules);
         my @userinfo = ('firstname','middlename','lastname','generation',
                         'permanentemail','id');
         my %canmodify = 
@@ -1094,32 +1137,38 @@ sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
     my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">';
     if ($error eq 'baduseremail') {
-        $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
+        $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'existinguser') {
-        $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
+        $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
     } elsif ($error eq 'userrules') {
-        $msg = &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
+        $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {
-        $msg = &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
+        $msg .= &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
     } elsif ($error eq 'captcha') {
-        $msg = &mt('Validation of the code your entered failed.');
+        $msg .= &mt('Validation of the code you entered failed.');
     } elsif ($error eq 'noemails') {
-        $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
+        $msg .= &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
     }
     $msg .= '</span>';
     if ($msgtext) {
         $msg .= '<br />'.$msgtext;
     }
-    $msg .= &linkto_email_help($contact_email,$domdesc);
+    $msg .= &linkto_email_help($contact_email,$domdesc,$error);
     return $msg;
 }
 
 sub linkto_email_help {
-    my ($contact_email,$domdesc) = @_;
+    my ($contact_email,$domdesc,$error) = @_;
     my $msg;
+    my $href = '/adm/helpdesk';
     if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
-        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
+        $href .= '?origurl='.$escuri;
+        if ($error eq 'existinguser') {
+            my $escemail = &HTML::Entities::encode($env{'form.useremail'});
+            $href .= '&useremail='.$escemail.'&useraccount='.$escemail;
+        }
+        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="'.$href.'">','</a>',$domdesc).'<br />';
     } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }
@@ -1142,7 +1191,7 @@ sub create_captcha {
             $output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".
                       &mt('Type in the letters/numbers shown below').'&nbsp;'.
                      '<input type="text" size="5" name="code" value="" /><br />'.
-                     '<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png">';
+                     '<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" />';
             last;
         }
     }