[sam] patch to bring sam up to spamassassin 3.x ...

[Jan Schneider]

http://bugs.horde.org/ticket/?id=3071

Zitat von "Marc G. Fournier" <scrappy at hub.org>:

>
> Spamassassin 3.x got rid of rewrite_subject, and replaced it with
> rewrite_header subject <tag> ... the following patch fixes things so that
> things are setup right in the SQL database:
>
> diff -cr sam/config/attributes.php.dist sam.n/config/attributes.php.dist
> *** sam/config/attributes.php.dist      Thu Dec  8 02:50:24 2005
> --- sam.n/config/attributes.php.dist    Thu Dec  8 05:35:10 2005
> ***************
> *** 74,87 ****
>        'type' => 'number',
>        'required' => false,
>    );
> ! $_attributes['subject_tag'] = array(
>        'label' => _("Subject Tag"),
>        'type' => 'text',
> -     'required' => false,
> - );
> - $_attributes['rewrite_sub'] = array(
> -     'label' => _("Rewrite Subject"),
> -     'type' => 'boolean',
>        'required' => false,
>    );
>    // As an alternative UI, all boolean types may be configured as   
> radio buttons.
> --- 74,82 ----
>        'type' => 'number',
>        'required' => false,
>    );
> ! $_attributes['rewrite_subject'] = array(
>        'label' => _("Subject Tag"),
>        'type' => 'text',
>        'required' => false,
>    );
>    // As an alternative UI, all boolean types may be configured as   
> radio buttons.
> diff -cr sam/lib/Driver/spamd.php sam.n/lib/Driver/spamd.php
> *** sam/lib/Driver/spamd.php    Thu Dec  8 02:50:25 2005
> --- sam.n/lib/Driver/spamd.php  Thu Dec  8 05:35:48 2005
> ***************
> *** 34,41 ****
>         */
>        var $_capabilities = array('hit_level',
>                                   'report_safe',
> !                                'rewrite_sub',
> !                                'subject_tag',
>                                   'skip_rbl',
>                                   'whitelist_to',
>                                   'whitelist_from',
> --- 34,40 ----
>         */
>        var $_capabilities = array('hit_level',
>                                   'report_safe',
> !                                'rewrite_subject',
>                                   'skip_rbl',
>                                   'whitelist_to',
>                                   'whitelist_from',
> ***************
> *** 48,54 ****
>         * @var array
>         */
>        var $_option_map = array('hit_level' => 'required_hits',
> !                              'rewrite_sub' => 'rewrite_subject',
>                                 'skip_rbl' => 'skip_rbl_checks');
>
>        /**
> --- 47,53 ----
>         * @var array
>         */
>        var $_option_map = array('hit_level' => 'required_hits',
> !                              'rewrite_subject' => 'rewrite_header subject',
>                                 'skip_rbl' => 'skip_rbl_checks');
>
>        /**
>
>
>
> ----
> Marc G. Fournier           Hub.Org Networking Services (http://www.hub.org)
> Email: scrappy at hub.org           Yahoo!: yscrappy              ICQ: 7615664
> --
> sam mailing list - Join the hunt: http://horde.org/bounties/#sam
> Frequently Asked Questions: http://horde.org/faq/
> To unsubscribe, mail: sam-unsubscribe at lists.horde.org
>
>



Jan.

-- 
Do you need professional PHP or Horde consulting?
http://horde.org/consulting/