The branch "master" has been updated. The following is a summary of the commits.
from: ce3bcdf663ecd9b784bfcb72c05b8f8a51e396f0 f22e7b3 Remove todo/question. We do want to check this. 8b61a1f Move these checks into the collection handler. 303fade Enfore that we need to initialize a PARTIAL sync before we can call this. d1b360a Some logging. 44e9b71 Return early if no collections. d85cd47 Do not take these values into account when comparing collections. 8ba59c8 Don't initialize a full sync for a PING request. Kills the synckeys. be7f398 Don't clear all collections, just overwrite changed. 9c22553 Smaller variable names. ad772a4 Merge branch 'master' into eas b764f8f Logging 9ed645e Only load from cache if we have an empty PING. c40fdaa Handle a non empty PING, but with no FOLDERS. 67e520c Try to send more appropriate error codes. bc4e7ff This check does more harm than good, especially on iOS. 0e65035 Ensure we send the proper response, and don't exit early in these cases. e8f7052 No need to save the synckey, we use lastsynckey for this. 48fa142 This is indeed true, remove this code. 26553fc Simplify 896e825 Only store the collection class, it's all we'll need this for. 85e8d8f Load the collection class if needed right away. dd4ce14 Throw an exception if we can't obtain the collection class. 4b96fd6 Fix variable name b378e3b Log this as well. d3745cd Not a question, this is a statement.. b98e9f2 Try to get the collection class as soon as we have the id. 1459791 Logging fixes. 7264c94 Normalize log levels for EAS code. 4e43dc3 Pull the synckey from the cache if needed. dc7e213 Revert "This check does more harm than good, especially on iOS." a3baa94 Revert accidently committed changes. a9d80e7 Perform this check early, so we don't need to check in multiple places. 1790e61 Don't exit, rather return false. 45db7e8 comments 1c1ecbe Merge branch 'eas' ----------------------------------------------------------------------- commit f22e7b354eeca304680035ac41151a6cd9481142 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:26:48 2013 -0400 Remove todo/question. We do want to check this. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/f22e7b354eeca304680035ac41151a6cd9481142 ----------------------------------------------------------------------- commit 8b61a1f0ecd6d8eb5f315a4687125ae7a8f35983 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:33:14 2013 -0400 Move these checks into the collection handler. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 20 +++++- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 48 +++-------- 2 files changed, 32 insertions(+), 36 deletions(-) http://git.horde.org/horde-git/-/commit/8b61a1f0ecd6d8eb5f315a4687125ae7a8f35983 ----------------------------------------------------------------------- commit 303fade3caf80b9881908b4c6803238ad76aa382 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:33:51 2013 -0400 Enfore that we need to initialize a PARTIAL sync before we can call this. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 4 ++++ framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/303fade3caf80b9881908b4c6803238ad76aa382 ----------------------------------------------------------------------- commit d1b360a74c57edd11d0ea371e06ec33111f4e595 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:36:14 2013 -0400 Some logging. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/d1b360a74c57edd11d0ea371e06ec33111f4e595 ----------------------------------------------------------------------- commit 44e9b71610160ed991176604d1dd6df90d97d32c Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:39:28 2013 -0400 Return early if no collections. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/44e9b71610160ed991176604d1dd6df90d97d32c ----------------------------------------------------------------------- commit d85cd47aba1096f6d68a3465d4725ac47d15b903 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:40:18 2013 -0400 Do not take these values into account when comparing collections. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/d85cd47aba1096f6d68a3465d4725ac47d15b903 ----------------------------------------------------------------------- commit 8ba59c880b1acb6fdc18701d765778f4d21620bd Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:41:46 2013 -0400 Don't initialize a full sync for a PING request. Kills the synckeys. framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8ba59c880b1acb6fdc18701d765778f4d21620bd ----------------------------------------------------------------------- commit be7f398d928e00e406a93fa78fe13e98afa95747 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:43:38 2013 -0400 Don't clear all collections, just overwrite changed. framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/be7f398d928e00e406a93fa78fe13e98afa95747 ----------------------------------------------------------------------- commit 9c22553897b998bb1741dcad84a079e6afc473a3 Author: Michael J Rubinsky <[email protected]> Date: Tue Apr 23 09:51:07 2013 -0400 Smaller variable names. framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 22 +++++++------- 1 files changed, 11 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/9c22553897b998bb1741dcad84a079e6afc473a3 ----------------------------------------------------------------------- commit ad772a4064fa8312f282a06e6b74bb42aba67997 Merge: 9c22553 d51e19d Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 13:12:28 2013 -0400 Merge branch 'master' into eas framework/Argv/locale/uk/LC_MESSAGES/Horde_Argv.mo | Bin 675 -> 1130 bytes framework/Argv/locale/uk/LC_MESSAGES/Horde_Argv.po | 16 +- framework/Cli/locale/uk/LC_MESSAGES/Horde_Cli.mo | Bin 709 -> 815 bytes framework/Cli/locale/uk/LC_MESSAGES/Horde_Cli.po | 26 +- framework/Compress/locale/uk/LC_MESSAGES/Horde_Compress.mo | Bin 758 -> 1144 bytes framework/Compress/locale/uk/LC_MESSAGES/Horde_Compress.po | 16 +- framework/Core/lib/Horde/Config.php | 3 +- framework/Core/lib/Horde/Core/Factory/Alarm.php | 14 +- framework/Core/lib/Horde/Core/Factory/Auth.php | 24 +- framework/Core/lib/Horde/Core/Factory/Cache.php | 2 +- framework/Core/lib/Horde/Core/Factory/Lock.php | 20 +- framework/Core/lib/Horde/Core/Factory/Perms.php | 16 +- framework/Core/lib/Horde/Core/Factory/Prefs.php | 32 +- framework/Core/lib/Horde/Core/Factory/SessionHandler.php | 13 +- framework/Core/lib/Horde/Core/Factory/Token.php | 22 +- framework/Core/lib/Horde/Core/Factory/Vfs.php | 14 +- framework/Core/lib/Horde/Core/Log/Object.php | 8 +- framework/Core/lib/Horde/Session.php | 13 + framework/Core/locale/uk/LC_MESSAGES/Horde_Core.mo | Bin 12206 -> 18867 bytes framework/Core/locale/uk/LC_MESSAGES/Horde_Core.po | 924 +- framework/Crypt/locale/uk/LC_MESSAGES/Horde_Crypt.mo | Bin 9138 -> 8827 bytes framework/Crypt/locale/uk/LC_MESSAGES/Horde_Crypt.po | 279 +- framework/Data/locale/uk/LC_MESSAGES/Horde_Data.mo | Bin 627 -> 1569 bytes framework/Data/locale/uk/LC_MESSAGES/Horde_Data.po | 39 +- framework/Exception/locale/uk/LC_MESSAGES/Horde_Exception.mo | Bin 579 -> 627 bytes framework/Exception/locale/uk/LC_MESSAGES/Horde_Exception.po | 6 +- framework/Form/locale/uk/LC_MESSAGES/Horde_Form.mo | Bin 10411 -> 11339 bytes framework/Form/locale/uk/LC_MESSAGES/Horde_Form.po | 54 +- .../Imap_Client/lib/Horde/Imap/Client/Cache/Backend/Mongo.php | 27 +- framework/Imap_Client/lib/Horde/Imap/Client/Ids.php | 2 +- framework/Imap_Client/package.xml | 2 + framework/Itip/locale/uk/LC_MESSAGES/Horde_Itip.mo | Bin 496 -> 1662 bytes framework/Itip/locale/uk/LC_MESSAGES/Horde_Itip.po | 31 +- framework/Mime/locale/uk/LC_MESSAGES/Horde_Mime.mo | Bin 1227 -> 1531 bytes framework/Mime/locale/uk/LC_MESSAGES/Horde_Mime.po | 20 +- framework/Mime_Viewer/locale/uk/LC_MESSAGES/Horde_Mime_Viewer.mo | Bin 541 -> 1731 bytes framework/Mime_Viewer/locale/uk/LC_MESSAGES/Horde_Mime_Viewer.po | 45 +- framework/Model/locale/uk/LC_MESSAGES/Horde_Model.mo | Bin 10491 -> 8016 bytes framework/Model/locale/uk/LC_MESSAGES/Horde_Model.po | 780 +- framework/Nls/locale/uk/LC_MESSAGES/Horde_Nls.mo | Bin 13708 -> 18807 bytes framework/Nls/locale/uk/LC_MESSAGES/Horde_Nls.po | 1353 +- framework/Prefs/lib/Horde/Prefs.php | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/Mongo.php | 152 + framework/Prefs/lib/Horde/Prefs/Storage/Sql.php | 15 +- framework/Prefs/locale/uk/LC_MESSAGES/Horde_Prefs.mo | Bin 1191 -> 1271 bytes framework/Prefs/locale/uk/LC_MESSAGES/Horde_Prefs.po | 9 +- framework/Prefs/package.xml | 21 +- framework/Rpc/locale/uk/LC_MESSAGES/Horde_Rpc.mo | Bin 1001 -> 1494 bytes framework/Rpc/locale/uk/LC_MESSAGES/Horde_Rpc.po | 16 +- .../locale/uk/LC_MESSAGES/Horde_Service_Facebook.mo | Bin 508 -> 733 bytes .../locale/uk/LC_MESSAGES/Horde_Service_Facebook.po | 10 +- .../SessionHandler/lib/Horde/SessionHandler/Storage/Mongo.php | 244 + framework/SessionHandler/package.xml | 18 +- framework/Share/locale/uk/LC_MESSAGES/Horde_Share.mo | Bin 1097 -> 1415 bytes framework/Share/locale/uk/LC_MESSAGES/Horde_Share.po | 10 +- framework/SyncMl/locale/uk/LC_MESSAGES/Horde_SyncMl.mo | Bin 498 -> 600 bytes framework/SyncMl/locale/uk/LC_MESSAGES/Horde_SyncMl.po | 3 +- gollem/locale/uk/LC_MESSAGES/gollem.mo | Bin 65673 -> 67417 bytes horde/bin/horde-sessions-gc | 52 + horde/config/conf.xml | 17 +- horde/locale/uk/LC_MESSAGES/horde.mo | Bin 60144 -> 61944 bytes horde/locale/uk/LC_MESSAGES/horde.po | 2547 +-- horde/templates/logintasks/logintasks.html.php | 4 +- imp/bin/imp-query-imap-cache | 34 +- imp/config/conf.xml | 12 +- imp/docs/CHANGES | 1 + imp/js/dimpbase.js | 19 +- imp/js/dimpcore.js | 3 + imp/lib/Ajax/Application/Handler/Dynamic.php | 18 + imp/lib/Auth.php | 5 +- imp/lib/Basic/Thread.php | 4 +- imp/lib/Compose.php | 2 +- imp/lib/Factory/Sentmail.php | 22 +- imp/lib/Imap.php | 20 +- imp/lib/Imap/Config.php | 56 +- imp/lib/Imap/Tree.php | 6 - imp/lib/Perms.php | 2 +- imp/lib/Sentmail.php | 43 +- imp/lib/Sentmail/Mongo.php | 161 + imp/locale/uk/LC_MESSAGES/imp.mo | Bin 184229 -> 191644 bytes imp/locale/uk/LC_MESSAGES/imp.po | 5327 +++-- imp/package.xml | 8 +- imp/themes/default/dynamic/screen.css | 6 +- imp/themes/default/screen.css | 3 +- ingo/locale/uk/LC_MESSAGES/ingo.mo | Bin 76328 -> 79361 bytes ingo/locale/uk/LC_MESSAGES/ingo.po | 619 +- kronolith/locale/uk/LC_MESSAGES/kronolith.mo | Bin 121169 -> 122464 bytes kronolith/locale/uk/LC_MESSAGES/kronolith.po | 2052 +- mnemo/docs/CHANGES | 3 +- mnemo/docs/CREDITS | 1 + mnemo/locale/uk/LC_MESSAGES/mnemo.mo | Bin 0 -> 73105 bytes mnemo/locale/uk/LC_MESSAGES/mnemo.po | 623 + mnemo/package.xml | 2 + nag/docs/CHANGES | 6 + nag/lib/Driver/Kolab.php | 4 +- nag/locale/uk/LC_MESSAGES/nag.mo | Bin 86254 -> 90393 bytes nag/locale/uk/LC_MESSAGES/nag.po | 1048 +- nag/package.xml | 3 + turba/locale/uk/LC_MESSAGES/turba.mo | Bin 94303 -> 100060 bytes turba/locale/uk/LC_MESSAGES/turba.po | 1085 +- whups/locale/uk/LC_MESSAGES/whups.mo | Bin 94387 -> 102844 bytes whups/locale/uk/LC_MESSAGES/whups.po | 1445 +- wicked/locale/uk/LC_MESSAGES/wicked.mo | Bin 72732 -> 74495 bytes 103 files changed, 10787 insertions(+), 8777 deletions(-) http://git.horde.org/horde-git/-/commit/ad772a4064fa8312f282a06e6b74bb42aba67997 ----------------------------------------------------------------------- commit b764f8f90c7c3f124b36ce34e29d2ec925e2ad8b Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:17:41 2013 -0400 Logging framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/b764f8f90c7c3f124b36ce34e29d2ec925e2ad8b ----------------------------------------------------------------------- commit 9ed645e9bb2da8a09aa2b2ece61ffc97d5399ae1 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:19:10 2013 -0400 Only load from cache if we have an empty PING. framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/9ed645e9bb2da8a09aa2b2ece61ffc97d5399ae1 ----------------------------------------------------------------------- commit c40fdaaa09eeb304302740913ad760872b547744 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:19:47 2013 -0400 Handle a non empty PING, but with no FOLDERS. This may happen rarely, but is used to update only the heartbeat interval. framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/c40fdaaa09eeb304302740913ad760872b547744 ----------------------------------------------------------------------- commit 67e520c394f5ea935c78ff001c947ff9c4516a84 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:20:36 2013 -0400 Try to send more appropriate error codes. framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 20 +++++++++--- 1 files changed, 15 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/67e520c394f5ea935c78ff001c947ff9c4516a84 ----------------------------------------------------------------------- commit bc4e7ff4dd152b3676b47d999a672bc474893c81 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:21:52 2013 -0400 This check does more harm than good, especially on iOS. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/bc4e7ff4dd152b3676b47d999a672bc474893c81 ----------------------------------------------------------------------- commit 0e65035c953d368764fd2e716aa5ac5791e76924 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:22:41 2013 -0400 Ensure we send the proper response, and don't exit early in these cases. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/0e65035c953d368764fd2e716aa5ac5791e76924 ----------------------------------------------------------------------- commit e8f705280de77180a758a21465905858bcd275e6 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:26:45 2013 -0400 No need to save the synckey, we use lastsynckey for this. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/e8f705280de77180a758a21465905858bcd275e6 ----------------------------------------------------------------------- commit 48fa1429284baf20fafefd5a5313a4b863bb466c Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:30:03 2013 -0400 This is indeed true, remove this code. framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 11 ------ 1 files changed, 0 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/48fa1429284baf20fafefd5a5313a4b863bb466c ----------------------------------------------------------------------- commit 26553fce0aeeaa5dc3ec205b8651d25486471951 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:33:06 2013 -0400 Simplify framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 7 +---- 1 files changed, 2 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/26553fce0aeeaa5dc3ec205b8651d25486471951 ----------------------------------------------------------------------- commit 896e82520fdd39a0f06a2ee6c3f3984f6b1f5fd4 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 15:39:12 2013 -0400 Only store the collection class, it's all we'll need this for. framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/896e82520fdd39a0f06a2ee6c3f3984f6b1f5fd4 ----------------------------------------------------------------------- commit 85e8d8f44af551cf073af04000a62812a21b51a6 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:19:36 2013 -0400 Load the collection class if needed right away. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/85e8d8f44af551cf073af04000a62812a21b51a6 ----------------------------------------------------------------------- commit dd4ce14c88e544736eee7eaf93802917eb3ace80 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:22:16 2013 -0400 Throw an exception if we can't obtain the collection class. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 7 +++++++ framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/dd4ce14c88e544736eee7eaf93802917eb3ace80 ----------------------------------------------------------------------- commit 4b96fd6e6fcc394ca19568227c539462f0e95a5c Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:22:54 2013 -0400 Fix variable name framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/4b96fd6e6fcc394ca19568227c539462f0e95a5c ----------------------------------------------------------------------- commit b378e3bee35939303006f03cc2a18c3398c66413 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:23:11 2013 -0400 Log this as well. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/b378e3bee35939303006f03cc2a18c3398c66413 ----------------------------------------------------------------------- commit d3745cd58809c78443b3f570edeac72e137c7bfd Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:23:23 2013 -0400 Not a question, this is a statement.. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/d3745cd58809c78443b3f570edeac72e137c7bfd ----------------------------------------------------------------------- commit b98e9f2ce6d36189ec3649291354bb1feb39759d Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:24:46 2013 -0400 Try to get the collection class as soon as we have the id. Helps to catch when the hierarchy cache vanishes. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 28 +++-------- 1 files changed, 8 insertions(+), 20 deletions(-) http://git.horde.org/horde-git/-/commit/b98e9f2ce6d36189ec3649291354bb1feb39759d ----------------------------------------------------------------------- commit 1459791e45b59810b792fe1f9220fe544eccbef6 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:27:27 2013 -0400 Logging fixes. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/1459791e45b59810b792fe1f9220fe544eccbef6 ----------------------------------------------------------------------- commit 7264c94bd28945def29aea0a29d998da036caa6d Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 18:49:47 2013 -0400 Normalize log levels for EAS code. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 64 +- framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 22 +- framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 8 +- .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 4 +- .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 8 +- .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +- .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 14 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 14 +- .../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php | 6 +- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 54 +- framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 4 +- .../ActiveSync/test/Horde/ActiveSync/CollectionsHandlerTest.php | 373 +++++ framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 34 +- 18 files changed, 498 insertions(+), 125 deletions(-) create mode 100644 framework/ActiveSync/test/Horde/ActiveSync/CollectionsHandlerTest.php http://git.horde.org/horde-git/-/commit/7264c94bd28945def29aea0a29d998da036caa6d ----------------------------------------------------------------------- commit 4e43dc3963f10e486e4f9f61eac1dab19a4b1eb5 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:17:12 2013 -0400 Pull the synckey from the cache if needed. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/4e43dc3963f10e486e4f9f61eac1dab19a4b1eb5 ----------------------------------------------------------------------- commit dc7e21317b92df7fdbe1b78cbf461b4214fb9126 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:18:58 2013 -0400 Revert "This check does more harm than good, especially on iOS." This reverts commit bc4e7ff4dd152b3676b47d999a672bc474893c81. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/dc7e21317b92df7fdbe1b78cbf461b4214fb9126 ----------------------------------------------------------------------- commit a3baa94bb8c3790c32852f9e997c66a5042c995d Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:35:53 2013 -0400 Revert accidently committed changes. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/a3baa94bb8c3790c32852f9e997c66a5042c995d ----------------------------------------------------------------------- commit a9d80e7b79de469b2d3d4b15ba9a6e6b6527017f Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:36:25 2013 -0400 Perform this check early, so we don't need to check in multiple places. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 20 +++++++----- 1 files changed, 12 insertions(+), 8 deletions(-) http://git.horde.org/horde-git/-/commit/a9d80e7b79de469b2d3d4b15ba9a6e6b6527017f ----------------------------------------------------------------------- commit 1790e612037fd66ab0bed3507081bcbd64bf2ffe Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:37:57 2013 -0400 Don't exit, rather return false. Ensures we send the full response, even for errors. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/1790e612037fd66ab0bed3507081bcbd64bf2ffe ----------------------------------------------------------------------- commit 45db7e84deee67af326d4ef893d799671e0b4a0f Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:40:00 2013 -0400 comments framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/45db7e84deee67af326d4ef893d799671e0b4a0f ----------------------------------------------------------------------- commit 1c1ecbe0a4c49a0f97a1c41700bb77a50df3ee0f Merge: ce3bcdf 45db7e8 Author: Michael J Rubinsky <[email protected]> Date: Sun Apr 28 19:44:36 2013 -0400 Merge branch 'eas' framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 108 +- framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 22 +- framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 8 +- .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 22 +- .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 8 +- .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +- .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 50 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 124 +- .../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php | 6 +- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 63 +- framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 41 +- .../ActiveSync/test/Horde/ActiveSync/CollectionsHandlerTest.php | 373 +++++ framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 34 +- 18 files changed, 639 insertions(+), 238 deletions(-) http://git.horde.org/horde-git/-/commit/1c1ecbe0a4c49a0f97a1c41700bb77a50df3ee0f -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
