[commits] Horde branch master updated. 76152d6a2976549c96ae0aec5b20c4669b8a68bf

Michael M Slusarz slusarz at horde.org
Mon Nov 15 23:41:33 UTC 2010 

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

from: 88b2247faec341feba8ddf3be8f0ce6512ae0208

4b1c4dd Keep tweaking IFRAME resizing
80c86b5 More attempts to work around inconsistent browser location redirection
417db83 IMP CSS tweaks
f89e332 Browser object needs to be created after config array is loaded - or else the logger will always be null
e42b0c9 Finish Horde_Prefs rewrite
8e8b5d9 phpdoc
91ffa12 Refactor inline message image blocking to operate on all messages, not just HTML messages.
6e0689f Bug #9387: Fix UI to allow upload of personal S/MIME cert
2b10ba3 Add optional app argument to Horde_Themes::soundList()
76152d6 Bug #9384: Fix directory name for sounds.

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

commit 4b1c4dd3e51c49ec774168fd6502c2fb95c5f7d7
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Nov 12 14:42:20 2010 -0700

    Keep tweaking IFRAME resizing

 imp/js/imp.js |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/imp/js/imp.js?rt=horde-git&r1=014052b4b5293d081c3079835577fdadba09d0f8&r2=4b1c4dd3e51c49ec774168fd6502c2fb95c5f7d7

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

commit 80c86b51d65beacc9a7ce24e3f562b74a1014cbc
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Nov 12 14:59:46 2010 -0700

    More attempts to work around inconsistent browser location redirection

 imp/js/dimpbase.js |    2 +-
 imp/js/dimpcore.js |   15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

http://git.horde.org/diff.php/imp/js/dimpbase.js?rt=horde-git&r1=55301a604f731c7dd59bd3dc4c9af0d7803753a6&r2=80c86b51d65beacc9a7ce24e3f562b74a1014cbc
http://git.horde.org/diff.php/imp/js/dimpcore.js?rt=horde-git&r1=ac20a963e7eef0ce515b86d9d5acf47a242c4b59&r2=80c86b51d65beacc9a7ce24e3f562b74a1014cbc

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

commit 417db8353b630d55bcbaac23c0ae2e481f477539
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Sun Nov 14 18:28:31 2010 -0700

    IMP CSS tweaks

 imp/themes/dimp/screen.css |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/imp/themes/dimp/screen.css?rt=horde-git&r1=55301a604f731c7dd59bd3dc4c9af0d7803753a6&r2=417db8353b630d55bcbaac23c0ae2e481f477539

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

commit f89e332c0329a986eefc31ff6e0b5e4b6ece5e5f
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 14:07:17 2010 -0700

    Browser object needs to be created after config array is loaded - or else the logger will always be null

 framework/Core/lib/Horde/Core/Browser.php |    1 +
 framework/Core/lib/Horde/Registry.php     |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Browser.php?rt=horde-git&r1=118be0578b9e8b652ca70b312401a585d9c4b063&r2=f89e332c0329a986eefc31ff6e0b5e4b6ece5e5f
http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=75431e498e6517b1d56b3f3fba412fe4fd753fc6&r2=f89e332c0329a986eefc31ff6e0b5e4b6ece5e5f

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

