From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 7 Dec 2016 00:15:42 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ecd038f7ae5c1ffc929f3c928ecd161eeb45d9be;hp=319dfa0901a8bc9897e700390d3e97128d155819

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 50df3dde6..b750ba5f7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2893,6 +2893,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'selfservice-password_reset_hours',
+    'section'     => 'self-service',
+    'description' => 'Numbers of hours an email password reset is valid.  Defaults to 24.',
+    'type'        => 'text',
+  },
+
+  {
     'key'         => 'selfservice-password_reset_msgnum',
     'section'     => 'self-service',
     'description' => 'Template to use for password reset emails.',
diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index fd3e9d770..1c456e7ad 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -867,7 +867,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 {