Fix inactivity timeouts

which are now expressed in minutes, not seconds
master
Daniel Berteaud 10 years ago
parent 18d76a597f
commit 45794f4127
  1. 4
      conf/settings.ini.dist
  2. 4
      templates/default/owner_password_modal.html.ep
  3. 4
      vroom.pl

@ -40,9 +40,9 @@
[rooms] [rooms]
; After this amount of time in minutes, rooms without any activity will be purged ; 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 ; 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 ; 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' ;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'

@ -15,12 +15,12 @@
<%=l 'SET_OWNER_PASS' %> <%=l 'SET_OWNER_PASS' %>
<ul> <ul>
<li> <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>
<li> <li>
<%=l 'A_RESERVED_ROOM' %> <%=l 'A_RESERVED_ROOM' %>
<% if ($config->{'rooms.reserved_inactivity_timeout'} > 0){ %> <% 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{ %> <% } else{ %>
<%=l 'WILL_NEVER_EXPIRE' %> <%=l 'WILL_NEVER_EXPIRE' %>
<% } %> <% } %>

@ -39,8 +39,8 @@ $config->{'interface.template'} ||= 'default';
$config->{'interface.chrome_extension_id'} ||= 'ecicdpoejfllflombfanbhfpgcimjddn'; $config->{'interface.chrome_extension_id'} ||= 'ecicdpoejfllflombfanbhfpgcimjddn';
$config->{'cookie.secret'} ||= 'secret'; $config->{'cookie.secret'} ||= 'secret';
$config->{'cookie.name'} ||= 'vroom'; $config->{'cookie.name'} ||= 'vroom';
$config->{'rooms.inactivity_timeout'} ||= 3600; $config->{'rooms.inactivity_timeout'} ||= 60;
$config->{'rooms.reserved_inactivity_timeout'} ||= 5184000; $config->{'rooms.reserved_inactivity_timeout'} ||= 86400;
$config->{'rooms.common_names'} ||= ''; $config->{'rooms.common_names'} ||= '';
$config->{'log.level'} ||= 'info'; $config->{'log.level'} ||= 'info';
$config->{'etherpad.uri'} ||= ''; $config->{'etherpad.uri'} ||= '';

Loading…
Cancel
Save