X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fmain.inc.php.dist;fp=config%2Fmain.inc.php.dist;h=926b4e0088c169571782a4aecf1d6c87cdb6c4e5;hb=ade1655456ffdb799be8081f57ec90a408b99dd9;hp=3b8e407c8bceaa33aef91fca05ee08a4bd021c4a;hpb=38bb9fc2d3bc5c90338eb7f375f42273b088adcd;p=roundcube.git

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 3b8e407..926b4e0 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -77,6 +77,12 @@ $rcmail_config['smtp_pass'] = '';
 // best server supported one)
 $rcmail_config['smtp_auth_type'] = '';
 
+// SMTP HELO host 
+// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages 
+// Leave this blank and you will get the server variable 'server_name' or 
+// localhost if that isn't defined. 
+$rcmail_config['smtp_helo_host'] = '';
+
 // Log sent messages
 $rcmail_config['smtp_log'] = TRUE;
 
@@ -87,6 +93,9 @@ $rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size');
 // relative path to the skin folder
 $rcmail_config['skin_path'] = 'skins/default/';
 
+// includes should be interpreted as PHP files
+$rcmail_config['skin_include_php'] = FALSE;
+
 // use this folder to store temp files (must be writebale for apache user)
 $rcmail_config['temp_dir'] = 'temp/';
 
@@ -121,7 +130,7 @@ $rcmail_config['date_long'] = 'd.m.Y H:i';
 $rcmail_config['date_today'] = 'H:i';
 
 // add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.1-rc1';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.1-rc2';
 
 // use this name to compose page titles
 $rcmail_config['product_name'] = 'RoundCube Webmail';
@@ -165,6 +174,8 @@ $rcmail_config['read_when_deleted'] = TRUE;
 $rcmail_config['flag_for_deletion'] = TRUE;
 
 // Make use of the built-in spell checker. It is based on GoogieSpell.
+// Since Google only accepts connections over https your PHP installatation
+// requires to be compiled with Open SSL support
 $rcmail_config['enable_spellcheck'] = TRUE;
 
 // For a locally installed Nox Spell Server, please specify the URI to call it.
@@ -199,14 +210,20 @@ $rcmail_config['mail_header_delimiter'] = NULL;
  *  'base_dn'       => '',
  *  'bind_dn'       => '',
  *  'bind_pass'     => '',
+ *  '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
  *  'scope'         => 'sub',   // search mode: sub|base|list
- *  'filter'        => '',      // will be &'d with search field ex: (status=act)
+ *  'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. ex: (status=act)
  *  'fuzzy_search'  => true);   // server allows wildcard search
  */
 
+// enable composing html formatted messages (experimental)
+$rcmail_config['enable_htmleditor'] = FALSE;
+
 // don't allow these settings to be overriden by the user
 $rcmail_config['dont_override'] = array();
 
@@ -223,10 +240,10 @@ $rcmail_config['include_host_config'] = FALSE;
 $rcmail_config['pagesize'] = 40;
 
 // use this timezone to display date/time
-$rcmail_config['timezone'] = 1;
+$rcmail_config['timezone'] = intval(date('O'))/100 - date('I');
 
-// daylight savings are On
-$rcmail_config['dst_active'] = TRUE;
+// is daylight saving On?
+$rcmail_config['dst_active'] = (bool)date('I');
 
 // prefer displaying HTML messages
 $rcmail_config['prefer_html'] = TRUE;
@@ -243,5 +260,8 @@ $rcmail_config['message_sort_order'] = 'DESC';
 // save compose message every 300 seconds (5min)
 $rcmail_config['draft_autosave'] = 300;
 
+// don't let users set pagesize to more than this value if set
+$rcmail_config['max_pagesize'] = 200;
+
 // end of config file
 ?>