[commits] Horde branch master updated. 95427ccd8bcb03db7c9ab306df4aef2844a3a9c4
Michael M Slusarz
slusarz at horde.org
Wed Oct 20 16:07:22 UTC 2010
The branch "master" has been updated.
The following is a summary of the commits.
from: 9d2d4aad4ba78864feb101529eeb0849e38f26ef
e73d7b5 Abstract prefs storage code into Horde_Prefs_Storage.
ac20a96 Fix undefined index error
6095c30 Simplify preference hooks.
d810a6e Don't cache prefs if using session storage driver
7b6150f Move Horde-specific code out of horde/Prefs and into horde/Core
3b1baf7 Convert a raiseError to exception throwing
a479411 Tweaks
95427cc Hide pref groups using application method
-----------------------------------------------------------------------
commit e73d7b53f08bbd075e2ab70c19de809a24fad42d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Fri Oct 15 16:02:55 2010 -0600
Abstract prefs storage code into Horde_Prefs_Storage.
Jan and I talked about using a stack system for retrieving prefs data
from storage. After discussion, determined that cache storage won't
work in the stack system for several reasons. However, it may be
possible to implement otherwise. For example, in Horde, there would be
2 stack drivers. The first is a read-only driver that returns the
default values from the prefs.php files. The second would be the
persistent storage driver.
framework/Core/lib/Horde/Core/Factory/Prefs.php | 11 +-
framework/Core/lib/Horde/Core/Prefs/Cache/Session.php | 73 ---
framework/Core/lib/Horde/Core/Prefs/Session.php | 66 ---
framework/Core/lib/Horde/Core/Prefs/Storage/Session.php | 59 ++
framework/Core/lib/Horde/Registry.php | 4 +-
framework/Core/package.xml | 6 +-
framework/Prefs/lib/Horde/Prefs.php | 290 +++++-----
framework/Prefs/lib/Horde/Prefs/Cache.php | 61 --
framework/Prefs/lib/Horde/Prefs/Cache/Null.php | 36 --
framework/Prefs/lib/Horde/Prefs/Cache/Session.php | 64 --
framework/Prefs/lib/Horde/Prefs/File.php | 209 -------
framework/Prefs/lib/Horde/Prefs/Imsp.php | 145 -----
framework/Prefs/lib/Horde/Prefs/Kolab.php | 43 --
framework/Prefs/lib/Horde/Prefs/KolabImap.php | 219 -------
framework/Prefs/lib/Horde/Prefs/Ldap.php | 451 ---------------
framework/Prefs/lib/Horde/Prefs/Session.php | 68 ---
framework/Prefs/lib/Horde/Prefs/Sql.php | 218 -------
framework/Prefs/lib/Horde/Prefs/Storage.php | 69 +++
framework/Prefs/lib/Horde/Prefs/Storage/File.php | 155 +++++
framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php | 110 ++++
framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php | 40 ++
framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php | 167 ++++++
framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php | 376 ++++++++++++
framework/Prefs/lib/Horde/Prefs/Storage/Null.php | 36 ++
framework/Prefs/lib/Horde/Prefs/Storage/Session.php | 66 +++
framework/Prefs/lib/Horde/Prefs/Storage/Sql.php | 185 ++++++
framework/Prefs/package.xml | 47 +-
framework/Prefs/test/Horde/Prefs/bug_2838.phpt | 21 -
28 files changed, 1446 insertions(+), 1849 deletions(-)
delete mode 100644 framework/Core/lib/Horde/Core/Prefs/Cache/Session.php
delete mode 100644 framework/Core/lib/Horde/Core/Prefs/Session.php
create mode 100644 framework/Core/lib/Horde/Core/Prefs/Storage/Session.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Cache.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Cache/Null.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Cache/Session.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/File.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Imsp.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Kolab.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/KolabImap.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Ldap.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Session.php
delete mode 100644 framework/Prefs/lib/Horde/Prefs/Sql.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/File.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Null.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Session.php
create mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Sql.php
delete mode 100644 framework/Prefs/test/Horde/Prefs/bug_2838.phpt
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Factory/Prefs.php?rt=horde-git&r1=3f60739828d2743e5bb76b2011c174ba05103ed0&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php?rt=horde-git&r1=3f60739828d2743e5bb76b2011c174ba05103ed0&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Session.php?rt=horde-git&r1=577a8c026e6a0980ac3b8ae713e63302eeec4a5d&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=0ab36983a478f9137f04e428f85ccd389e617710&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Core/package.xml?rt=horde-git&r1=3f60739828d2743e5bb76b2011c174ba05103ed0&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs.php?rt=horde-git&r1=22b76adfe5a33ee8ba0b2c97e3e352ee654936e6&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache.php?rt=horde-git&r1=9335b242fdb8821768d5897f1421efa4d0dec070&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache/Null.php?rt=horde-git&r1=9335b242fdb8821768d5897f1421efa4d0dec070&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Cache/Session.php?rt=horde-git&r1=9335b242fdb8821768d5897f1421efa4d0dec070&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/File.php?rt=horde-git&r1=5c3919542a4c64907d06f26a3747b9ee9da89864&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Imsp.php?rt=horde-git&r1=5c3919542a4c64907d06f26a3747b9ee9da89864&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Kolab.php?rt=horde-git&r1=77e3dd782f525dadbb88512854d903ac2d7f9cb9&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/KolabImap.php?rt=horde-git&r1=5c3919542a4c64907d06f26a3747b9ee9da89864&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Ldap.php?rt=horde-git&r1=5c3919542a4c64907d06f26a3747b9ee9da89864&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Session.php?rt=horde-git&r1=6e6599dfe74533b868cb0aaa80eeb6a2d482ce92&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Sql.php?rt=horde-git&r1=5c3919542a4c64907d06f26a3747b9ee9da89864&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/File.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Null.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Session.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/co.php/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php?rt=horde-git&r=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/package.xml?rt=horde-git&r1=9335b242fdb8821768d5897f1421efa4d0dec070&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
http://git.horde.org/diff.php/framework/Prefs/test/Horde/Prefs/bug_2838.phpt?rt=horde-git&r1=61e152c1cb66d66db7fedbc358a4f417aa4e17c5&r2=e73d7b53f08bbd075e2ab70c19de809a24fad42d
-----------------------------------------------------------------------
commit ac20a963e7eef0ce515b86d9d5acf47a242c4b59
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 15:44:50 2010 -0600
Fix undefined index error
imp/js/dimpcore.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/diff.php/imp/js/dimpcore.js?rt=horde-git&r1=1532939f784c60d132838e90a557514411d1067c&r2=ac20a963e7eef0ce515b86d9d5acf47a242c4b59
-----------------------------------------------------------------------
commit 6095c30cc046404079b8ce1699a7d99ecc37f180
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Fri Oct 15 14:59:39 2010 -0600
Simplify preference hooks.
Instead of having separate hooks for each preference, define single hook
for each of the preference events (init, change) and pass these hooks
the preference name.
framework/Prefs/lib/Horde/Prefs.php | 4 +-
horde/config/hooks.php.dist | 268 ++++++++++++++++++-----------------
horde/docs/UPGRADING | 1 +
imp/config/hooks.php.dist | 94 ++++++-------
imp/lib/Prefs/Identity.php | 2 +-
5 files changed, 185 insertions(+), 184 deletions(-)
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=6095c30cc046404079b8ce1699a7d99ecc37f180
http://git.horde.org/diff.php/horde/config/hooks.php.dist?rt=horde-git&r1=39e5fd1c8178d03a46be8bf19af366d72c193fae&r2=6095c30cc046404079b8ce1699a7d99ecc37f180
http://git.horde.org/diff.php/horde/docs/UPGRADING?rt=horde-git&r1=f3643dbc7a09e41f6578a507ade02e9b8b0e2aea&r2=6095c30cc046404079b8ce1699a7d99ecc37f180
http://git.horde.org/diff.php/imp/config/hooks.php.dist?rt=horde-git&r1=2f76218fd0a64dc121003ca7d07edd0bd1d4e0ff&r2=6095c30cc046404079b8ce1699a7d99ecc37f180
http://git.horde.org/diff.php/imp/lib/Prefs/Identity.php?rt=horde-git&r1=00c63fa70475450522f1f98b802f50a7c6cbb5bd&r2=6095c30cc046404079b8ce1699a7d99ecc37f180
-----------------------------------------------------------------------
commit d810a6e13f53ad48721747971a2327517ad4308c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 16:59:50 2010 -0600
Don't cache prefs if using session storage driver
framework/Core/lib/Horde/Core/Factory/Prefs.php | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Factory/Prefs.php?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=d810a6e13f53ad48721747971a2327517ad4308c
-----------------------------------------------------------------------
commit 7b6150f3a2acdedea798fbd6b17f26ca9e0835c2
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 17:00:18 2010 -0600
Move Horde-specific code out of horde/Prefs and into horde/Core
Includes the prefs.php configuration loading and hooks code.
framework/Core/lib/Horde/Core/Factory/Prefs.php | 4 +-
framework/Core/lib/Horde/Core/Prefs.php | 112 ++++++++++++++++++
framework/Core/package.xml | 2 +
framework/Prefs/lib/Horde/Prefs.php | 139 ++++++-----------------
4 files changed, 151 insertions(+), 106 deletions(-)
create mode 100644 framework/Core/lib/Horde/Core/Prefs.php
http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Factory/Prefs.php?rt=horde-git&r1=d810a6e13f53ad48721747971a2327517ad4308c&r2=7b6150f3a2acdedea798fbd6b17f26ca9e0835c2
http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Prefs.php?rt=horde-git&r=7b6150f3a2acdedea798fbd6b17f26ca9e0835c2
http://git.horde.org/diff.php/framework/Core/package.xml?rt=horde-git&r1=e73d7b53f08bbd075e2ab70c19de809a24fad42d&r2=7b6150f3a2acdedea798fbd6b17f26ca9e0835c2
http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs.php?rt=horde-git&r1=6095c30cc046404079b8ce1699a7d99ecc37f180&r2=7b6150f3a2acdedea798fbd6b17f26ca9e0835c2
-----------------------------------------------------------------------
commit 3b1baf7f1cd6df8fd9bc5199d352f303014ebdbe
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 23:33:38 2010 -0600
Convert a raiseError to exception throwing
framework/Data/lib/Horde/Data/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/diff.php/framework/Data/lib/Horde/Data/Base.php?rt=horde-git&r1=1526c4e2f0121646bf75285f8b25fdb3865aa60c&r2=3b1baf7f1cd6df8fd9bc5199d352f303014ebdbe
-----------------------------------------------------------------------
commit a47941197dea3dfb86d6067ce5ed0ff873825f9e
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 23:38:19 2010 -0600
Tweaks
framework/Data/lib/Horde/Data/Base.php | 58 +++++++++++++++++---------------
1 files changed, 31 insertions(+), 27 deletions(-)
http://git.horde.org/diff.php/framework/Data/lib/Horde/Data/Base.php?rt=horde-git&r1=3b1baf7f1cd6df8fd9bc5199d352f303014ebdbe&r2=a47941197dea3dfb86d6067ce5ed0ff873825f9e
-----------------------------------------------------------------------
commit 95427ccd8bcb03db7c9ab306df4aef2844a3a9c4
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Oct 19 23:43:27 2010 -0600
Hide pref groups using application method
ingo/config/prefs.php.dist | 13 +++++--------
ingo/lib/Application.php | 13 +++++++++++++
2 files changed, 18 insertions(+), 8 deletions(-)
http://git.horde.org/diff.php/ingo/config/prefs.php.dist?rt=horde-git&r1=21652c9db84ac02e489ebaded3ed9a955ace1fc5&r2=95427ccd8bcb03db7c9ab306df4aef2844a3a9c4
http://git.horde.org/diff.php/ingo/lib/Application.php?rt=horde-git&r1=c685edee620ef4d9931ef899c7f1ad162bf430af&r2=95427ccd8bcb03db7c9ab306df4aef2844a3a9c4
More information about the commits
mailing list