Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eeb9767969bc04bff52e139c7a7ab57ee52438b5
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Jul 25 10:24:05 2013 +0200

    Fix calendar settings form (wrong selection for calendar_timeslots)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 09ef214..1932608 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -333,7 +333,7 @@ class calendar extends rcube_plugin
       $select->add($choices);
       $p['blocks']['view']['options']['timeslots'] = array(
         'title' => html::label($field_id, Q($this->gettext('timeslots'))),
-        'content' => $select->show($this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots'])),
+        'content' => $select->show(strval($this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots']))),
       );
       
       $field_id = 'rcmfd_firstday';
@@ -491,8 +491,8 @@ class calendar extends rcube_plugin
 
       $p['prefs'] = array(
         'calendar_default_view' => get_input_value('_default_view', RCUBE_INPUT_POST),
-        'calendar_timeslots'    => get_input_value('_timeslots', RCUBE_INPUT_POST),
-        'calendar_first_day'    => get_input_value('_first_day', RCUBE_INPUT_POST),
+        'calendar_timeslots'    => intval(get_input_value('_timeslots', RCUBE_INPUT_POST)),
+        'calendar_first_day'    => intval(get_input_value('_first_day', RCUBE_INPUT_POST)),
         'calendar_first_hour'   => intval(get_input_value('_first_hour', RCUBE_INPUT_POST)),
         'calendar_work_start'   => intval(get_input_value('_work_start', RCUBE_INPUT_POST)),
         'calendar_work_end'     => intval(get_input_value('_work_end', RCUBE_INPUT_POST)),