[geeklog-hg] geeklog: Fixed spam-x records_delete default for new installs an...

[geeklog-cvs at lists.geeklog.net]

changeset 9470:f1a14213ab21
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f1a14213ab21
user: Tom <websitemaster at cogeco.net>
date: Sun Feb 02 10:53:40 2014 -0500
description:
Fixed spam-x records_delete default for new installs and upgrades

diffstat:

 plugins/spamx/install_defaults.php |  5 ++++-
 plugins/spamx/install_updates.php  |  2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 9755d4a580a8 -r f1a14213ab21 plugins/spamx/install_defaults.php
--- a/plugins/spamx/install_defaults.php	Sun Feb 02 10:45:42 2014 -0500
+++ b/plugins/spamx/install_defaults.php	Sun Feb 02 10:53:40 2014 -0500
@@ -71,6 +71,9 @@
 // The max age in days to keep spamx records since there last update (0 = infinite) 
 $_SPX_DEFAULT['max_age'] = 0; 
 
+// The record types to delete when max age is reached
+$_SPX_DEFAULT['records_delete'] = array('email','IP');
+
 // If the module Stop Forum Spam is enabled
 $_SPX_DEFAULT['sfs_enabled'] = false;
 
@@ -123,7 +126,7 @@
                 0, 0, null, 50, false, 'spamx', 0);
         $c->add('max_age', $_SPX_DEFAULT['max_age'], 'text',
                         0, 0, null, 60, true, 'spamx', 0);
-        $c->add('records_delete', array('email','IP'), '%text', 0, 0, NULL, 70, TRUE, 'spamx', 0);        
+        $c->add('records_delete', $_SPX_DEFAULT['records_delete'], '%text', 0, 0, NULL, 70, TRUE, 'spamx', 0);        
 
         $c->add('tab_modules', NULL, 'tab', 0, 0, NULL, 0, true, 'spamx', 10);
         $c->add('fs_sfs', NULL, 'fieldset', 0, 0, NULL, 0, true, 'spamx', 10);
diff -r 9755d4a580a8 -r f1a14213ab21 plugins/spamx/install_updates.php
--- a/plugins/spamx/install_updates.php	Sun Feb 02 10:45:42 2014 -0500
+++ b/plugins/spamx/install_updates.php	Sun Feb 02 10:53:40 2014 -0500
@@ -55,7 +55,7 @@
                     0, 0, null, 60, true, 'spamx', 0);  
     $c->add('sfs_confidence', $_SPX_DEFAULT['sfs_confidence'], 'text',
                     0, 0, null, 20, true, 'spamx', 10); 
-    $c->add('records_delete', array('email','IP'), '%text', 0, 0, NULL, 70, TRUE, 'spamx', 0);
+    $c->add('records_delete', $_SPX_DEFAULT['records_delete'], '%text', 0, 0, NULL, 70, TRUE, 'spamx', 0);
 
     return true;
 }