X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcontact.pm;h=148fa6157f01c02f87457b9b0088479cb90eb70c;hb=9813252ec987e72242efa564c7a927b111f9222a;hp=d906dc9a2e688da9ef656990ce0ba3c517528a9d;hpb=5bc19ba554e29029e7963e40012e43432892306b;p=freeside.git

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index d906dc9a2..148fa6157 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -233,7 +233,8 @@ sub delete {
     }
   }
 
-  my $error = $self->SUPER::delete;
+  my $error = $self->delete_password_history
+           || $self->SUPER::delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -674,7 +675,10 @@ sub send_reset_email {
     'svcnum'     => $opt{'svcnum'},
   };
 
-  my $timeout = '24 hours'; #?
+  
+  my $conf = new FS::Conf;
+  my $timeout =
+    ($conf->config('selfservice-password_reset_hours') || 24 ). ' hours';
 
   my $reset_session_id;
   do {