The branch "imp_multiple_accounts" has been updated. The following is a summary of the commits.
from: 85ef9b12dae3c909a8e1cb389088a5991c4c525a 6d1df12 [mms] Add Horde_Session::ENCRYPT flag for session data. 4d85e08 Use new Horde_Session::ENCRYPT flag to store password in session 309e8f6 Use new Horde_Session::ENCRYPT flag to store password in session 846d7b1 [mms] Horde_Session now handles resetting the secret key on login. c7f9518 [mms] Add preferred way of retrieving password - by passing in callable to 'password' parameter. 74faf18 Use the new 'password' callable parameter to store password for Imap object 7f38f48 [mms] Update session data stored with secret key if session ID changed and we are using non-cookie based sessions. 35ae43b Convert dynamic password generation from callable to a Horde_Imap_Client_Base_Password object cf6e014 Use Horde_Imap_Client_Base_Password to dynamically generate password for Horde_Imap_Client 8b470b7 Merge branch 'master' into bug_12590 019a5e8 This is not needed anymore 5979d7f Merge branch 'master' into bug_12590 a7bdc94 Merge branch 'master' into bug_12590 ab063da More detailed comments, update test. 1980614 Simplify even more, and re-enable test. 98541b2 Order alphabetically. fab73e7 Enable history tests. 88277e5 Fix name. f82f7ae Merge branch 'bug_12590' 384ceb2 [mms] Added the 'statuscache' property to Horde_Imap_Client_Base (Request #12589). 8c77afd Merge branch 'master' into imp_6_2 1d4e731 Merge branch 'imp_6_2' into imp_multiple_accounts ----------------------------------------------------------------------- commit 6d1df122dd44a0cd293eb12d22ca2826ace78ec4 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 16:14:37 2013 -0600 [mms] Add Horde_Session::ENCRYPT flag for session data. framework/Core/lib/Horde/Session.php | 63 ++++++++++++++++++++++----------- framework/Core/package.xml | 10 +++-- 2 files changed, 48 insertions(+), 25 deletions(-) http://git.horde.org/horde-git/-/commit/6d1df122dd44a0cd293eb12d22ca2826ace78ec4 ----------------------------------------------------------------------- commit 4d85e082551f6974d1f511f1b8bc6fc7b922653a Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 20:53:02 2013 -0600 Use new Horde_Session::ENCRYPT flag to store password in session mnemo/lib/Mnemo.php | 15 ++++++--------- mnemo/package.xml | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/4d85e082551f6974d1f511f1b8bc6fc7b922653a ----------------------------------------------------------------------- commit 309e8f6d9f254596a38d1f6314ccfb7642c83125 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 20:54:49 2013 -0600 Use new Horde_Session::ENCRYPT flag to store password in session imp/lib/Crypt/Pgp.php | 20 ++++++++------------ imp/lib/Crypt/Smime.php | 15 +++++++-------- imp/lib/Factory/Imap.php | 5 ----- imp/lib/Imap.php | 6 ------ imp/lib/Imap/Config.php | 46 ++++++++++++++++++++++------------------------ imp/package.xml | 2 +- 6 files changed, 38 insertions(+), 56 deletions(-) http://git.horde.org/horde-git/-/commit/309e8f6d9f254596a38d1f6314ccfb7642c83125 ----------------------------------------------------------------------- commit 846d7b162e3d7f560eff664e47004ce6886c766b Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 20:54:13 2013 -0600 [mms] Horde_Session now handles resetting the secret key on login. framework/Core/lib/Horde/Session.php | 3 +++ framework/Core/package.xml | 2 ++ horde/login.php | 10 ---------- horde/package.xml | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/846d7b162e3d7f560eff664e47004ce6886c766b ----------------------------------------------------------------------- commit c7f951850f7601136428a2c01ce01dc473401bd1 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 21:19:44 2013 -0600 [mms] Add preferred way of retrieving password - by passing in callable to 'password' parameter. framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 5 ++ framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 34 +++++++++++++---- framework/Imap_Client/package.xml | 2 + 3 files changed, 33 insertions(+), 8 deletions(-) http://git.horde.org/horde-git/-/commit/c7f951850f7601136428a2c01ce01dc473401bd1 ----------------------------------------------------------------------- commit 74faf189977c45afcd33358458206cda6bcbbf34 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 21:30:41 2013 -0600 Use the new 'password' callable parameter to store password for Imap object This *should* transparently work around issue where secret key changes when IMP is used as the authentication application. imp/lib/Imap.php | 28 ++++++++++++++++++++++++---- imp/package.xml | 9 +-------- 2 files changed, 25 insertions(+), 12 deletions(-) http://git.horde.org/horde-git/-/commit/74faf189977c45afcd33358458206cda6bcbbf34 ----------------------------------------------------------------------- commit 7f38f489e746cf0d55298ae25d6c2d841168dda0 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 21:41:44 2013 -0600 [mms] Update session data stored with secret key if session ID changed and we are using non-cookie based sessions. framework/Core/lib/Horde/Session.php | 16 ++++++++++++++++ framework/Core/package.xml | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/7f38f489e746cf0d55298ae25d6c2d841168dda0 ----------------------------------------------------------------------- commit 35ae43be030b61eae43f41fa0b67675edc542f4f Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 22:33:22 2013 -0600 Convert dynamic password generation from callable to a Horde_Imap_Client_Base_Password object framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 3 +- framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 8 +- framework/Imap_Client/lib/Horde/Imap/Client/Base/Password.php | 33 +++++++++ framework/Imap_Client/package.xml | 8 ++- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Base/Password.php http://git.horde.org/horde-git/-/commit/35ae43be030b61eae43f41fa0b67675edc542f4f ----------------------------------------------------------------------- commit cf6e0141675057b16799cb1d3c1893b8bbf7b371 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 22:42:27 2013 -0600 Use Horde_Imap_Client_Base_Password to dynamically generate password for Horde_Imap_Client imp/lib/Imap.php | 27 ++-------------- imp/lib/Imap/Password.php | 74 +++++++++++++++++++++++++++++++++++++++++++++ imp/package.xml | 6 ++- 3 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 imp/lib/Imap/Password.php http://git.horde.org/horde-git/-/commit/cf6e0141675057b16799cb1d3c1893b8bbf7b371 ----------------------------------------------------------------------- commit 8b470b784980c9fa35fa07427773b60c31201a9f Merge: cf6e014 9d5d7dc Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 22:42:30 2013 -0600 Merge branch 'master' into bug_12590 framework/Smtp/doc/Horde/Smtp/UPGRADING | 3 ++ framework/Smtp/lib/Horde/Smtp.php | 39 ++++++++++++++++++++-------- framework/Smtp/lib/Horde/Smtp/Password.php | 32 +++++++++++++++++++++++ framework/Smtp/package.xml | 2 + 4 files changed, 65 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/8b470b784980c9fa35fa07427773b60c31201a9f ----------------------------------------------------------------------- commit 019a5e8c95a0c69f1ea51406dde9048f91d90e91 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 22:46:55 2013 -0600 This is not needed anymore imp/lib/Imap.php | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/019a5e8c95a0c69f1ea51406dde9048f91d90e91 ----------------------------------------------------------------------- commit 5979d7f0f1a448917a2d80210ed5c8121f3cfea0 Merge: 019a5e8 c299947 Author: Michael M Slusarz <[email protected]> Date: Tue Aug 20 22:47:21 2013 -0600 Merge branch 'master' into bug_12590 http://git.horde.org/horde-git/-/commit/5979d7f0f1a448917a2d80210ed5c8121f3cfea0 ----------------------------------------------------------------------- commit a7bdc948fc416f4722a034edaab4504280dde115 Merge: 5979d7f d180c4a Author: Michael M Slusarz <[email protected]> Date: Wed Aug 21 13:27:07 2013 -0600 Merge branch 'master' into bug_12590 chora/themes/default/screen.css | 1 - framework/Core/lib/Horde.php | 24 +++-- framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 8 ++ framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 21 +--- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 23 +++- .../Imap_Client/lib/Horde/Imap/Client/Socket/Connection/Pop3.php | 4 +- .../lib/Horde/Imap/Client/Socket/Connection/Socket.php | 2 +- framework/Imap_Client/package.xml | 2 + framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php | 6 +- framework/Kolab_Storage/package.xml | 2 +- framework/Smtp/lib/Horde/Smtp.php | 27 ++--- horde/lib/Test.php | 3 - horde/themes/default/screen.css | 4 - imp/docs/CHANGES | 1 + imp/js/message-dimp.js | 2 + imp/lib/Mailbox.php | 2 +- imp/lib/Message.php | 3 + imp/lib/Notification/Handler/Decorator/NewmailNotify.php | 2 +- imp/package.xml | 2 + imp/themes/default/dynamic/screen.css | 6 - imp/themes/default/screen.css | 2 - imp/themes/default/smartmobile/screen.css | 1 - whups/lib/Driver/Sql.php | 13 ++- 23 files changed, 82 insertions(+), 79 deletions(-) http://git.horde.org/horde-git/-/commit/a7bdc948fc416f4722a034edaab4504280dde115 ----------------------------------------------------------------------- commit ab063da2d93d55184e43cb248a54df5db5a49857 Author: Michael J Rubinsky <[email protected]> Date: Thu Aug 22 15:54:01 2013 -0400 More detailed comments, update test. framework/History/lib/Horde/History/Sql.php | 22 +++++++++++++++++--- framework/History/test/Horde/History/TestBase.php | 16 ++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/ab063da2d93d55184e43cb248a54df5db5a49857 ----------------------------------------------------------------------- commit 198061400af787412df8e3231102f061afe8739a Author: Jan Schneider <[email protected]> Date: Thu Aug 22 22:34:54 2013 +0200 Simplify even more, and re-enable test. framework/History/test/Horde/History/TestBase.php | 24 +++++++++----------- 1 files changed, 11 insertions(+), 13 deletions(-) http://git.horde.org/horde-git/-/commit/198061400af787412df8e3231102f061afe8739a ----------------------------------------------------------------------- commit 98541b2833b3c49e23964bd6a37cc0c404d79c79 Author: Jan Schneider <[email protected]> Date: Thu Aug 22 22:45:58 2013 +0200 Order alphabetically. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/98541b2833b3c49e23964bd6a37cc0c404d79c79 ----------------------------------------------------------------------- commit fab73e7e8f97f7cbfd76bffe38309484ce514ef3 Author: Jan Schneider <[email protected]> Date: Thu Aug 22 22:47:38 2013 +0200 Enable history tests. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/fab73e7e8f97f7cbfd76bffe38309484ce514ef3 ----------------------------------------------------------------------- commit 88277e5d2ab844da84576ff03b231b6c826b9eeb Author: Jan Schneider <[email protected]> Date: Thu Aug 22 23:03:19 2013 +0200 Fix name. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/88277e5d2ab844da84576ff03b231b6c826b9eeb ----------------------------------------------------------------------- commit f82f7ae8a09e09a5b1d283c45bc62aa3d694b38d Merge: 88277e5 a7bdc94 Author: Michael M Slusarz <[email protected]> Date: Fri Aug 23 00:13:26 2013 -0600 Merge branch 'bug_12590' framework/Core/lib/Horde/Session.php | 82 +++++++++++++++++++++++++--------- framework/Core/package.xml | 14 ++++-- horde/login.php | 10 ---- horde/package.xml | 2 +- imp/lib/Crypt/Pgp.php | 20 +++----- imp/lib/Crypt/Smime.php | 15 +++--- imp/lib/Factory/Imap.php | 5 -- imp/lib/Imap.php | 16 +------ imp/lib/Imap/Config.php | 46 +++++++++---------- imp/lib/Imap/Password.php | 74 ++++++++++++++++++++++++++++++ imp/package.xml | 17 +++----- mnemo/lib/Mnemo.php | 15 +++---- mnemo/package.xml | 2 +- 13 files changed, 197 insertions(+), 121 deletions(-) http://git.horde.org/horde-git/-/commit/f82f7ae8a09e09a5b1d283c45bc62aa3d694b38d ----------------------------------------------------------------------- commit 384ceb2be3ac85dd68cca101718654e41d536030 Author: Michael M Slusarz <[email protected]> Date: Fri Aug 23 00:24:39 2013 -0600 [mms] Added the 'statuscache' property to Horde_Imap_Client_Base (Request #12589). framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 4 ++++ framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 17 +++++++++++++++++ framework/Imap_Client/package.xml | 2 ++ 3 files changed, 23 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/384ceb2be3ac85dd68cca101718654e41d536030 ----------------------------------------------------------------------- commit 8c77afd9dd33e0c28ece9691d3932fe278f2e0f3 Merge: 60d31d7 384ceb2 Author: Michael M Slusarz <[email protected]> Date: Fri Aug 23 00:25:36 2013 -0600 Merge branch 'master' into imp_6_2 .travis.yml | 2 +- framework/Core/lib/Horde/Session.php | 82 ++++++++++++---- framework/Core/package.xml | 14 ++- framework/History/lib/Horde/History/Sql.php | 22 ++++- framework/History/test/Horde/History/TestBase.php | 18 ++-- framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 4 + framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 17 ++++ framework/Imap_Client/package.xml | 2 + horde/login.php | 10 -- horde/package.xml | 2 +- imp/lib/Crypt/Pgp.php | 20 ++--- imp/lib/Crypt/Smime.php | 15 ++-- imp/lib/Factory/Imap.php | 5 - imp/lib/Imap.php | 16 +--- imp/lib/Imap/Config.php | 46 +++++----- imp/lib/Imap/Password.php | 74 +++++++++++++++ imp/package.xml | 17 +-- mnemo/lib/Mnemo.php | 15 +-- mnemo/package.xml | 2 +- 19 files changed, 250 insertions(+), 133 deletions(-) http://git.horde.org/horde-git/-/commit/8c77afd9dd33e0c28ece9691d3932fe278f2e0f3 ----------------------------------------------------------------------- commit 1d4e731834951d4a7dac6f683f78f7a8e48cb4b6 Merge: 85ef9b1 8c77afd Author: Michael M Slusarz <[email protected]> Date: Fri Aug 23 01:15:07 2013 -0600 Merge branch 'imp_6_2' into imp_multiple_accounts Conflicts: imp/package.xml .travis.yml | 2 +- framework/Core/lib/Horde/Session.php | 82 ++++++++++++---- framework/Core/package.xml | 14 ++- framework/History/lib/Horde/History/Sql.php | 22 ++++- framework/History/test/Horde/History/TestBase.php | 18 ++-- framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 4 + framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 17 ++++ framework/Imap_Client/package.xml | 2 + horde/login.php | 10 -- horde/package.xml | 2 +- imp/lib/Crypt/Pgp.php | 20 ++--- imp/lib/Crypt/Smime.php | 15 ++-- imp/lib/Factory/Imap.php | 5 - imp/lib/Imap.php | 16 +--- imp/lib/Imap/Config.php | 46 +++++----- imp/lib/Imap/Password.php | 74 +++++++++++++++ imp/package.xml | 15 +-- mnemo/lib/Mnemo.php | 15 +-- mnemo/package.xml | 2 +- 19 files changed, 249 insertions(+), 132 deletions(-) http://git.horde.org/horde-git/-/commit/1d4e731834951d4a7dac6f683f78f7a8e48cb4b6 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
