[pkg-horde] [COMMIT reg sam--upstream--0--patch-2] Import CVS upstream of SAM 0.1

[Lionel Elie Mamane]

A  {arch}/sam/sam--upstream/sam--upstream--0/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
M  blacklist.php
M  whitelist.php
M  spam.php
M  config/backends.php.dist
M  lib/Driver/spamd_ldap.php

--- /dev/null
+++ {arch}/sam/sam--upstream/sam--upstream--0/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
@@ -0,0 +1,15 @@
+Revision: sam--upstream--0--patch-2
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Gregory Colpart <reg at evolix.fr>
+Date: Fri Mar 17 03:27:31 CET 2006
+Standard-date: 2006-03-17 02:27:31 GMT
+Modified-files: blacklist.php config/backends.php.dist
+    lib/Driver/spamd_ldap.php spam.php whitelist.php
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-2
+Summary: Import CVS upstream of SAM 0.1
+Keywords: 
+
+Imported sam
+into pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0
+
+


--- orig/blacklist.php
+++ mod/blacklist.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: sam/blacklist.php,v 1.22 2006/01/01 21:11:49 jan Exp $
+ * $Horde: sam/blacklist.php,v 1.23 2006/03/05 04:41:08 chuck Exp $
  *
  * Copyright 2002-2006 Chris Bowlby <excalibur at hub.org>
  *
@@ -23,9 +23,9 @@
 }
 
 /* Initialize the form. */
-$vars = &Variables::getDefaultVariables();
-$form = &Horde_Form::singleton('BlacklistForm', $vars);
-$renderer = &new Horde_Form_Renderer();
+$vars = Variables::getDefaultVariables();
+$form = new BlacklistForm($vars);
+$renderer = new Horde_Form_Renderer();
 $renderer->setAttrColumnWidth('25%');
 $defaults = false;
 


--- orig/whitelist.php
+++ mod/whitelist.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: sam/whitelist.php,v 1.22 2006/01/01 21:11:49 jan Exp $
+ * $Horde: sam/whitelist.php,v 1.23 2006/03/05 04:41:08 chuck Exp $
  *
  * Copyright 2002-2006 Chris Bowlby <excalibur at hub.org>
  *
@@ -23,9 +23,9 @@
 }
 
 /* Initialize the form. */
-$vars = &Variables::getDefaultVariables();
-$form = &Horde_Form::singleton('WhitelistForm', $vars);
-$renderer = &new Horde_Form_Renderer();
+$vars = Variables::getDefaultVariables();
+$form = new WhitelistForm($vars);
+$renderer = new Horde_Form_Renderer();
 $renderer->setAttrColumnWidth('25%');
 $defaults = false;
 


--- orig/spam.php
+++ mod/spam.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: sam/spam.php,v 1.15 2006/01/13 19:52:05 jan Exp $
+ * $Horde: sam/spam.php,v 1.16 2006/03/05 04:41:08 chuck Exp $
  * Copyright 2002-2006 Chris Bowlby <excalibur at hub.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
@@ -28,9 +28,9 @@
 }
 
 /* Initialize the form. */
-$vars = &Variables::getDefaultVariables();
-$form = &Horde_Form::singleton('OptionsForm', $vars);
-$renderer = &new Horde_Form_Renderer();
+$vars = Variables::getDefaultVariables();
+$form = new OptionsForm($vars);
+$renderer = new Horde_Form_Renderer();
 $renderer->setAttrColumnWidth('25%');
 $defaults = false;
 


--- orig/config/backends.php.dist
+++ mod/config/backends.php.dist
@@ -57,13 +57,13 @@
         'basedn' => 'ou=users,dc=example,dc=com',
         'attribute' => 'spamassassinConfig',
         'uid' => 'uid',
-        ),
     'defaults' => array(
         'hit_level' => '5',
         'subject_tag' => '***SPAM***',
         'rewrite_sub' => 1,
         'report_safe' => 1,
         'skip_rbl' => 1,
+        ),
     ),
 );
 


--- orig/lib/Driver/spamd_ldap.php
+++ mod/lib/Driver/spamd_ldap.php
@@ -30,7 +30,7 @@
  * @since   SAM 0.1
  * @package Sam
  */
-class SAM_Driver_spamd_ldap extends SAM_Driver {
+class SAM_Driver_spamd_ldap extends SAM_Driver_spamd {
 
     /**
      * Handle for the current LDAP connection.