default to a session cookie instead of setting an explicit timeout, weird timezone...

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 383fb0e..57a8867 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2452,8 +2452,8 @@ and customer address. Include units.',
 
   {
     'key'         => 'selfservice-timeout',
 
   {
     'key'         => 'selfservice-timeout',

-    'section'     => 'self-service',
-    'description' => 'Timeout for the self-service login cookie, in seconds.  Defaults to 1 hour.',
+    'section'     => 'deprecated',
+    'description' => 'Deprecated.  Was the timeout for the self-service login cookie, in seconds.  Defaulted to 1 hour.',

     'type'        => 'text',
   },
 
     'type'        => 'text',
   },
 

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 6eab11d..b1fea7d 100755 (executable)
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -1250,10 +1250,8 @@ sub do_template {
   $fill_in->{$_} = $access_info->{$_} foreach keys %$access_info;
 
   # update the user's authentication
   $fill_in->{$_} = $access_info->{$_} foreach keys %$access_info;
 
   # update the user's authentication

-  my $timeout = $access_info->{'timeout'} || '3600';

   my $cookie = CGI::Cookie->new('-name'     => 'session',
                                 '-value'    => $session_id,
   my $cookie = CGI::Cookie->new('-name'     => 'session',
                                 '-value'    => $session_id,

-                                '-expires'  => '+'.$timeout.'s',

                                 #'-secure'   => 1, # would be a good idea...
                                );
   if ( $name eq 'logout' ) {
                                 #'-secure'   => 1, # would be a good idea...
                                );
   if ( $name eq 'logout' ) {