[LON-CAPA-cvs] cvs: loncom /interface createaccount.pm

[raeburn]

raeburn		Fri Jul  4 15:32:56 2008 EDT

  Modified files:              
    /loncom/interface	createaccount.pm 
  Log:
  - Fix some changes made in rev 1.6.
  - Remove single quotes around $esc_token
  - Restore <br /> (it's needed for two column display from the <div></div>)
  - Some &mt()
  
  
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.8 loncom/interface/createaccount.pm:1.9
--- loncom/interface/createaccount.pm:1.8	Fri Jul  4 14:53:22 2008
+++ loncom/interface/createaccount.pm	Fri Jul  4 15:32:56 2008
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.8 2008/07/04 18:53:22 raeburn Exp $
+# $Id: createaccount.pm,v 1.9 2008/07/04 19:32:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -320,7 +320,7 @@
         if (grep(/^email$/,@{$cancreate})) {
             $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
             if (grep(/^login$/,@{$cancreate})) {
-                $output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have a log-in ID at your institution.').'<br /><br />';
+                $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','<br />').'<br /><br />';
             } else {
                 $output .= '<br />';
             }
@@ -444,7 +444,7 @@
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '.
              &mt('To complete this process please open a web browser and enter the following'
                 .' URL in the address/location box: [_1]'
-                ,&Apache::lonnet::absolute_url().'/adm/createaccount?token=$esc_token');
+                ,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
                                                  $contact_email);
         if ($result eq 'ok') {
@@ -467,8 +467,9 @@
     my %data = &Apache::lonnet::tmpget($token);
     my $now = time;
     if (keys(%data) == 0) {
-        $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid.')
-              .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
+        $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.')
+               .' '.&mt('Either the token included in the URL has been deleted or the URL you provided was invalid.')
+               .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>');
         return $msg;
     }
     if (($data{'time'} =~ /^\d+$/) &&