[commits] Horde branch master updated. 393da70cea95c9988ae295846545050fae9ab1fd

Michael M Slusarz slusarz at horde.org
Thu Dec 16 22:29:10 UTC 2010


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

from: f8fbce65bc45c7e91b9a02abd2f1f1bf06d5a215

993d32c Make sure HEAD exists before appending to it
657e791 Fix tree display in mimp
c6cd10f Fix function name
61c90ad Make colorpicker work with abbreviated hex values
5fe00ab Rewrite IMAP flags handling/display code
32fc78d style/doc
18447eb Bug #9453: Fix highlighting escaped symbols in autocomplete
393da70 Ticket #9454: Add example hook for setting search_fields pref

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

commit 993d32c2b0836d4b1384871060a94f9368aadf15
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Dec 14 15:30:15 2010 -0700

    Make sure HEAD exists before appending to it

 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/993d32c2b0836d4b1384871060a94f9368aadf15

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

commit 657e7919ce2f5970060997de5fb3fe46b97f5087
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Wed Dec 15 11:23:35 2010 -0700

    Fix tree display in mimp

 imp/lib/Imap/Tree.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/657e7919ce2f5970060997de5fb3fe46b97f5087

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

commit c6cd10fcd7d75427816e69dd7ead77c1727c53fd
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Dec 16 10:13:10 2010 -0700

    Fix function name

 framework/Image/lib/Horde/Image.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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

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

commit 61c90ad7a4bb9828f189b8f3ff4870c597a1c907
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Dec 16 10:20:11 2010 -0700

    Make colorpicker work with abbreviated hex values

 horde/js/colorpicker.js |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/61c90ad7a4bb9828f189b8f3ff4870c597a1c907

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

commit 5fe00abb2cdde93a178812d19178d8d8d07bbaff
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Wed Dec 15 16:30:53 2010 -0700

    Rewrite IMAP flags handling/display code
    
    Rewrite to match recent search rewrite. Biggest benefit: removes a large
    amount of logic from the preferences file (and, thus, wasted storage in
    the session).
    
    Move all flags to separate objects, and use these objects to interact
    with the various flag quirks.
    
    This commit does make a fairly significant UI change: you no longer mark
    a message as 'Unseen', you unmark it as 'Seen'.  Not quite as intuitive
    to me, but this is the way the IMAP specs define it and the way that
    other MUAs (e.g. Thunderbird) show to user. But at the internal level it
    allows us to get rid of the 'inverse' flagging.
    
    Fix bug: Allow filtering of ALL IMAP flags in dimp, not just user settable
    ones.
    
    fullmessage-dimp.js -> message-dimp.js
    
    For those upgrading that have custom flags you don't want to lose, this
    script is what I used to convert.  YMMV.
    
    <?php
    require_once dirname(__FILE__) . '/lib/Application.php';
    Horde_Registry::appInit('imp', array('authentication' => 'none'));
    
    $registry->setAuth(***USERNAME***, array());
    
    $msgflags = array_merge(
        json_decode($prefs->getValue('msgflags_user'), true),
        json_decode($prefs->getValue('msgflags'), true)
    );
    $out = array();
    
    foreach ($msgflags as $key => $val) {
        if ($val['t'] == 'imapp') {
            $out[] = new IMP_Flag_User($val['l'], $key, $val['b']);
        }
    }
    
    $prefs->setValue('msgflags', serialize($out));
    $prefs->remove('msgflags_user');

 imp/config/prefs.php.dist                |  146 +---------
 imp/js/compose-dimp.js                   |    6 +-
 imp/js/dimpbase.js                       |  185 +++++-------
 imp/js/dimpcore.js                       |    2 +-
 imp/js/fullmessage-dimp.js               |  253 ----------------
 imp/js/message-dimp.js                   |  261 ++++++++++++++++
 imp/lib/Ajax/Application.php             |  202 ++++++++-----
 imp/lib/Api.php                          |   15 +-
 imp/lib/Application.php                  |    1 +
 imp/lib/Flag/Base.php                    |  229 ++++++++++++++
 imp/lib/Flag/Imap.php                    |   50 +++
 imp/lib/Flag/Imap/Answered.php           |   36 +++
 imp/lib/Flag/Imap/Deleted.php            |   40 +++
 imp/lib/Flag/Imap/Draft.php              |   40 +++
 imp/lib/Flag/Imap/Flagged.php            |   40 +++
 imp/lib/Flag/Imap/Forwarded.php          |   36 +++
 imp/lib/Flag/Imap/Seen.php               |   37 +++
 imp/lib/Flag/System.php                  |   17 +
 imp/lib/Flag/System/Attachment.php       |   46 +++
 imp/lib/Flag/System/Encrypted.php        |   43 +++
 imp/lib/Flag/System/HighPriority.php     |   48 +++
 imp/lib/Flag/System/LowPriority.php      |   40 +++
 imp/lib/Flag/System/Personal.php         |   54 ++++
 imp/lib/Flag/System/Signed.php           |   40 +++
 imp/lib/Flag/System/Unseen.php           |   63 ++++
 imp/lib/Flag/User.php                    |  102 +++++++
 imp/lib/Flags.php                        |  397 ++++++++++++++++++++++++
 imp/lib/Imap/Flags.php                   |  484 ------------------------------
 imp/lib/Indices.php                      |   38 ++-
 imp/lib/Injector/Factory/Flags.php       |   66 ++++
 imp/lib/Message.php                      |    6 +-
 imp/lib/Prefs/Ui.php                     |   69 ++---
 imp/lib/Search/Element/Flag.php          |    3 +-
 imp/lib/Ui/Mailbox.php                   |   32 --
 imp/lib/Views/ListMessages.php           |   14 +-
 imp/lib/Views/ShowMessage.php            |   22 +-
 imp/mailbox-mimp.php                     |   14 +-
 imp/mailbox.php                          |   41 ++-
 imp/message-dimp.php                     |   13 +-
 imp/message-mimp.php                     |   14 +-
 imp/message.php                          |   31 ++-
 imp/package.xml                          |    4 +-
 imp/search-basic.php                     |   13 +-
 imp/search.php                           |   15 +-
 imp/templates/dimp/index.inc             |    3 +
 imp/templates/dimp/javascript_defs.php   |   24 +-
 imp/templates/mobile/javascript_defs.php |   22 +-
 imp/templates/prefs/flags.html           |   28 +-
 imp/themes/default/dimp/screen.css       |    2 +-
 imp/themes/default/screen.css            |    3 +
 imp/themes/silver/screen.css             |    3 +
 51 files changed, 2107 insertions(+), 1286 deletions(-)
 delete mode 100644 imp/js/fullmessage-dimp.js
 create mode 100644 imp/js/message-dimp.js
 create mode 100644 imp/lib/Flag/Base.php
 create mode 100644 imp/lib/Flag/Imap.php
 create mode 100644 imp/lib/Flag/Imap/Answered.php
 create mode 100644 imp/lib/Flag/Imap/Deleted.php
 create mode 100644 imp/lib/Flag/Imap/Draft.php
 create mode 100644 imp/lib/Flag/Imap/Flagged.php
 create mode 100644 imp/lib/Flag/Imap/Forwarded.php
 create mode 100644 imp/lib/Flag/Imap/Seen.php
 create mode 100644 imp/lib/Flag/System.php
 create mode 100644 imp/lib/Flag/System/Attachment.php
 create mode 100644 imp/lib/Flag/System/Encrypted.php
 create mode 100644 imp/lib/Flag/System/HighPriority.php
 create mode 100644 imp/lib/Flag/System/LowPriority.php
 create mode 100644 imp/lib/Flag/System/Personal.php
 create mode 100644 imp/lib/Flag/System/Signed.php
 create mode 100644 imp/lib/Flag/System/Unseen.php
 create mode 100644 imp/lib/Flag/User.php
 create mode 100644 imp/lib/Flags.php
 delete mode 100644 imp/lib/Imap/Flags.php
 create mode 100644 imp/lib/Injector/Factory/Flags.php

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

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

commit 32fc78df4343221e501fb56c7c5f9dd5e2eefd92
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Dec 16 15:20:24 2010 -0700

    style/doc

 framework/Core/js/autocomplete.js |   10 ++++++----
 horde/js/keynavlist.js            |    8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/32fc78df4343221e501fb56c7c5f9dd5e2eefd92

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

commit 18447eb6003da2f4bf3848f09417c79c2d8f5ae5
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Dec 16 15:20:46 2010 -0700

    Bug #9453: Fix highlighting escaped symbols in autocomplete

 framework/Core/js/autocomplete.js |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/18447eb6003da2f4bf3848f09417c79c2d8f5ae5

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

commit 393da70cea95c9988ae295846545050fae9ab1fd
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Dec 16 15:26:08 2010 -0700

    Ticket #9454: Add example hook for setting search_fields pref

 imp/config/hooks.php.dist |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/393da70cea95c9988ae295846545050fae9ab1fd




More information about the commits mailing list