[commits] Horde branch master updated. e4b00f0c7b1ac1a266648dfe539c773a2e827811
Michael M Slusarz
slusarz at horde.org
Tue Feb 24 07:13:09 UTC 2015
The branch "master" has been updated.
The following is a summary of the commits.
from: 28e49215e89cad483490cb56c85dce0f3e82b2ee
7416f09 [mms] Rule code has been separated from the storage backend drivers.
af9d504 Revert "[mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug #13819)."
92bb09e Disable Ingo SQL driver saving for now, since I have not tested
ed23e3b Fix visibility of variable
e4b00f0 Bump version
Summary: http://github.com/horde/horde/compare/28e49215e89cad483490cb56c85dce0f3e82b2ee...e4b00f0c7b1ac1a266648dfe539c773a2e827811
-----------------------------------------------------------------------
commit 7416f099c4a2fa82f1ab34e521487c55a8a3c9a0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 16 17:57:52 2015 -0700
[mms] Rule code has been separated from the storage backend drivers.
ingo/bin/ingo-convert-prefs-to-sql | 27 +-
ingo/bin/ingo-postfix-policyd | 10 +-
ingo/config/fields.php | 44 +-
ingo/config/prefs.php | 26 +-
ingo/docs/CHANGES | 1 +
ingo/js/filters.js | 1 +
ingo/js/smartmobile.js | 2 +-
ingo/lib/Ajax/Application/Filters.php | 7 +-
ingo/lib/Ajax/Application/Smartmobile.php | 12 +-
ingo/lib/Api.php | 86 ++--
ingo/lib/Application.php | 99 +++-
ingo/lib/Basic/Blacklist.php | 39 +-
ingo/lib/Basic/Filters.php | 283 +++++----
ingo/lib/Basic/Forward.php | 40 +-
ingo/lib/Basic/Rule.php | 205 +++---
ingo/lib/Basic/Spam.php | 45 +-
ingo/lib/Basic/Vacation.php | 92 ++--
ingo/lib/Basic/Whitelist.php | 14 +-
ingo/lib/Block/Overview.php | 109 ++--
ingo/lib/Factory/Script.php | 43 +-
ingo/lib/Ingo.php | 59 --
ingo/lib/LoginTasks/SystemTask/Upgrade.php | 155 +++++-
ingo/lib/Rule.php | 63 ++
ingo/lib/Rule/Addresses.php | 124 ++++
ingo/lib/Rule/System.php | 25 +
ingo/lib/Rule/System/Blacklist.php | 95 +++
ingo/lib/Rule/System/Forward.php | 89 +++
ingo/lib/Rule/System/Spam.php | 80 +++
ingo/lib/Rule/System/Vacation.php | 209 ++++++
ingo/lib/Rule/System/Whitelist.php | 52 ++
ingo/lib/Rule/User.php | 176 +++++
ingo/lib/Rule/User/Discard.php | 36 +
ingo/lib/Rule/User/FlagOnly.php | 36 +
ingo/lib/Rule/User/Keep.php | 36 +
ingo/lib/Rule/User/Move.php | 36 +
ingo/lib/Rule/User/MoveKeep.php | 37 +
ingo/lib/Rule/User/Notify.php | 36 +
ingo/lib/Rule/User/Redirect.php | 36 +
ingo/lib/Rule/User/RedirectKeep.php | 37 +
ingo/lib/Rule/User/Reject.php | 36 +
ingo/lib/Script/Base.php | 15 +-
ingo/lib/Script/Customsql.php | 41 +-
ingo/lib/Script/Imap.php | 121 ++--
ingo/lib/Script/Ispconfig.php | 23 +-
ingo/lib/Script/Ispconfig/Vacation.php | 10 +-
ingo/lib/Script/Maildrop.php | 340 ++++++----
ingo/lib/Script/Maildrop/Recipe.php | 22 +-
ingo/lib/Script/Procmail.php | 317 ++++++----
ingo/lib/Script/Procmail/Recipe.php | 17 +-
ingo/lib/Script/Sieve.php | 449 +++++++------
ingo/lib/Script/Sieve/Action/Flag.php | 8 +-
ingo/lib/Session.php | 19 +-
ingo/lib/Smartmobile.php | 35 +-
ingo/lib/Storage.php | 492 +++++++-------
ingo/lib/Storage/Blacklist.php | 74 --
ingo/lib/Storage/FilterIterator.php | 61 ++
ingo/lib/Storage/FilterIterator/Match.php | 41 ++
ingo/lib/Storage/FilterIterator/Skip.php | 41 ++
ingo/lib/Storage/Filters.php | 253 -------
ingo/lib/Storage/Filters/Memory.php | 35 -
ingo/lib/Storage/Filters/Prefs.php | 37 -
ingo/lib/Storage/Filters/Sql.php | 330 ---------
ingo/lib/Storage/Forward.php | 77 ---
ingo/lib/Storage/Memory.php | 45 ++
ingo/lib/Storage/Prefs.php | 169 +----
ingo/lib/Storage/Rule.php | 42 --
ingo/lib/Storage/Rule/Addresses.php | 50 --
ingo/lib/Storage/Spam.php | 68 --
ingo/lib/Storage/Sql.php | 737 ++++++++++++++-------
ingo/lib/Storage/Vacation.php | 236 -------
ingo/lib/Storage/Whitelist.php | 61 --
ingo/package.xml | 80 ++-
ingo/templates/basic/blacklist/blacklist.html.php | 4 +-
ingo/templates/basic/rule/rule.html.php | 23 +-
ingo/test/Ingo/Autoload.php | 2 -
ingo/test/Ingo/Stub/Storage/Mock.php | 70 --
ingo/test/Ingo/Stub/Storage/Vacation.php | 32 -
ingo/test/Ingo/Unit/MaildropTest.php | 45 +-
ingo/test/Ingo/Unit/ProcmailTest.php | 74 +--
ingo/test/Ingo/Unit/ScriptTest.php | 48 +-
ingo/test/Ingo/Unit/SieveTest.php | 82 +--
ingo/test/Ingo/Unit/TestBase.php | 26 +-
82 files changed, 3948 insertions(+), 3442 deletions(-)
create mode 100644 ingo/lib/Rule.php
create mode 100644 ingo/lib/Rule/Addresses.php
create mode 100644 ingo/lib/Rule/System.php
create mode 100644 ingo/lib/Rule/System/Blacklist.php
create mode 100644 ingo/lib/Rule/System/Forward.php
create mode 100644 ingo/lib/Rule/System/Spam.php
create mode 100644 ingo/lib/Rule/System/Vacation.php
create mode 100644 ingo/lib/Rule/System/Whitelist.php
create mode 100644 ingo/lib/Rule/User.php
create mode 100644 ingo/lib/Rule/User/Discard.php
create mode 100644 ingo/lib/Rule/User/FlagOnly.php
create mode 100644 ingo/lib/Rule/User/Keep.php
create mode 100644 ingo/lib/Rule/User/Move.php
create mode 100644 ingo/lib/Rule/User/MoveKeep.php
create mode 100644 ingo/lib/Rule/User/Notify.php
create mode 100644 ingo/lib/Rule/User/Redirect.php
create mode 100644 ingo/lib/Rule/User/RedirectKeep.php
create mode 100644 ingo/lib/Rule/User/Reject.php
delete mode 100644 ingo/lib/Storage/Blacklist.php
create mode 100644 ingo/lib/Storage/FilterIterator.php
create mode 100644 ingo/lib/Storage/FilterIterator/Match.php
create mode 100644 ingo/lib/Storage/FilterIterator/Skip.php
delete mode 100644 ingo/lib/Storage/Filters.php
delete mode 100644 ingo/lib/Storage/Filters/Memory.php
delete mode 100644 ingo/lib/Storage/Filters/Prefs.php
delete mode 100644 ingo/lib/Storage/Filters/Sql.php
delete mode 100644 ingo/lib/Storage/Forward.php
create mode 100644 ingo/lib/Storage/Memory.php
delete mode 100644 ingo/lib/Storage/Rule.php
delete mode 100644 ingo/lib/Storage/Rule/Addresses.php
delete mode 100644 ingo/lib/Storage/Spam.php
delete mode 100644 ingo/lib/Storage/Vacation.php
delete mode 100644 ingo/lib/Storage/Whitelist.php
delete mode 100644 ingo/test/Ingo/Stub/Storage/Mock.php
delete mode 100644 ingo/test/Ingo/Stub/Storage/Vacation.php
http://github.com/horde/horde/commit/7416f099c4a2fa82f1ab34e521487c55a8a3c9a0
-----------------------------------------------------------------------
commit af9d5041df23f0bec606a54d4d305510b86193a3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 23 22:24:47 2015 -0700
Revert "[mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug #13819)."
This reverts commit c521c26a78f9d75d45a07a4069edb67843a5408a.
Not needed anymore - race-conditions have been fixed by accessing rules
by UIDs instead of filter position
ingo/docs/CHANGES | 2 --
ingo/js/filters.js | 18 ------------------
ingo/package.xml | 1 -
ingo/templates/basic/filters/filters.html.php | 4 ----
ingo/themes/default/screen.css | 13 -------------
5 files changed, 0 insertions(+), 38 deletions(-)
http://github.com/horde/horde/commit/af9d5041df23f0bec606a54d4d305510b86193a3
-----------------------------------------------------------------------
commit 92bb09e912a570f160ce5fa63be85036081a3ede
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Feb 24 00:00:05 2015 -0700
Disable Ingo SQL driver saving for now, since I have not tested
ingo/lib/Storage/Sql.php | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/92bb09e912a570f160ce5fa63be85036081a3ede
-----------------------------------------------------------------------
commit ed23e3b21a793b68abc70bf20912965e82434fe7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Feb 24 00:11:27 2015 -0700
Fix visibility of variable
framework/lz4/horde_lz4.c | 2 +-
framework/lz4/horde_lz4.h | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/ed23e3b21a793b68abc70bf20912965e82434fe7
-----------------------------------------------------------------------
commit e4b00f0c7b1ac1a266648dfe539c773a2e827811
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Feb 24 00:12:03 2015 -0700
Bump version
framework/lz4/horde_lz4.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/e4b00f0c7b1ac1a266648dfe539c773a2e827811
More information about the commits
mailing list