[commits] Horde branch master updated. 025a1bfbe69622036f8e3a27a6edd39c02dcd4ea

[Michael M Slusarz]

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

from: f9c14fb404dd99ad08b1943350f9a7929333ff0c

b6d03b8 Rework compose attachment hook.
025a1bf Bug #9011: Fix XSS

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

commit b6d03b85926cd4f8063bbc5f6dd2277ec4810370
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Aug 24 12:21:18 2010 -0600

    Rework compose attachment hook.
    
    Rename from 'attachmimetype' to 'compose_attach', since more than just
    MIME type determination can be done in the hook.
    Add virus scanning example to hook.

 imp/config/hooks.php.dist |   25 +++++++++++++++++++++++--
 imp/lib/Compose.php       |    4 ++--
 2 files changed, 25 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/imp/config/hooks.php.dist?rt=horde-git&r1=9583b1984dd8cd40fde0bbc6e67291ab16374451&r2=b6d03b85926cd4f8063bbc5f6dd2277ec4810370
http://git.horde.org/diff.php/imp/lib/Compose.php?rt=horde-git&r1=618b889787d97cabcb906378074cfc8828e7f5ab&r2=b6d03b85926cd4f8063bbc5f6dd2277ec4810370

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

commit 025a1bfbe69622036f8e3a27a6edd39c02dcd4ea
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Aug 24 12:34:57 2010 -0600

    Bug #9011: Fix XSS
    
    slusarz     2010-08-24 18:31:34 UTC
    
      Modified files:        (Branch: FRAMEWORK_3)
        docs                 CHANGES
        .                    view.php
      Log:
      Bug: 9191
      Submitted by: nightmare.lmw at anarchynet.org
      Fix CSS vulnerability when viewing file data.
    
      Revision    Changes    Path
      1.114.2.58  +2 -0      gollem/docs/CHANGES
      1.51.2.7    +3 -5      gollem/view.php

 gollem/docs/CHANGES |    2 ++
 gollem/view.php     |   21 ++++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

http://git.horde.org/diff.php/gollem/docs/CHANGES?rt=horde-git&r1=88e8e7d6868320ed69d726afeb57c18cb6bacce5&r2=025a1bfbe69622036f8e3a27a6edd39c02dcd4ea
http://git.horde.org/diff.php/gollem/view.php?rt=horde-git&r1=7f7a4300f16b429ed645bc3e2af2cedffc70ce3e&r2=025a1bfbe69622036f8e3a27a6edd39c02dcd4ea