commit e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 8 15:49:57 2010 -0700

    Finish Horde_Prefs rewrite
    
    Main focus: ability to to stack storage drivers to allow for multiple
    drivers to build a preferences scope.
    
    Horde now uses 3 storage drivers to build the final prefs hash: the
    configuration file, prefs backend, and hooks.
    
    Caching needed to be separated from storage since the two objects do
    *not* store the same data.  Caching is intended to store the entire
    preference scope, storage only handles discrete preference values.
    
    Default/dirty bits are now entirely handled internally by the Scope
    object.
    
    Remove all external charset conversion API for prefs.  Charset
    conversion, if needed, should be done entirely within the storage
    driver (prefs now assumes all in-memory prefs are in UTF-8).

 framework/Core/lib/Horde/Core/Factory/Prefs.php               |   40 +-
 framework/Core/lib/Horde/Core/Prefs.php                       |  112 --
 framework/Core/lib/Horde/Core/Prefs/Cache/Session.php         |   44 +
 framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php |   72 ++
 framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php         |   60 +
 framework/Core/lib/Horde/Core/Prefs/Storage/Session.php       |   59 -
 framework/Core/package.xml                                    |   12 +-
 framework/Prefs/lib/Horde/Prefs.php                           |  483 ++-------
 framework/Prefs/lib/Horde/Prefs/Cache.php                     |   67 ++
 framework/Prefs/lib/Horde/Prefs/Cache/Null.php                |   36 +
 framework/Prefs/lib/Horde/Prefs/Cache/Session.php             |   60 +
 framework/Prefs/lib/Horde/Prefs/Identity.php                  |    7 +-
 framework/Prefs/lib/Horde/Prefs/Scope.php                     |  271 +++++
 framework/Prefs/lib/Horde/Prefs/Storage.php                   |   29 +-
 framework/Prefs/lib/Horde/Prefs/Storage/File.php              |   81 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php              |   31 +-
 framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php         |   59 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php              |   51 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Null.php              |    6 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Session.php           |   66 --
 framework/Prefs/lib/Horde/Prefs/Storage/Sql.php               |   42 +-
 framework/Prefs/package.xml                                   |   15 +-
 hermes/entry.php                                              |    6 +-
 hermes/lib/Application.php                                    |    4 +-
 hermes/start.php                                              |    8 +-
 horde/config/hooks.php.dist                                   |   18 +-
 horde/config/prefs.php.dist                                   |   19 +-
 horde/lib/LoginTasks/SystemTask/UpgradeFromHorde3.php         |   47 -
 imp/lib/Compose/Stationery.php                                |    6 +-
 imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php             |    1 -
 ingo/lib/Storage/Prefs.php                                    |   34 +-
 31 files changed, 961 insertions(+), 885 deletions(-)
 delete mode 100644 framework/Core/lib/Horde/Core/Prefs.php
 create mode 100644 framework/Core/lib/Horde/Core/Prefs/Cache/Session.php
 create mode 100644 framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php
 create mode 100644 framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php
 delete mode 100644 framework/Core/lib/Horde/Core/Prefs/Storage/Session.php
 create mode 100644 framework/Prefs/lib/Horde/Prefs/Cache.php
 create mode 100644 framework/Prefs/lib/Horde/Prefs/Cache/Null.php
 create mode 100644 framework/Prefs/lib/Horde/Prefs/Cache/Session.php
 create mode 100644 framework/Prefs/lib/Horde/Prefs/Scope.php
 delete mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Session.php
 delete mode 100644 horde/lib/LoginTasks/SystemTask/UpgradeFromHorde3.php

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Factory/Prefs.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs.php?rt=horde-git&r1=f8b7335d4d7e11bf1e7295fa50b3e779995f4ce2&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php?rt=horde-git&r=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php?rt=horde-git&r=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php?rt=horde-git&r1=7988b797380b30f8ac00a4febbe59aec44a1795b&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Core/package.xml?rt=horde-git&r1=2ecc04e00288fbf6beffb065d20aac9c491e59ce&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache/Null.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache/Session.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Identity.php?rt=horde-git&r1=86cf457beaed347585b357e4ba089c88c11e55a0&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Scope.php?rt=horde-git&r=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/File.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/Null.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/Session.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php?rt=horde-git&r1=0959120abadd553307e97517e2fa3f3145a044cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/framework/Prefs/package.xml?rt=horde-git&r1=0584fe84b460694ec6d66bbd44a8f1d12f5b810e&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/hermes/entry.php?rt=horde-git&r1=fc55d6178d33ca825f59a1a2eba44c8c7daa6019&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/hermes/lib/Application.php?rt=horde-git&r1=fc55d6178d33ca825f59a1a2eba44c8c7daa6019&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/hermes/start.php?rt=horde-git&r1=e60da622060274282dd92c2d41c4c0dce4724dd6&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/horde/config/hooks.php.dist?rt=horde-git&r1=118be0578b9e8b652ca70b312401a585d9c4b063&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/horde/config/prefs.php.dist?rt=horde-git&r1=82bccce8fadb4691aafcf803bee94164da573408&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/horde/lib/LoginTasks/SystemTask/UpgradeFromHorde3.php?rt=horde-git&r1=4059d986ed1753a016328993e2f1a428ff68d2b3&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/imp/lib/Compose/Stationery.php?rt=horde-git&r1=8352173fc37d37ad4a99af2a4508a8b7e9600f50&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php?rt=horde-git&r1=95695d805d9824a0fb7ef63e539bf156bc5bf680&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38
http://git.horde.org/diff.php/ingo/lib/Storage/Prefs.php?rt=horde-git&r1=ee55e0993d8c6777bd26c789830e3bde251114cf&r2=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38

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

