X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_domain.pm;h=78556cf8b70222c19f6e7a74bf69436023c837ad;hp=dd4f2c52f8d5a333b68ecf34f424c014c982b4f1;hb=ad3bcb39580173f0ac1b6357cb49515d48af7ddf;hpb=ad84bf7cfdb56aa1fe268ea315b7a2f7dd768db2 diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm index dd4f2c52f..78556cf8b 100644 --- a/FS/FS/svc_domain.pm +++ b/FS/FS/svc_domain.pm @@ -1,7 +1,9 @@ package FS::svc_domain; use strict; -use vars qw( @ISA $whois_hack $conf +use base qw( FS::svc_Parent_Mixin FS::svc_CGP_Mixin FS::svc_CGPRule_Mixin + FS::svc_Common ); +use vars qw( $whois_hack $conf @defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine $soarefresh $soaretry ); @@ -12,8 +14,6 @@ use Date::Format; use Net::Domain::TLD qw(tld_exists); use FS::Record qw(fields qsearch qsearchs dbh); use FS::Conf; -use FS::svc_Common; -use FS::svc_Parent_Mixin; use FS::cust_svc; use FS::svc_acct; use FS::cust_pkg; @@ -21,8 +21,6 @@ use FS::cust_main; use FS::domain_record; use FS::queue; -@ISA = qw( FS::svc_Parent_Mixin FS::svc_Common ); - #ask FS::UID to run this stuff for us later $FS::UID::callback{'FS::domain'} = sub { $conf = new FS::Conf; @@ -69,25 +67,53 @@ FS::svc_Common. The following fields are currently supported: =over 4 -=item svcnum - primary key (assigned automatically for new accounts) +=item svcnum + +primary key (assigned automatically for new accounts) =item domain -=item catchall - optional svcnum of an svc_acct record, designating an email catchall account. +=item catchall + +optional svcnum of an svc_acct record, designating an email catchall account. + +=item suffix + +=item parent_svcnum + +=item quota + +Storage limit + +=item registrarnum + +Registrar (see L) + +=item registrarkey + +Registrar key or password for this domain + +=item setup_date + +UNIX timestamp + +=item renewal_interval -=item suffix - +Number of days before expiration date to start renewal -=item parent_svcnum - +=item expiration_date -=item registrarnum - Registrar (see L) +UNIX timestamp -=item registrarkey - Registrar key or password for this domain +=item max_accounts -=item setup_date - UNIX timestamp +=item au_eligibility_type -=item renewal_interval - Number of days before expiration date to start renewal +AU-specific field for domain registrations -=item expiration_date - UNIX timestamp +=item au_registrant_name + +AU-specific field for domain registrations =back @@ -108,7 +134,192 @@ sub table_info { 'display_weight' => 20, 'cancel_weight' => 60, 'fields' => { - 'domain' => 'Domain', + 'domain' => { + label => 'Domain', + required => 1, + }, + '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, + }, + 'au_registrant_name' => { label => 'AU Registrant Name', + disable_inventory => 1, + disable_select => 1, + }, + 'au_eligibility_type' => { label => 'AU Eligibility Type', + type => 'select', + select_list => __PACKAGE__->au_eligibility_type_values, + disable_inventory => 1, + disable_select => 1, + }, + 'max_accounts' => { label => 'Maximum number of accounts', + 'disable_inventory' => 1, + }, + 'quota' => { + label => 'Quota', #storage limit + type => 'text', + 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, + }, + 'cgp_certificatetype' => { + label => 'Communigate PKI services', + type => 'select', + select_list => __PACKAGE__->cgp_certificatetype_values, + 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 => 'select', + select_list => __PACKAGE__->cgp_emptytrash_values, + 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', + }, + 'acct_def_cgp_archiveafter' => { + label => 'Archive messages after', + type => 'select', + select_hash => [ + -2 => 'default(730 days)', + 0 => 'Never', + 86400 => '24 hours', + 172800 => '2 days', + 259200 => '3 days', + 432000 => '5 days', + 604800 => '7 days', + 1209600 => '2 weeks', + 2592000 => '30 days', + 7776000 => '90 days', + 15552000 => '180 days', + 31536000 => '365 days', + 63072000 => '730 days', + ], + disable_inventory => 1, + disable_select => 1, + }, + 'trailer' => { + label => 'Mail trailer', + type => 'textarea', + disable_inventory => 1, + disable_select => 1, + }, + '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 => __PACKAGE__->cgp_timezone_values, + 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, + }, }, }; } @@ -120,6 +331,41 @@ sub search_sql { $class->search_sql_field('domain', $string); } +=item au_eligibility_type_values + +=cut + +sub au_eligibility_type_values { + + [ '', + 'Charity', + 'Child Care Centre', + 'Citizen/Resident', + 'Club', + 'Commercial Statutory Body', + 'Company', + 'Government School', + 'Higher Education Institution', + 'Incorporated Association', + 'Industry Body', + 'National Body', + 'Non-Government School', + 'Non-profit Organisation', + 'Other', + 'Partnership', + 'Pending TM Owner', + 'Political Party', + 'Pre-school', + 'Registered Business', + 'Religious/Church Group', + 'Research Organisation', + 'Sole Trader', + 'Trade Union', + 'Trademark Owner', + 'Training Organisation', + ]; + +} =item label @@ -140,11 +386,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. - -A registration or transfer email will be submitted unless -$FS::svc_domain::whois_hack is true. +The additional field I should be set to I for new domains, I +for transfers, or I for no action (registered elsewhere). The additional field I can be used to manually set the admin contact email address on this email. Otherwise, the svc_acct records for this package @@ -181,19 +424,36 @@ 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(@_); + $error = $self->SUPER::insert(@_) + || $self->insert_defaultrecords; if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; } + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + + ''; #no error +} + +=item insert_defaultrecords + +=cut + +sub insert_defaultrecords { + my $self = shift; + + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + if ( $soamachine ) { my $soa = new FS::domain_record { 'svcnum' => $self->svcnum, @@ -203,10 +463,10 @@ sub insert { 'recdata' => "$soamachine $soaemail ( ". time2str("%Y%m%d", time). "00 ". "$soarefresh $soaretry $soaexpire $soadefaultttl )" }; - $error = $soa->insert; + my $error = $soa->insert; if ( $error ) { $dbh->rollback if $oldAutoCommit; - return "couldn't insert SOA record for new domain: $error"; + return "couldn't insert SOA record: $error"; } foreach my $record ( @defaultrecords ) { @@ -221,7 +481,7 @@ sub insert { my $error = $domain_record->insert; if ( $error ) { $dbh->rollback if $oldAutoCommit; - return "couldn't insert record for new domain: $error"; + return "couldn't insert record: $error"; } } @@ -297,10 +557,11 @@ sub replace { : $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; } @@ -341,7 +602,36 @@ sub check { #my $part_svc = $x; my $error = $self->ut_numbern('svcnum') + || $self->ut_textn('au_eligibility_type') + || $self->ut_textn('au_registrant_name') || $self->ut_numbern('catchall') + || $self->ut_numbern('max_accounts') + || $self->ut_alphan('quota') + || $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' ]) + || $self->ut_snumbern('acct_def_cgp_archiveafter') + #preferences + || $self->ut_alphasn('acct_def_cgp_deletemode') + || $self->ut_enum('acct_def_cgp_emptytrash', + $self->cgp_emptytrash_values ) + || $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 ; return $error if $error; @@ -361,7 +651,7 @@ sub check { $recref->{domain} = "$1.$2"; $recref->{suffix} ||= $2; # hmmmmmmmm. - } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.]+)\.(\w+)$/ ) { + } elsif ( $whois_hack && $recref->{domain} =~ /^([\w\-\.\/]+)\.(\w+)$/ ) { $recref->{domain} = "$1.$2"; # need to match a list of suffixes - no guarantee they're top-level.. # http://wiki.mozilla.org/TLD_List @@ -392,6 +682,18 @@ sub 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 @@ -407,6 +709,7 @@ sub domain_record { 'A' => 5, 'TXT' => 6, 'PTR' => 7, + 'SRV' => 8, ); my %sort = ( @@ -424,6 +727,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) }