Changeset 957 in subversion

Timestamp:

Jan 27, 2008 1:45:44 PM (5 years ago)

Author:

tomekp

Message:

first part of devel-vnext to trunk merging process
this broke the devel-vnext branch, we switched to error_reporting(E_ALL|E_STRICT)
more to come shortly

Location:

branches/devel-vnext

Files:

• CHANGELOG (modified) (1 diff)
• INSTALL (modified) (4 diffs)
• SQL/mssql.initial.sql (modified) (1 diff)
• SQL/mysql.initial.sql (modified) (2 diffs)
• SQL/mysql.update-0.1a.sql (deleted)
• SQL/mysql.update.sql (modified) (2 diffs)
• SQL/mysql5.initial.sql (modified) (2 diffs)
• SQL/postgres.initial.sql (modified) (1 diff)
• SQL/postgres.update.sql (modified) (1 diff)
• SQL/sqlite.initial.sql (modified) (1 diff)
• UPGRADING (modified) (3 diffs)
• config/db.inc.php.dist (modified) (3 diffs)
• config/main.inc.php.dist (modified) (7 diffs)
• program/include/bootstrap.php (modified) (5 diffs)
• program/include/globals.php (modified) (31 diffs)
• program/include/rcube.php (modified) (3 diffs)
• program/include/rcube_contacts.php (modified) (5 diffs)
• program/include/rcube_error.php (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (7 diffs)
• program/include/rcube_smtp.php (modified) (2 diffs)
• program/include/rcube_sqlite.inc (modified) (2 diffs)
• program/include/rcube_template.php (modified) (54 diffs)
• program/include/rcube_user.php (added)
• program/include/session.inc (modified) (9 diffs)

branches/devel-vnext/CHANGELOG

@@ -2 +2 @@
 ---------------------------
 
-2007/11/12 (tomekp)
-- MFH: ar, ca, de_DE, en_GB, en_US, eu, fa, fr, ja, lt, ru, se, sk, sl localizations
+2008/01/08 (tomekp)
+----------
+- add he (Hebrew) localization (#1484713)
+
+
+2008/01/08 (tomekp)
+----------
+- update fr localization
+
+
+2008/01/04 (tomekp)
+- purge kur_KU because it has no messages translation
+- bump copyright for all localization files
+
+
+2007/12/31 (tomekp)
+----------
+- update es localization
+
+
+2007/12/28 (tomekp)
+----------
+- update mk localization
+
+
+2007/12/27 (tomekp)
+----------
+- update se localization
+
+
+2007/12/13 (robin)
+----------
+- Add Received header on outgoing mail
+
+
+2007/12/10 (estadtherr)
+----------
+- Upgrade to TinyMCE 2.1.3
+- Allow inserting image attachments into HTML messages while composing (#1484557)
+
+
+2007/12/10 (thomasb)
+----------
+- Delegate user-stuff to new class rcube_user
+- Implement Message-Disposition-Notification (Receipts)
+
+
+2007/12/05 (tomekp)
+----------
+- update bg, uk localization
+
+
+2007/12/04 (tomekp)
+----------
+- update bg localization
+
+
+2007/11/25 (thomasb)
+----------
+- Applied UID fetch patch by Glen Ogilvie
+- Applied patch for correct Postgres instructions from ticket #1484674
+- Fix overriding of session vars when register_globals is on (#1484670)
+- Fix wrong Postgres setup instructions in INSTALL (#1484674)
+- Fix bug with case-sensitive folder names (#1484245)
+- Don't create default folders by default
+- Added Georgian localization by Zaza Zviadadze
+- Updated Russian localization
+- Fixed some potential security risks (audited by Andris)
+- Only show new messages if they match the current search (#1484176)
+
+
+2007/11/20 (tomekp)
+----------
+- add Korean (kr) localization
+
+
+2007/11/14 (tomekp)
+----------
+- update id_ID localization
+
+
+2007/11/06 (thomasb)
+----------
+- Switch to/from when searcing in Sent folder (#1484555)
+- Correctly read the References header (#1484646)
+- Unset old cookie in before sending a new value (#1484639)
+- Correctly decode attachments when downloading them (#1484645 and #1484642)
+
 
 2007/10/22 (tomekp)
-- MFH: da, eo, gl, hu, ru localizations
-
-2007/10/17 (tomekp)
-- MFH: update ca, cz, es, it, pt_BR, pt_PT localizations
-
-2007/10/05
-- MFH: add Esperanto localization
-- MFH: update German localization
-
-2007/10/04 (tomekp)
-----------
-- MFH: all localizations
+----------
+- update ru, eo localizations
+
+
+2007/10/17 (thomasb)
+----------
+- Make message listing less error prone
+
+
+2007/10/10 (thomasb)
+----------
+- Suppress IE errors when clearing attachments form (#1484356)
+- Set preferences field in user table to NULL (#1484386)
+- Log error when login fails due to auto_create_user turned off
+- Update UPGRADING instructions
+
+
+2007/10/05 (tomekp)
+----------
+- Add Esperanto localization
+
+
++2007/10/04 (Stiwi)
+----------
+- Updated German localization
+
+
+2007/10/04 (yllar)
+----------
+- Added Malay localization
+- Updated Lithuanian localization
+
 
 2007/09/27 (tomekp)
 ----------
+- Update dutch localization (closes #1484588)
+
+
+2007/09/29 (thomasb)
+----------
+- Filter linked/imported CSS files (closes #1484056)
+
+
+2007/09/27 (tomekp)
+----------
 - Update brazilian portuguese localization (#1484580)
 
+
+2007/09/26 (thomasb)
+----------
+- Improve message compose screen (closes #1484383)
+- Select next row after removing one from list (#1484387)
+
+
 2007/09/26 (tomekp)
 ----------
+- Add polish labels for changes in r816.
 - Update polish localization (#1484579)
 - Update thai localization (#1484578)
 
+
+2007/09/25 (robin)
+----------
+- Enable drag-/dropping of folders to a new parent folder (#1457344)
+
+
+2007/09/24 (robin)
+----------
+- Fix preview pane size for Safari & Konqueror (#1484187)
+
+
+2007/09/20 (robin)
+----------
+- Make smtp HELO/EHLO hostname configurable (#1484067)
+
+
+2007/09/19 (thomasb)
+----------
+- IPv6 Compatability (#1484322), Patch #1484373
+- Unlock interface when message sending fails (#1484570)
+- Eval PHP code in template includes (if configured)
+- Show message when folder is empty. Mo more static text in table (#1484395)
+- Only display unread count in page title when new messages arrived
+- Show mailbox name in page title
+
+
+2007/09/09 (thomasb)
+----------
+- Fixed wrong delete button tooltip (#1483965)
+- Fixed charset encoding bug (#1484429)
+- Applied patch for LDAP version (#1484552)
+- Improved XHTML validation
+
+
+2007/09/05 (thomasb)
+----------
+- Fix message list selection (#1484550)
+- Better fix lowercased usernames (#1484473)
+- Update pngbehavior Script as suggested in #1484490
+
+
+2007/08/29 (richs)
+----------
+- Fixed moving/deleting messages when more than 1 is selected
+
+
+2007/08/15 (thomasb)
+----------
+- Applied patch for LDAP contacts listing by Glen Ogilvie
+- Applied patch for more address fields in LDAP contacts (#1484402)
+- Close LDAP connections on script shutdown
+
+
+2007/08/13 (thomasb)
+----------
+- Add alternative for getallheaders() (fix #1484508)
+- Revert changes for mbstring usage (fix #1484509)
+
+
+2007/08/10 (thomasb)
+----------
+- Identify mailboxes case-sensitive
+- Sort mailbox list case-insensitive (closes #1484338)
+- Fix display of multipart messages from Apple Mail (closes #1484027)
+- Protect AJAX request from being fetched by a foreign site (XSS)
+- Make autocomplete for loginform configurable by the skin template
+- Fix compose function from address book (closes #1484426)
+- Added //IGNORE to iconv call (patch #1484420, closes #1484023)
+- Check if mbstring supports charset (#1484290 and #1484292)
+- Prefer iconv over mbstring (as suggested in #1484292)
+- Check filesize of template includes (#1484409)
+- Updated Simplified Chinese localization
+- Added Ukrainian translation
+
+
+2007/08/09 (richs)
+----------
+- Fixed bug with buttons not dimming/enabling properly after switching folders
+- Fixed compose window becoming unresponsive after saving a draft (#1484487)
+- Re-enabled "Back" button in compose window now that bug #1484487 is fixed
+- Fixed unresponsive interface issue when downloading attachments (#1484496)
+- Lowered status message time from 5 to 3 seconds to improve responsiveness
+- Added note to INSTALL about .htaccess limiting upload_max_filesize
+- Raised .htaccess upload_max_filesize from 2M to 5M to differ from default php.ini
+- Increased "mailboxcontrols" mail.css width from 160 to 170px to fix non-english languages (#1484499)
+- Fixed empty-message sending with TinyMCE plain-text mode, or if it's not installed
+
+
+2007/07/03 (thomasb)
+----------
+- Added Macedonian (Slavic FYROM) localization
+- Fix status message bug #1484464 with regard to #1484353
+- Fix address adding bug reported by David Koblas
+- Applied socket error patch by Thomas Mangin
+
+
+2007/06/28 (tomekp)
+----------
+- fix typos in Polish localization (Janusz Zamecki)
+
+
+2007/06/27 (tomekp)
+----------
+- Update Polish (Janusz Zamecki), Croatian (Svebor Prstacic) localization
+
+
+2007/06/12 (thomasb)
+----------
+- Updated Turkish, Polish, Finnish/Suomi, Japanese, Hungarian, Greek, Euskara localization
+- Added Irish/Gaelic translation
+- Little correction in Swedish translation
+- Quote username for virtuser_query
+- Pass-by-reference workarround for PHP5 in sendmail.inc
+
+
+2007/06/04 (estadtherr)
+----------
+- Fixed bug in HTML->Plain editor toggling
+
+
+2007/05/28 (thomasb)
+---------
+- Fixed buggy imap_root settings (closes #1484379)
+- Prevent default events on subject links (#1484399)
+- Typo in rcube_smtp.inc
+
+
+2007/05/23 (estadtherr)
+----------
+- Upgrade to TinyMCE v2.1.1.1
+
+
 2007/05/18 (thomasb)
 ----------
+- Enable drag-&-dropping of folders to a new parent and allow to create subfolders (#1457344)
+- Suppress IE errors when clearing attachments form (#1484356)
+- Set preferences field in user table to NULL (#1484386)
+- Log error when login fails due to auto_create_user turned off
+- Filter linked/imported CSS files (closes #1484056)
+- Improve message compose screen (closes #1484383)
+- Select next row after removing one from list (#1484387)
+- Make smtp HELO/EHLO hostname configurable (#1484067)
+- IPv6 Compatability (#1484322), Patch #1484373
+- Unlock interface when message sending fails (#1484570)
+- Eval PHP code in template includes (if configured)
+- Show message when folder is empty. Mo more static text in table (#1484395)
+- Only display unread count in page title when new messages arrived
+- Fixed wrong delete button tooltip (#1483965)
+- Fixed charset encoding bug (#1484429)
+- Applied patch for LDAP version (#1484552)
+- Improved XHTML validation
+- Fix message list selection (#1484550)
+- Better fix lowercased usernames (#1484473)
+- Update pngbehavior Script as suggested in #1484490
+- Fixed moving/deleting messages when more than 1 is selected
+- Applied patch for LDAP contacts listing by Glen Ogilvie
+- Applied patch for more address fields in LDAP contacts (#1484402)
+- Add alternative for getallheaders() (fix #1484508)
+- Identify mailboxes case-sensitive
+- Sort mailbox list case-insensitive (closes #1484338)
+- Fix display of multipart messages from Apple Mail (closes #1484027)
+- Protect AJAX request from being fetched by a foreign site (XSS)
+- Make autocomplete for loginform configurable by the skin template
+- Fix compose function from address book (closes #1484426)
+- Added //IGNORE to iconv call (patch #1484420, closes #1484023)
+- Check if mbstring supports charset (#1484290 and #1484292)
+- Prefer iconv over mbstring (as suggested in #1484292)
+- Check filesize of template includes (#1484409)
+- Fixed bug with buttons not dimming/enabling properly after switching folders
+- Fixed compose window becoming unresponsive after saving a draft (#1484487)
+- Re-enabled "Back" button in compose window now that bug #1484487 is fixed
+- Fixed unresponsive interface issue when downloading attachments (#1484496)
+- Lowered status message time from 5 to 3 seconds to improve responsiveness
+- Raised .htaccess upload_max_filesize from 2M to 5M to differ from default php.ini
+- Increased "mailboxcontrols" mail.css width from 160 to 170px to fix non-english languages (#1484499)
+- Fix status message bug #1484464 with regard to #1484353
+- Fix address adding bug reported by David Koblas
+- Applied socket error patch by Thomas Mangin
+- Pass-by-reference workarround for PHP5 in sendmail.inc
+- Fixed buggy imap_root settings (closes #1484379)
+- Prevent default events on subject links (#1484399)
 - Use HTTP-POST requests for actions that change state
 
+
+RELEASE 0.1.-RC1
 
 2007/05/17 (thomasb)

branches/devel-vnext/INSTALL

@@ +1 @@
+INTRODUCTION
+============
+
+This file describes the basic steps to install RoundCube Webmail on your
+web server. For additional information, please also consult the project's
+wiki page at
+
+     http://trac.roundcube.net/wiki
+
 
 REQUIREMENTS
 ============
 
-* The Apache Webserver
+* The Apache or Lighttpd Webserver
 * .htaccess support allowing overrides for DirectoryIndex
-* PHP Version 4.3.1 or greater
-* PCRE (perl compatible regular expression) installed with PHP
+* PHP Version 4.3.1 or greater including
+   - PCRE (perl compatible regular expression)
+   - libiconv (recommended)
+   - mbstring (optional)
 * php.ini options:
    - error_reporting E_ALL & ~E_NOTICE (or lower)
    - file_uploads on (for attachment upload features)
    - memory_limit (increase as suitable to support large attachments)
+* PHP compiled with Open SSL to connect to IMAPS and to use the spell checker
 * A MySQL or PostgreSQL database engine or the SQLite extension for PHP
-* A database with permission to create tables
+* One of the above databases with permission to create tables
+* An SMTP server or PHP configured for mail delivery
 
 
@@ -81 +94 @@
 * PostgreSQL
 ------------
-To use RoundCube with PostgreSQL support you have to follow the next
-simple steps, which have to be done with the postgres system user (or
+
+To use RoundCube with PostgreSQL support you have to follow these
+simple steps, which have to be done as the postgres system user (or
 which ever is the database superuser):
 
-$ createuser roundcubemail
-$ createdb -O roundcubemail roundcubemail
+$ createuser roundcube
+$ createdb -O roundcube roundcubemail
 $ psql roundcubemail
 
 roundcubemail =# ALTER USER roundcube WITH PASSWORD 'the_new_password';
-roundcubemail =# \c - roundcubemail
+roundcubemail =# \c - roundcube
 roundcubemail => \i SQL/postgres.initial.sql
 
-All this has been tested with PostgreSQL 8.0.x and 7.4.x. Older
+All this has been tested with PostgreSQL 8.x and 7.4.x. Older
 versions don't have a -O option for the createdb, so if you are
 using that version you'll have to change ownership of the DB later.
@@ -101 +115 @@
 =============
 
-Change the files in config/* according your to environment and your needs.
-Details about the config parameters can be found in the config files
-or in the wiki: http://trac.roundcube.net/trac.cgi/wiki/Howto_Config
+First of all, rename the files config/*.inc.php.dist to config/*.inc.php.
+You can then change these files according to your environment and your needs.
+Details about the config parameters can be found in the config files.
+
+You can also modify the default .htaccess file. This is necessary to
+increase the allowed size of file attachments, for example:
+       php_value       upload_max_filesize     2M
 
 
@@ -112 +130 @@
 please refer to the instructions in UPGRADING guide.
 
-

branches/devel-vnext/SQL/mssql.initial.sql

@@ -59 +59 @@
         [created] [datetime] NOT NULL ,
         [changed] [datetime] NULL ,
-        [ip] [varchar] (15) COLLATE Latin1_General_CI_AI NOT NULL ,
+        [ip] [varchar] (40) COLLATE Latin1_General_CI_AI NOT NULL ,
         [vars] [text] COLLATE Latin1_General_CI_AI NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

branches/devel-vnext/SQL/mysql.initial.sql

@@ -74 +74 @@
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `changed` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ip` VARCHAR(15) NOT NULL default '',
+  `ip` VARCHAR(40) NOT NULL default '',
   `vars` text NOT NULL,
   PRIMARY KEY  (`sess_id`)
@@ -93 +93 @@
   `last_login` datetime NOT NULL default '0000-00-00 00:00:00',
   `language` varchar(5) NOT NULL default 'en',
-  `preferences` text NOT NULL default '',
+  `preferences` text,
   PRIMARY KEY  (`user_id`)
 );

branches/devel-vnext/SQL/mysql.update.sql

@@ -1 +1 @@
 -- RoundCube Webmail update script for MySQL databases
 -- Updates from version 0.1-beta and 0.1-beta2
+
+TRUNCATE TABLE `messages`;
 
 ALTER TABLE `messages`
@@ -11 +13 @@
   ADD `html_signature` tinyint(1) default 0 NOT NULL;
 
+ALTER TABLE `session` CHANGE `ip` `ip` VARCHAR(40);
+
 -- Uncomment these lines if you're using MySQL 4.1 or higher
 -- ALTER TABLE `users`

branches/devel-vnext/SQL/mysql5.initial.sql

@@ -13 +13 @@
  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
  `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `ip` varchar(15) NOT NULL,
+ `ip` varchar(40) NOT NULL,
  `vars` text NOT NULL,
  PRIMARY KEY(`sess_id`)
@@ -29 +29 @@
  `last_login` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
  `language` varchar(5) NOT NULL DEFAULT 'en',
- `preferences` text NOT NULL DEFAULT '',
+ `preferences` text,
  PRIMARY KEY(`user_id`)
 ) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;

branches/devel-vnext/SQL/postgres.initial.sql

@@ -37 +37 @@
     created timestamp with time zone DEFAULT now() NOT NULL,
     changed timestamp with time zone DEFAULT now() NOT NULL,
-    ip character varying(16) NOT NULL,
+    ip character varying(41) NOT NULL,
     vars text NOT NULL
 );

branches/devel-vnext/SQL/postgres.update.sql

@@ -6 +6 @@
 ALTER TABLE "messages" ADD UNIQUE (user_id, cache_key, uid);
 
-ALTER TABLE "identities" ADD html_signature integer DEFAULT 0 NOT NULL;
-
+ALTER TABLE "identities" ADD html_signature INTEGER;
+ALTER TABLE "identities" ALTER html_signature SET DEFAULT 0;
+UPDATE identities SET html_signature = 0;
+ALTER TABLE "identities" ALTER html_signature SET NOT NULL;

branches/devel-vnext/SQL/sqlite.initial.sql

@@ -94 +94 @@
   created datetime NOT NULL default '0000-00-00 00:00:00',
   changed datetime NOT NULL default '0000-00-00 00:00:00',
-  ip varchar(15) NOT NULL default '',
+  ip varchar(40) NOT NULL default '',
   vars text NOT NULL
 );

branches/devel-vnext/UPGRADING

@@ -5 +5 @@
 of RoundCube Webmail.
 
+from version 0.1-rc
+----------------------------------------
+* replace index.php
+* 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 1.0-beta2
@@ -11 +18 @@
 * 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
+* 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, change prop key 'mail_field'
-  to 'email_field' for each server confgured in /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
@@ -24 +31 @@
 * 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/db.inc.php
-  $rcmail_config['db_persistent'] = TRUE;
+* 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'] = TRUE;
-  $rcmail_config['enable_spellcheck'] = TRUE;
-  $rcmail_config['protect_default_folders'] = TRUE;
-  $rcmail_config['draft_autosave'] = 300;
-  $rcmail_config['date_today'] = 'H:i';
+   $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'] = TRUE;
-
-
-
-from version 0.1-20051021
-----------------------------------------
-* replace index.php
-* replace all files in folder /program/
-* replace all files in folder /skins/default/
-* run all commands in SQL/*.update-0.1a.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';
-  $rcmail_config['drafts_mbox'] = 'Drafts';
-  $rcmail_config['product_name'] = 'RoundCube Webmail';
-  $rcmail_config['read_when_deleted'] = TRUE;
-  $rcmail_config['enable_spellcheck'] = TRUE;
-* 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';
-  $rcmail_config['db_persistent'] = TRUE;
-
-
-
-from version 0.1-20051007
-----------------------------------------
-* replace index.php
-* replace all files in folder /program/
-* replace all files in folder /skins/default/
-* run all commands in SQL/*.update-0.1a.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';
-  $rcmail_config['drafts_mbox'] = 'Drafts';
-  $rcmail_config['product_name'] = 'RoundCube Webmail';
-  $rcmail_config['read_when_deleted'] = TRUE;
-  $rcmail_config['enable_spellcheck'] = TRUE;
-* 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';  
-  $rcmail_config['db_persistent'] = TRUE;
-
-
-
-from version 0.1-20050820
-----------------------------------------
-* replace index.php
-* replace all files in folder /program/
-* replace all files in folder /skins/default/
-* run all commands in SQL/*.update-0.1a.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;
-
-
-
-from versions 0.1-alpha and 0.1-20050811
-----------------------------------------
-* replace index.php
-* replace all files in folder /program/
-* replace all files in folder /skins/default/
-* run all commands in SQL/*.update-0.1a.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;
-
+  with
+   $rcmail_config['include_host_config'] = false;

branches/devel-vnext/config/db.inc.php.dist

@@ -17 +17 @@
 // PEAR database DSN for read/write operations
 // format is db_provider://user:password@host/databse
-// currentyl suported db_providers: mysql, sqlite
+// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql
 
 $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
@@ -34 +34 @@
 
 // use persistent db-connections
+// beware this will not "always" work as expected
+// see: http://www.php.net/manual/en/features.persistent-connections.php
 $rcmail_config['db_persistent'] = FALSE;
-
 
 // you can define specific table names used to store webmail data
@@ -62 +63 @@
 $rcmail_config['db_sequence_messages'] = 'message_ids';
 
+// end db config file
 
-// end db config file
 ?>

branches/devel-vnext/config/main.inc.php.dist

@@ -78 +78 @@
 $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 +93 @@
 // 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)
@@ -149 +158 @@
 $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
 
+// automatically create the above listed default folders on login
+$rcmail_config['create_default_folders'] = FALSE;
+
 // protect the default folders from renames, deletes, and subscription changes
 $rcmail_config['protect_default_folders'] = TRUE;
@@ -166 +178 @@
 
 // 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;
 
@@ -200 +214 @@
  *  '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;
 
 // addressbook plugin? ;-)
@@ -234 +254 @@
 
 // use this timezone to display date/time
-$rcmail_config['timezone'] = 1;
-
-// daylight savings are On
-$rcmail_config['dst_active'] = TRUE;
+$rcmail_config['timezone'] = intval(date('O'))/100 - date('I');
+
+// is daylight saving On?
+$rcmail_config['dst_active'] = (bool)date('I');
 
 // prefer displaying HTML messages
@@ -256 +276 @@
 // save compose message every 300 seconds (5min)
 $rcmail_config['draft_autosave'] = 300;
+
+// default setting if preview pane is enabled
+$rcmail_config['preview_pane'] = FALSE;
+
+// don't let users set pagesize to more than this value if set
+$rcmail_config['max_pagesize'] = 200;
 
 // default setting if preview pane is enabled

branches/devel-vnext/program/include/bootstrap.php

@@ -51 +51 @@
 ini_set('session.gc_maxlifetime', 21600);
 ini_set('session.gc_divisor', 500);
-ini_set('error_reporting', E_ALL&~E_NOTICE);
+ini_set('error_reporting', E_ALL|E_STRICT);
 set_magic_quotes_runtime(0);
 
@@ -57 +57 @@
 // (does not work in safe mode)
 if (!ini_get('safe_mode')) {
-    @set_time_limit(120);
+    set_time_limit(120);
 }
-
 
 /**
  * Use PHP5 autoload for dynamic class loading
  */
-function __autoload($classname)
-{
+function __autoload($classname) {
     $filename = preg_replace(
         array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/'),
@@ -72 +70 @@
     );
 
-    @include_once($filename. ".php");
+    include_once $filename. '.php';
 }
-
 
 // include global functions
 require_once 'globals.php';
 
-
 /**
  * Local callback function for PEAR errors
  */
-function rcube_pear_error($err)
-{
+function rcube_pear_error($err) {
   error_log(sprintf("%s (%s): %s",
     $err->getMessage(),
@@ -91 +86 @@
 }
 
-
 // set PEAR error handling
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
-
 
 // create registry and set some global properties
@@ -101 +94 @@
 
 
+?>

branches/devel-vnext/program/include/globals.php

@@ -16 +16 @@
  +-----------------------------------------------------------------------+
 
- $Id:  $
-
-*/
+ $Id$
+
+ */
 
 /**
  * RoundCube global functions
- * 
+ *
  * @package Core
  */
@@ -32 +32 @@
  * @see rcube::rep_specialchars_output()
  */
-function Q($str, $mode='strict', $newlines=TRUE)
-{
+function Q($str, $mode = 'strict', $newlines = TRUE) {
     return rcube::rep_specialchars_output($str, 'html', $mode, $newlines);
 }
@@ -42 +41 @@
  * @see rcube::rep_specialchars_output()
  */
-function JQ($str)
-{
+function JQ($str) {
     return rcube::rep_specialchars_output($str, 'js');
 }
@@ -54 +52 @@
  * @return string Dequoted string
  */
-function strip_quotes($str)
-{
+function strip_quotes($str) {
     return preg_replace('/[\'"]/', '', $str);
 }
@@ -65 +62 @@
  * @return string Stripped string
  */
-function strip_newlines($str)
-{
+function strip_newlines($str) {
     return preg_replace('/[\r\n]/', '', $str);
 }
@@ -74 +70 @@
  * Send HTTP headers to prevent caching this page
  */
-function send_nocacheing_headers()
-{
+function send_nocacheing_headers() {
     if (headers_sent()) {
         return;
@@ -91 +86 @@
  * @param int Expiration time in seconds
  */
-function send_future_expire_header($offset = 2600000)
-  {
-  if (headers_sent())
-    return;
-
-  header("Expires: ".gmdate("D, d M Y H:i:s", mktime()+$offset)." GMT");
-  header("Cache-Control: max-age=$offset");
-  header("Pragma: ");
-  }
+function send_future_expire_header($offset = 2600000) {
+    if (headers_sent()) {
+        return;
+    }
+
+    header('Expires: '.gmdate('D, d M Y H:i:s', mktime()+$offset).' GMT');
+    header('Cache-Control: max-age='.$offset);
+    header('Pragma: ');
+}
 
 
@@ -108 +103 @@
  * @param int Modified date as unix timestamp
  * @param string Etag value for caching
-*/
-function send_modified_header($mdate, $etag=null)
-{
+ */
+function send_modified_header($mdate, $etag = null) {
     if (headers_sent()) {
         return;
     }
     $iscached = false;
-    if (
-        $_SERVER['HTTP_IF_MODIFIED_SINCE']
-        && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $mdate
-    ) {
+    if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $mdate) {
         $iscached = true;
     }
 
-    $etag = $etag ? "\"$etag\"" : null;
+    $etag = $etag ? '"'.$etag.'"' : null;
     if ($etag && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag) {
         $iscached = true;
     }
     if ($iscached) {
-        header("HTTP/1.x 304 Not Modified");
-    }
-    else {
-        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mdate)." GMT");
-    }
-    header("Cache-Control: max-age=0");
-    header("Expires: ");
-    header("Pragma: ");
+        header('HTTP/1.x 304 Not Modified');
+    } else {
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mdate).' GMT');
+    }
+    header('Cache-Control: max-age=0');
+    header('Expires: ');
+    header('Pragma: ');
 
     if ($etag) {
@@ -152 +142 @@
  * @return string Serialized JSON string
  */
-function json_serialize($var)
-{
+function json_serialize($var) {
     if (is_object($var)) {
         $var = get_object_vars($var);
@@ -161 +150 @@
         if (!sizeof($var)) {
             return '[]';
-        }
-        else {
+        } else {
             $keys_arr = array_keys($var);
             $is_assoc = $have_numeric = 0;
@@ -183 +171 @@
             foreach ($var as $key => $value) {
                 // enclose key with quotes if it is not variable-name conform
-                if (!ereg("^[_a-zA-Z]{1}[_a-zA-Z0-9]*$", $key) /* || is_js_reserved_word($key) */)
-                    $key = "'$key'";
-
-                $pairs[] = sprintf("%s%s", $is_assoc ? "$key:" : '', json_serialize($value));
+                if (!ereg('^[_a-zA-Z]{1}[_a-zA-Z0-9]*$', $key) /* || is_js_reserved_word($key) */)
+                $key = "'$key'";
+
+                $pairs[] = sprintf("%s%s", $is_assoc ? $key.':' : '', json_serialize($value));
             }
             return $brackets{0} . implode(',', $pairs) . $brackets{1};
         }
-    }
-    else if (is_numeric($var) && strval(intval($var)) === strval($var)) {
+    } else if (is_numeric($var) && strval(intval($var)) === strval($var)) {
         return $var;
-    }
-    else if (is_bool($var)) {
+    } else if (is_bool($var)) {
         return $var ? '1' : '0';
-    }
-    else {
+    } else {
         return "'" . JQ($var) . "'";
     }
@@ -207 +192 @@
  * @deprecated
  */
-function array2js($arr, $type='')
-{
+// TODO is it really not used? rcmail_compose line 368
+function array2js($arr, $type='') {
     return json_serialize($arr);
 }
@@ -220 +205 @@
  * @return boolean True if found, False if not
  */
-function in_array_nocase($needle, $haystack)
-{
+function in_array_nocase($needle, $haystack) {
     foreach ($haystack as $value) {
-        if (strtolower($needle)===strtolower($value)) {
+        if (strtolower($needle) === strtolower($value)) {
             return TRUE;
         }
@@ -237 +221 @@
  * @return boolean Imagine what!
  */
-function get_boolean($str)
-{
+function get_boolean($str) {
     $str = strtolower($str);
     if(in_array($str, array('false', '0', 'no', 'nein', ''), TRUE)) {
         return FALSE;
-    }
-    else {
+    } else {
         return TRUE;
     }
@@ -255 +237 @@
  * @return int Number of bytes
  */
-function parse_bytes($str)
-{
-    if (is_numeric($str))
+function parse_bytes($str) {
+    if (is_numeric($str)) {
         return intval($str);
+    }
 
     if (preg_match('/([0-9]+)([a-z])/i', $str, $regs)) {
         $bytes = floatval($regs[1]);
         switch (strtolower($regs[2])) {
-        case 'g':
-            $bytes *= 1073741824;
-            break;
-        case 'm':
-            $bytes *= 1048576;
-            break;
-        case 'k':
-            $bytes *= 1024;
-            break;
+            case 'g':
+                $bytes *= 1073741824;
+                break;
+            case 'm':
+                $bytes *= 1048576;
+                break;
+            case 'k':
+                $bytes *= 1024;
+                break;
         }
     }
@@ -279 +261 @@
 
 
- /**
-  * Create a human readable string for a number of bytes
-  *
-  * @param int Number of bytes
-  * @return string Byte string
-  */
-function show_bytes($bytes)
-{
+/**
+ * Create a human readable string for a number of bytes
+ *
+ * @param int Number of bytes
+ * @return string Byte string
+ */
+function show_bytes($bytes) {
     if ($bytes > 1073741824) {
         $gb = $bytes/1073741824;
         $str = sprintf($gb>=10 ? "%d GB" : "%.1f GB", $gb);
-    }
-    else if ($bytes > 1048576) {
+    } else if ($bytes > 1048576) {
         $mb = $bytes/1048576;
         $str = sprintf($mb>=10 ? "%d MB" : "%.1f MB", $mb);
-    }
-    else if ($bytes > 1024)
+    } else if ($bytes > 1024) {
         $str = sprintf("%d KB",  round($bytes/1024));
-    else
+    } else {
         $str = sprintf('%d B', $bytes);
-
+    }
     return $str;
 }
@@ -311 +290 @@
  * @return string Absolute URL
  */
-function make_absolute_url($path, $base_url)
-{
+function make_absolute_url($path, $base_url) {
     $host_url = $base_url;
     $abs_path = $path;
 
     // cut base_url to the last directory
-    if (strpos($base_url, '/')>7) {
+    if (strpos($base_url, '/') > 7) {
         $host_url = substr($base_url, 0, strpos($base_url, '/'));
         $base_url = substr($base_url, 0, strrpos($base_url, '/'));
@@ -323 +301 @@
 
     // $path is absolute
-    if ($path{0}=='/')
+    if ($path{0} == '/') {
         $abs_path = $host_url.$path;
-    else {
+    } else {
         // strip './' because its the same as ''
         $path = preg_replace('/^\.\//', '', $path);
 
-    if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER))
-        foreach($matches as $a_match) {
-            if (strrpos($base_url, '/'))
-                $base_url = substr($base_url, 0, strrpos($base_url, '/'));
-
-            $path = substr($path, 3);
-        }
-
+        if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER)) {
+            foreach($matches as $a_match) {
+                if (strrpos($base_url, '/')) {
+                    $base_url = substr($base_url, 0, strrpos($base_url, '/'));
+                }
+                $path = substr($path, 3);
+            }
+        }
         $abs_path = $base_url.'/'.$path;
     }
-
     return $abs_path;
 }
@@ -347 +324 @@
  * Wrapper function for strlen
  */
-function rc_strlen($str)
-{
-    if (function_exists('mb_strlen'))
+function rc_strlen($str) {
+    if (function_exists('mb_strlen')) {
         return mb_strlen($str);
-    else
+    } else {
         return strlen($str);
+    }
 }
 
@@ -358 +335 @@
  * Wrapper function for strtolower
  */
-function rc_strtolower($str)
-{
-    if (function_exists('mb_strtolower'))
+function rc_strtolower($str) {
+    if (function_exists('mb_strtolower')) {
         return mb_strtolower($str);
-    else
+    } else {
         return strtolower($str);
+    }
 }
 
@@ -369 +346 @@
  * Wrapper function for substr
  */
-function rc_substr($str, $start, $len=null)
-{
-    if (function_exists('mb_substr'))
+function rc_substr($str, $start, $len = null) {
+    if (function_exists('mb_substr')) {
         return mb_substr($str, $start, $len);
-    else
+    } else {
         return substr($str, $start, $len);
+    }
 }
 
@@ -380 +357 @@
  * Wrapper function for strpos
  */
-function rc_strpos($haystack, $needle, $offset=0)
-{
-    if (function_exists('mb_strpos'))
+function rc_strpos($haystack, $needle, $offset = 0) {
+    if (function_exists('mb_strpos')) {
         return mb_strpos($haystack, $needle, $offset);
-    else
+    } else {
         return strpos($haystack, $needle, $offset);
+    }
 }
 
@@ -391 +368 @@
  * Wrapper function for strrpos
  */
-function rc_strrpos($haystack, $needle, $offset=0)
-{
-    if (function_exists('mb_strrpos'))
+function rc_strrpos($haystack, $needle, $offset = 0) {
+    if (function_exists('mb_strrpos')) {
         return mb_strrpos($haystack, $needle, $offset);
-    else
+    } else {
         return strrpos($haystack, $needle, $offset);
+    }
 }
 
@@ -409 +386 @@
  * @return string Abbrevated string
  */
-function abbrevate_string($str, $maxlength, $place_holder='...')
-{
+function abbrevate_string($str, $maxlength, $place_holder = '...') {
     $length = rc_strlen($str);
     $first_part_length = floor($maxlength/2) - rc_strlen($place_holder);
@@ -426 +402 @@
  * Make sure the string ends with a slash
  */
-function slashify($str)
-{
+function slashify($str) {
     return unslashify($str).'/';
 }
@@ -435 +410 @@
  * Remove slash at the end of the string
  */
-function unslashify($str)
-{
+function unslashify($str) {
     return preg_replace('/\/$/', '', $str);
 }
@@ -447 +421 @@
  * @return boolean True on success, False if directory was not found
  */
-function clear_directory($dir_path)
-{
-    $dir = @opendir($dir_path);
-    if (!$dir)
+function clear_directory($dir_path) {
+    $dir = opendir($dir_path);
+    if (!$dir) {
         return false;
-
-    while ($file = readdir($dir))
-        if (strlen($file) > 2)
+    }
+
+    while ($file = readdir($dir)) {
+        if (strlen($file) > 2) {
             unlink("$dir_path/$file");
+        }
+    }
 
     closedir($dir);
@@ -469 +445 @@
  * @return int Unix timestamp
  */
-function get_offset_time($offset_str, $factor=1)
-{
+function get_offset_time($offset_str, $factor = 1) {
     if (preg_match('/^([0-9]+)\s*([smhdw])/i', $offset_str, $regs)) {
         $amount = (int)$regs[1];
         $unit = strtolower($regs[2]);
-    }
-    else {
+    } else {
         $amount = (int)$offset_str;
         $unit = 's';
@@ -482 +456 @@
     $ts = mktime();
     switch ($unit) {
-    case 'w':
-        $amount *= 7;
-    case 'd':
-        $amount *= 24;
-    case 'h':
-        $amount *= 60;
-    case 'm':
-        $amount *= 60;
-    case 's':
-        $ts += $amount * $factor;
+        case 'w':
+            $amount *= 7;
+        case 'd':
+            $amount *= 24;
+        case 'h':
+            $amount *= 60;
+        case 'm':
+            $amount *= 60;
+        case 's':
+            $ts += $amount * $factor;
     }
 
@@ -505 +479 @@
  * @return index of needle within haystack, or false if not found
  */
-function strrstr($haystack, $needle)
-{
+function strrstr($haystack, $needle) {
     $pver = phpversion();
     if ($pver[0] >= 5) {
         return strrpos($haystack, $needle);
-    }
-    else {
+    } else {
         $index = strpos(strrev($haystack), strrev($needle));
         if ($index === false) {
@@ -521 +493 @@
 }
 
-
+?>

branches/devel-vnext/program/include/rcube.php

@@ -25 +25 @@
 require_once 'lib/utf8.class.php';
 
-
 /**
  * rcube
@@ -38 +37 @@
  * @since    0.1-rc1
  */
-class rcube
-{
+class rcube {
     const INPUT_GET  = 0x0101;
     const INPUT_POST = 0x0102;
@@ -53 +51 @@
      * @return void
      */
-    static function startup($task = 'mail')
-    {
+    static function startup($task = 'mail') {
         $registry = rcube_registry::get_instance();
         $registry->set('task', $task, 'core');

branches/devel-vnext/program/include/rcube_contacts.php

@@ -115 +115 @@
     }
 
+        /**
+         * Close connection to source
+         * Called on script shutdown
+         */
+    function close() {}
 
     /**
@@ -120 +125 @@
      *
      * @param  array  List of cols to show
+     * @param  int    Only return this number of records, use negative values for tail
      * @return array  Indexed list of contact records, each a hash array
      */
@@ -167 +173 @@
      * @return Indexed list of contact records and 'count' value
      */
-    function search($fields, $value, $select=true)
+    function search($fields, $value, $strict = false, $select = true)
     {
         if (!is_array($fields)) {
@@ -177 +183 @@
                 $ids         = !is_array($value) ? split(',', $value) : $value;
                 $add_where[] = $this->primary_key." IN (".join(',', $ids).")";
+            }
+            elseif ($strict) {
+                $add_where[] = $this->db->quoteIdentifier($col)."=".$this->db->quote($value);
             }
             else {
@@ -279 +288 @@
 
         if ($check) {
-            $existing = $this->search('email', $save_data['email'], false);
+            $existing = $this->search('email', $save_data['email'], true, false);
         }
         $a_insert_cols = $a_insert_values = array();

branches/devel-vnext/program/include/rcube_error.php

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/include/rcube_ldap.php

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2006-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -18 +18 @@
  $Id: rcube_ldap.inc 563 2007-05-17 15:58:51Z thomasb $
 
-*/
+ */
 
 /**
@@ -25 +25 @@
  * @package Addressbook
  */
-class rcube_ldap
-{
-  var $conn;
-  var $prop = array();
-  var $fieldmap = array();
-  
-  var $filter = '';
-  var $result = null;
-  var $ldap_result = null;
-  var $sort_col = '';
-  
-  /** public properties */
-  var $primary_key = 'ID';
-  var $readonly = true;
-  var $list_page = 1;
-  var $page_size = 10;
-  var $ready = false;
-  
-  
-  /**
-   * Object constructor
-   *
-   * @param array LDAP connection properties
-   * @param integer User-ID
-   */
-  function __construct($p)
-  {
-    $this->prop = $p;
-    
-    foreach ($p as $prop => $value)
-      if (preg_match('/^(.+)_field$/', $prop, $matches))
+class rcube_ldap {
+    var $conn;
+    var $prop = array();
+    var $fieldmap = array();
+
+    var $filter = '';
+    var $result = null;
+    var $ldap_result = null;
+    var $sort_col = '';
+
+    /** public properties */
+    var $primary_key = 'ID';
+    var $readonly = true;
+    var $list_page = 1;
+    var $page_size = 10;
+    var $ready = false;
+
+
+    /**
+     * Object constructor
+     *
+     * @param array LDAP connection properties
+     * @param integer User-ID
+     */
+    public function __construct($p) {
+        $this->prop = $p;
+
+        foreach ($p as $prop => $value)
+        if (preg_match('/^(.+)_field$/', $prop, $matches))
         $this->fieldmap[$matches[1]] = $value;
-    
-    // $this->filter = "(dn=*)";
-    $this->connect();
-  }
-
-  /**
-   * PHP 4 object constructor
-   *
-   * @see  rcube_ldap::__construct
-   */
-  function rcube_ldap($p)
-  {
-    $this->__construct($p);
-  }
-  
-
-  /**
-   * Establish a connection to the LDAP server
-   */
-  function connect()
-  {
-    if (!function_exists('ldap_connect'))
-      rcube_error::raise(array('type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true);
-
-    if (is_resource($this->conn))
-      return true;
-    
-    if (!is_array($this->prop['hosts']))
-      $this->prop['hosts'] = array($this->prop['hosts']);
-
-    foreach ($this->prop['hosts'] as $host)
-    {
-      if ($lc = @ldap_connect($host, $this->prop['port']))
-      {
-        ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['port']);
-        $this->prop['host'] = $host;
-        $this->conn = $lc;
-        break;
-      }
-    }
-    
-    if (is_resource($this->conn))
-    {
-      $this->ready = true;
-      if (!empty($this->prop['bind_dn']) && !empty($this->prop['bind_pass']))
-        $this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
-    }
-    else
-      rcube_error::raise(array('type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true);
-  }
-
-
-  /**
-   * Bind connection with DN and password
-   */
-  function bind($dn, $pass)
-  {
-    if (!$this->conn)
-      return false;
-    
-    if (@ldap_bind($this->conn, $dn, $pass))
-      return true;
-    else
-    {
-      rcube_error::raise(array(
-        'code' => ldap_errno($this->conn),
-        'type' => 'ldap',
-        'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
-      true);
-    }
-    
-    return false;
-  }
-
-
-  /**
-   * Close connection to LDAP server
-   */
-  function close()
-  {
-    if ($this->conn)
-      @ldap_unbind($this->conn);
-  }
-
-
-  /**
-   * Set internal list page
-   *
-   * @param  number  Page number to list
-   * @access public
-   */
-  function set_page($page)
-  {
-    $this->list_page = (int)$page;
-  }
-
-
-  /**
-   * Set internal page size
-   *
-   * @param  number  Number of messages to display on one page
-   * @access public
-   */
-  function set_pagesize($size)
-  {
-    $this->page_size = (int)$size;
-  }
-
-
-  /**
-   * Save a search string for future listings
-   *
-   * @param string ??
-   */
-  function set_search_set($filter)
-  {
-    $this->filter = $filter;
-  }
-  
-  
+
+        $this->connect();
+    }
+
+    /**
+     * Establish a connection to the LDAP server
+     */
+    function connect() {
+        if (!function_exists('ldap_connect')) {
+            rcube_error::raise(array('type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true);
+        }
+
+        if (is_resource($this->conn)) {
+            return true;
+        }
+
+        if (!is_array($this->prop['hosts'])) {
+            $this->prop['hosts'] = array($this->prop['hosts']);
+        }
+
+        if (empty($this->prop['ldap_version'])) {
+            $this->prop['ldap_version'] = 3;
+        }
+
+        foreach ($this->prop['hosts'] as $host) {
+            if ($lc = ldap_connect($host, $this->prop['port'])) {
+                ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
+                $this->prop['host'] = $host;
+                $this->conn = $lc;
+                break;
+            }
+        }
+
+        if (is_resource($this->conn)) {
+            $this->ready = true;
+            if (!empty($this->prop['bind_dn']) && !empty($this->prop['bind_pass'])) {
+                $this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
+            }
+        } else {
+            rcube_error::raise(array('type' => 'ldap', 'message' => 'Could not connect to any LDAP server, tried '.$host.':'.$this->prop['port'].' last'), true);
+        }
+    }
+
+
+    /**
+     * Bind connection with DN and password
+     */
+    function bind($dn, $pass) {
+        if (!$this->conn) {
+            return false;
+        }
+
+        if (ldap_bind($this->conn, $dn, $pass)) {
+            return true;
+        } else {
+            rcube_error::raise(
+                    array(
+                        'code' => ldap_errno($this->conn),
+                        'type' => 'ldap',
+                        'message' => 'Bind failed for dn='.$dn.': '.ldap_error($this->conn)),
+                    true);
+            return false;
+        }
+    }
+
+
+    /**
+     * Close connection to LDAP server
+     */
+    function close() {
+        if ($this->conn) {
+            ldap_unbind($this->conn);
+            $this->conn = null;
+        }
+    }
+
+
+    /**
+     * Set internal list page
+     *
+     * @param  number  Page number to list
+     * @access public
+     */
+    function set_page($page) {
+        $this->list_page = (int)$page;
+    }
+
+
+    /**
+     * Set internal page size
+     *
+     * @param  number  Number of messages to display on one page
+     * @access public
+     */
+    function set_pagesize($size) {
+        $this->page_size = (int)$size;
+    }
+
+
+    /**
+     * Save a search string for future listings
+     *
+     * @param string Filter string
+     */
+    function set_search_set($filter) {
+        $this->filter = $filter;
+    }
+
+
     /**
      * Getter for saved search properties
@@ -182 +169 @@
      * @return mixed Search properties used by this class
      */
-    function get_search_set()
-    {
+    function get_search_set() {
         return $this->filter;
     }
@@ -191 +177 @@
      * Reset all saved results and search parameters
      */
-    function reset()
-    {
+    function reset() {
         $this->result = null;
         $this->ldap_result = null;
         $this->filter = '';
     }
-  
+
     /**
      * List the current set of contact records
      *
      * @param  array  List of cols to show
+     * @param  int    Only return this number of records (not implemented)
      * @return array  Indexed list of contact records, each a hash array
      */
-    function list_records($cols=null, $subset=0)
-    {
+    function list_records($cols=null, $subset=0) {
         // add general filter to query
         if (!empty($this->prop['filter'])) {
             $filter = $this->prop['filter'];
-        }
-        $this->set_search_set($filter);
+            $this->set_search_set($filter);
+        }
 
         // exec LDAP search if no result resource is stored
@@ -219 +204 @@
         // count contacts for this user
         $this->result = $this->count();
-    
+
         // we have a search result resource
         if ($this->ldap_result && $this->result->count > 0) {
             if ($this->sort_col && $this->prop['scope'] !== "base") {
-                @ldap_sort($this->conn, $this->ldap_result, $this->sort_col);
+                ldap_sort($this->conn, $this->ldap_result, $this->sort_col);
             }
 
@@ -235 +220 @@
 
 
-  /**
-   * Search contacts
-   *
-   * @param array   List of fields to search in
-   * @param string  Search value
-   * @param boolean True if results are requested, False if count only
-   * @return Indexed list of contact records and 'count' value
-   */
-  function search($fields, $value, $select=true)
-  {
-    // special treatment for ID-based search
-    if ($fields == 'ID' || $fields == $this->primary_key)
-    {
-      $ids = explode(',', $value);
-      $result = new rcube_result_set();
-      foreach ($ids as $id)
-        if ($rec = $this->get_record($id, true))
-        {
-          $result->add($rec);
-          $result->count++;
-        }
-      
-      return $result;
-    }
-    
-    $filter = '(|';
-    $wc = $this->prop['fuzzy_search'] ? '*' : '';
-    if (is_array($this->prop['search_fields']))
-    {
-      foreach ($this->prop['search_fields'] as $k => $field)
-        $filter .= "($field=$wc" . rcube_ldap::quote_string($value) . "$wc)";
-    }
-    else
-    {
-      foreach ((array)$fields as $field)
-        if ($f = $this->_map_field($field))
-          $filter .= "($f=$wc" . rcube_ldap::quote_string($value) . "$wc)";
-    }
-    $filter .= ')';
-    
-    // add general filter to query
-    if (!empty($this->prop['filter']))
-      $filter = '(&'.$this->prop['filter'] . $filter . ')';
-
-    // set filter string and execute search
-    $this->set_search_set($filter);
-    $this->_exec_search();
-    
-    if ($select)
-      $this->list_records();
-    else
-      $this->result = $this->count();
-   
-    return $this->result; 
-  }
-
-
-  /**
-   * Count number of available contacts in database
-   *
-   * @return Result array with values for 'count' and 'first'
-   */
-  function count()
-  {
-    $count = 0;
-    if ($this->conn && $this->ldap_result)
-      $count = ldap_count_entries($this->conn, $this->ldap_result);
-
-    return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
-  }
-
-
-  /**
-   * Return the last result set
-   *
-   * @return Result array or NULL if nothing selected yet
-   */
-  function get_result()
-  {
-    return $this->result;
-  }
-  
-  
-  /**
-   * Get a specific contact record
-   *
-   * @param mixed record identifier
-   * @return Hash array with all record fields or False if not found
-   */
-  function get_record($dn, $assoc=false)
-  {
-    $res = null;
-    if ($this->conn && $dn)
-    {
-      $this->ldap_result = @ldap_read($this->conn, base64_decode($dn), "(objectclass=*)", array_values($this->fieldmap));
-      $entry = @ldap_first_entry($this->conn, $this->ldap_result);
-      
-      if ($entry && ($rec = ldap_get_attributes($this->conn, $entry)))
-      {
-        $res = $this->_ldap2result($rec);
-        $this->result = new rcube_result_set(1);
-        $this->result->add($res);
-      }
-    }
-
-    return $assoc ? $res : $this->result;
-  }
-  
-  
-  /**
-   * Create a new contact record
-   *
-   * @param array Assoziative array with save data
-   * @return The create record ID on success, False on error
-   */
-  function insert($save_cols)
-  {
-    // TODO
-    return false;
-  }
-  
-  
-  /**
-   * Update a specific contact record
-   *
-   * @param mixed Record identifier
-   * @param array Assoziative array with save data
-   * @return True on success, False on error
-   */
-  function update($id, $save_cols)
-  {
-    // TODO    
-    return false;
-  }
-  
-  
-  /**
-   * Mark one or more contact records as deleted
-   *
-   * @param array  Record identifiers
-   */
-  function delete($ids)
-  {
-    // TODO
-    return false;
-  }
-
-
-  /**
-   * Execute the LDAP search based on the stored credentials
-   *
-   * @private
-   */
-  function _exec_search()
-  {
-    if ($this->conn && $this->filter)
-    {
-      $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
-      $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
-      return true;
-    }
-    else
-      return false;
-  }
-  
-  
-  /**
-   * @private
-   */
-  function _ldap2result($rec)
-  {
-    $out = array();
-    
-    if ($rec['dn'])
-      $out[$this->primary_key] = base64_encode($rec['dn']);
-    
-    foreach ($this->fieldmap as $rf => $lf)
-    {
-      if ($rec[$lf]['count'])
-        $out[$rf] = $rec[$lf][0];
-    }
-    
-    return $out;
-  }
-  
-  
-  /**
-   * @private
-   */
-  function _map_field($field)
-  {
-    return $this->fieldmap[$field];
-  }
-  
-  
-  /**
-   * @static
-   */
-  function quote_string($str)
-  {
-    return strtr($str, array('*'=>'\2a', '('=>'\28', ')'=>'\29', '\\'=>'\5c'));
-  }
-
-
+    /**
+     * Search contacts
+     *
+     * @param array   List of fields to search in
+     * @param string  Search value
+     * @param boolean True if results are requested, False if count only
+     * @return array  Indexed list of contact records and 'count' value
+     */
+    function search($fields, $value, $strict=false, $select=true) {
+        // special treatment for ID-based search
+        if ($fields == 'ID' || $fields == $this->primary_key) {
+            $ids = explode(',', $value);
+            $result = new rcube_result_set();
+            foreach ($ids as $id) {
+                if ($rec = $this->get_record($id, true)) {
+                    $result->add($rec);
+                    $result->count++;
+                }
+            }
+            return $result;
+        }
+
+        $filter = '(|';
+        $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : '';
+        if (is_array($this->prop['search_fields'])) {
+            foreach ($this->prop['search_fields'] as $k => $field) {
+                $filter .= "($field=$wc" . rcube_ldap::quote_string($value) . "$wc)";
+            }
+        } else {
+            foreach ((array)$fields as $field) {
+                if ($f = $this->_map_field($field)) {
+                    $filter .= "($f=$wc" . rcube_ldap::quote_string($value) . "$wc)";
+                }
+            }
+        }
+        $filter .= ')';
+
+        // add general filter to query
+        if (!empty($this->prop['filter'])) {
+            $filter = '(&'.$this->prop['filter'] . $filter . ')';
+        }
+
+        // set filter string and execute search
+        $this->set_search_set($filter);
+        $this->_exec_search();
+
+        if ($select) {
+            $this->list_records();
+        } else {
+            $this->result = $this->count();
+        }
+
+        return $this->result;
+    }
+
+
+    /**
+     * Count number of available contacts in database
+     *
+     * @return object rcube_result_set Resultset with values for 'count' and 'first'
+     */
+    function count() {
+        $count = 0;
+        if ($this->conn && $this->ldap_result) {
+            $count = ldap_count_entries($this->conn, $this->ldap_result);
+        }
+
+        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
+    }
+
+
+    /**
+     * Return the last result set
+     *
+     * @return object rcube_result_set Current resultset or NULL if nothing selected yet
+     */
+    function get_result() {
+        return $this->result;
+    }
+
+
+    /**
+     * Get a specific contact record
+     *
+         * @param mixed   Record identifier
+         * @param boolean Return as associative array
+         * @return mixed  Hash array or rcube_result_set with all record fields
+     */
+    function get_record($dn, $assoc=false) {
+        $res = null;
+        if ($this->conn && $dn) {
+            $this->ldap_result = ldap_read($this->conn, base64_decode($dn), "(objectclass=*)", array_values($this->fieldmap));
+            $entry = ldap_first_entry($this->conn, $this->ldap_result);
+
+            if ($entry && ($rec = ldap_get_attributes($this->conn, $entry))) {
+                $res = $this->_ldap2result($rec);
+                $this->result = new rcube_result_set(1);
+                $this->result->add($res);
+            }
+        }
+
+        return $assoc ? $res : $this->result;
+    }
+
+
+    /**
+     * Create a new contact record
+     *
+         * @param array    Hash array with save data
+         * @return boolean The create record ID on success, False on error
+     */
+    function insert($save_cols) {
+        // TODO
+        return false;
+    }
+
+
+    /**
+     * Update a specific contact record
+     *
+     * @param mixed Record identifier
+         * @param array Hash array with save data
+         * @return boolean True on success, False on error
+     */
+    function update($id, $save_cols) {
+        // TODO
+        return false;
+    }
+
+
+    /**
+     * Mark one or more contact records as deleted
+     *
+         * @return boolean True on success, False on error
+     */
+    function delete($ids) {
+        // TODO
+        return false;
+    }
+
+
+    /**
+     * Execute the LDAP search based on the stored credentials
+     *
+     * @return boolean true on success, false on error
+     */
+    private function _exec_search() {
+        if ($this->conn && $this->filter) {
+            $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
+            $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * ldap2result
+     * 
+     * @param array
+     * @return array
+     */
+    private function _ldap2result($rec) {
+        $out = array();
+
+        if ($rec['dn']) {
+            $out[$this->primary_key] = base64_encode($rec['dn']);
+        }
+
+        foreach ($this->fieldmap as $rf => $lf) {
+            if ($rec[$lf]['count']) {
+                $out[$rf] = $rec[$lf][0];
+            }
+        }
+
+        return $out;
+    }
+
+
+    /**
+     * map field
+     * @param string field
+     * @return string returns mapped field
+     */
+    private function _map_field($field) {
+        return $this->fieldmap[$field];
+    }
+
+
+    /**
+     * translate char2hex
+     * @param string char
+     * @return string hex
+     */
+    private static function quote_string($str) {
+        return strtr($str, array('*'=>'\2a', '('=>'\28', ')'=>'\29', '\\'=>'\5c'));
+    }
 }
 

branches/devel-vnext/program/include/rcube_smtp.php

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -70 +70 @@
     // create Net_SMTP object and connect to server
     if (!is_object($smtp_conn)) {
-        $helo_host = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost';
+        $helo_host = empty($CONFIG['smtp_helo_host']) ? ((empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME'])) : $CONFIG['smtp_helo_host'];
         $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
 

branches/devel-vnext/program/include/rcube_sqlite.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -22 +22 @@
 
 
-function rcube_sqlite_from_unixtime($timestamp)
-  {
-        $timestamp = trim($timestamp);
-        if (!preg_match("/^[0-9]+$/is", $timestamp))
-          $ret = strtotime($timestamp);
-        else
-          $ret = $timestamp;
-          
-        $ret = date("Y-m-d H:i:s", $ret);
-        rcube_sqlite_debug("FROM_UNIXTIME ($timestamp) = $ret");
-        return $ret;
-  }
+function rcube_sqlite_from_unixtime($timestamp) {
+    $timestamp = trim($timestamp);
+    if (!preg_match('/^[0-9]+$/is', $timestamp)) {
+        $ret = strtotime($timestamp);
+    } else {
+        $ret = $timestamp;
+    }
+    $ret = date('Y-m-d H:i:s', $ret);
+    rcube_sqlite_debug("FROM_UNIXTIME ($timestamp) = $ret");
+    return $ret;
+}
 
 
-function rcube_sqlite_unix_timestamp($timestamp="")
-  {
-        $timestamp = trim($timestamp);
-        if (!$timestamp)
-          $ret = time();
-        else if (!preg_match("/^[0-9]+$/is", $timestamp))
-          $ret = strtotime($timestamp);
-        else
-          $ret = $timestamp;
+function rcube_sqlite_unix_timestamp($timestamp = '') {
+    $timestamp = trim($timestamp);
+    if (!$timestamp) {
+        $ret = time();
+    } else if (!preg_match('/^[0-9]+$/is', $timestamp)) {
+        $ret = strtotime($timestamp);
+    } else {
+        $ret = $timestamp;
+    }
 
-        rcube_sqlite_debug("UNIX_TIMESTAMP ($timestamp) = $ret");
-        return $ret;
-  }
+    rcube_sqlite_debug("UNIX_TIMESTAMP ($timestamp) = $ret");
+    return $ret;
+}
 
 
-function rcube_sqlite_now()
-  {
-        rcube_sqlite_debug("NOW() = ".date("Y-m-d H:i:s"));
-        return date("Y-m-d H:i:s");
-  }
+function rcube_sqlite_now() {
+    rcube_sqlite_debug("NOW() = ".date('Y-m-d H:i:s'));
+    return date('Y-m-d H:i:s');
+}
 
 
-function rcube_sqlite_md5($str)
-  {
-        return md5($str);
-  }
+function rcube_sqlite_md5($str) {
+    return md5($str);
+}
 
 
-function rcube_sqlite_debug($str)
-  {
+function rcube_sqlite_debug($str) {
         //rcube::console($str);
-  }
+}
         
 ?>

branches/devel-vnext/program/include/rcube_template.php

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -17 +17 @@
  +-----------------------------------------------------------------------+
 
- $Id:  $
-
-*/
+ $Id$
+
+ */
 
 
@@ -48 +48 @@
      * @todo   Use jQuery's $(document).ready() here.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
-        
+
         $registry     = rcube_registry::get_instance();
         $this->task   = $registry->get('task', 'core');
         $this->config = $registry->get_all('config');
-        
+
         // add common javascripts
-        $javascript = "var ".JS_OBJECT_NAME." = new rcube_webmail();";
+        $javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();';
 
         // don't wait for page onload. Call init at the bottom of the page (delayed)
@@ -68 +67 @@
         $this->include_script('common.js');
         $this->include_script('app.js');
-        
+
         // register common UI objects
         $this->add_handlers(array(
@@ -85 +84 @@
      * @param boolean True if this property should be added to client environment
      */
-    public function set_env($name, $value, $addtojs=true)
-    {
+    public function set_env($name, $value, $addtojs = true) {
         $this->env[$name] = $value;
         if ($addtojs || isset($this->js_env[$name])) {
@@ -97 +95 @@
      * Set page title variable
      */
-    public function set_pagetitle($title)
-    {
+    public function set_pagetitle($title) {
         $this->pagetitle = $title;
     }
@@ -110 +107 @@
      * @return void
      */
-    public function add_handler($obj, $func)
-    {
+    public function add_handler($obj, $func) {
         $this->object_handlers[$obj] = $func;
     }
@@ -121 +117 @@
      * @return void
      */
-    public function add_handlers($arr)
-    {
+    public function add_handlers($arr) {
         $this->object_handlers = array_merge($this->object_handlers, $arr);
     }
@@ -133 +128 @@
      * @return void
      */
-    public function add_gui_object($obj, $id)
-    {
+    public function add_gui_object($obj, $id) {
         $this->add_script(JS_OBJECT_NAME.".gui_object('$obj', '$id');");
     }
@@ -144 +138 @@
      * @param ... Additional arguments
      */
-    public function command()
-    {
+    public function command() {
         $this->js_commands[] = func_get_args();
     }
-    
-    
+
+
     /**
      * Add a localized label to the client environment
      */
-    public function add_label()
-    {
+    public function add_label() {
         $arg_list = func_get_args();
         foreach ($arg_list as $i => $name) {
@@ -160 +152 @@
         }
     }
-    
+
 
     /**
@@ -170 +162 @@
      * @uses self::command()
      */
-    public function show_message($message, $type='notice', $vars=NULL)
-    {
+    public function show_message($message, $type='notice', $vars=NULL) {
         $this->command(
                 'display_message',
-                rcube::gettext(array('name' => $message, 'vars' => $vars)),
-                $type
+        rcube::gettext(array('name' => $message, 'vars' => $vars)),
+        $type
         );
     }
@@ -190 +181 @@
      * @uses   self::$object_handlers
      */
-    public public function reset()
-    {
+    public public function reset() {
         $this->env = array();
         $this->js_env = array();
@@ -207 +197 @@
      * @param boolean True if script should terminate (default)
      */
-    public function send($templ=null, $exit=true)
-    {
+    public function send($templ = null, $exit = true) {
         if ($templ != 'iframe') {
             //rcube::tfk_debug("/Parsing $templ");
             $this->parse($templ, false);
-        }
-        else {
+        } else {
             $this->framed = $templ == 'iframe' ? true : $this->framed;
             $this->write();
@@ -230 +218 @@
      * @override
      */
-    public function write($template='')
-    {
+    public function write($template = '') {
+        // unlock interface after iframe load
+        if ($this->framed) {
+            array_unshift($this->js_commands, array('set_busy', false));
+        }
         // write all env variables to client
         $js = $this->framed ? "if(window.parent) {\n" : '';
@@ -251 +242 @@
      * @link   http://php.net/manual/en/function.exit.php
      */
-    private function parse($name='main', $exit=true)
-    {
+    private function parse($name = 'main', $exit = true) {
         $skin_path = $this->config['skin_path'];
 
@@ -261 +251 @@
         $path = "$skin_path/templates/$name.html";
 
-        if(($fp = @fopen($path, 'r')) === false) {
+        if (($fp = fopen($path, 'r')) === false) {
             $message = '';
             ob_start();
@@ -268 +258 @@
             ob_end_clean();
             rcube_error::raise(
-                array(
-                    'code' => 501,
-                    'type' => 'php',
-                    'line' => __LINE__,
-                    'file' => __FILE__,
-                    'message' => "Error loading template for '$name': $message"
-                ),
-                TRUE,
-                TRUE
+            array(
+                        'code' => 501,
+                        'type' => 'php',
+                        'line' => __LINE__,
+                        'file' => __FILE__,
+                        'message' => 'Error loading template for '.$name.': '.$message
+            ),
+            TRUE,
+            TRUE
             );
             return FALSE;
         }
         $templ = fread($fp, filesize($path));
-        @fclose($fp);
+        fclose($fp);
 
         //rcube::tfk_debug("// parsed: $path");
@@ -294 +284 @@
                             <a href="#toggle" onclick="con=document.getElementById(\'dbgconsole\');con.style.display=(con.style.display==\'none\'?\'block\':\'none\');return false">console</a>
                             <form action="/" name="debugform"><textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:x-small"></textarea></form></div>'
-            );
+                            );
         }
         $output = $this->parse_with_globals($output);
@@ -309 +299 @@
      * @return string $out
      */
-    private function get_js_commands()
-    {
+    private function get_js_commands() {
         $out = '';
         if (!$this->framed && !empty($this->js_env)) {
@@ -323 +312 @@
             $out .= sprintf(
                 "%s.%s(%s);\n",
-                ($parent ? 'parent.' : '') . JS_OBJECT_NAME,
-                preg_replace('/^parent\./', '', $method),
-                implode(',', $args)
+            ($parent ? 'parent.' : '') . JS_OBJECT_NAME,
+            preg_replace('/^parent\./', '', $method),
+            implode(',', $args)
+            );
+        }
+        // add command to set page title
+        if ($this->ajax_call && !empty($this->pagetitle)) {
+            $out .= sprintf(
+                                "this.set_pagetitle('%s');\n",
+            JQ((!empty($this->config['product_name']) ? $this->config['product_name'].' :: ' : '') . $this->pagetitle)
             );
         }
@@ -338 +334 @@
      * @return string
      */
-    public function abs_url($str)
-    {
+    private function abs_url($str) {
         return preg_replace('/^\//', $this->config['skin_path'].'/', $str);
     }
 
-
-
     /*****  Template parsing methods  *****/
 
     /**
-     * Replace all strings ($varname) with the content
-     * of the according global variable.
-     */
-    private function parse_with_globals($input)
-    {
+     * Replace all strings ($varname)
+     * with the content of the according global variable.
+     */
+    private function parse_with_globals($input) {
         $registry  = rcube_registry::get_instance();
         $COMM_PATH = $registry->get('COMM_PATH', 'core');
 
-        $GLOBALS['__comm_path'] = $COMM_PATH;
+        $GLOBALS['__comm_path'] = urlencode($COMM_PATH);
         return preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
     }
@@ -368 +360 @@
      * @since  0.1-rc1
      */
-    public function just_parse($input)
-    {
+    public function just_parse($input) {
         return $this->parse_xml($input);
     }
@@ -379 +370 @@
      * @return string
      */
-    private function parse_conditions($input)
-    {
+    private function parse_conditions($input) {
         $matches = preg_split(
                         '/<roundcube:(if|elseif|else|endif)\s+([^>]+)>/is',
-                        $input,
-                        2,
-                        PREG_SPLIT_DELIM_CAPTURE
+        $input,
+        2,
+        PREG_SPLIT_DELIM_CAPTURE
         );
-        if ($matches && count($matches)==4) {
+        if ($matches && count($matches) == 4) {
             if (preg_match('/^(else|endif)$/i', $matches[1])) {
                 return $matches[0] . $this->parse_conditions($matches[3]);
@@ -396 +386 @@
                 $submatches = preg_split(
                                 '/<roundcube:(elseif|else|endif)\s+([^>]+)>/is',
-                                $matches[3],
-                                2,
-                                PREG_SPLIT_DELIM_CAPTURE
+                $matches[3],
+                2,
+                PREG_SPLIT_DELIM_CAPTURE
                 );
                 if ($condmet) {
                     $result = $submatches[0];
                     $result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>/Uis', '', $submatches[3], 1) : $submatches[3]);
-                }
-                else {
+                } else {
                     $result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
                 }
@@ -410 +399 @@
             }
             rcube_error::raise(
-                array(
+            array(
                     'code' => 500,
                     'type' => 'php',
@@ -416 +405 @@
                     'file' => __FILE__,
                     'message' => "Unable to parse conditional tag " . $matches[2]
-                ),
-                TRUE,
-                FALSE
+            ),
+            TRUE,
+            FALSE
             );
         }
@@ -433 +422 @@
      * @return boolean True if condition is met, False is not
      */
-    private function check_condition($condition)
-    {
+    private function check_condition($condition) {
         $condition = preg_replace(
-                array(
+        array(
                     '/session:([a-z0-9_]+)/i',
                     '/config:([a-z0-9_]+)/i',
                     '/env:([a-z0-9_]+)/i',
                     '/request:([a-z0-9_]+)/ie'
-                ),
-                array(
+                    ),
+                    array(
                     "\$_SESSION['\\1']",
                     "\$this->config['\\1']",
                     "\$this->env['\\1']",
                     "rcube::get_input_value('\\1', rcube::INPUT_GPC)"
-                ),
-                $condition
-        );
-        return @eval("return (".$condition.");");
-    }
-
-
-   /**
-    * Search for special tags in input and replace them
-    * with the appropriate content
-    *
-    * @param  string Input string to parse
-    * @return string Altered input string
-    * @todo   Maybe a cache.
-    */
-   private function parse_xml($input)
-   {
+                    ),
+                    $condition
+                    );
+                    return eval("return (".$condition.");");
+    }
+
+
+    /**
+     * Search for special tags in input and replace them
+     * with the appropriate content
+     *
+     * @param  string Input string to parse
+     * @return string Altered input string
+     * @todo   Maybe a cache.
+     */
+    private function parse_xml($input) {
         return preg_replace('/<roundcube:([-_a-z]+)\s+([^>]+)>/Uie', "\$this->xml_command('\\1', '\\2')", $input);
-   }
+    }
 
 
@@ -475 +462 @@
      * @return string Tag/Object content
      */
-    private function xml_command($command, $str_attrib, $add_attrib=array())
-    {
+    private function xml_command($command, $str_attrib, $add_attrib = array()) {
         $command = strtolower($command);
         $attrib  = rcube::parse_attrib_string($str_attrib) + $add_attrib;
@@ -499 +485 @@
                 break;
 
-            // show a label
+                // show a label
             case 'label':
                 if ($attrib['name'] || $attrib['command']) {
@@ -506 +492 @@
                 break;
 
-            // include a file
+                // include a file
             case 'include':
                 $path = realpath($this->config['skin_path'].$attrib['file']);
@@ -516 +502 @@
                     return $this->parse_xml('');
                 }
-                if ($fp = @fopen($path, 'r')) {
+                if ($this->config['skin_include_php']) {
+                    $incl = $this->include_php($path);
+                } else if ($fp = fopen($path, 'r')) {
                     $incl = fread($fp, $tpl_filesize);
                     fclose($fp);
-                    return $this->parse_xml($incl);
-                }
+                }
+                return $this->parse_xml($incl);
                 break;
 
@@ -540 +528 @@
                 break;
 
-            // return code for a specific application object
+                // return code for a specific application object
             case 'object':
                 $object = strtolower($attrib['name']);
@@ -547 +535 @@
                 if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
                     if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) ||
-                        (is_string($handler[0]) && class_exists($handler[0])))
-                            return call_user_func($handler, $attrib);
-                }
-                // execute object handler function
-                else if (function_exists($handler))
+                    (is_string($handler[0]) && class_exists($handler[0])))
                     return call_user_func($handler, $attrib);
+                } else if (function_exists($handler)) {
+                    // execute object handler function
+                    return call_user_func($handler, $attrib);
+                }
 
                 if ($object=='productname') {
@@ -565 +553 @@
                     $title = !empty($this->config['product_name']) ? $this->config['product_name'].' :: ' : '';
 
-                    if (!empty($this->pagetitle))
+                    if (!empty($this->pagetitle)) {
                         $title .= $this->pagetitle;
-                    else if ($task == 'login')
+                    } else if ($task == 'login') {
                         $title = rcube::gettext(array('name' => 'welcome', 'vars' => array('product' => $this->config['product_name'])));
-                    else
+                    } else {
                         $title .= ucfirst($task);
+                    }
 
                     return Q($title);
                 }
                 break;
+                // return variable
+            case 'var':
+                $var = explode(':', $attrib['name']);
+                $name = $var[1];
+                $value = '';
+
+                switch ($var[0]) {
+                    case 'env':
+                        $value = $this->env[$name];
+                        break;
+                    case 'config':
+                        $value = $this->config[$name];
+                        if (is_array($value) && $value[$_SESSION['imap_host']]) {
+                            $value = $value[$_SESSION['imap_host']];
+                        }
+                        break;
+                    case 'request':
+                        $value = get_input_value($name, RCUBE_INPUT_GPC);
+                        break;
+                    case 'session':
+                        $value = $_SESSION[$name];
+                        break;
+                }
+
+                if (is_array($value)) {
+                    $value = implode(', ', $value);
+                }
+
+                return Q($value);
+                break;
         }
         return '';
+    }
+
+    /**
+     * Include a specific file and return it's contents
+     *
+     * @param string File path
+     * @return string Contents of the processed file
+     */
+    private function include_php($file) {
+        ob_start();
+        // TODO i'm not sure but i think this can be require_once
+        include $file;
+        $out = ob_get_contents();
+        ob_end_clean();
+
+        return $out;
     }
 
@@ -588 +623 @@
      * @todo   Remove all sprintf()'s - they are pretty, but also slow.
      */
-    public function button($attrib)
-    {
+    private function button($attrib) {
         static $sa_buttons = array();
         static $s_button_count = 100;
-        
+
         $browser    = new rcube_browser();
         $MAIN_TASKS = rcube_registry::get_instance()->get('MAIN_TASKS', 'core');
@@ -608 +642 @@
         if ($attrib['type']) {
             $attrib['type'] = strtolower($attrib['type']);
-        }
-        else {
+        } else {
             $attrib['type'] = ($attrib['image'] || $attrib['imagepas'] || $attrib['imageact']) ? 'image' : 'link';
         }
@@ -615 +648 @@
 
         // take the button from the stack
-        if($attrib['name'] && $sa_buttons[$attrib['name']]) {
+        if ($attrib['name'] && $sa_buttons[$attrib['name']]) {
             $attrib = $sa_buttons[$attrib['name']];
-        }
-        // add button to button stack
-        else if($attrib['image'] || $attrib['imageact'] || $attrib['imagepas'] || $attrib['class'])
-        {
+        } else if($attrib['image'] || $attrib['imageact'] || $attrib['imagepas'] || $attrib['class']) {
+            // add button to button stack
             if (!$attrib['name']) {
                 $attrib['name'] = $command;
@@ -628 +659 @@
             }
             $sa_buttons[$attrib['name']] = $attrib;
-        }
-
-        // get saved button for this command/name
-        else if ($command && $sa_buttons[$command]) {
+        } else if ($command && $sa_buttons[$command]) {
+            // get saved button for this command/name
             $attrib = $sa_buttons[$command];
         }
-        //else
-        //  return '';
-
 
         // set border to 0 because of the link arround the button
@@ -667 +693 @@
 
         // register button in the system
-        if ($attrib['command'])
-        {
+        if ($attrib['command']) {
             $this->add_script(
-                sprintf(
+            sprintf(
                     "%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
-                    JS_OBJECT_NAME,
-                    $command,
-                    $attrib['id'],
-                    $attrib['type'],
-                    $attrib['imageact'] ? $skin_path.$attrib['imageact'] : $attrib['classact'],
-                    $attrib['imagesel'] ? $skin_path.$attrib['imagesel'] : $attrib['classsel'],
-                    $attrib['imageover'] ? $skin_path.$attrib['imageover'] : ''
-                )
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['id'],
+            $attrib['type'],
+            $attrib['imageact'] ? $skin_path.$attrib['imageact'] : $attrib['classact'],
+            $attrib['imagesel'] ? $skin_path.$attrib['imagesel'] : $attrib['classsel'],
+            $attrib['imageover'] ? $skin_path.$attrib['imageover'] : ''
+            )
             );
 
@@ -685 +710 @@
             if (in_array($attrib['command'], $MAIN_TASKS)) {
                 $attrib['href'] = Q(rcube::url(null, null, $attrib['command']));
-            }
-            else if (in_array($attrib['command'], $a_static_commands)) {
+            } else if (in_array($attrib['command'], $a_static_commands)) {
                 $attrib['href'] = Q(rcube::url($attrib['command']));
             }
@@ -698 +722 @@
             $attrib['onclick'] = sprintf(
                 "return %s.command('%s','%s',this)",
-                JS_OBJECT_NAME,
-                $command,
-                $attrib['prop']
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['prop']
             );
         }
@@ -706 +730 @@
             $attrib['onmouseover'] = sprintf(
                 "return %s.button_over('%s','%s')",
-                JS_OBJECT_NAME,
-                $command,
-                $attrib['id']
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['id']
             );
             $attrib['onmouseout'] = sprintf(
                 "return %s.button_out('%s','%s')",
-                JS_OBJECT_NAME,
-                $command,
-                $attrib['id']
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['id']
             );
         }
@@ -721 +745 @@
             $attrib['onmousedown'] = sprintf(
                 "return %s.button_sel('%s','%s')",
-                JS_OBJECT_NAME,
-                $command,
-                $attrib['id']
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['id']
             );
             $attrib['onmouseup'] = sprintf(
                 "return %s.button_out('%s','%s')",
-                JS_OBJECT_NAME,
-                $command,
-                $attrib['id']
+            JS_OBJECT_NAME,
+            $command,
+            $attrib['id']
             );
         }
@@ -738 +762 @@
         if ($attrib['type']=='image') {
             $attrib_str = rcube::create_attrib_string(
-                $attrib,
-                array(
+            $attrib,
+            array(
                     'style', 'class', 'id', 'width',
                     'height', 'border', 'hspace',
                     'vspace', 'align', 'alt',
-                )
+            )
             );
             $img_tag = sprintf('<img src="%%s"%s />', $attrib_str);
@@ -751 +775 @@
             }
             $link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'title');
-        }
-        else if ($attrib['type']=='link') {
+        } else if ($attrib['type']=='link') {
             $btn_content = $attrib['label'] ? $attrib['label'] : $attrib['command'];
             $link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style');
-        }
-        else if ($attrib['type']=='input') {
+        } else if ($attrib['type']=='input') {
             $attrib['type'] = 'button';
 
-            if ($attrib['label'])
+            if ($attrib['label']) {
                 $attrib['value'] = $attrib['label'];
+            }
 
             $attrib_str = rcube::create_attrib_string(
-                $attrib,
-                array(
+            $attrib,
+            array(
                     'type', 'value', 'onclick',
                     'id', 'class', 'style'
-                )
-            );
-            $out = sprintf('<input%s disabled="disabled" />', $attrib_str);
+                    )
+                    );
+                    $out = sprintf('<input%s disabled="disabled" />', $attrib_str);
         }
 
@@ -780 +803 @@
         return $out;
     }
-    
-    
+
+
     /*  ************* common functions delivering gui objects **************  */
-    
-    
+
+
     /**
      * GUI object 'username'
@@ -809 +832 @@
         $_query.= " AND del<>1";
         $sql_result = $DB->query(
-                            $_query,
-                            $_SESSION['user_id']
+        $_query,
+        $_SESSION['user_id']
         );
 
@@ -823 +846 @@
             $username = $_SESSION['username'].'@'.$_SESSION['imap_host'];
         }
-        
+
         $registry->set('username', $username, 'core');
         return $username;
@@ -867 +890 @@
         $form_name  = !empty($attrib['form']) ? $attrib['form'] : 'form';
         $this->add_gui_object('loginform', $form_name);
-        
+
         // create HTML table with two cols
         $table = new html_table(array('cols' => 2));
-        
+
         $table->add('title', html::label('rcmloginuser', Q(rcube::gettext('username'))));
         $table->add(null, $input_user->show(rcube::get_input_value('_user', rcube::INPUT_POST)));
@@ -876 +899 @@
         $table->add('title', html::label('rcmloginpwd', Q(rcube::gettext('password'))));
         $table->add(null, $input_pass->show());
-        
+
         // add host selection row
         if (is_object($input_host)) {
@@ -886 +909 @@
         $out .= $input_action->show();
         $out .= $table->show();
-        
+
         if (empty($attrib['form']))
-            $out = html::tag(
+        $out = html::tag(
                 'form',
-                array(
+        array(
                     'name' => $form_name,
                     'action' => $registry->get('BASE_URI', $BASE_URI),
                     'method' => "post"
-                ),
-                $out);
-
-        return $out;
+                    ),
+                    $out);
+
+                    return $out;
     }
 
@@ -933 +956 @@
                     'onsubmit' => JS_OBJECT_NAME . ".command('search');return false;",
                     'style' => "display:inline",
-                ),
-                $out
-            );
-        }
-        
+            ),
+            $out
+            );
+        }
+
         return $out;
     }
@@ -991 +1014 @@
             'Windows-1257' => 'Windows-1257 (Baltic)',
             'UTF-8'        => 'UTF-8'
-        );
-
-        $select = new html_select($field_attrib);
-        $select->add(array_values($charsets), array_keys($charsets));
-
-        $set = $_POST['_charset'] ? $_POST['_charset'] : $this->get_charset();
-        return $select->show($set);
+            );
+
+            $select = new html_select($field_attrib);
+            $select->add(array_values($charsets), array_keys($charsets));
+
+            $set = $_POST['_charset'] ? $_POST['_charset'] : $this->get_charset();
+            return $select->show($set);
     }
 

branches/devel-vnext/program/include/session.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland                 |
+ | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -21 +21 @@
 
 
-function sess_open($save_path, $session_name)
-{
+function sess_open($save_path, $session_name) {
     return true;
 }
 
 
-function sess_close()
-{
+function sess_close() {
     return true;
 }
@@ -34 +32 @@
 
 // read session data
-function sess_read($key)
-{
+function sess_read($key) {
     $registry       = rcube_registry::get_instance();
     $DB             = $registry->get('DB', 'core');
@@ -66 +63 @@
 
 // save session data
-function sess_write($key, $vars)
-{
+function sess_write($key, $vars) {
     $DB = rcube_registry::get_instance()->get('DB', 'core');
 
-    if (!is_object($DB) || $DB->is_error())
+    if (!is_object($DB) || $DB->is_error()) {
         return false;
+    }
 
     $sql_result = $DB->query(
@@ -88 +85 @@
             $vars,
             $key);
-    }
-    else {
+    } else {
         $DB->query(
             "INSERT INTO " . rcube::get_table_name('session') . "
@@ -104 +100 @@
 
 // handler for session_destroy()
-function sess_destroy($key)
-{
+function sess_destroy($key) {
     $DB = rcube_registry::get_instance()->get('DB', 'core');
 
@@ -127 +122 @@
 
 // garbage collecting function
-function sess_gc($maxlifetime)
-{
+function sess_gc($maxlifetime) {
     $DB = rcube_registry::get_instance()->get('DB', 'core');
 
@@ -165 +159 @@
 
 
-function sess_regenerate_id()
-{
+function sess_regenerate_id() {
     $randlen = 32;
     $randval = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -183 +176 @@
     $cookie = session_get_cookie_params();
     setcookie(session_name(), $random, $cookie['lifetime'], $cookie['path']);
+    setcookie(session_name(), '', time() - 3600);
+    setcookie(session_name(), $random, $cookie['lifetime'] ? time() + $cookie['lifetime'] : 0, $cookie['path']);
 
     return true;