From 6b06edae106b8391da872e6e60a48dcf9b12158a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Jan 2012 04:22:51 +0000
Subject: [PATCH] fixing option order in export to read mailbox status
 information, RT#15987

---
 FS/FS/part_export/acct_sql.pm        | 13 +++++++------
 FS/FS/part_export/acct_sql_status.pm |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index e5e9d7e38..ffe39caa5 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -3,13 +3,14 @@ use base qw( FS::part_export::sql_Common );
 
 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',
-                        type=>'select', options=>[qw(crypt md5 sha1_base64)],
-                        default=>'crypt',
-                      };
+tie my %options, 'Tie::IxHash', %{__PACKAGE__->sql_options};
+$options{'crypt'} = { label => 'Password encryption',
+                      type=>'select', options=>[qw(crypt md5 sha1_base64)],
+                      default=>'crypt',
+                    };
 
 tie my %vpopmail_map, 'Tie::IxHash',
   'pw_name'   => 'username',
@@ -62,7 +63,7 @@ my $postfix_native_mailbox_map =
   '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
diff --git a/FS/FS/part_export/acct_sql_status.pm b/FS/FS/part_export/acct_sql_status.pm
index bcc1e0116..78a086c3e 100644
--- a/FS/FS/part_export/acct_sql_status.pm
+++ b/FS/FS/part_export/acct_sql_status.pm
@@ -4,14 +4,15 @@ use base qw( FS::part_export::sql_Common );
 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
-- 
2.11.0