From 8c985e87d6d6b494c57c2f98371985cc591c39ff Mon Sep 17 00:00:00 2001
From: Thomas <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 03:21:13 -0400
Subject: [PATCH] Backported the canned responses feature to the 0.9 release series

---
 config/main.inc.php.dist |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 2bbf8cb..a8e9b29 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -174,6 +174,8 @@
 $rcmail_config['smtp_helo_host'] = '';
 
 // SMTP connection timeout, in seconds. Default: 0 (no limit)
+// Note: There's a known issue where using ssl connection with
+// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
 $rcmail_config['smtp_timeout'] = 0;
 
 // ----------------------------------
@@ -250,6 +252,9 @@
 
 // Session name. Default: 'roundcube_sessid'
 $rcmail_config['session_name'] = null;
+
+// Session authentication cookie name. Default: 'roundcube_sessauth'
+$rcmail_config['session_auth_name'] = null;
 
 // Session path. Defaults to PHP session.cookie_path setting.
 $rcmail_config['session_path'] = null;
@@ -431,7 +436,8 @@
 $rcmail_config['date_format'] = 'Y-m-d';
 
 // give this choice of date formats to the user to select from
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
+// Note: do not use ambiguous formats like m/d/Y
+$rcmail_config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
 
 // use this format for time display (date or strftime format)
 $rcmail_config['time_format'] = 'H:i';
@@ -529,6 +535,12 @@
 // after object delete action. Currently used with supporting address book sources.
 // Setting it to 0, disables the feature.
 $rcmail_config['undo_timeout'] = 0;
+
+// A static list of canned responses which are immutable for the user
+$rcmail_config['compose_responses_static'] = array(
+//  array('name' => 'Canned Response 1', 'text' => 'Static Response One'),
+//  array('name' => 'Canned Response 2', 'text' => 'Static Response Two'),
+);
 
 // ----------------------------------
 // ADDRESSBOOK SETTINGS
@@ -866,6 +878,7 @@
 $rcmail_config['mdn_default'] = 0;
 
 // Delivery Status Notification checkbox default state
+// Note: This can be used only if smtp_server is non-empty
 $rcmail_config['dsn_default'] = 0;
 
 // Place replies in the folder of the message being replied to

--
Gitblit v1.9.1