From a88792546f52b527a3499af5c8a21480be3a880a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 06 Oct 2008 15:39:51 -0400
Subject: [PATCH] #1485446: calculate message's ETAG including inline_images option (for multipart messages) 

---
 UPGRADING |  182 +++++++++++++++++++++------------------------
 1 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 624262d..44daba0 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,113 +1,103 @@
 UPDATE instructions
 ===================
 
-Follow these instructions if upgrading from a previous version
+First you should remove all subfolders from /program/localization/
+because most language codes have changed in 0.2-alpha. This way you
+can make sure that no old localization files remain on your disk.
+
+Then follow these instructions if upgrading from a previous version
 of RoundCube Webmail.
 
-
-from versions 0.1-alpha and 0.1-20050811
+from version 0.2-alpha
 ----------------------------------------
-- replace index.php
-- replace all files in folder /program/
-- replace all files in folder /skins/default/
-- run all commands in SQL/*.update.sql or re-initalize database with *.initial.sql
-- add these line to /config/main.inc.php
-  $rcmail_config['trash_mbox'] = 'Trash';
-  $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
-  $rcmail_config['prefer_html'] = TRUE;
-  $rcmail_config['prettydate'] = TRUE;
-  $rcmail_config['smtp_port'] = 25;
-  $rcmail_config['default_port'] = 143;
-  $rcmail_config['session_lifetime'] = 20;
-  $rcmail_config['skip_deleted'] = FALSE;
-  $rcmail_config['message_sort_col'] = 'date';
-  $rcmail_config['message_sort_order'] = 'DESC';
-  $rcmail_config['log_dir'] = 'logs/';
-  $rcmail_config['temp_dir'] = 'temp/';
-  $rcmail_config['message_cache_lifetime'] = '10d';
-- replace database properties (db_type, db_host, db_user, db_pass, $d_name)
-  in /config/db.inc.php with the following line:
-  $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
-- add these lines to /config/db.inc.php
-  $rcmail_config['db_max_length'] = 512000;
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+  below the line "-- Updates from version 0.2-alpha"
+* check the config/main.inc.php.dist for new configuration 
+  options and add them to your config 
+  WARNING: 'skin_path' option was replaced by 'skin' option
+* WARNING: 'db_backend' option has been removed, now only
+  PEAR::MDB2 driver is supported
 
 
-from version 0.1-20050820
+from version 0.1.1
 ----------------------------------------
-- replace index.php
-- replace all files in folder /program/
-- replace all files in folder /skins/default/
-- run all commands in SQL/*.update.sql or re-initalize database with *.initial.sql
-- add these line to /config/main.inc.php
-  $rcmail_config['prettydate'] = TRUE;
-  $rcmail_config['smtp_port'] = 25;
-  $rcmail_config['default_port'] = 143;
-  $rcmail_config['session_lifetime'] = 20;
-  $rcmail_config['skip_deleted'] = FALSE;
-  $rcmail_config['message_sort_col'] = 'date';
-  $rcmail_config['message_sort_order'] = 'DESC';
-  $rcmail_config['log_dir'] = 'logs/';
-  $rcmail_config['temp_dir'] = 'temp/';
-  $rcmail_config['message_cache_lifetime'] = '10d';
-- replace database properties (db_type, db_host, db_user, db_pass, $d_name)
-  in /config/db.inc.php with the following line:
-  $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
-- add these lines to /config/db.inc.php
-  $rcmail_config['db_max_length'] = 512000;
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+  below the line "-- Updates from version 0.1.1"
+* check the config/main.inc.php.dist for new configuration 
+  options and add them to your config 
 
 
-from version 0.1-20051007
+from version 0.1-stable
 ----------------------------------------
-- replace index.php
-- replace all files in folder /program/
-- replace all files in folder /skins/default/
-- run all commands in SQL/*.update.sql or re-initalize database with *.initial.sql
-- add these lines to /config/main.inc.php
-  $rcmail_config['smtp_auth_type'] = '';  // if you need to specify an auth method for SMTP
-  $rcmail_config['session_lifetime'] = 20;  // to specify the session lifetime in minutes
-  $rcmail_config['skip_deleted'] = FALSE;
-  $rcmail_config['message_sort_col'] = 'date';
-  $rcmail_config['message_sort_order'] = 'DESC';
-  $rcmail_config['log_dir'] = 'logs/';
-  $rcmail_config['temp_dir'] = 'temp/';
-  $rcmail_config['message_cache_lifetime'] = '10d';
-- add these lines to /config/db.inc.php
-  $rcmail_config['db_max_length'] = 512000;  
-  $rcmail_config['db_sequence_user_ids'] = 'user_ids';
-  $rcmail_config['db_sequence_identity_ids'] = 'identity_ids';
-  $rcmail_config['db_sequence_contact_ids'] = 'contact_ids';
-  $rcmail_config['db_sequence_cache_ids'] = 'cache_ids';
-  $rcmail_config['db_sequence_message_ids'] = 'message_ids';  
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+* check the config/main.inc.php.dist for new configuration options
+  and add them to your config 
 
 
-from version 0.1-20051021
+from version 0.1-rc2
 ----------------------------------------
-- replace index.php
-- replace all files in folder /program/
-- replace all files in folder /skins/default/
-- run all commands in SQL/*.update.sql or re-initalize database with *.initial.sql
-- add these lines to /config/main.inc.php
-  $rcmail_config['skip_deleted'] = FALSE;
-  $rcmail_config['message_sort_col'] = 'date';
-  $rcmail_config['message_sort_order'] = 'DESC';
-  $rcmail_config['log_dir'] = 'logs/';
-  $rcmail_config['temp_dir'] = 'temp/';
-  $rcmail_config['message_cache_lifetime'] = '10d';
-- add these lines to /config/db.inc.php
-  $rcmail_config['db_max_length'] = 512000;
-  $rcmail_config['db_sequence_user_ids'] = 'user_ids';
-  $rcmail_config['db_sequence_identity_ids'] = 'identity_ids';
-  $rcmail_config['db_sequence_contact_ids'] = 'contact_ids';
-  $rcmail_config['db_sequence_cache_ids'] = 'cache_ids';
-  $rcmail_config['db_sequence_message_ids'] = 'message_ids';
-  
-  
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+
+
+from version 0.1-rc1
+----------------------------------------
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* If you have LDAP servers configured you should re-configure
+  the config entries using the template given in /config/main.inc.php.dist
+
+
+from version 0.1-beta2
+----------------------------------------
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql or
+  re-initalize the database with [yourdbtype].initial.sql
+* add these lines to /config/main.inc.php
+   $rcmail_config['draft_autosave'] = 300;
+   $rcmail_config['date_today'] = 'H:i';
+* If you have LDAP servers configured you should re-configure
+  the config entries using the template given in /config/main.inc.php.dist
+
+
 form version 0.1-beta
 ----------------------------------------
-- replace index.php
-- replace all files in folder /program/
-- replace all files in folder /skins/default/
-- add these lines to /config/db.inc.php
-  $rcmail_config['db_persistent'] = TRUE;
-
-  
+* replace index.php
+* replace all files in folder /bin/
+* replace all files in folder /program/
+* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql or
+  re-initalize the database with [yourdbtype].initial.sql
+* add this line to /config/db.inc.php
+   $rcmail_config['db_persistent'] = false;
+* add these lines to /config/main.inc.php
+   $rcmail_config['drafts_mbox'] = 'Drafts';
+   $rcmail_config['junk_mbox'] = 'Junk';
+   $rcmail_config['product_name'] = 'RoundCube Webmail';
+   $rcmail_config['read_when_deleted'] = false;
+   $rcmail_config['enable_spellcheck'] = false;
+   $rcmail_config['protect_default_folders'] = false;
+* replace the following line from /config/main.inc.php
+   @include($_SERVER['HTTP_HOST'].'.inc.php');
+  with 
+   $rcmail_config['include_host_config'] = false;

--
Gitblit v1.9.1