commit 8e8b5d9d958f6cb20c677cc4f55e8ae8d0dbbb6d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 15:29:16 2010 -0700

    phpdoc

 imp/lib/Imap/Tree/Element.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Imap/Tree/Element.php?rt=horde-git&r1=9d465a49576aac5cff21a85088958af29334c957&r2=8e8b5d9d958f6cb20c677cc4f55e8ae8d0dbbb6d

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

commit 91ffa129ee86b75d506351e1d6ac66e921676273
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 16:18:24 2010 -0700

    Refactor inline message image blocking to operate on all messages, not just HTML messages.

 imp/config/mime_drivers.php.dist                  |   14 +++---
 imp/config/prefs.php.dist                         |   20 ++++----
 imp/docs/CHANGES                                  |    2 +
 imp/docs/UPGRADING                                |    2 +
 imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php |   19 +++++++
 imp/lib/Mime/Viewer/Html.php                      |    9 +++-
 imp/lib/Mime/Viewer/Images.php                    |   27 +++++++----
 imp/lib/Prefs/Ui.php                              |    2 -
 imp/lib/Ui/Imageview.php                          |   54 +++++++++++++++++++++
 imp/locale/en/help.xml                            |   12 ++--
 10 files changed, 125 insertions(+), 36 deletions(-)
 create mode 100644 imp/lib/Ui/Imageview.php

http://git.horde.org/diff.php/imp/config/mime_drivers.php.dist?rt=horde-git&r1=0606689672f7cb682608323243da7542bed9d416&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/config/prefs.php.dist?rt=horde-git&r1=fccb2396a4ee9e22da1e2feeee766051f242f421&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/docs/CHANGES?rt=horde-git&r1=553216ba5135fba3287054ffa84d16ae9e21c8bf&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/docs/UPGRADING?rt=horde-git&r1=b714b62c1b717ac01b738fef17b91844396c1b07&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php?rt=horde-git&r1=e42b0c9a2e41ab5d6e42ebec540ce70af56a1f38&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=940d62332dba8346d1fa55b067706fab4aa4d894&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Images.php?rt=horde-git&r1=30df656fbd7abe6f4896e14365c3203523da3998&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=5907d00d695bffc7821333168c33b463821c3b8d&r2=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/co.php/imp/lib/Ui/Imageview.php?rt=horde-git&r=91ffa129ee86b75d506351e1d6ac66e921676273
http://git.horde.org/diff.php/imp/locale/en/help.xml?rt=horde-git&r1=6b2c7d5e725f211a601798d707c631ba710748e2&r2=91ffa129ee86b75d506351e1d6ac66e921676273

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

commit 6e0689f1744fca73ec226af1bf96f1d335241b5b
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 16:24:33 2010 -0700

    Bug #9387: Fix UI to allow upload of personal S/MIME cert

 imp/lib/Prefs/Ui.php                     |    2 +-
 imp/templates/prefs/smimeprivatekey.html |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=91ffa129ee86b75d506351e1d6ac66e921676273&r2=6e0689f1744fca73ec226af1bf96f1d335241b5b
http://git.horde.org/diff.php/imp/templates/prefs/smimeprivatekey.html?rt=horde-git&r1=cfe3dcaeb7056bdcfdf05ab0adcda44607090462&r2=6e0689f1744fca73ec226af1bf96f1d335241b5b

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

commit 2b10ba329ac45e643d61a3d8a3b27bb4ccb9c1a4
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 16:36:31 2010 -0700

    Add optional app argument to Horde_Themes::soundList()

 framework/Core/lib/Horde/Themes.php |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Themes.php?rt=horde-git&r1=49f1c92a295582e0f54ea58efe06c94ee9e29c34&r2=2b10ba329ac45e643d61a3d8a3b27bb4ccb9c1a4

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

commit 76152d6a2976549c96ae0aec5b20c4669b8a68bf
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Nov 15 16:37:20 2010 -0700

    Bug #9384: Fix directory name for sounds.

 framework/Core/lib/Horde/Themes/Sound.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Themes/Sound.php?rt=horde-git&r1=8bf994d9f34831ab2f5a67e478caba05a48f41ba&r2=76152d6a2976549c96ae0aec5b20c4669b8a68bf

More information about the commits mailing list