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

[raeburn]

raeburn		Fri Oct  3 19:37:28 2008 EDT

  Modified files:              
    /loncom/interface	resetpw.pm 
  Log:
  - Replace localtime() with lonlocal::locallocaltime(). 
  
  
Index: loncom/interface/resetpw.pm
diff -u loncom/interface/resetpw.pm:1.8 loncom/interface/resetpw.pm:1.9
--- loncom/interface/resetpw.pm:1.8	Fri Jan 25 11:46:50 2008
+++ loncom/interface/resetpw.pm	Fri Oct  3 19:37:27 2008
@@ -165,7 +165,7 @@
     my $token = &Apache::lonnet::tmpput(\%info,$server,'resetpw');
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
-        my $mailmsg = "A request was submitted on ".localtime(time)." for a reset of the ".
+        my $mailmsg = "A request was submitted on ".&Apache::lonlocal::locallocaltime(time)." for a reset of the ".
              "password for your LON-CAPA account.".
              "To complete this process please open a web browser and enter the following ".
              "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_token";
@@ -242,14 +242,14 @@
         ($data{'domain'} ne '') && 
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {
-        my $reqtime = localtime($data{'time'});
+        my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
         if ($now - $data{'time'} < 7200) {
             if ($env{'form.action'} eq 'verify_and_change_pass') {
                 my $change_failed = 
 		    &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token);
                 if (!$change_failed) {
                     my $delete = &Apache::lonnet::tmpdel($token);
-                    my $now = localtime(time);
+                    my $now = &Apache::lonlocal::locallocaltime(time);
                     my $domdesc = 
 			&Apache::lonnet::domain($data{'domain'},'description');
                     my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";