From 45794f4127e6e2d18d9165eb91edd26c7c9840a7 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 19 Oct 2014 13:02:01 +0200
Subject: [PATCH] Fix inactivity timeouts which are now expressed in minutes,
 not seconds

---
 conf/settings.ini.dist                         | 4 ++--
 templates/default/owner_password_modal.html.ep | 4 ++--
 vroom.pl                                       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist
index f5e3f8d..9f1cdd8 100644
--- a/conf/settings.ini.dist
+++ b/conf/settings.ini.dist
@@ -40,9 +40,9 @@
 
 [rooms]
 ; After this amount of time in minutes, rooms without any activity will be purged
-;inactivity_timeout = '3600'
+;inactivity_timeout = '60'
 ; You can also purge reserved rooms
-;reserved_inactivity_imeout = '5184000'
+;reserved_inactivity_timeout = '86400'
 ; A comma separated list of room names you don't want to be reservable
 ;common_names = 'test,test1,test123,0,1,2,3,4,5,6,7,8,9,123,1234,12345,a,aa,abc,azerty,qwerty,vroom,foo,bar,baz'
 
diff --git a/templates/default/owner_password_modal.html.ep b/templates/default/owner_password_modal.html.ep
index 3c46dca..f235b87 100644
--- a/templates/default/owner_password_modal.html.ep
+++ b/templates/default/owner_password_modal.html.ep
@@ -15,12 +15,12 @@
                 <%=l 'SET_OWNER_PASS' %>
                 <ul>
                   <li>
-                    <%= sprintf($self->l('A_STANDARD_ROOM_EXPIRES_AFTER_d'), int($config->{'rooms.inactivity_timeout'}/3600)) %>
+                    <%= sprintf($self->l('A_STANDARD_ROOM_EXPIRES_AFTER_d'), int($config->{'rooms.inactivity_timeout'}/60)) %>
                   </li>
                   <li>
                     <%=l 'A_RESERVED_ROOM' %>
                     <% if ($config->{'rooms.reserved_inactivity_timeout'} > 0){ %>
-                      <%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{'reserved_inactivity_timeout'}/(3600*24))) %>
+                      <%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{'rooms.reserved_inactivity_timeout'}/(60*24))) %>
                     <% } else{ %>
                       <%=l 'WILL_NEVER_EXPIRE' %>
                     <% } %>
diff --git a/vroom.pl b/vroom.pl
index 079da4c..b244bfd 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -39,8 +39,8 @@ $config->{'interface.template'}                ||= 'default';
 $config->{'interface.chrome_extension_id'}     ||= 'ecicdpoejfllflombfanbhfpgcimjddn';
 $config->{'cookie.secret'}                     ||= 'secret';
 $config->{'cookie.name'}                       ||= 'vroom';
-$config->{'rooms.inactivity_timeout'}          ||= 3600;
-$config->{'rooms.reserved_inactivity_timeout'} ||= 5184000;
+$config->{'rooms.inactivity_timeout'}          ||= 60;
+$config->{'rooms.reserved_inactivity_timeout'} ||= 86400;
 $config->{'rooms.common_names'}                ||= '';
 $config->{'log.level'}                         ||= 'info';
 $config->{'etherpad.uri'}                      ||= '';