[commits] Horde branch horde_5_2 updated. c081ba0ec243511e714e9bd3138fdcc1e7e89151

Michael J. Rubinsky mrubinsk at horde.org
Mon Oct 28 02:33:36 UTC 2013


The branch "horde_5_2" has been updated.
The following is a summary of the commits.

from: dc40b97893659412656f8fad417dfe4d12ed5f28

e5c5858 [mms] SECURITY: Protect against CSRF attacks by using tokens on destructive actions (CVE-2013-6275; Bug #12796; Marcela Benetrix <m.benetrix at e-secure.com.au>).
b85ae49 [mms] Use SHA-1 instead of MD5 for internal hashing.
3933752 Update note via ActiveSync: Fix filtering of HTML tags. Bug #12785
07e00f4 Bug: 12784  Fix loss of note body when body is HTML.
e9952a1 Get rid of some E_STRICT errors.
c081ba0 Merge branch 'master' into horde_5_2

Summary: http://github.com/horde/horde/compare/dc40b97893659412656f8fad417dfe4d12ed5f28...c081ba0ec243511e714e9bd3138fdcc1e7e89151

-----------------------------------------------------------------------

commit e5c585867f908322346b37b43ef6460e7d0096c8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Oct 24 23:42:23 2013 -0600

    [mms] SECURITY: Protect against CSRF attacks by using tokens on destructive actions (CVE-2013-6275; Bug #12796; Marcela Benetrix <m.benetrix at e-secure.com.au>).

 ingo/docs/CHANGES            |    3 ++
 ingo/lib/Basic/Base.php      |   52 ++++++++++++++++++++++++++++++++++++++++++
 ingo/lib/Basic/Blacklist.php |    7 ++++-
 ingo/lib/Basic/Filters.php   |   16 ++++++++++--
 ingo/lib/Basic/Forward.php   |    3 +-
 ingo/lib/Basic/Rule.php      |   17 +++++++++----
 ingo/lib/Basic/Script.php    |   12 +++++++--
 ingo/lib/Basic/Spam.php      |    3 +-
 ingo/lib/Basic/Vacation.php  |    3 +-
 ingo/lib/Basic/Whitelist.php |    7 ++++-
 ingo/package.xml             |    4 +-
 11 files changed, 107 insertions(+), 20 deletions(-)

http://github.com/horde/horde/commit/e5c585867f908322346b37b43ef6460e7d0096c8
http://git.horde.org/horde-git/-/commit/e5c585867f908322346b37b43ef6460e7d0096c8

-----------------------------------------------------------------------

commit b85ae495937bda9837bd1f14a392d35a9f03e947
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 25 02:23:49 2013 -0600

    [mms] Use SHA-1 instead of MD5 for internal hashing.

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php        |    6 +++---
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php |    2 +-
 framework/Imap_Client/package.xml                           |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/b85ae495937bda9837bd1f14a392d35a9f03e947
http://git.horde.org/horde-git/-/commit/b85ae495937bda9837bd1f14a392d35a9f03e947

-----------------------------------------------------------------------

commit 393375265d08897a5ccb30dfbb555d512a664c44
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Wed Oct 23 10:57:21 2013 +0200

    Update note via ActiveSync: Fix filtering of HTML tags. Bug #12785
    
    We already filter HTML tags on new, incoming notes.
    When notes get updated, we need to filter HTML tags, too.
    
    This fixes updating notes via iOS 7.x
    
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

 mnemo/lib/Api.php |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/393375265d08897a5ccb30dfbb555d512a664c44
http://git.horde.org/horde-git/-/commit/393375265d08897a5ccb30dfbb555d512a664c44

-----------------------------------------------------------------------

commit 07e00f45ff4c4aad72771bdd69c5b95125ac3abb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 25 16:58:34 2013 -0400

    Bug: 12784  Fix loss of note body when body is HTML.

 mnemo/lib/Driver.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/07e00f45ff4c4aad72771bdd69c5b95125ac3abb
http://git.horde.org/horde-git/-/commit/07e00f45ff4c4aad72771bdd69c5b95125ac3abb

-----------------------------------------------------------------------

commit e9952a156db7504904a05a122bab37147f2b5a95
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 22:31:14 2013 -0400

    Get rid of some E_STRICT errors.

 kronolith/lib/Driver/Resource/Sql.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/e9952a156db7504904a05a122bab37147f2b5a95
http://git.horde.org/horde-git/-/commit/e9952a156db7504904a05a122bab37147f2b5a95

-----------------------------------------------------------------------

commit c081ba0ec243511e714e9bd3138fdcc1e7e89151
Merge: dc40b97 e9952a1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 22:33:21 2013 -0400

    Merge branch 'master' into horde_5_2

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php        |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php |    2 +-
 framework/Imap_Client/package.xml                           |    2 +
 ingo/docs/CHANGES                                           |    3 +
 ingo/lib/Basic/Base.php                                     |   52 +++++++++++
 ingo/lib/Basic/Blacklist.php                                |    7 +-
 ingo/lib/Basic/Filters.php                                  |   16 +++-
 ingo/lib/Basic/Forward.php                                  |    3 +-
 ingo/lib/Basic/Rule.php                                     |   17 +++-
 ingo/lib/Basic/Script.php                                   |   12 ++-
 ingo/lib/Basic/Spam.php                                     |    3 +-
 ingo/lib/Basic/Vacation.php                                 |    3 +-
 ingo/lib/Basic/Whitelist.php                                |    7 +-
 ingo/package.xml                                            |    4 +-
 kronolith/lib/Driver/Resource/Sql.php                       |    4 +-
 mnemo/lib/Api.php                                           |   10 ++-
 mnemo/lib/Driver.php                                        |    5 +-
 17 files changed, 127 insertions(+), 29 deletions(-)

http://github.com/horde/horde/commit/c081ba0ec243511e714e9bd3138fdcc1e7e89151
http://git.horde.org/horde-git/-/commit/c081ba0ec243511e714e9bd3138fdcc1e7e89151




More information about the commits mailing list