From 92fc63277d9d12e4f5c2ae07f63e2e36c5c41f7f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 27 Jun 2012 22:31:42 +0200
Subject: [PATCH] Fix typos + add documentation for two more config options

---
 plugins/calendar/calendar.php        | 6 +++---
 plugins/calendar/config.inc.php.dist | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index ebe9b2f4..5b1ec0d9 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -373,7 +373,7 @@ class calendar extends rcube_plugin
         ' &mdash; ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)),
       );
 
-      $field_id = 'rcmfd_coloing';
+      $field_id = 'rcmfd_coloring';
       $select_colors = new html_select(array('name' => '_event_coloring', 'id' => $field_id));
       $select_colors->add($this->gettext('coloringmode0'), 0);
       $select_colors->add($this->gettext('coloringmode1'), 1);
@@ -482,7 +482,7 @@ class calendar extends rcube_plugin
 
       // compose default alarm preset value
       $alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST);
-      $default_alam = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];
+      $default_alarm = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];
 
       $p['prefs'] = array(
         'calendar_default_view' => get_input_value('_default_view', RCUBE_INPUT_POST),
@@ -493,7 +493,7 @@ class calendar extends rcube_plugin
         'calendar_work_end'     => intval(get_input_value('_work_end', RCUBE_INPUT_POST)),
         'calendar_event_coloring'       => intval(get_input_value('_event_coloring', RCUBE_INPUT_POST)),
         'calendar_default_alarm_type'   => get_input_value('_alarm_type', RCUBE_INPUT_POST),
-        'calendar_default_alarm_offset' => $default_alam,
+        'calendar_default_alarm_offset' => $default_alarm,
         'calendar_default_calendar'     => get_input_value('_default_calendar', RCUBE_INPUT_POST),
         'calendar_date_format' => null,  // clear previously saved values
         'calendar_time_format' => null,
diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist
index 03273f82..0fb8bea1 100644
--- a/plugins/calendar/config.inc.php.dist
+++ b/plugins/calendar/config.inc.php.dist
@@ -80,6 +80,15 @@ $rcmail_config['calendar_work_end'] = 18;
 // show line at current time of the day
 $rcmail_config['calendar_time_indicator'] = true;
 
+// default alarm settings for new events.
+// this is only a preset when a new event dialog opens
+// possible values are <empty>, DISPLAY, EMAIL
+$rcmail_config['calendar_default_alarm_type'] = '';
+
+// default alarm offset for new events.
+// use ical-style offset values like "-1H" (one hour before) or "+30M" (30 minutes after)
+$rcmail_config['calendar_default_alarm_offset'] = '-15M';
+
 // how to colorize events:
 // 0: according to calendar color
 // 1: according to category color