--- loncom/interface/createaccount.pm	2012/02/13 17:22:56	1.40.2.5.2.6
+++ loncom/interface/createaccount.pm	2012/02/14 16:04:22	1.40.2.5.2.9
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.40.2.5.2.6 2012/02/13 17:22:56 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.5.2.9 2012/02/14 16:04:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,8 +57,8 @@ sub handler {
 
     my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
     my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
-    my $privkey = $r->subprocess_env->get('reCAPTCHA_PRIVATE');
-    my $pubkey  = $r->subprocess_env->get('reCAPTCHA_PUBLIC')
+    my $privkey = $r->dir_config('reCAPTCHA_PRIVATE');
+    my $pubkey  = $r->dir_config('reCAPTCHA_PUBLIC');
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
     &Apache::lonacc::get_posted_cgi($r);
@@ -409,11 +409,10 @@ sub print_username_form {
         crea   => 'Create account with a username provided by this institution',
         crlc   => 'Create LON-CAPA account',
         type   => 'Type in your log-in ID and password to find out.',
-        sign   => 'You are about to sign-up for the Mechanics Online course.',
         plse   => 'Please enter a valid e-mail address below.',
         inst   => 'Instructions on how to activate your account will be sent to the e-mail address you provide.',
         aftr   => 'After completing the activation process you will have access to a "self test" that will help you assess your readiness for the course.',
-        thes   => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012',
+        thes   => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012.',
     );
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
@@ -430,11 +429,12 @@ sub print_username_form {
         }
         if (grep(/^email$/,@{$cancreate})) {
             $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'.
-                        $lt{'sign'}.'<br />'.
-                        $lt{'plse'}.'<br />'.
-                        $lt{'inst'}.'<br />'.
-                        $lt{'aftr'}.'<br />'.
-                        $lt{'thes'}.'<br />';
+                        '<p class="LC_info">'.
+                        &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','<em>','</em>').'<br />'.
+                        $lt{'plse'}.'</p><ul>'.
+                        '<li>'.$lt{'inst'}.'</li>'.
+                        '<li>'.$lt{'aftr'}.'</li>'.
+                        '<li>'.$lt{'thes'}.'</li></ul>';
             my $captchaform = &create_recaptcha($pubkey);
             if ($captchaform) {
                 my $submit_text = &mt('Sign-up');
@@ -622,12 +622,28 @@ sub send_token {
     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);
-        my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_2] account.',$showtime,$domdesc)."\n".
-             &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',
-                 "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
-        my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
-                                                 $contact_email);
+        my $mailsubj = &mt('Your Mechanics Online Course Account');
+        my $msgfrom  = &mt('Mechanics Online Course Staff');
+        my $mailmsg =  &mt('Greetings.')."\n\n".
+                       &mt('Thank you for your interest in our Online Mechanics Course.').
+                       ' '.
+                       &mt('In order to complete the registration process, please open the following link in your web browser:').
+                       "\n\n".
+                       &Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token).
+                       "\n\n".
+                       &mt('This link will take you to a sign-up page where you will be asked to provide some general information and finalize the registration process.').
+                       ' '.
+                       &mt('The course will begin on March 1st, and until that date, a self-test will be available for you to test your level of preparation for our course.').
+                       ' '.
+                       &mt('The self-test is an integral part of the course, and should be completed by the March 1st start date.').
+                       "\n\n".
+                       &mt('Best Regards,').
+                       "\n\n".
+                       &mt('RELATE Group')."\n";
+
+        my $result = &Apache::resetpw::send_mail('MIT',$email,$mailmsg,
+                                                 $msgfrom,$contact_email,
+                                                 $mailsubj);
         if ($result eq 'ok') {
             $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the sign-up process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {