[commits] Horde branch imp_6_2 updated. 5dd0d2a8c02de1ffdcd02dc36394c7771522283d
Michael M Slusarz
slusarz at horde.org
Thu Sep 12 23:05:33 UTC 2013
The branch "imp_6_2" has been updated.
The following is a summary of the commits.
from: c980954263f636751c3d7c69f615b51644dbb86e
45cb1fb Add title to login/logout button.
8d296cf Fix undefined index
cf5e872 [mms] Correctly enforce file size attachment limits on the first attachment (Bug #12663).
c2f6d07 [mms] Fix parsing SMTP error message on servers that support ENHANCEDSTATUSCODES (Bug #12666).
ee0745e Released Horde_Smtp-1.2.3
c1bd1e0 Development mode for Horde_Smtp-1.2.4
6e4e845 Fix toggle in minimal folders page
593d22a fix mismatched tag
723dc5d Fix URL escaping
c65b78c Merge branch 'master' into imp_6_2
002217b [mms] Fix EOL filter when multi-character EOL is split between incoming buckets (Bug #12673).
5e369d2 Make more methods abstract.
fc14c3c Already defined in base class.
ed92d8a [jan] Always return a Horde_Db_Adapter_Base_Result sub-class from the select() method.
c92f78f AVoid strict error.
bc4f4a7 execute() won't go completely, just don't use it.
ac24664 Fix incorrect usage of Horde_Db API.
88ca85b Fix message actions in minimal view
bcd0a19 Improved error notification messages
13df52b [mms] Fixed regression in enforcing max_recipients and max_timelimit permissions (Bug #12674).
5c03814 Cast these values to integers
702519c Don't wrap ngettext strings in an additional gettext call
924303a grammar in help file
541e22f grammar in help file
5dd0d2a Merge branch 'master' into imp_6_2
-----------------------------------------------------------------------
commit 45cb1fbf633134c156d4098328f82407c3fb44d1
Author: Jan Schneider <jan at horde.org>
Date: Wed Sep 11 10:25:29 2013 +0200
Add title to login/logout button.
horde/templates/topbar/_menubar.html.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/45cb1fbf633134c156d4098328f82407c3fb44d1
-----------------------------------------------------------------------
commit 8d296cf562758fe34c8aff36b6356a39075aea95
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 13:06:36 2013 -0600
Fix undefined index
imp/lib/Mime/Viewer/Html.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/8d296cf562758fe34c8aff36b6356a39075aea95
-----------------------------------------------------------------------
commit cf5e872ca149083b1bf313c4d964588d1e3ab81d
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 13:40:17 2013 -0600
[mms] Correctly enforce file size attachment limits on the first attachment (Bug #12663).
imp/docs/CHANGES | 2 ++
imp/lib/Compose.php | 7 ++++---
imp/package.xml | 2 ++
3 files changed, 8 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/cf5e872ca149083b1bf313c4d964588d1e3ab81d
-----------------------------------------------------------------------
commit c2f6d07a7c4abe7d83c7261bfc3c67e534023a95
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:01:20 2013 -0600
[mms] Fix parsing SMTP error message on servers that support ENHANCEDSTATUSCODES (Bug #12666).
framework/Smtp/lib/Horde/Smtp.php | 2 +-
framework/Smtp/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/c2f6d07a7c4abe7d83c7261bfc3c67e534023a95
-----------------------------------------------------------------------
commit ee0745e311f25a53c8feb36bc8b0bcf2395b0baf
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:13:33 2013 -0600
Released Horde_Smtp-1.2.3
framework/Smtp/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/ee0745e311f25a53c8feb36bc8b0bcf2395b0baf
-----------------------------------------------------------------------
commit c1bd1e06a04e76e9010d093ac21ddb235ae14134
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:13:33 2013 -0600
Development mode for Horde_Smtp-1.2.4
framework/Smtp/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/c1bd1e06a04e76e9010d093ac21ddb235ae14134
-----------------------------------------------------------------------
commit 6e4e845ba9e13803ae374e8c545d891959f50601
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:36:51 2013 -0600
Fix toggle in minimal folders page
imp/lib/Tree/Simplehtml.php | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/6e4e845ba9e13803ae374e8c545d891959f50601
-----------------------------------------------------------------------
commit 593d22ad5d5c34a4c0e2368af6e4fea575d513ca
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:37:15 2013 -0600
fix mismatched tag
imp/templates/minimal/menu.html.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/593d22ad5d5c34a4c0e2368af6e4fea575d513ca
-----------------------------------------------------------------------
commit 723dc5d981ededaab8002eeac81dfdb21c1004ce
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:38:28 2013 -0600
Fix URL escaping
imp/lib/Minimal/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/723dc5d981ededaab8002eeac81dfdb21c1004ce
-----------------------------------------------------------------------
commit c65b78ca8cddb7b9c57472d97495151ed796a0d0
Merge: c980954 723dc5d
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Sep 11 14:41:45 2013 -0600
Merge branch 'master' into imp_6_2
Conflicts:
imp/package.xml
framework/Smtp/lib/Horde/Smtp.php | 2 +-
framework/Smtp/package.xml | 19 ++++++++++++++++---
horde/templates/topbar/_menubar.html.php | 4 ++--
imp/docs/CHANGES | 2 ++
imp/lib/Compose.php | 7 ++++---
imp/lib/Mime/Viewer/Html.php | 9 +++++----
imp/lib/Minimal/Base.php | 2 +-
imp/lib/Tree/Simplehtml.php | 14 ++++++++++++++
imp/package.xml | 1 +
imp/templates/minimal/menu.html.php | 2 +-
10 files changed, 47 insertions(+), 15 deletions(-)
http://git.horde.org/horde-git/-/commit/c65b78ca8cddb7b9c57472d97495151ed796a0d0
-----------------------------------------------------------------------
commit 002217b71751edaf756d77641007d15b966b2dd0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 00:54:07 2013 -0600
[mms] Fix EOL filter when multi-character EOL is split between incoming buckets (Bug #12673).
framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php | 25 ++++++++--
framework/Stream_Filter/package.xml | 4 +-
framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php | 21 +++++++-
3 files changed, 42 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/002217b71751edaf756d77641007d15b966b2dd0
-----------------------------------------------------------------------
commit 5e369d250b03912cfce85c43e91324598677ffbd
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 15:19:39 2013 +0200
Make more methods abstract.
The implementation in the base method was PDO-specific anyway.
framework/Db/doc/Horde/Db/UPGRADING | 5 +-
framework/Db/lib/Horde/Db/Adapter/Base.php | 37 ++------------
framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 10 +++-
framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 63 ++++++++++++++++++++++++
framework/Db/package.xml | 8 ++--
5 files changed, 82 insertions(+), 41 deletions(-)
http://git.horde.org/horde-git/-/commit/5e369d250b03912cfce85c43e91324598677ffbd
-----------------------------------------------------------------------
commit fc14c3c17a6ec367f3567f294e1d2fd52a1f2597
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 15:21:28 2013 +0200
Already defined in base class.
framework/Db/lib/Horde/Db/Adapter/Mysql.php | 6 ------
framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 6 ------
2 files changed, 0 insertions(+), 12 deletions(-)
http://git.horde.org/horde-git/-/commit/fc14c3c17a6ec367f3567f294e1d2fd52a1f2597
-----------------------------------------------------------------------
commit ed92d8a5c5f53ab0449bcfaaa554259f98585d42
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 15:38:10 2013 +0200
[jan] Always return a Horde_Db_Adapter_Base_Result sub-class from the select() method.
framework/Db/doc/Horde/Db/UPGRADING | 3 +
framework/Db/lib/Horde/Db/Adapter/Base.php | 2 +-
framework/Db/lib/Horde/Db/Adapter/Base/Result.php | 247 +++++++++++++++++++
framework/Db/lib/Horde/Db/Adapter/Mysql.php | 2 +-
framework/Db/lib/Horde/Db/Adapter/Mysql/Result.php | 211 ++--------------
framework/Db/lib/Horde/Db/Adapter/Mysqli/Result.php | 208 ++--------------
framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 4 +-
framework/Db/lib/Horde/Db/Adapter/Pdo/Result.php | 54 ++++
framework/Db/package.xml | 15 ++
9 files changed, 366 insertions(+), 380 deletions(-)
create mode 100644 framework/Db/lib/Horde/Db/Adapter/Base/Result.php
create mode 100644 framework/Db/lib/Horde/Db/Adapter/Pdo/Result.php
http://git.horde.org/horde-git/-/commit/ed92d8a5c5f53ab0449bcfaaa554259f98585d42
-----------------------------------------------------------------------
commit c92f78f4334ed70bfbfb48cd97e0c900233d9453
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 15:39:04 2013 +0200
AVoid strict error.
framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/c92f78f4334ed70bfbfb48cd97e0c900233d9453
-----------------------------------------------------------------------
commit bc4f4a7a753ebd72e21ab18393a1b9c42bd5a231
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 15:44:18 2013 +0200
execute() won't go completely, just don't use it.
framework/Db/doc/Horde/Db/UPGRADING | 4 ++--
framework/Db/lib/Horde/Db/Adapter/Base.php | 3 +--
framework/Db/lib/Horde/Db/Adapter/Mysql.php | 12 ++++++++----
framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 12 ++++++++----
framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 2 ++
framework/Db/package.xml | 4 ++--
6 files changed, 23 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/bc4f4a7a753ebd72e21ab18393a1b9c42bd5a231
-----------------------------------------------------------------------
commit ac24664198612c4e8fb39e546bb761488c5b920d
Author: Jan Schneider <jan at horde.org>
Date: Thu Sep 12 16:10:43 2013 +0200
Fix incorrect usage of Horde_Db API.
The code was assuming select() would return a PDOStatement, but it will only
guarantee to return a Traversable (or Horde_Db_Adapter_Base_Result after my
refactoring).
framework/Imap_Client/lib/Horde/Imap/Client/Cache/Backend/Db.php | 6 +++---
framework/Imap_Client/package.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/ac24664198612c4e8fb39e546bb761488c5b920d
-----------------------------------------------------------------------
commit 88ca85bdb4d5436d49eafe5e505b723e508f80ab
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 16:25:24 2013 -0600
Fix message actions in minimal view
imp/lib/Minimal/Message.php | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/88ca85bdb4d5436d49eafe5e505b723e508f80ab
-----------------------------------------------------------------------
commit bcd0a194ac3c8af8fe051e75d617f3e3228b2044
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 16:57:29 2013 -0600
Improved error notification messages
imp/lib/Compose.php | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/bcd0a194ac3c8af8fe051e75d617f3e3228b2044
-----------------------------------------------------------------------
commit 13df52bf9d42bb22c5bcfd1c3eeb3773daa1b15c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 16:58:16 2013 -0600
[mms] Fixed regression in enforcing max_recipients and max_timelimit permissions (Bug #12674).
imp/docs/CHANGES | 2 ++
imp/lib/Imap.php | 2 ++
imp/lib/Perms.php | 4 ++--
imp/package.xml | 2 ++
4 files changed, 8 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/13df52bf9d42bb22c5bcfd1c3eeb3773daa1b15c
-----------------------------------------------------------------------
commit 5c03814f35368f80e9f421a554eeee3ffdc72fea
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 16:58:47 2013 -0600
Cast these values to integers
imp/lib/Imap.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/5c03814f35368f80e9f421a554eeee3ffdc72fea
-----------------------------------------------------------------------
commit 702519cd631e907c93fc465365256f49c8847c93
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 16:59:49 2013 -0600
Don't wrap ngettext strings in an additional gettext call
imp/lib/Basic/Compose.php | 2 +-
imp/lib/Filter.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/702519cd631e907c93fc465365256f49c8847c93
-----------------------------------------------------------------------
commit 924303ae498e2e018c69626bed0c9a8334e8ebe4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 17:02:17 2013 -0600
grammar in help file
imp/locale/en/help.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/924303ae498e2e018c69626bed0c9a8334e8ebe4
-----------------------------------------------------------------------
commit 541e22f3d29c64390d519331f3c068a7d06d88c1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 17:03:52 2013 -0600
grammar in help file
ingo/locale/en/help.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/541e22f3d29c64390d519331f3c068a7d06d88c1
-----------------------------------------------------------------------
commit 5dd0d2a8c02de1ffdcd02dc36394c7771522283d
Merge: c65b78c 541e22f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Sep 12 17:05:20 2013 -0600
Merge branch 'master' into imp_6_2
Conflicts:
imp/package.xml
framework/Db/doc/Horde/Db/UPGRADING | 12 +-
framework/Db/lib/Horde/Db/Adapter/Base.php | 42 +-
framework/Db/lib/Horde/Db/Adapter/Base/Result.php | 247 ++++++
framework/Db/lib/Horde/Db/Adapter/Mysql.php | 20 +-
framework/Db/lib/Horde/Db/Adapter/Mysql/Result.php | 211 +----
framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 28 +-
framework/Db/lib/Horde/Db/Adapter/Mysqli/Result.php | 208 +----
framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 69 ++-
framework/Db/lib/Horde/Db/Adapter/Pdo/Result.php | 54 ++
framework/Db/package.xml | 27 +-
framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 5 +-
framework/Imap_Client/lib/Horde/Imap/Client/Cache/Backend/Db.php | 6 +-
framework/Imap_Client/package.xml | 4 +-
framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php | 25 +-
framework/Stream_Filter/package.xml | 4 +-
framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php | 21 +-
imp/docs/CHANGES | 2 +
imp/lib/Basic/Compose.php | 2 +-
imp/lib/Compose.php | 19 +-
imp/lib/Filter.php | 2 +-
imp/lib/Imap.php | 4 +-
imp/lib/Minimal/Message.php | 33 +-
imp/lib/Perms.php | 4 +-
imp/locale/en/help.xml | 8 +-
imp/package.xml | 1 +
ingo/locale/en/help.xml | 2 +-
26 files changed, 573 insertions(+), 487 deletions(-)
http://git.horde.org/horde-git/-/commit/5dd0d2a8c02de1ffdcd02dc36394c7771522283d
More information about the commits
mailing list