diff options
| author | ivan <ivan> | 2010-08-17 06:41:29 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-08-17 06:41:29 +0000 |
| commit | 4cf169cc5a1de8b1ab40f88b1ee388efca7fedaf (patch) | |
| tree | 1ac24a66701b30a0582450c36c805338b56b0824 | |
| parent | 9d8d3c6e4a2d2e757150402b8a89c719b8c1013f (diff) | |
LEAVE is reserved in msyql
| -rw-r--r-- | FS/FS/Schema.pm | 2 | ||||
| -rw-r--r-- | FS/FS/acct_snarf.pm | 8 | ||||
| -rw-r--r-- | httemplate/edit/acct_snarf.html | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 076be7e..cc6438a 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2181,7 +2181,7 @@ sub tables_hashref { 'username', 'varchar', '', $char_d, '', '', '_password', 'varchar', '', $char_d, '', '', 'check_freq', 'int', 'NULL', '', '', '', - 'leave', 'char', 'NULL', 1, '', '', + 'leavemail', 'char', 'NULL', 1, '', '', 'apop', 'char', 'NULL', 1, '', '', 'tls', 'char', 'NULL', 1, '', '', 'mailbox', 'varchar', 'NULL', $char_d, '', '', diff --git a/FS/FS/acct_snarf.pm b/FS/FS/acct_snarf.pm index 480a632..9816de9 100644 --- a/FS/FS/acct_snarf.pm +++ b/FS/FS/acct_snarf.pm @@ -142,7 +142,7 @@ sub check { || $self->ut_alphan('protocol') || $self->ut_textn('username') || $self->ut_numbern('check_freq') - || $self->ut_enum('leave', [ '', 'Y' ]) + || $self->ut_enum('leavemail', [ '', 'Y' ]) || $self->ut_enum('apop', [ '', 'Y' ]) || $self->ut_enum('tls', [ '', 'Y' ]) || $self->ut_alphan('mailbox') @@ -195,9 +195,9 @@ sub cgp_hashref { 'domain' => $self->machine, 'password' => $self->_password, 'period' => $self->check_freq.'s', - 'APOP' => ( $self->apop eq 'Y' ? 'YES' : 'NO' ), - 'TLS' => ( $self->tls eq 'Y' ? 'YES' : 'NO' ), - 'Leave' => ( $self->leave eq 'Y' ? 'YES' : 'NO' ), #XXX leave?? + 'APOP' => ( $self->apop eq 'Y' ? 'YES' : 'NO' ), + 'TLS' => ( $self->tls eq 'Y' ? 'YES' : 'NO' ), + 'Leave' => ( $self->leavemail eq 'Y' ? 'YES' : 'NO' ), #XXX leave?? }; } diff --git a/httemplate/edit/acct_snarf.html b/httemplate/edit/acct_snarf.html index 5fd3f83..1c815b2 100644 --- a/httemplate/edit/acct_snarf.html +++ b/httemplate/edit/acct_snarf.html @@ -9,7 +9,7 @@ 'username' => 'Username', '_password' => 'Password', 'check_freq' => 'Poll every', - 'leave' => 'Leave', + 'leavemail' => 'Leave', 'apop' => 'Use APOP', 'tls' => 'TLS', 'mailbox' => 'Mailbox', @@ -26,9 +26,9 @@ 'options' => [ keys %$cf_labels ], 'labels' => $cf_labels, }, - { field=>'leave', type=>'checkbox', value=>'Y', }, - { field=>'apop', type=>'checkbox', value=>'Y', }, - { field=>'tls', type=>'checkbox', value=>'Y', }, + { field=>'leavemail', type=>'checkbox', value=>'Y' }, + { field=>'apop', type=>'checkbox', value=>'Y' }, + { field=>'tls', type=>'checkbox', value=>'Y' }, 'mailbox', ], 'new_callback' => sub { my( $cgi, $acct_snarf ) = @_; |