--- loncom/interface/createaccount.pm 2009/04/22 13:43:48 1.35
+++ loncom/interface/createaccount.pm 2010/08/16 14:39:20 1.40.2.1
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.35 2009/04/22 13:43:48 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.1 2010/08/16 14:39:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -139,7 +139,6 @@ sub handler {
$start_page =
&Apache::loncommon::start_page($title,$js,
{'no_inline_link' => 1,});
-
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
@@ -278,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')",
@@ -547,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}) {
@@ -645,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);
@@ -918,7 +917,7 @@ sub username_check {
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}) {
@@ -1065,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 =
@@ -1186,7 +1185,7 @@ sub create_captcha {
$output = ''."\n".
&mt('Type in the letters/numbers shown below').' '.
' '.
- '';
+ '';
last;
}
}