From 01a8c54f76dcbbf4da4be7471dbe04ba7401bec8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 01 May 2009 11:57:33 -0400
Subject: [PATCH] Applied patch for pspell language configuration (#1485822)

---
 config/main.inc.php.dist |   85 +++++++++++++++++++++++-------------------
 1 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index bb036d6..e890ef3 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -5,7 +5,7 @@
  | Main configuration file                                               |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -21,6 +21,10 @@
 // log driver:  'syslog' or 'file'.
 $rcmail_config['log_driver'] = 'file';
 
+// date format for log entries
+// (read http://php.net/manual/en/function.date.php for all format characters)  
+$rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';
+
 // Syslog ident string to use, if using the 'syslog' log driver.
 $rcmail_config['syslog_id'] = 'roundcube';
 
@@ -34,6 +38,12 @@
 
 // use this folder to store temp files (must be writeable for apache user)
 $rcmail_config['temp_dir'] = 'temp/';
+
+// use this folder to search for plugin sources
+$rcmail_config['plugins_dir'] = 'plugins/';
+
+// List of active plugins. Add the name of a directory found in 'plugins_dir'
+$rcmail_config['plugins'] = array();
 
 // enable caching of messages and mailbox data in the local database.
 // this is recommended if the IMAP server does not run on the same machine
@@ -51,7 +61,7 @@
 // the mail host chosen to perform the log-in
 // leave blank to show a textbox at login, give a list of hosts
 // to display a pulldown menu or set one host as string.
-// To use SSL connection, enter ssl://hostname:993
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
 $rcmail_config['default_host'] = '';
 
 // TCP port used for IMAP connections
@@ -152,7 +162,7 @@
 $rcmail_config['date_today'] = 'H:i';
 
 // add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.2-beta';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.3-beta';
 
 // use this name to compose page titles
 $rcmail_config['product_name'] = 'RoundCube Webmail';
@@ -209,8 +219,7 @@
 
 // These languages can be selected for spell checking.
 // Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
-// Leave empty for default set of Google spell check languages, should be defined
-// when using local Pspell extension
+// Leave empty for default set of available language.
 $rcmail_config['spellcheck_languages'] = NULL;
 
 // path to a text file which will be added to each sent message
@@ -248,43 +257,43 @@
 //  o=root
 //   ou=people
 //    uid=user@domain
-//	mail=contact@contactdomain
-//	
+//  mail=contact@contactdomain
+//
 // So the base_dn would be uid=%fu,ou=people,o=root
 // The bind_dn would be the same as based_dn or some super user login.
-/** 
+/* 
  * example config for Verisign directory
  *
- * $rcmail_config['ldap_public']['Verisign'] = array(
- *  'name'          => 'Verisign.com',
- *  'hosts'         => array('directory.verisign.com'),
- *  'port'          => 389,
- *  'use_tls'	    => false,
- *  'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
- *  // %fu - The full username provided, assumes the username is an email
- *  //       address, uses the username_domain value if not an email address.
- *  // %u  - The username prior to the '@'.
- *  // %d  - The domain name after the '@'.
- *  'base_dn'       => '',
- *  'bind_dn'       => '',
- *  'bind_pass'     => '',
- *  'writable'      => false,   // Indicates if we can write to the LDAP directory or not.
- *  // If writable is true then these fields need to be populated:
- *  // LDAP_Object_Classes, required_fields, LDAP_rdn
- *  'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
- *  'required_fields'     => array("cn", "sn", "mail"),     // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
- *  'LDAP_rdn'      => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
- *  'ldap_version'  => 3,       // using LDAPv3
- *  'search_fields' => array('mail', 'cn'),  // fields to search in
- *  'name_field'    => 'cn',    // this field represents the contact's name
- *  'email_field'   => 'mail',  // this field represents the contact's e-mail
- *  'surname_field' => 'sn',    // this field represents the contact's last name
- *  'firstname_field' => 'gn',  // this field represents the contact's first name
- *  'sort'          => 'cn',    // The field to sort the listing by.
- *  'scope'         => 'sub',   // search mode: sub|base|list
- *  'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
- *  'fuzzy_search'  => true);   // server allows wildcard search
- */
+$rcmail_config['ldap_public']['Verisign'] = array(
+  'name'          => 'Verisign.com',
+  'hosts'         => array('directory.verisign.com'),
+  'port'          => 389,
+  'use_tls'	    => false,
+  'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
+  // %fu - The full username provided, assumes the username is an email
+  //       address, uses the username_domain value if not an email address.
+  // %u  - The username prior to the '@'.
+  // %d  - The domain name after the '@'.
+  'base_dn'       => '',
+  'bind_dn'       => '',
+  'bind_pass'     => '',
+  'writable'      => false,   // Indicates if we can write to the LDAP directory or not.
+  // If writable is true then these fields need to be populated:
+  // LDAP_Object_Classes, required_fields, LDAP_rdn
+  'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
+  'required_fields'     => array("cn", "sn", "mail"),     // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
+  'LDAP_rdn'      => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
+  'ldap_version'  => 3,       // using LDAPv3
+  'search_fields' => array('mail', 'cn'),  // fields to search in
+  'name_field'    => 'cn',    // this field represents the contact's name
+  'email_field'   => 'mail',  // this field represents the contact's e-mail
+  'surname_field' => 'sn',    // this field represents the contact's last name
+  'firstname_field' => 'gn',  // this field represents the contact's first name
+  'sort'          => 'cn',    // The field to sort the listing by.
+  'scope'         => 'sub',   // search mode: sub|base|list
+  'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
+  'fuzzy_search'  => true);   // server allows wildcard search
+*/
 
 // An ordered array of the ids of the addressbooks that should be searched
 // when populating address autocomplete fields server-side. ex: array('sql','Verisign');

--
Gitblit v1.9.1