diff options
author | ivan <ivan> | 2012-01-15 04:22:50 +0000 |
---|---|---|
committer | ivan <ivan> | 2012-01-15 04:22:50 +0000 |
commit | ffbcf0363fb3c17e33ccb90de0b3ad2dd6b14fb5 (patch) | |
tree | c4b204bdfc451c696280b07d0e86fc8c432dd353 | |
parent | 2c2cbb6a21e294dcd10a2c1ffdb560291deefc41 (diff) |
fixing option order in export to read mailbox status information, RT#15987
-rw-r--r-- | FS/FS/part_export/acct_sql.pm | 13 | ||||
-rw-r--r-- | 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 e5e9d7e..ffe39ca 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 bcc1e01..78a086c 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 |