[freeside-commits] freeside/FS/FS/part_export acct_sql_status.pm, 1.1.2.4, 1.1.2.5 acct_sql.pm, 1.22.2.1, 1.22.2.2

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	acct_sql_status.pm acct_sql.pm 
Log Message:
fixing option order in export to read mailbox status information, RT#15987

Index: acct_sql_status.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/acct_sql_status.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -d -r1.1.2.4 -r1.1.2.5
--- acct_sql_status.pm	15 Jan 2012 04:14:02 -0000	1.1.2.4
+++ acct_sql_status.pm	15 Jan 2012 04:22:50 -0000	1.1.2.5
@@ -4,14 +4,15 @@
 use strict;
 use warnings;
 use vars qw( %info );
+use Tie::IxHash;
 
-my $options = { %{__PACKAGE__->sql_options} };#a new hashref so we don't pollute
-delete $options->{$_} for qw( table schema static primary_key );
+tie my %options, 'Tie::IxHash', %{__PACKAGE__->sql_options};
+delete $options{$_} for qw( table schema static primary_key );
 
 %info = (
   'svc'      => 'svc_acct',
   'desc'     => 'Mailbox status information from SQL',
-  'options'  => $options,
+  'options'  => \%options,
   'nodomain' => '',
   'notes'    => <<END
 Read mailbox status information (vacation and spam settings) from an SQL

Index: acct_sql.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/acct_sql.pm,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -w -d -r1.22.2.1 -r1.22.2.2
--- acct_sql.pm	15 Jan 2012 04:14:06 -0000	1.22.2.1
+++ acct_sql.pm	15 Jan 2012 04:22:50 -0000	1.22.2.2
@@ -3,10 +3,11 @@
 
 use strict;
 use vars qw( %info );
+use Tie::IxHash;
 use FS::Record; #qw(qsearchs);
 
-my $options = { %{__PACKAGE__->sql_options} };#a new hashref so we don't pollute
-$options->{'crypt'} = { label => 'Password encryption',
+tie my %options, 'Tie::IxHash', %{__PACKAGE__->sql_options};
+$options{'crypt'} = { label => 'Password encryption',
                         type=>'select', options=>[qw(crypt md5 sha1_base64)],
                         default=>'crypt',
                       };
@@ -62,7 +63,7 @@
   'svc'      => 'svc_acct',
   'desc'     => 'Real-time export of accounts to SQL databases '.
                 '(vpopmail, Postfix+Courier IMAP, others?)',
-  'options'  => $options,
+  'options'  => \%options,
   'nodomain' => '',
   'notes'    => <<END
 Export accounts (svc_acct records) to SQL databases.  Currently has default