[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface resetpw.pm

[raeburn]

raeburn		Mon Dec  6 02:40:45 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/interface	resetpw.pm 
  Log:
  - Customization for GCI_3.
   - Support for multiple Concept Inventories.
  
  
Index: loncom/interface/resetpw.pm
diff -u loncom/interface/resetpw.pm:1.22.2.4 loncom/interface/resetpw.pm:1.22.2.5
--- loncom/interface/resetpw.pm:1.22.2.4	Wed Dec  1 23:15:47 2010
+++ loncom/interface/resetpw.pm	Mon Dec  6 02:40:45 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.22.2.4 2010/12/01 23:15:47 raeburn Exp $
+# $Id: resetpw.pm,v 1.22.2.5 2010/12/06 02:40:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,10 +204,11 @@
         $value{'uname'} = $uname;
         $value{'useremail'} = $useremail;
     }
+    my $inventory = uc($defdom);
     my $msg = '<br />'.&mt('To be able to reset a forgotten password:')
            .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
            .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'
-           .&mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'<br /><br />';
+           .&mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'<br /><br />';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box().
             &Apache::lonhtmlcommon::row_title($lt{'unam'}).
@@ -317,6 +318,7 @@
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
+        my $inventory = uc($data{'domain'});
         if ($now - $data{'time'} < 7200) {
             if ($env{'form.action'} eq 'verify_and_change_pass') {
                 my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'});
@@ -375,7 +377,7 @@
             } else {
                 $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br />'.
                           '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.
-                          &mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.').'</p>'.
+                          &mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'</p>'.
                           '<p>'.&mt('The new password must contain at least 7 characters.').' '.
                           &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);