[commits] Horde branch imp_6_1 updated. 4ed1f129c6d5992566cb43e3a81dc9d3dcaa07ef

Michael M Slusarz slusarz at horde.org
Tue Feb 5 20:08:13 UTC 2013


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

from: c7c0882273f4cfecbe17e12e392ad7ec74a7809e

4a67417 Destructor not needed.
d487e54 Style, phpdoc.
6c0313b Fix syntax and style.
7e3728d Run the application handlers for notifications separately.
21a24bd9 [mms] Fix inserting HEAD into HTML document with Horde_Domhtml#getHead() if it doesn't already exist in the document.
0af5745 [mms] Fix XSS filter removing control characters that cause certain charsets (ISO-2022-JP) to break (Bug #12015).
0fe19a1 [mms] Added Horde_Domhtml#getCharset() to get best-guess charset of current encoding within the DOM object.
5dd15a8 Remove existing charset information from DOM data
533b0bc [mms] Added 'charset' and 'metacharset' parameters to returnHtml().
17061ce [mms] Improved detection of charset in text/html message parts.
4ed1f12 Merge branch 'master' into imp_6_1

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

commit 4a674178c8b7fe61701144562d3afc4a508909c2
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 4 20:59:23 2013 +0100

    Destructor not needed.

 framework/Argv/lib/Horde/Argv/Parser.php |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/4a674178c8b7fe61701144562d3afc4a508909c2

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

commit d487e541bfd2852ee6b37f49653978771230891e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 4 20:59:35 2013 +0100

    Style, phpdoc.

 framework/Cli_Modular/lib/Horde/Cli/Modular.php |   28 +++++++++-------------
 1 files changed, 12 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/d487e541bfd2852ee6b37f49653978771230891e

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

commit 6c0313b451ecbbc1488ab9e7863157ad9d15274f
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 5 15:04:27 2013 +0100

    Fix syntax and style.

 framework/Core/js/map/horde.js |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/6c0313b451ecbbc1488ab9e7863157ad9d15274f

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

commit 7e3728dd9d34fe2548933f1744e6b8bbbabf4a37
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 5 15:25:56 2013 +0100

    Run the application handlers for notifications separately.
    
    Listing applications and running API methods might reach code that tries to
    call the global $notification object that we are still instantiating. This
    happens for example if using transparent authentication and getting to the
    setView() code.

 framework/Core/lib/Horde/Core/Factory/Notification.php |   19 ++++++++++------
 framework/Core/lib/Horde/Registry.php                  |    1 +
 framework/Core/package.xml                             |    2 +
 3 files changed, 15 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/7e3728dd9d34fe2548933f1744e6b8bbbabf4a37

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

commit 21a24bd9fddb8bcc5cbc3a772b80313056be965c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 10:32:50 2013 -0700

    [mms] Fix inserting HEAD into HTML document with Horde_Domhtml#getHead() if it doesn't already exist in the document.

 framework/Util/lib/Horde/Domhtml.php           |    7 ++++++-
 framework/Util/package.xml                     |    4 ++--
 framework/Util/test/Horde/Util/DomhtmlTest.php |    8 ++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/21a24bd9fddb8bcc5cbc3a772b80313056be965c

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

commit 0af57458e802cdc68f187295c3736c372c011a94
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 11:18:52 2013 -0700

    [mms] Fix XSS filter removing control characters that cause certain charsets (ISO-2022-JP) to break (Bug #12015).

 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php      |   36 --------------
 framework/Text_Filter/package.xml                        |    4 +-
 framework/Text_Filter/test/Horde/Text/Filter/XssTest.php |  Bin 23500 -> 23372 bytes
 3 files changed, 2 insertions(+), 38 deletions(-)

http://git.horde.org/horde-git/-/commit/0af57458e802cdc68f187295c3736c372c011a94

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

commit 0fe19a1a71e41784d9dc3bb571a64cf3b9772fc1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 11:35:22 2013 -0700

    [mms] Added Horde_Domhtml#getCharset() to get best-guess charset of current encoding within the DOM object.

 framework/Util/lib/Horde/Domhtml.php           |   14 +++++++++
 framework/Util/package.xml                     |   10 ++++--
 framework/Util/test/Horde/Util/DomhtmlTest.php |   37 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0fe19a1a71e41784d9dc3bb571a64cf3b9772fc1

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

commit 5dd15a87b1c5b5d80921447eaffd36b096cb4fd5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 12:07:19 2013 -0700

    Remove existing charset information from DOM data

 framework/Util/lib/Horde/Domhtml.php |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/5dd15a87b1c5b5d80921447eaffd36b096cb4fd5

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

commit 533b0bc498855fe015cbac20c761d9de35e00e75
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 12:55:36 2013 -0700

    [mms] Added 'charset' and 'metacharset' parameters to returnHtml().

 framework/Util/lib/Horde/Domhtml.php           |   29 ++++++++++++++++++++++-
 framework/Util/package.xml                     |    2 +
 framework/Util/test/Horde/Util/DomhtmlTest.php |   20 ++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/533b0bc498855fe015cbac20c761d9de35e00e75

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

commit 17061ce6f834d2c3c224e2910d4edaf44a725c96
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 13:01:24 2013 -0700

    [mms] Improved detection of charset in text/html message parts.

 imp/docs/CHANGES             |    1 +
 imp/lib/Mime/Viewer/Html.php |   17 +++++++++++++----
 imp/package.xml              |    4 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/17061ce6f834d2c3c224e2910d4edaf44a725c96

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

commit 4ed1f129c6d5992566cb43e3a81dc9d3dcaa07ef
Merge: c7c0882 17061ce
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 13:02:41 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 framework/Argv/lib/Horde/Argv/Parser.php                 |   17 ----
 framework/Cli_Modular/lib/Horde/Cli/Modular.php          |   28 +++----
 framework/Core/js/map/horde.js                           |   22 +++---
 framework/Core/lib/Horde/Core/Factory/Notification.php   |   19 +++--
 framework/Core/lib/Horde/Registry.php                    |    1 +
 framework/Core/package.xml                               |    2 +
 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php      |   36 --------
 framework/Text_Filter/package.xml                        |    4 +-
 framework/Text_Filter/test/Horde/Text/Filter/XssTest.php |  Bin 23500 -> 23372 bytes
 framework/Util/lib/Horde/Domhtml.php                     |   58 +++++++++++-
 framework/Util/package.xml                               |   16 ++--
 framework/Util/test/Horde/Util/DomhtmlTest.php           |   65 ++++++++++++++
 imp/docs/CHANGES                                         |    1 +
 imp/lib/Mime/Viewer/Html.php                             |   17 +++-
 imp/package.xml                                          |    3 +-
 15 files changed, 186 insertions(+), 103 deletions(-)

http://git.horde.org/horde-git/-/commit/4ed1f129c6d5992566cb43e3a81dc9d3dcaa07ef




More information about the commits mailing list