X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export.pm;h=033840aebbd416930d51c1a265b9014746ed18cb;hb=ab9f512842cf99736a92d8f3c1031e45bacc26fb;hp=01e71c0ed8eb510ecb886b32c49c9e7a2d1904cf;hpb=dc77b9285fd9bd9a9594b5d6abf82a5a69e1097c;p=freeside.git
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 01e71c0ed..033840aeb 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -274,10 +274,6 @@ sub check {
;
return $error if $error;
- $self->machine =~ /^([\w\-\.]*)$/
- or return "Illegal machine: ". $self->machine;
- $self->machine($1);
-
$self->nodomain =~ /^(Y?)$/ or return "Illegal nodomain: ". $self->nodomain;
$self->nodomain($1);
@@ -580,13 +576,13 @@ tie my %shellcommands_options, 'Tie::IxHash',
type =>'checkbox',
},
'suspend' => { label=>'Suspension command',
- default=>'',
+ default=>'usermod -L $username',
},
'suspend_stdin' => { label=>'Suspension command STDIN',
default=>'',
},
'unsuspend' => { label=>'Unsuspension command',
- default=>'',
+ default=>'usermod -U $username',
},
'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
default=>'',
@@ -702,12 +698,20 @@ tie my %sqlradius_options, 'Tie::IxHash',
'datasrc' => { label=>'DBI data source ' },
'username' => { label=>'Database username' },
'password' => { label=>'Database password' },
+ 'ignore_accounting' => {
+ type => 'checkbox',
+ label=>'Ignore accounting records from this database'
+ },
;
tie my %sqlradius_withdomain_options, 'Tie::IxHash',
'datasrc' => { label=>'DBI data source ' },
'username' => { label=>'Database username' },
'password' => { label=>'Database password' },
+ 'ignore_accounting' => {
+ type => 'checkbox',
+ label=>'Ignore accounting records from this database'
+ },
;
tie my %cyrus_options, 'Tie::IxHash',
@@ -758,6 +762,24 @@ tie my %communigate_pro_options, 'Tie::IxHash',
},
;
+tie my %communigate_pro_singledomain_options, 'Tie::IxHash',
+ 'port' => { label=>'Port number', default=>'106', },
+ 'login' => { label=>'The administrator account name. The name can contain a domain part.', },
+ 'password' => { label=>'The administrator account password.', },
+ 'domain' => { label=>'Domain', },
+ 'accountType' => { label=>'Type for newly-created accounts',
+ type=>'select',
+ options=>[qw( MultiMailbox TextMailbox MailDirMailbox )],
+ default=>'MultiMailbox',
+ },
+ 'externalFlag' => { label=> 'Create accounts with an external (visible for legacy mailers) INBOX.',
+ type=>'checkbox',
+ },
+ 'AccessModes' => { label=>'Access modes',
+ default=>'Mail POP IMAP PWD WebMail WebSite',
+ },
+;
+
tie my %bind_options, 'Tie::IxHash',
#'machine' => { label=>'named machine' },
'named_conf' => { label => 'named.conf location',
@@ -913,7 +935,7 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
'options' => \%shellcommands_options,
'nodomain' => 'Y',
- 'notes' => 'Run remote commands via SSH. Usernames are considered unique (also see shellcommands_withdomain). You probably want this if the commands you are running will not accept a domain as a parameter. You will need to setup SSH for unattended operation.
Use these buttons for some useful presets:The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): $username$_password$quoted_password - unencrypted password quoted for the shell$crypt_password - encrypted password$uid$gid$finger - GECOS, already quoted for the shell (do not add additional quotes)$dir - home directory$shell$quota- All other fields in svc_acct are also available.
',
+ 'notes' => 'Run remote commands via SSH. Usernames are considered unique (also see shellcommands_withdomain). You probably want this if the commands you are running will not accept a domain as a parameter. You will need to setup SSH for unattended operation.
Use these buttons for some useful presets:The following variables are available for interpolation (prefixed with new_ or old_ for replace operations): $username$_password$quoted_password - unencrypted password quoted for the shell$crypt_password - encrypted password$uid$gid$finger - GECOS, already quoted for the shell (do not add additional quotes)$dir - home directory$shell$quota- All other fields in svc_acct are also available.
',
},
'shellcommands_withdomain' => {
@@ -978,7 +1000,14 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
'communigate_pro' => {
'desc' => 'Real-time export to a CommuniGate Pro mail server',
'options' => \%communigate_pro_options,
- 'notes' => 'Real time export to a mail server. The CommuniGate Pro Perl Interface must be installed as CGP::CLI.',
+ 'notes' => 'Real time export to a CommuniGate Pro mail server. The CommuniGate Pro Perl Interface must be installed as CGP::CLI.',
+ },
+
+ 'communigate_pro_singledomain' => {
+ 'desc' => 'Real-time export to a CommuniGate Pro mail server, one domain only',
+ 'options' => \%communigate_pro_singledomain_options,
+ 'nodomain' => 'Y',
+ 'notes' => 'Real time export to a CommuniGate Pro mail server. This is an unusual export to CommuniGate Pro that forces all accounts into a single domain. As CommuniGate Pro supports multiple domains, unless you have a specific reason for using this export, you probably want to use the communigate_pro export instead. The CommuniGate Pro Perl Interface must be installed as CGP::CLI.',
},
},
@@ -1055,6 +1084,10 @@ tie my %forward_shellcommands_options, 'Tie::IxHash',
'notes' => '',
},
},
+
+ 'svc_external' => {
+ },
+
);
=back