X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_domain.pm;h=2a24da427ac5c9b18a61f3ec3c324799ac37e02b;hp=758b399be5a0612fc7713d017e8cd0067a2de579;hb=7a8c7b6f64ac14d555d866f93300e64c47b74a98;hpb=802b846f6572d188cff3e4c2c84739a192179ac6 diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm index 758b399be..2a24da427 100644 --- a/FS/FS/svc_domain.pm +++ b/FS/FS/svc_domain.pm @@ -6,6 +6,7 @@ use vars qw( @ISA $whois_hack $conf $soarefresh $soaretry ); use Carp; +use Scalar::Util qw( blessed ); use Date::Format; #use Net::Whois::Raw; use Net::Domain::TLD qw(tld_exists); @@ -88,6 +89,8 @@ FS::svc_Common. The following fields are currently supported: =item expiration_date - UNIX timestamp +=item max_accounts + =back =head1 METHODS @@ -108,6 +111,204 @@ sub table_info { 'cancel_weight' => 60, 'fields' => { 'domain' => 'Domain', + 'parent_svcnum' => { + label => 'Parent domain / Communigate administrator domain', + type => 'select', + select_table => 'svc_domain', + select_key => 'svcnum', + select_label => 'domain', + disable_inventory => 1, + disable_select => 1, + }, + 'max_accounts' => { label => 'Maximum number of accounts', + 'disable_inventory' => 1, + }, + 'cgp_aliases' => { + label => 'Communigate aliases', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'cgp_accessmodes' => { + label => 'Communigate enabled services', + type => 'communigate_pro-accessmodes', + disable_inventory => 1, + disable_select => 1, + }, + + 'acct_def_cgp_accessmodes' => { + label => 'Acct. default Communigate enabled services', + type => 'communigate_pro-accessmodes', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_password_selfchange' => { label => 'Acct. default Password modification', + type => 'checkbox', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_password_recover' => { label => 'Acct. default Password recovery', + type => 'checkbox', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_deletemode' => { + label => 'Acct. default Communigate message delete method', + type => 'select', + select_list => [ 'Move To Trash', 'Immediately', 'Mark' ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_emptytrash' => { + label => 'Acct. default Communigate on logout remove trash', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_quota' => { + label => 'Acct. default Quota', #Mail storage limit + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_file_quota'=> { + label => 'Acct. default File storage limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_file_maxnum'=> { + label => 'Acct. default Number of files limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_file_maxsize'=> { + label => 'Acct. default File size limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_rulesallowed' => { + label => 'Acct. default Allowed mail rules', + type => 'select', + select_list => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_rpopallowed' => { + label => 'Acct. default RPOP modifications', + type => 'checkbox', + }, + 'acct_def_cgp_mailtoall' => { + label => 'Acct. default Accepts mail to "all"', + type => 'checkbox', + }, + 'acct_def_cgp_addmailtrailer' => { + label => 'Acct. default Add trailer to sent mail', + type => 'checkbox', + }, + 'trailer' => { + label => 'Mail trailer', + type => 'textarea', + }, + 'acct_def_cgp_language' => { + label => 'Acct. default language', + type => 'select', + select_list => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_timezone' => { + label => 'Acct. default time zone', + type => 'select', + select_list => [ '', + 'HostOS', + '(+0100) Algeria/Congo', + '(+0200) Egypt/South Africa', + '(+0300) Saudi Arabia', + '(+0400) Oman', + '(+0500) Pakistan', + '(+0600) Bangladesh', + '(+0700) Thailand/Vietnam', + '(+0800) China/Malaysia', + '(+0900) Japan/Korea', + '(+1000) Queensland', + '(+1100) Micronesia', + '(+1200) Fiji', + '(+1300) Tonga/Kiribati', + '(+1400) Christmas Islands', + '(-0100) Azores/Cape Verde', + '(-0200) Fernando de Noronha', + '(-0300) Argentina/Uruguay', + '(-0400) Venezuela/Guyana', + '(-0500) Haiti/Peru', + '(-0600) Central America', + '(-0700) Arisona', + '(-0800) Adamstown', + '(-0900) Marquesas Islands', + '(-1000) Hawaii/Tahiti', + '(-1100) Samoa', + 'Asia/Afghanistan', + 'Asia/India', + 'Asia/Iran', + 'Asia/Iraq', + 'Asia/Israel', + 'Asia/Jordan', + 'Asia/Lebanon', + 'Asia/Syria', + 'Australia/Adelaide', + 'Australia/East', + 'Australia/NorthernTerritory', + 'Europe/Central', + 'Europe/Eastern', + 'Europe/Moscow', + 'Europe/Western', + 'GMT (+0000)', + 'Newfoundland', + 'NewZealand/Auckland', + 'NorthAmerica/Alaska', + 'NorthAmerica/Atlantic', + 'NorthAmerica/Central', + 'NorthAmerica/Eastern', + 'NorthAmerica/Mountain', + 'NorthAmerica/Pacific', + 'Russia/Ekaterinburg', + 'Russia/Irkutsk', + 'Russia/Kamchatka', + 'Russia/Krasnoyarsk', + 'Russia/Magadan', + 'Russia/Novosibirsk', + 'Russia/Vladivostok', + 'Russia/Yakutsk', + 'SouthAmerica/Brasil', + 'SouthAmerica/Chile', + 'SouthAmerica/Paraguay', + ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_skinname' => { + label => 'Acct. default layout', + type => 'select', + select_list => [ '', '***', 'GoldFleece', 'Skin2' ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_prontoskinname' => { + label => 'Acct. default Pronto style', + type => 'select', + select_list => [ '', 'Pronto', 'Pronto-darkflame', 'Pronto-steel', 'Pronto-twilight', ], + disable_inventory => 1, + disable_select => 1, + }, + 'acct_def_cgp_sendmdnmode' => { + label => 'Acct. default send read receipts', + type => 'select', + select_list => [ '', 'Never', 'Manually', 'Automatically' ], + disable_inventory => 1, + disable_select => 1, + }, }, }; } @@ -139,8 +340,8 @@ otherwise returns false. The additional fields I and I (see L) should be defined. An FS::cust_svc record will be created and inserted. -The additional field I should be set to I for new domains or I -for transfers. +The additional field I should be set to I for new domains, I +for transfers, or I for no action (registered elsewhere). A registration or transfer email will be submitted unless $FS::svc_domain::whois_hack is true. @@ -180,13 +381,6 @@ sub insert { local $FS::UID::AutoCommit = 0; my $dbh = dbh; - $error = $self->check; - return $error if $error; - - return "Domain in use (here)" - if qsearchs( 'svc_domain', { 'domain' => $self->domain } ); - - $error = $self->SUPER::insert(@_); if ( $error ) { $dbh->rollback if $oldAutoCommit; @@ -289,16 +483,18 @@ returns the error, otherwise returns false. =cut sub replace { - my ( $new, $old ) = ( shift, shift ); + my $new = shift; - # We absolutely have to have an old vs. new record to make this work. - $old = $new->replace_old unless defined($old); + my $old = ( blessed($_[0]) && $_[0]->isa('FS::Record') ) + ? shift + : $new->replace_old; return "Can't change domain - reorder." - if $old->getfield('domain') ne $new->getfield('domain'); + if $old->getfield('domain') ne $new->getfield('domain') + && ! $conf->exists('svc_domain-edit_domain'); # Better to do it here than to force the caller to remember that svc_domain is weird. - $new->setfield(action => 'M'); + $new->setfield(action => 'I'); my $error = $new->SUPER::replace($old, @_); return $error if $error; } @@ -340,6 +536,32 @@ sub check { my $error = $self->ut_numbern('svcnum') || $self->ut_numbern('catchall') + || $self->ut_numbern('max_accounts') + || $self->ut_anything('trailer') #well + || $self->ut_textn('cgp_aliases') #well + || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ]) + || $self->ut_enum('acct_def_password_recover', [ '', 'Y' ]) + || $self->ut_textn('acct_def_cgp_accessmodes') + || $self->ut_alphan('acct_def_quota') + || $self->ut_alphan('acct_def_file_quota') + || $self->ut_alphan('acct_def_maxnum') + || $self->ut_alphan('acct_def_maxsize') + #settings + || $self->ut_alphasn('acct_def_cgp_rulesallowed') + || $self->ut_enum('acct_def_cgp_rpopallowed', [ '', 'Y' ]) + || $self->ut_enum('acct_def_cgp_mailtoall', [ '', 'Y' ]) + || $self->ut_enum('acct_def_cgp_addmailtrailer', [ '', 'Y' ]) + #XXX archive messages + #preferences + || $self->ut_alphasn('acct_def_cgp_deletemode') + || $self->ut_alphan('acct_def_cgp_emptytrash') + || $self->ut_alphan('acct_def_cgp_language') + || $self->ut_textn('acct_def_cgp_timezone') + || $self->ut_textn('acct_def_cgp_skinname') + || $self->ut_textn('acct_def_cgp_prontoskinname') + || $self->ut_alphan('acct_def_cgp_sendmdnmode') + #mail + #XXX rules, archive rule, spam foldering rule(s) ; return $error if $error; @@ -386,11 +608,22 @@ sub check { or $self->ut_numbern('setup_date') or $self->ut_numbern('renewal_interval') or $self->ut_numbern('expiration_date') - or $self->ut_textn('purpose') or $self->SUPER::check; } +sub _check_duplicate { + my $self = shift; + + $self->lock_table; + + if ( qsearchs( 'svc_domain', { 'domain' => $self->domain } ) ) { + return "Domain in use (here)"; + } else { + return ''; + } +} + =item domain_record =cut @@ -423,6 +656,7 @@ sub domain_record { 'PTR' => sub { $_[0]->reczone <=> $_[1]->reczone }, ); + map { $_ } #return $self->num_domain_record( PARAMS ) unless wantarray; sort { $order{$a->rectype} <=> $order{$b->rectype} or &{ $sort{$a->rectype} || sub { 0; } }($a, $b) }