[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.45, 1.168.2.46 acct_snarf.pm, 1.3, 1.3.8.1 Mason.pm, 1.19.2.13, 1.19.2.14

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv10163/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm acct_snarf.pm Mason.pm 
Log Message:
communigate phase 3: RPOP/acct_snarf, RT#7515

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.45
retrieving revision 1.168.2.46
diff -u -w -d -r1.168.2.45 -r1.168.2.46
--- Schema.pm	6 Aug 2010 21:28:02 -0000	1.168.2.45
+++ Schema.pm	7 Aug 2010 07:39:06 -0000	1.168.2.46
@@ -2004,12 +2004,18 @@
 
     'acct_snarf' => {
       'columns' => [
-        'snarfnum',  'int', '', '', '', '', 
+        'snarfnum',    'serial',     '',      '', '', '', 
+        'snarfname',  'varchar', 'NULL', $char_d, '', '', 
         'svcnum',    'int', '', '', '', '', 
         'machine',   'varchar', '', 255, '', '', 
         'protocol',  'varchar', '', $char_d, '', '', 
         'username',  'varchar', '', $char_d, '', '', 
         '_password', 'varchar', '', $char_d, '', '', 
+        'check_freq',     'int', 'NULL',      '', '', '', 
+        'leave',         'char', 'NULL',       1, '', '', 
+        'apop',          'char', 'NULL',       1, '', '', 
+        'tls',           'char', 'NULL',       1, '', '', 
+        'mailbox',    'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'snarfnum',
       'unique' => [],

Index: acct_snarf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/acct_snarf.pm,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -w -d -r1.3 -r1.3.8.1
--- acct_snarf.pm	25 Oct 2003 02:05:44 -0000	1.3
+++ acct_snarf.pm	7 Aug 2010 07:39:06 -0000	1.3.8.1
@@ -2,6 +2,7 @@
 
 use strict;
 use vars qw( @ISA );
+use Tie::IxHash;
 use FS::Record;
 
 @ISA = qw( FS::Record );
@@ -35,6 +36,8 @@
 
 =item snarfnum - primary key
 
+=item snarfname - Label
+
 =item svcnum - Account (see L<FS::svc_acct>)
 
 =item machine - external machine to download mail from
@@ -100,11 +103,17 @@
   my $self = shift;
   my $error =
        $self->ut_numbern('snarfnum')
+    || $self->ut_textn('snarfname') #alphasn?
     || $self->ut_number('svcnum')
     || $self->ut_foreign_key('svcnum', 'svc_acct', 'svcnum')
     || $self->ut_domain('machine')
     || $self->ut_alphan('protocol')
     || $self->ut_textn('username')
+    || $self->ut_numbern('check_freq')
+    || $self->ut_enum('leave', [ '', 'Y' ])
+    || $self->ut_enum('apop', [ '', 'Y' ])
+    || $self->ut_enum('tls', [ '', 'Y' ])
+    || $self->ut_alphan('mailbox')
   ;
   return $error if $error;
 
@@ -114,6 +123,32 @@
   ''; #no error
 }
 
+sub check_freq_labels {
+
+  tie my %hash, 'Tie::IxHash',
+    0 => 'Never',
+    60 => 'minute',
+    120 => '2 minutes',
+    180 => '3 minutes',
+    300 => '5 minutes',
+    600 => '10 minutes',
+    900 => '15 minutes',
+    1800 => '30 minutes',
+    3600 => 'hour',
+    7200 => '2 hours',
+    10800 => '3 hours',
+    21600 => '6 hours',
+    43200 => '12 hours',
+    86400 => 'day',
+    172800 => '2 days',
+    259200 => '3 days',
+    604800 => 'week',
+    1000000000 => 'Disabled',
+  ;
+
+  \%hash;
+}
+
 =back
 
 =head1 BUGS

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.19.2.13
retrieving revision 1.19.2.14
diff -u -w -d -r1.19.2.13 -r1.19.2.14
--- Mason.pm	3 Aug 2010 03:30:34 -0000	1.19.2.13
+++ Mason.pm	7 Aug 2010 07:39:06 -0000	1.19.2.14
@@ -231,6 +231,7 @@
   use FS::cgp_rule_action;
   use FS::msg_template;
   use FS::part_tag;
+  use FS::acct_snarf;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {