[commits] Horde branch master updated. b691d3c566cce3d52b2f9759b8d2874024fa3567
Jan Schneider
jan at horde.org
Wed Aug 31 13:46:48 UTC 2011
The branch "master" has been updated.
The following is a summary of the commits.
from: 2a03b510ec3d706646c32626182b16ab4528141b
f91edf6 Import Sam from CVS.
4a8be0b Move translations.
805111f Move base theme.
9968948 Remove $Horde$ tags.
c9b4902 Style
d6502a6 Remove @since tags.
22a0feb Bump copyright years.
3ec9133 Fix file/path names.
e284a7c Not needed anymore.
a1f18cd Update to H4.
d4096b9 Update class names, PPP.
85aebd9 Use autoloading.
d6c25d8 Horde_Auth changes.
08c275c base.php -> Application.php.
56a66dc Convert to Horde_Registry_Api.
826e7d4 Use exceptions.
94a3bde Fix parse error.
f5f81e9 Use Horde_Db.
937540c Use Horde_Ldap.
ba7a173 Add Sam_Exception.
54542e6 Convert to UTF-8.
bffe018 Add driver factory and use injector.
3f0667f Convert to H4 Horde_Vfs.
d79bdb7 PEAR_Error -> Exception
dc83644 Application initialization, templates, menus.
5815845 Fix redirection.
2cda0d3 Convert to migrations.
055d710 Style tweaks.
3d25dc2 Sam_Driver -> Sam_Driver_Base, remove factory and singleton.
529bc88 Remove weird constant usage.
96a35b0 Cleanup, proper OOP.
6491a1a Reduce code duplication.
8d7bdb4 Fix hook calling.
78f4224 Style
8d419c7 Reduce indention.
a372077 Consolidate duplicate code.
5bc411d Add Sam.
476c552 Default to 'full' hordeauth.
7006af3 Use Horde::loadConfiguration().
97ea005 Remove hooks configuration, fix menu configuration.
b50ad83 Enable rules by default.
64419d0 Fix syntax.
b10f7fd Fix parse errors.
9b19ac3 Catch injector exceptions.
a0ba6d4 Add blacklist/whitelist links.
42822cb Fix reading prefs from FTP.
d04ea92 Fix arguments.
91634f7 Fix column types.
c7cbbd2 Don't use disabled backends.
5057169 Merge branch 'sam-H4'
b691d3c BFN
-----------------------------------------------------------------------
commit f91edf61abcc7fa3afd1e22f3dbcbb5ace1fb3b4
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:15:30 2011 +0200
Import Sam from CVS.
sam/COPYING | 280 +++++++++++
sam/README | 73 +++
sam/blacklist.php | 68 +++
sam/config/attributes.php.dist | 312 ++++++++++++
sam/config/backends.php.dist | 153 ++++++
sam/config/conf.xml | 30 ++
sam/config/hooks.php.dist | 27 +
sam/config/menu.php.dist | 40 ++
sam/docs/CHANGES | 141 ++++++
sam/docs/CREDITS | 47 ++
sam/docs/INSTALL | 175 +++++++
sam/docs/TODO | 9 +
sam/index.php | 31 ++
sam/lib/Driver.php | 276 +++++++++++
sam/lib/Driver/amavisd_sql.php | 768 ++++++++++++++++++++++++++++++
sam/lib/Driver/spamd.php | 89 ++++
sam/lib/Driver/spamd_ftp.php | 166 +++++++
sam/lib/Driver/spamd_ldap.php | 201 ++++++++
sam/lib/Driver/spamd_sql.php | 344 +++++++++++++
sam/lib/Forms/Blacklist.php | 51 ++
sam/lib/Forms/Options.php | 95 ++++
sam/lib/Forms/Whitelist.php | 51 ++
sam/lib/SAM.php | 149 ++++++
sam/lib/api.php | 81 ++++
sam/lib/base.php | 64 +++
sam/lib/version.php | 1 +
sam/locale/cs_CZ/LC_MESSAGES/sam.mo | Bin 0 -> 138518 bytes
sam/locale/de_DE/LC_MESSAGES/sam.mo | Bin 0 -> 159966 bytes
sam/locale/en_US/help.xml | 267 +++++++++++
sam/locale/es_ES/LC_MESSAGES/sam.mo | Bin 0 -> 153029 bytes
sam/locale/es_ES/help.xml | 215 +++++++++
sam/locale/et_EE/LC_MESSAGES/sam.mo | Bin 0 -> 137544 bytes
sam/locale/fi_FI/LC_MESSAGES/sam.mo | Bin 0 -> 149020 bytes
sam/locale/fi_FI/help.xml | 191 ++++++++
sam/locale/fr_FR/LC_MESSAGES/sam.mo | Bin 0 -> 149817 bytes
sam/locale/it_IT/LC_MESSAGES/sam.mo | Bin 0 -> 150491 bytes
sam/locale/nn_NO/LC_MESSAGES/sam.mo | Bin 0 -> 25086 bytes
sam/locale/ro_RO/LC_MESSAGES/sam.mo | Bin 0 -> 18883 bytes
sam/locale/zh_TW/LC_MESSAGES/sam.mo | Bin 0 -> 129184 bytes
sam/po/README | 1 +
sam/po/cs_CZ.po | 190 ++++++++
sam/po/de_DE.po | 237 +++++++++
sam/po/es_ES.po | 238 +++++++++
sam/po/et_EE.po | 232 +++++++++
sam/po/fi_FI.po | 229 +++++++++
sam/po/fr_FR.po | 106 ++++
sam/po/it_IT.po | 299 ++++++++++++
sam/po/nn_NO.po | 91 ++++
sam/po/ro_RO.po | 228 +++++++++
sam/po/sam.pot | 236 +++++++++
sam/po/zh_TW.po | 242 ++++++++++
sam/scripts/.htaccess | 1 +
sam/scripts/sql/amavisd_sql.mysql.sql | 61 +++
sam/scripts/sql/spamd_sql.mysql.sql | 11 +
sam/scripts/sql/spamd_sql.pgsql.sql | 10 +
sam/spam.php | 104 ++++
sam/templates/common-header.inc | 27 +
sam/templates/menu.inc | 4 +
sam/themes/graphics/blacklist.png | Bin 0 -> 563 bytes
sam/themes/graphics/favicon.ico | Bin 0 -> 1150 bytes
sam/themes/graphics/sam.png | Bin 0 -> 187 bytes
sam/themes/graphics/whitelist.png | Bin 0 -> 1180 bytes
sam/themes/silver/graphics/blacklist.png | Bin 0 -> 655 bytes
sam/themes/silver/graphics/favicon.ico | Bin 0 -> 1150 bytes
sam/themes/silver/graphics/sam.png | Bin 0 -> 702 bytes
sam/themes/silver/graphics/whitelist.png | Bin 0 -> 537 bytes
sam/whitelist.php | 68 +++
67 files changed, 7010 insertions(+), 0 deletions(-)
create mode 100644 sam/COPYING
create mode 100644 sam/README
create mode 100644 sam/blacklist.php
create mode 100644 sam/config/attributes.php.dist
create mode 100644 sam/config/backends.php.dist
create mode 100644 sam/config/conf.xml
create mode 100644 sam/config/hooks.php.dist
create mode 100644 sam/config/menu.php.dist
create mode 100644 sam/docs/CHANGES
create mode 100644 sam/docs/CREDITS
create mode 100644 sam/docs/INSTALL
create mode 100644 sam/docs/TODO
create mode 100644 sam/index.php
create mode 100644 sam/lib/Driver.php
create mode 100644 sam/lib/Driver/amavisd_sql.php
create mode 100644 sam/lib/Driver/spamd.php
create mode 100644 sam/lib/Driver/spamd_ftp.php
create mode 100644 sam/lib/Driver/spamd_ldap.php
create mode 100644 sam/lib/Driver/spamd_sql.php
create mode 100644 sam/lib/Forms/Blacklist.php
create mode 100644 sam/lib/Forms/Options.php
create mode 100644 sam/lib/Forms/Whitelist.php
create mode 100644 sam/lib/SAM.php
create mode 100644 sam/lib/api.php
create mode 100644 sam/lib/base.php
create mode 100644 sam/lib/version.php
create mode 100644 sam/locale/cs_CZ/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/de_DE/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/en_US/help.xml
create mode 100644 sam/locale/es_ES/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/es_ES/help.xml
create mode 100644 sam/locale/et_EE/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/fi_FI/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/fi_FI/help.xml
create mode 100644 sam/locale/fr_FR/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/it_IT/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/nn_NO/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/ro_RO/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/zh_TW/LC_MESSAGES/sam.mo
create mode 100644 sam/po/README
create mode 100644 sam/po/cs_CZ.po
create mode 100644 sam/po/de_DE.po
create mode 100644 sam/po/es_ES.po
create mode 100644 sam/po/et_EE.po
create mode 100644 sam/po/fi_FI.po
create mode 100644 sam/po/fr_FR.po
create mode 100644 sam/po/it_IT.po
create mode 100644 sam/po/nn_NO.po
create mode 100644 sam/po/ro_RO.po
create mode 100644 sam/po/sam.pot
create mode 100644 sam/po/zh_TW.po
create mode 100644 sam/scripts/.htaccess
create mode 100644 sam/scripts/sql/amavisd_sql.mysql.sql
create mode 100644 sam/scripts/sql/spamd_sql.mysql.sql
create mode 100644 sam/scripts/sql/spamd_sql.pgsql.sql
create mode 100644 sam/spam.php
create mode 100644 sam/templates/common-header.inc
create mode 100644 sam/templates/menu.inc
create mode 100644 sam/themes/graphics/blacklist.png
create mode 100644 sam/themes/graphics/favicon.ico
create mode 100644 sam/themes/graphics/sam.png
create mode 100644 sam/themes/graphics/whitelist.png
create mode 100644 sam/themes/silver/graphics/blacklist.png
create mode 100644 sam/themes/silver/graphics/favicon.ico
create mode 100644 sam/themes/silver/graphics/sam.png
create mode 100644 sam/themes/silver/graphics/whitelist.png
create mode 100644 sam/themes/silver/themed_graphics
create mode 100644 sam/whitelist.php
http://git.horde.org/horde-git/-/commit/f91edf61abcc7fa3afd1e22f3dbcbb5ace1fb3b4
-----------------------------------------------------------------------
commit 4a8be0bffdae2aa19333bf4cd04597d73fcb2dc6
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:21:33 2011 +0200
Move translations.
sam/locale/cs/LC_MESSAGES/sam.mo | Bin 0 -> 138518 bytes
sam/locale/cs/LC_MESSAGES/sam.po | 190 ++++++++++++++++++++++
sam/locale/cs_CZ/LC_MESSAGES/sam.mo | Bin 138518 -> 0 bytes
sam/locale/de/LC_MESSAGES/sam.mo | Bin 0 -> 159966 bytes
sam/locale/de/LC_MESSAGES/sam.po | 237 +++++++++++++++++++++++++++
sam/locale/de_DE/LC_MESSAGES/sam.mo | Bin 159966 -> 0 bytes
sam/locale/en/help.xml | 267 +++++++++++++++++++++++++++++++
sam/locale/en_US/help.xml | 267 -------------------------------
sam/locale/es/LC_MESSAGES/sam.mo | Bin 0 -> 153029 bytes
sam/locale/es/LC_MESSAGES/sam.po | 238 ++++++++++++++++++++++++++++
sam/locale/es/help.xml | 215 +++++++++++++++++++++++++
sam/locale/es_ES/LC_MESSAGES/sam.mo | Bin 153029 -> 0 bytes
sam/locale/es_ES/help.xml | 215 -------------------------
sam/locale/et/LC_MESSAGES/sam.mo | Bin 0 -> 137544 bytes
sam/locale/et/LC_MESSAGES/sam.po | 232 +++++++++++++++++++++++++++
sam/locale/et_EE/LC_MESSAGES/sam.mo | Bin 137544 -> 0 bytes
sam/locale/fi/LC_MESSAGES/sam.mo | Bin 0 -> 149020 bytes
sam/locale/fi/LC_MESSAGES/sam.po | 229 +++++++++++++++++++++++++++
sam/locale/fi/help.xml | 191 ++++++++++++++++++++++
sam/locale/fi_FI/LC_MESSAGES/sam.mo | Bin 149020 -> 0 bytes
sam/locale/fi_FI/help.xml | 191 ----------------------
sam/locale/fr/LC_MESSAGES/sam.mo | Bin 0 -> 149817 bytes
sam/locale/fr/LC_MESSAGES/sam.po | 106 ++++++++++++
sam/locale/fr_FR/LC_MESSAGES/sam.mo | Bin 149817 -> 0 bytes
sam/locale/it/LC_MESSAGES/sam.mo | Bin 0 -> 150491 bytes
sam/locale/it/LC_MESSAGES/sam.po | 299 +++++++++++++++++++++++++++++++++++
sam/locale/it_IT/LC_MESSAGES/sam.mo | Bin 150491 -> 0 bytes
sam/locale/nn/LC_MESSAGES/sam.mo | Bin 0 -> 25086 bytes
sam/locale/nn/LC_MESSAGES/sam.po | 91 +++++++++++
sam/locale/nn_NO/LC_MESSAGES/sam.mo | Bin 25086 -> 0 bytes
sam/locale/ro/LC_MESSAGES/sam.mo | Bin 0 -> 18883 bytes
sam/locale/ro/LC_MESSAGES/sam.po | 228 ++++++++++++++++++++++++++
sam/locale/ro_RO/LC_MESSAGES/sam.mo | Bin 18883 -> 0 bytes
sam/locale/sam.pot | 236 +++++++++++++++++++++++++++
sam/locale/zh_TW/LC_MESSAGES/sam.po | 242 ++++++++++++++++++++++++++++
sam/po/README | 1 -
sam/po/cs_CZ.po | 190 ----------------------
sam/po/de_DE.po | 237 ---------------------------
sam/po/es_ES.po | 238 ----------------------------
sam/po/et_EE.po | 232 ---------------------------
sam/po/fi_FI.po | 229 ---------------------------
sam/po/fr_FR.po | 106 ------------
sam/po/it_IT.po | 299 -----------------------------------
sam/po/nn_NO.po | 91 -----------
sam/po/ro_RO.po | 228 --------------------------
sam/po/sam.pot | 236 ---------------------------
sam/po/zh_TW.po | 242 ----------------------------
47 files changed, 3001 insertions(+), 3002 deletions(-)
create mode 100644 sam/locale/cs/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/cs/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/cs_CZ/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/de/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/de/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/de_DE/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/en/help.xml
delete mode 100644 sam/locale/en_US/help.xml
create mode 100644 sam/locale/es/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/es/LC_MESSAGES/sam.po
create mode 100644 sam/locale/es/help.xml
delete mode 100644 sam/locale/es_ES/LC_MESSAGES/sam.mo
delete mode 100644 sam/locale/es_ES/help.xml
create mode 100644 sam/locale/et/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/et/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/et_EE/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/fi/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/fi/LC_MESSAGES/sam.po
create mode 100644 sam/locale/fi/help.xml
delete mode 100644 sam/locale/fi_FI/LC_MESSAGES/sam.mo
delete mode 100644 sam/locale/fi_FI/help.xml
create mode 100644 sam/locale/fr/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/fr/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/fr_FR/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/it/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/it/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/it_IT/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/nn/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/nn/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/nn_NO/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/ro/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/ro/LC_MESSAGES/sam.po
delete mode 100644 sam/locale/ro_RO/LC_MESSAGES/sam.mo
create mode 100644 sam/locale/sam.pot
create mode 100644 sam/locale/zh_TW/LC_MESSAGES/sam.po
delete mode 100644 sam/po/README
delete mode 100644 sam/po/cs_CZ.po
delete mode 100644 sam/po/de_DE.po
delete mode 100644 sam/po/es_ES.po
delete mode 100644 sam/po/et_EE.po
delete mode 100644 sam/po/fi_FI.po
delete mode 100644 sam/po/fr_FR.po
delete mode 100644 sam/po/it_IT.po
delete mode 100644 sam/po/nn_NO.po
delete mode 100644 sam/po/ro_RO.po
delete mode 100644 sam/po/sam.pot
delete mode 100644 sam/po/zh_TW.po
http://git.horde.org/horde-git/-/commit/4a8be0bffdae2aa19333bf4cd04597d73fcb2dc6
-----------------------------------------------------------------------
commit 805111f77806c919dced98d295e47e389a2f434d
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:22:57 2011 +0200
Move base theme.
sam/themes/default/graphics/blacklist.png | Bin 0 -> 563 bytes
sam/themes/default/graphics/favicon.ico | Bin 0 -> 1150 bytes
sam/themes/default/graphics/sam.png | Bin 0 -> 187 bytes
sam/themes/default/graphics/whitelist.png | Bin 0 -> 1180 bytes
sam/themes/graphics/blacklist.png | Bin 563 -> 0 bytes
sam/themes/graphics/favicon.ico | Bin 1150 -> 0 bytes
sam/themes/graphics/sam.png | Bin 187 -> 0 bytes
sam/themes/graphics/whitelist.png | Bin 1180 -> 0 bytes
8 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 sam/themes/default/graphics/blacklist.png
create mode 100644 sam/themes/default/graphics/favicon.ico
create mode 100644 sam/themes/default/graphics/sam.png
create mode 100644 sam/themes/default/graphics/whitelist.png
delete mode 100644 sam/themes/graphics/blacklist.png
delete mode 100644 sam/themes/graphics/favicon.ico
delete mode 100644 sam/themes/graphics/sam.png
delete mode 100644 sam/themes/graphics/whitelist.png
delete mode 100644 sam/themes/silver/themed_graphics
http://git.horde.org/horde-git/-/commit/805111f77806c919dced98d295e47e389a2f434d
-----------------------------------------------------------------------
commit 99689488790ac77a6881616e06bae314b25ab758
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:30:47 2011 +0200
Remove $Horde$ tags.
sam/README | 2 --
sam/blacklist.php | 2 --
sam/config/attributes.php.dist | 2 --
sam/config/backends.php.dist | 2 --
sam/config/conf.xml | 2 +-
sam/config/menu.php.dist | 1 -
sam/index.php | 2 --
sam/lib/Driver.php | 2 --
sam/lib/Driver/amavisd_sql.php | 2 --
sam/lib/Driver/spamd.php | 2 --
sam/lib/Driver/spamd_ftp.php | 2 --
sam/lib/Driver/spamd_ldap.php | 2 --
sam/lib/Driver/spamd_sql.php | 2 --
sam/lib/Forms/Blacklist.php | 2 --
sam/lib/Forms/Options.php | 2 --
sam/lib/Forms/Whitelist.php | 2 --
sam/lib/SAM.php | 2 --
sam/lib/api.php | 2 --
sam/lib/base.php | 2 --
sam/locale/en/help.xml | 1 -
sam/locale/es/help.xml | 1 -
sam/locale/fi/help.xml | 1 -
sam/spam.php | 2 --
sam/whitelist.php | 2 --
24 files changed, 1 insertions(+), 43 deletions(-)
http://git.horde.org/horde-git/-/commit/99689488790ac77a6881616e06bae314b25ab758
-----------------------------------------------------------------------
commit c9b4902c63709efdf10377d8dc2f1f2c4cd4c72d
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:32:06 2011 +0200
Style
sam/config/conf.xml | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
http://git.horde.org/horde-git/-/commit/c9b4902c63709efdf10377d8dc2f1f2c4cd4c72d
-----------------------------------------------------------------------
commit d6502a65f8eb4d507bc496958dd20106c91b3b25
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:33:07 2011 +0200
Remove @since tags.
sam/lib/Driver.php | 1 -
sam/lib/Driver/amavisd_sql.php | 1 -
sam/lib/Driver/spamd.php | 1 -
sam/lib/Driver/spamd_ftp.php | 1 -
sam/lib/Driver/spamd_ldap.php | 1 -
sam/lib/Driver/spamd_sql.php | 1 -
sam/lib/SAM.php | 1 -
7 files changed, 0 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/d6502a65f8eb4d507bc496958dd20106c91b3b25
-----------------------------------------------------------------------
commit 22a0febe125b6bba27bcd474664a4c851fef0f72
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:36:24 2011 +0200
Bump copyright years.
sam/blacklist.php | 2 +-
sam/index.php | 2 +-
sam/lib/Driver/spamd.php | 2 +-
sam/lib/Driver/spamd_ftp.php | 2 +-
sam/lib/Driver/spamd_ldap.php | 2 +-
sam/lib/Driver/spamd_sql.php | 2 +-
sam/lib/Forms/Blacklist.php | 2 +-
sam/lib/Forms/Options.php | 2 +-
sam/lib/Forms/Whitelist.php | 2 +-
sam/lib/SAM.php | 2 +-
sam/lib/base.php | 2 +-
sam/locale/cs/LC_MESSAGES/sam.po | 2 +-
sam/locale/de/LC_MESSAGES/sam.po | 2 +-
sam/locale/es/LC_MESSAGES/sam.po | 2 +-
sam/locale/et/LC_MESSAGES/sam.po | 2 +-
sam/locale/ro/LC_MESSAGES/sam.po | 2 +-
sam/spam.php | 2 +-
sam/templates/common-header.inc | 2 +-
sam/whitelist.php | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
http://git.horde.org/horde-git/-/commit/22a0febe125b6bba27bcd474664a4c851fef0f72
-----------------------------------------------------------------------
commit 3ec9133f543e0c88f8760b5659f3696f894a1510
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:41:42 2011 +0200
Fix file/path names.
sam/config/attributes.php | 310 ++++++++++++++++
sam/config/attributes.php.dist | 310 ----------------
sam/config/backends.php | 151 ++++++++
sam/config/backends.php.dist | 151 --------
sam/lib/Api.php | 79 ++++
sam/lib/Driver/Amavisd/Sql.php | 765 ++++++++++++++++++++++++++++++++++++++++
sam/lib/Driver/Spamd/Base.php | 86 +++++
sam/lib/Driver/Spamd/Ftp.php | 163 +++++++++
sam/lib/Driver/Spamd/Ldap.php | 198 +++++++++++
sam/lib/Driver/Spamd/Sql.php | 341 ++++++++++++++++++
sam/lib/Driver/amavisd_sql.php | 765 ----------------------------------------
sam/lib/Driver/spamd.php | 86 -----
sam/lib/Driver/spamd_ftp.php | 163 ---------
sam/lib/Driver/spamd_ldap.php | 198 -----------
sam/lib/Driver/spamd_sql.php | 341 ------------------
sam/lib/Form/Blacklist.php | 49 +++
sam/lib/Form/Options.php | 93 +++++
sam/lib/Form/Whitelist.php | 49 +++
sam/lib/Forms/Blacklist.php | 49 ---
sam/lib/Forms/Options.php | 93 -----
sam/lib/Forms/Whitelist.php | 49 ---
sam/lib/SAM.php | 146 --------
sam/lib/Sam.php | 146 ++++++++
sam/lib/api.php | 79 ----
24 files changed, 2430 insertions(+), 2430 deletions(-)
create mode 100644 sam/config/attributes.php
delete mode 100644 sam/config/attributes.php.dist
create mode 100644 sam/config/backends.php
delete mode 100644 sam/config/backends.php.dist
create mode 100644 sam/lib/Api.php
create mode 100644 sam/lib/Driver/Amavisd/Sql.php
create mode 100644 sam/lib/Driver/Spamd/Base.php
create mode 100644 sam/lib/Driver/Spamd/Ftp.php
create mode 100644 sam/lib/Driver/Spamd/Ldap.php
create mode 100644 sam/lib/Driver/Spamd/Sql.php
delete mode 100644 sam/lib/Driver/amavisd_sql.php
delete mode 100644 sam/lib/Driver/spamd.php
delete mode 100644 sam/lib/Driver/spamd_ftp.php
delete mode 100644 sam/lib/Driver/spamd_ldap.php
delete mode 100644 sam/lib/Driver/spamd_sql.php
create mode 100644 sam/lib/Form/Blacklist.php
create mode 100644 sam/lib/Form/Options.php
create mode 100644 sam/lib/Form/Whitelist.php
delete mode 100644 sam/lib/Forms/Blacklist.php
delete mode 100644 sam/lib/Forms/Options.php
delete mode 100644 sam/lib/Forms/Whitelist.php
delete mode 100644 sam/lib/SAM.php
create mode 100644 sam/lib/Sam.php
delete mode 100644 sam/lib/api.php
http://git.horde.org/horde-git/-/commit/3ec9133f543e0c88f8760b5659f3696f894a1510
-----------------------------------------------------------------------
commit e284a7c9fd14fcd7117cd1ede53742d3c5183e33
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 16:42:39 2011 +0200
Not needed anymore.
sam/lib/version.php | 1 -
sam/templates/common-header.inc | 27 ---------------------------
sam/templates/menu.inc | 4 ----
3 files changed, 0 insertions(+), 32 deletions(-)
delete mode 100644 sam/lib/version.php
delete mode 100644 sam/templates/common-header.inc
delete mode 100644 sam/templates/menu.inc
http://git.horde.org/horde-git/-/commit/e284a7c9fd14fcd7117cd1ede53742d3c5183e33
-----------------------------------------------------------------------
commit a1f18cdd0d2bab673a35b9fac3e036f90434c7ba
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 17:01:55 2011 +0200
Update to H4.
sam/config/menu.php.dist | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
http://git.horde.org/horde-git/-/commit/a1f18cdd0d2bab673a35b9fac3e036f90434c7ba
-----------------------------------------------------------------------
commit d4096b95c3f9f0e16c255cd36594a4db160d5e7f
Author: Jan Schneider <jan at horde.org>
Date: Mon Aug 29 17:02:21 2011 +0200
Update class names, PPP.
sam/blacklist.php | 2 +-
sam/config/backends.php | 2 +-
sam/lib/Driver.php | 59 +++++++++++++++----------------
sam/lib/Driver/Amavisd/Sql.php | 76 ++++++++++++++++++++--------------------
sam/lib/Driver/Spamd/Base.php | 13 +++----
sam/lib/Driver/Spamd/Ftp.php | 17 ++++-----
sam/lib/Driver/Spamd/Ldap.php | 19 +++++-----
sam/lib/Driver/Spamd/Sql.php | 33 ++++++++---------
sam/lib/Form/Blacklist.php | 9 ++---
sam/lib/Form/Options.php | 11 +++---
sam/lib/Form/Whitelist.php | 9 ++---
sam/lib/Sam.php | 17 ++++-----
sam/lib/base.php | 4 +-
sam/spam.php | 2 +-
sam/whitelist.php | 2 +-
15 files changed, 133 insertions(+), 142 deletions(-)
http://git.horde.org/horde-git/-/commit/d4096b95c3f9f0e16c255cd36594a4db160d5e7f
-----------------------------------------------------------------------
commit 85aebd92fa00c1d1631502d319e75369edc582d2
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 10:42:05 2011 +0200
Use autoloading.
sam/blacklist.php | 1 -
sam/lib/Driver.php | 1 -
sam/lib/Driver/Spamd/Ftp.php | 5 -----
sam/lib/Driver/Spamd/Ldap.php | 3 ---
sam/lib/Driver/Spamd/Sql.php | 3 ---
sam/lib/base.php | 8 --------
sam/spam.php | 1 -
sam/whitelist.php | 1 -
8 files changed, 0 insertions(+), 23 deletions(-)
http://git.horde.org/horde-git/-/commit/85aebd92fa00c1d1631502d319e75369edc582d2
-----------------------------------------------------------------------
commit d6c25d8ec589ac44ca130920ca001d4fbecf5831
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 13:02:05 2011 +0200
Horde_Auth changes.
sam/blacklist.php | 2 +-
sam/lib/Driver/Spamd/Ftp.php | 4 ++--
sam/lib/Driver/Spamd/Ldap.php | 2 +-
sam/lib/Form/Blacklist.php | 3 ++-
sam/lib/Form/Options.php | 3 ++-
sam/lib/Form/Whitelist.php | 3 ++-
sam/lib/Sam.php | 2 +-
sam/spam.php | 2 +-
sam/whitelist.php | 2 +-
9 files changed, 13 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/d6c25d8ec589ac44ca130920ca001d4fbecf5831
-----------------------------------------------------------------------
commit 08c275c47d980a09ec454152efa49c0631d08181
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 13:11:48 2011 +0200
base.php -> Application.php.
sam/lib/Application.php | 75 +++++++++++++++++++++++++++++++++++++++++++++++
sam/lib/Sam.php | 23 --------------
sam/lib/base.php | 54 ---------------------------------
3 files changed, 75 insertions(+), 77 deletions(-)
create mode 100644 sam/lib/Application.php
delete mode 100644 sam/lib/base.php
http://git.horde.org/horde-git/-/commit/08c275c47d980a09ec454152efa49c0631d08181
-----------------------------------------------------------------------
commit 56a66dc073cbf4b47698e40676fcd7f6bef62abb
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 13:13:53 2011 +0200
Convert to Horde_Registry_Api.
sam/lib/Api.php | 100 ++++++++++++++++++++++---------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
http://git.horde.org/horde-git/-/commit/56a66dc073cbf4b47698e40676fcd7f6bef62abb
-----------------------------------------------------------------------
commit 826e7d48cfc95fc6d24cd8345a1e2fab0812ae62
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 13:24:57 2011 +0200
Use exceptions.
sam/blacklist.php | 16 +++++++++-------
sam/config/attributes.php | 27 +++++++++++++++------------
sam/lib/Sam.php | 12 +++++++-----
sam/spam.php | 16 +++++++++-------
sam/whitelist.php | 17 +++++++++--------
5 files changed, 49 insertions(+), 39 deletions(-)
http://git.horde.org/horde-git/-/commit/826e7d48cfc95fc6d24cd8345a1e2fab0812ae62
-----------------------------------------------------------------------
commit 94a3bde748b23730a0aeac7d98620c57217495f9
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 17:07:01 2011 +0200
Fix parse error.
sam/whitelist.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/94a3bde748b23730a0aeac7d98620c57217495f9
-----------------------------------------------------------------------
commit f5f81e941395b4940f272657140b92ff546cfe31
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 17:07:20 2011 +0200
Use Horde_Db.
sam/lib/Driver/Amavisd/Sql.php | 746 +++++++++++++--------------------------
sam/lib/Driver/Spamd/Sql.php | 241 ++++----------
2 files changed, 317 insertions(+), 670 deletions(-)
http://git.horde.org/horde-git/-/commit/f5f81e941395b4940f272657140b92ff546cfe31
-----------------------------------------------------------------------
commit 937540c6fc7324854972e4afa800bbe54feebaf0
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 18:16:00 2011 +0200
Use Horde_Ldap.
sam/lib/Driver/Spamd/Ldap.php | 105 +++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 60 deletions(-)
http://git.horde.org/horde-git/-/commit/937540c6fc7324854972e4afa800bbe54feebaf0
-----------------------------------------------------------------------
commit ba7a173983b12f4a51f25ccfca94beade3695b20
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 18:20:36 2011 +0200
Add Sam_Exception.
sam/lib/Exception.php | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 sam/lib/Exception.php
http://git.horde.org/horde-git/-/commit/ba7a173983b12f4a51f25ccfca94beade3695b20
-----------------------------------------------------------------------
commit 54542e663d6fb218218d6b5d0f450242c739cd8c
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 18:25:28 2011 +0200
Convert to UTF-8.
sam/locale/cs/LC_MESSAGES/sam.po | 102 +++++++++++++++++-----------------
sam/locale/de/LC_MESSAGES/sam.po | 50 +++++++++---------
sam/locale/es/LC_MESSAGES/sam.po | 34 ++++++------
sam/locale/et/LC_MESSAGES/sam.po | 32 ++++++------
sam/locale/fi/LC_MESSAGES/sam.po | 50 +++++++++---------
sam/locale/fr/LC_MESSAGES/sam.po | 44 ++++++++--------
sam/locale/it/LC_MESSAGES/sam.po | 14 +++---
sam/locale/nn/LC_MESSAGES/sam.po | 30 +++++-----
sam/locale/ro/LC_MESSAGES/sam.po | 4 +-
sam/locale/zh_TW/LC_MESSAGES/sam.po | 86 +++++++++++++++---------------
10 files changed, 223 insertions(+), 223 deletions(-)
http://git.horde.org/horde-git/-/commit/54542e663d6fb218218d6b5d0f450242c739cd8c
-----------------------------------------------------------------------
commit bffe01871ea28e923a6ac7e97e33c34f4aca2528
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 19:13:18 2011 +0200
Add driver factory and use injector.
sam/blacklist.php | 1 +
sam/config/backends.php | 8 ++--
sam/lib/Api.php | 6 ++-
sam/lib/Application.php | 9 +----
sam/lib/Driver/Amavisd/Sql.php | 45 +++++++++++-------------
sam/lib/Driver/Spamd/Ftp.php | 40 +++++++++++++--------
sam/lib/Driver/Spamd/Ldap.php | 71 ++++++++++++++-----------------------
sam/lib/Driver/Spamd/Sql.php | 58 +++++++++++-------------------
sam/lib/Factory/Driver.php | 75 ++++++++++++++++++++++++++++++++++++++++
sam/lib/Form/Blacklist.php | 4 +--
sam/lib/Form/Options.php | 4 +--
sam/lib/Form/Whitelist.php | 4 +--
sam/lib/Sam.php | 2 +-
sam/spam.php | 1 +
sam/whitelist.php | 1 +
15 files changed, 183 insertions(+), 146 deletions(-)
create mode 100644 sam/lib/Factory/Driver.php
http://git.horde.org/horde-git/-/commit/bffe01871ea28e923a6ac7e97e33c34f4aca2528
-----------------------------------------------------------------------
commit 3f0667ff76e9e03abc745cdbd4010d8791064997
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 21:13:36 2011 +0200
Convert to H4 Horde_Vfs.
sam/lib/Driver/Spamd/Ftp.php | 76 +++++++++++++++++------------------------
1 files changed, 32 insertions(+), 44 deletions(-)
http://git.horde.org/horde-git/-/commit/3f0667ff76e9e03abc745cdbd4010d8791064997
-----------------------------------------------------------------------
commit d79bdb706a903d2efd211e9cae102389501e4019
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 21:14:09 2011 +0200
PEAR_Error -> Exception
sam/blacklist.php | 7 ++++---
sam/spam.php | 7 ++++---
sam/whitelist.php | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
http://git.horde.org/horde-git/-/commit/d79bdb706a903d2efd211e9cae102389501e4019
-----------------------------------------------------------------------
commit dc83644e5d4b35fb2a934ebd86fb7e6c23149c88
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 21:25:55 2011 +0200
Application initialization, templates, menus.
sam/blacklist.php | 13 +++++++------
sam/index.php | 16 +++-------------
sam/lib/Driver.php | 3 ++-
sam/lib/Sam.php | 1 +
sam/spam.php | 13 +++++++------
sam/whitelist.php | 13 +++++++------
6 files changed, 27 insertions(+), 32 deletions(-)
http://git.horde.org/horde-git/-/commit/dc83644e5d4b35fb2a934ebd86fb7e6c23149c88
-----------------------------------------------------------------------
commit 581584558f7a2ac325fa4c68d4fc1bc89cc412ef
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 21:29:20 2011 +0200
Fix redirection.
sam/spam.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/581584558f7a2ac325fa4c68d4fc1bc89cc412ef
-----------------------------------------------------------------------
commit 2cda0d369f1b6ba065938aafc5fb1c540966fc69
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 22:04:34 2011 +0200
Convert to migrations.
The migrations use generic table names from the default schemes of
SpamAssassin/Amavis. Those are probably configurable though, so I consider
using sam_ prefixed table names like in any other Horde application. If the
user is using this migration, he doesn't use any existing tables anyway. And if
he wants to, he can still change Sam's configuration.
sam/migration/1_sam_base_tables.php | 137 +++++++++++++++++++++++++++++++++
sam/scripts/.htaccess | 1 -
sam/scripts/sql/amavisd_sql.mysql.sql | 61 ---------------
sam/scripts/sql/spamd_sql.mysql.sql | 11 ---
sam/scripts/sql/spamd_sql.pgsql.sql | 10 ---
5 files changed, 137 insertions(+), 83 deletions(-)
create mode 100644 sam/migration/1_sam_base_tables.php
delete mode 100644 sam/scripts/.htaccess
delete mode 100644 sam/scripts/sql/amavisd_sql.mysql.sql
delete mode 100644 sam/scripts/sql/spamd_sql.mysql.sql
delete mode 100644 sam/scripts/sql/spamd_sql.pgsql.sql
http://git.horde.org/horde-git/-/commit/2cda0d369f1b6ba065938aafc5fb1c540966fc69
-----------------------------------------------------------------------
commit 055d71018132f9536e23eb8729f91df9abafeb73
Author: Jan Schneider <jan at horde.org>
Date: Tue Aug 30 22:07:30 2011 +0200
Style tweaks.
sam/blacklist.php | 3 ++-
sam/spam.php | 9 ++++++---
sam/whitelist.php | 3 ++-
3 files changed, 10 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/055d71018132f9536e23eb8729f91df9abafeb73
-----------------------------------------------------------------------
commit 3d25dc27266ccc721f4f03f9e172e15f71ba3ac2
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 11:40:04 2011 +0200
Sam_Driver -> Sam_Driver_Base, remove factory and singleton.
sam/lib/Driver.php | 272 ----------------------------------------
sam/lib/Driver/Amavisd/Sql.php | 2 +-
sam/lib/Driver/Base.php | 211 +++++++++++++++++++++++++++++++
sam/lib/Driver/Spamd/Base.php | 2 +-
sam/lib/Factory/Driver.php | 4 +-
5 files changed, 215 insertions(+), 276 deletions(-)
delete mode 100644 sam/lib/Driver.php
create mode 100644 sam/lib/Driver/Base.php
http://git.horde.org/horde-git/-/commit/3d25dc27266ccc721f4f03f9e172e15f71ba3ac2
-----------------------------------------------------------------------
commit 529bc887d3436aac0ed14837981e6dae6f67b14a
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 12:17:20 2011 +0200
Remove weird constant usage.
sam/lib/Driver/Amavisd/Sql.php | 23 ++++++++++++-----------
sam/lib/Driver/Base.php | 11 +++--------
sam/lib/Driver/Spamd/Base.php | 7 -------
3 files changed, 15 insertions(+), 26 deletions(-)
http://git.horde.org/horde-git/-/commit/529bc887d3436aac0ed14837981e6dae6f67b14a
-----------------------------------------------------------------------
commit 96a35b0ef06d3908ed93c8f1e5fe798590b95f21
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:03:34 2011 +0200
Cleanup, proper OOP.
sam/lib/Driver/Amavisd/Sql.php | 305 +++++++++++++++++++---------------------
sam/lib/Driver/Base.php | 122 +++++++++--------
sam/lib/Driver/Spamd/Base.php | 48 +++----
sam/lib/Driver/Spamd/Ftp.php | 89 +++++-------
sam/lib/Driver/Spamd/Ldap.php | 45 ++-----
sam/lib/Driver/Spamd/Sql.php | 52 +++-----
6 files changed, 294 insertions(+), 367 deletions(-)
http://git.horde.org/horde-git/-/commit/96a35b0ef06d3908ed93c8f1e5fe798590b95f21
-----------------------------------------------------------------------
commit 6491a1a3a7aea8af1da9e8d8adb89154f0ae761c
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:07:31 2011 +0200
Reduce code duplication.
sam/lib/Api.php | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
http://git.horde.org/horde-git/-/commit/6491a1a3a7aea8af1da9e8d8adb89154f0ae761c
-----------------------------------------------------------------------
commit 8d7bdb42b2672d23e7c191f9130ee68516a321d8
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:23:43 2011 +0200
Fix hook calling.
sam/config/hooks.php.dist | 21 ++++++++++++++-------
sam/lib/Sam.php | 24 ++++++++++++------------
2 files changed, 26 insertions(+), 19 deletions(-)
http://git.horde.org/horde-git/-/commit/8d7bdb42b2672d23e7c191f9130ee68516a321d8
-----------------------------------------------------------------------
commit 78f42247bb4dcd770920b5ec34f352d4f16b3ba4
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:23:56 2011 +0200
Style
sam/lib/Sam.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/78f42247bb4dcd770920b5ec34f352d4f16b3ba4
-----------------------------------------------------------------------
commit 8d419c7ba3461defdfc0623d25fbaeab81e8dab7
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:34:01 2011 +0200
Reduce indention.
sam/lib/Form/Options.php | 105 +++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 52 deletions(-)
http://git.horde.org/horde-git/-/commit/8d419c7ba3461defdfc0623d25fbaeab81e8dab7
-----------------------------------------------------------------------
commit a37207791221c72d3a9d67644501ec1a255a0c82
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:34:38 2011 +0200
Consolidate duplicate code.
sam/lib/Form/Blacklist.php | 39 +++++++-----------------------------
sam/lib/Form/List.php | 46 ++++++++++++++++++++++++++++++++++++++++++++
sam/lib/Form/Whitelist.php | 39 +++++++-----------------------------
3 files changed, 62 insertions(+), 62 deletions(-)
create mode 100644 sam/lib/Form/List.php
http://git.horde.org/horde-git/-/commit/a37207791221c72d3a9d67644501ec1a255a0c82
-----------------------------------------------------------------------
commit 5bc411d27519252fb25cb22bf6f0efea25835af7
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 13:38:20 2011 +0200
Add Sam.
horde/config/registry.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/5bc411d27519252fb25cb22bf6f0efea25835af7
-----------------------------------------------------------------------
commit 476c552f1c00884776aee6840da9a472dc067888
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:43:10 2011 +0200
Default to 'full' hordeauth.
sam/config/backends.php | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/476c552f1c00884776aee6840da9a472dc067888
-----------------------------------------------------------------------
commit 7006af33c45b2c579f87993868825db107cafd90
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:47:13 2011 +0200
Use Horde::loadConfiguration().
sam/config/attributes.php | 33 +++++++++++++++++++--------------
sam/config/backends.php | 9 +++++++++
sam/lib/Sam.php | 6 +++---
3 files changed, 31 insertions(+), 17 deletions(-)
http://git.horde.org/horde-git/-/commit/7006af33c45b2c579f87993868825db107cafd90
-----------------------------------------------------------------------
commit 97ea00576d5872760d4dda2da2e4beaa31cbc308
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:50:27 2011 +0200
Remove hooks configuration, fix menu configuration.
sam/config/conf.xml | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
http://git.horde.org/horde-git/-/commit/97ea00576d5872760d4dda2da2e4beaa31cbc308
-----------------------------------------------------------------------
commit b50ad83ee7d244c3f50be51d86a2dbe9832a7ef3
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:53:01 2011 +0200
Enable rules by default.
sam/config/conf.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/b50ad83ee7d244c3f50be51d86a2dbe9832a7ef3
-----------------------------------------------------------------------
commit 64419d065734cfe2e4a5a628f03746b741068c40
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:56:42 2011 +0200
Fix syntax.
sam/lib/Form/Blacklist.php | 9 ++++-----
sam/lib/Form/Whitelist.php | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/64419d065734cfe2e4a5a628f03746b741068c40
-----------------------------------------------------------------------
commit b10f7fd03269b06756469a2fa677bbeac83929e6
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 14:57:11 2011 +0200
Fix parse errors.
sam/lib/Driver/Spamd/Ldap.php | 2 +-
sam/lib/Factory/Driver.php | 2 +-
sam/lib/Sam.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/b10f7fd03269b06756469a2fa677bbeac83929e6
-----------------------------------------------------------------------
commit 9b19ac3c4f0b00faf794259dfd996410dff6e3e7
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:43:35 2011 +0200
Catch injector exceptions.
sam/blacklist.php | 2 +-
sam/lib/Factory/Driver.php | 35 ++++++++++++++++++++++++-----------
sam/lib/Form/List.php | 7 ++++++-
sam/lib/Form/Options.php | 7 ++++++-
sam/spam.php | 2 +-
sam/whitelist.php | 2 +-
6 files changed, 39 insertions(+), 16 deletions(-)
http://git.horde.org/horde-git/-/commit/9b19ac3c4f0b00faf794259dfd996410dff6e3e7
-----------------------------------------------------------------------
commit a0ba6d4a47ad53d7b56c5808bc83ef3f4af74a0d
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:43:50 2011 +0200
Add blacklist/whitelist links.
sam/lib/Api.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/a0ba6d4a47ad53d7b56c5808bc83ef3f4af74a0d
-----------------------------------------------------------------------
commit 42822cb4a88ba7f304ee612e3d96f371e56a6620
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:44:08 2011 +0200
Fix reading prefs from FTP.
sam/lib/Driver/Spamd/Ftp.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/42822cb4a88ba7f304ee612e3d96f371e56a6620
-----------------------------------------------------------------------
commit d04ea92473f07044b3715e96b7b8e75f0fc3d853
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:44:40 2011 +0200
Fix arguments.
sam/lib/Driver/Spamd/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/d04ea92473f07044b3715e96b7b8e75f0fc3d853
-----------------------------------------------------------------------
commit 91634f7ef2dd86d3b1fef914993882be36fdbdd0
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:44:52 2011 +0200
Fix column types.
sam/migration/1_sam_base_tables.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/91634f7ef2dd86d3b1fef914993882be36fdbdd0
-----------------------------------------------------------------------
commit c7cbbd2e71cd737e2d936ae5f0aacd4bdd029eac
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:45:03 2011 +0200
Don't use disabled backends.
sam/lib/Sam.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/c7cbbd2e71cd737e2d936ae5f0aacd4bdd029eac
-----------------------------------------------------------------------
commit 505716999fdd00f451891dc935b5638a0e49a761
Merge: 2a03b51 c7cbbd2
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:45:56 2011 +0200
Merge branch 'sam-H4'
horde/config/registry.php | 8 +
sam/COPYING | 280 ++++++++++++++++
sam/README | 71 ++++
sam/blacklist.php | 71 ++++
sam/config/attributes.php | 318 ++++++++++++++++++
sam/config/backends.php | 166 ++++++++++
sam/config/conf.xml | 19 ++
sam/config/hooks.php.dist | 34 ++
sam/config/menu.php.dist | 42 +++
sam/docs/CHANGES | 141 ++++++++
sam/docs/CREDITS | 47 +++
sam/docs/INSTALL | 175 ++++++++++
sam/docs/TODO | 9 +
sam/index.php | 19 ++
sam/lib/Api.php | 56 ++++
sam/lib/Application.php | 68 ++++
sam/lib/Driver/Amavisd/Sql.php | 498 +++++++++++++++++++++++++++++
sam/lib/Driver/Base.php | 212 ++++++++++++
sam/lib/Driver/Spamd/Base.php | 76 +++++
sam/lib/Driver/Spamd/Ftp.php | 136 ++++++++
sam/lib/Driver/Spamd/Ldap.php | 137 ++++++++
sam/lib/Driver/Spamd/Sql.php | 200 ++++++++++++
sam/lib/Exception.php | 17 +
sam/lib/Factory/Driver.php | 88 +++++
sam/lib/Form/Blacklist.php | 23 ++
sam/lib/Form/List.php | 51 +++
sam/lib/Form/Options.php | 97 ++++++
sam/lib/Form/Whitelist.php | 23 ++
sam/lib/Sam.php | 129 ++++++++
sam/locale/cs/LC_MESSAGES/sam.mo | Bin 0 -> 138518 bytes
sam/locale/cs/LC_MESSAGES/sam.po | 190 +++++++++++
sam/locale/de/LC_MESSAGES/sam.mo | Bin 0 -> 159966 bytes
sam/locale/de/LC_MESSAGES/sam.po | 237 ++++++++++++++
sam/locale/en/help.xml | 266 +++++++++++++++
sam/locale/es/LC_MESSAGES/sam.mo | Bin 0 -> 153029 bytes
sam/locale/es/LC_MESSAGES/sam.po | 238 ++++++++++++++
sam/locale/es/help.xml | 214 +++++++++++++
sam/locale/et/LC_MESSAGES/sam.mo | Bin 0 -> 137544 bytes
sam/locale/et/LC_MESSAGES/sam.po | 232 ++++++++++++++
sam/locale/fi/LC_MESSAGES/sam.mo | Bin 0 -> 149020 bytes
sam/locale/fi/LC_MESSAGES/sam.po | 229 +++++++++++++
sam/locale/fi/help.xml | 190 +++++++++++
sam/locale/fr/LC_MESSAGES/sam.mo | Bin 0 -> 149817 bytes
sam/locale/fr/LC_MESSAGES/sam.po | 106 ++++++
sam/locale/it/LC_MESSAGES/sam.mo | Bin 0 -> 150491 bytes
sam/locale/it/LC_MESSAGES/sam.po | 299 +++++++++++++++++
sam/locale/nn/LC_MESSAGES/sam.mo | Bin 0 -> 25086 bytes
sam/locale/nn/LC_MESSAGES/sam.po | 91 ++++++
sam/locale/ro/LC_MESSAGES/sam.mo | Bin 0 -> 18883 bytes
sam/locale/ro/LC_MESSAGES/sam.po | 228 +++++++++++++
sam/locale/sam.pot | 236 ++++++++++++++
sam/locale/zh_TW/LC_MESSAGES/sam.mo | Bin 0 -> 129184 bytes
sam/locale/zh_TW/LC_MESSAGES/sam.po | 242 ++++++++++++++
sam/migration/1_sam_base_tables.php | 137 ++++++++
sam/spam.php | 108 +++++++
sam/themes/default/graphics/blacklist.png | Bin 0 -> 563 bytes
sam/themes/default/graphics/favicon.ico | Bin 0 -> 1150 bytes
sam/themes/default/graphics/sam.png | Bin 0 -> 187 bytes
sam/themes/default/graphics/whitelist.png | Bin 0 -> 1180 bytes
sam/themes/silver/graphics/blacklist.png | Bin 0 -> 655 bytes
sam/themes/silver/graphics/favicon.ico | Bin 0 -> 1150 bytes
sam/themes/silver/graphics/sam.png | Bin 0 -> 702 bytes
sam/themes/silver/graphics/whitelist.png | Bin 0 -> 537 bytes
sam/whitelist.php | 71 ++++
64 files changed, 6525 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/505716999fdd00f451891dc935b5638a0e49a761
-----------------------------------------------------------------------
commit b691d3c566cce3d52b2f9759b8d2874024fa3567
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 31 15:46:24 2011 +0200
BFN
sam/docs/CHANGES | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/b691d3c566cce3d52b2f9759b8d2874024fa3567
More information about the commits
mailing list