[freeside-commits] branch FREESIDE_4_BRANCH updated. 3c76cd28ea10efe044bdfcd2b6f5cb7e6c533416

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  3c76cd28ea10efe044bdfcd2b6f5cb7e6c533416 (commit)
      from  a43fb5bc593ac742a3154edac76858142e4be6ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3c76cd28ea10efe044bdfcd2b6f5cb7e6c533416
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 6 16:14:03 2016 -0800

    Make a config for the number of hours a self-service password reset is valid

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 4c87f93..90d0747 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2909,6 +2909,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 a8aa43b..2dbe548 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -873,7 +873,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 {

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm    |    7 +++++++
 FS/FS/contact.pm |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)