--- loncom/interface/createaccount.pm	2021/01/04 04:42:13	1.72.4.6
+++ loncom/interface/createaccount.pm	2019/08/25 02:42:56	1.79
@@ -4,7 +4,7 @@
 # kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as
 # username may be processed automatically, or may be queued for approval.
 #
-# $Id: createaccount.pm,v 1.72.4.6 2021/01/04 04:42:13 raeburn Exp $
+# $Id: createaccount.pm,v 1.79 2019/08/25 02:42:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -570,7 +570,8 @@ sub javascript_validmail {
     my %js_lt = &Apache::lonlocal::texthash (
                email => 'The e-mail address you entered',
                notv  => 'is not a valid e-mail address',
-               avae  => 'A valid e-mail address is not formed when the value you entered is combined with the required domain',
+               avae  => 'A valid e-mail address is not formed when the value you entered',
+               isco  => 'is combined with the required domain',
     );
     my $output =  "\n".'<script type="text/javascript">'."\n".
                   '// <![CDATA['."\n".
@@ -582,7 +583,7 @@ function validate_email(client) {
     var condition = '$condition';
     if (validmail(field,condition) == false) {
         if ((condition != undefined) && (condition != '')) {
-            alert("$js_lt{'avae'}: "+condition);
+            alert("$js_lt{'avae'}: "+field.value+" $js_lt{'isco'}: "+condition);
         } else {
             alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
         }
@@ -982,8 +983,7 @@ sub send_token {
             $msg .= '</form></p>';
             return $msg;
         }
-        my $ip = &Apache::lonnet::get_requestor_ip();
-        my %info = ('ip'         => $ip,
+        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $email,
@@ -1099,9 +1099,8 @@ sub process_mailtoken {
                             &create_account($r,$domain,$domdesc,\%data);
                         if ($result eq 'ok') {
                             $msg = $output;
-                            my $ip = &Apache::lonnet::get_requestor_ip();
                             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,$ip,$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);
@@ -1407,7 +1406,7 @@ sub create_account {
             unless (($inststatus eq 'default') || ($inststatus eq '')) {
                 &Apache::lonnet::put('environment',{inststatus => $inststatus},$domain,$username);
             }
-            $output .= '<br />'.&mt('Home Server').": $uhome ".
+            $output .= '<br />'.&mt('Home server: [_1]',$uhome).' '.
                        &Apache::lonnet::hostname($uhome).'<br /><br />';
             return ('ok',$output,$uhome);
         } else {
@@ -1580,8 +1579,7 @@ sub username_check {
                     '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
                     '<input type="hidden" name="phase" value="username_activation" />';
         my $now = time;
-        my $ip = &Apache::lonnet::get_requestor_ip();
-        my %info = ('ip'         => $ip,
+        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $username);