From: ivan Date: Sat, 20 Feb 2010 22:34:57 +0000 (+0000) Subject: communigate pro provisioning, RT#7083 X-Git-Tag: root_of_svc_elec_features~458 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d2e5d9d1f65fc94eb87eae45b675645e92087f49 communigate pro provisioning, RT#7083 --- diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index f4f70f5fb..0b4000e4c 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -1837,7 +1837,7 @@ worry that config_items is freeside-specific and icky. { 'key' => 'svc_acct-notes', - 'section' => 'UI', + 'section' => 'deprecated', 'description' => 'Extra HTML to be displayed on the Account View screen.', 'type' => 'textarea', }, diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 201e7b23c..3b1967e42 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -2140,7 +2140,7 @@ sub ut_alpha { ''; } -=item ut_alpha COLUMN +=item ut_alphan COLUMN Check/untaint alphanumeric strings (no spaces). May be null. If there is an error, returns the error, otherwise returns false. @@ -2155,6 +2155,22 @@ sub ut_alphan { ''; } +=item ut_alphasn COLUMN + +Check/untaint alphanumeric strings, spaces allowed. May be null. If there is +an error, returns the error, otherwise returns false. + +=cut + +sub ut_alphasn { + my($self,$field)=@_; + $self->getfield($field) =~ /^([\w ]*)$/ + or return "Illegal (alphanumeric) $field: ". $self->getfield($field); + $self->setfield($field,$1); + ''; +} + + =item ut_alpha_lower COLUMN Check/untaint lowercase alphanumeric strings (no spaces). May not be null. If diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 6a25fab5c..3c6289fc6 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1633,6 +1633,14 @@ sub tables_hashref { 'pbxsvc', 'int', 'NULL', '', '', '', 'last_login', @date_type, '', '', 'last_logout', @date_type, '', '', + #communigate pro fields (quota = MaxAccountSize) + 'file_quota', 'varchar', 'NULL', $char_d, '', '', #MaxWebSize + 'file_maxnum', 'varchar', 'NULL', $char_d, '', '', #MaxWebFiles + 'file_maxsize', 'varchar', 'NULL', $char_d, '', '', #MaxFileSize + 'cgp_accessmodes', 'varchar', 'NULL', 255, '', '', #AccessModes + 'password_selfchange','char', 'NULL', 1, '', '', + 'password_recover', 'char', 'NULL', 1, '', '', + 'cgp_type', 'varchar', 'NULL', $char_d, '', '', #AccountType ], 'primary_key' => 'svcnum', #'unique' => [ [ 'username', 'domsvc' ] ], diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm index c4201c0d0..90283d2ae 100644 --- a/FS/FS/part_export/communigate_pro.pm +++ b/FS/FS/part_export/communigate_pro.pm @@ -1,7 +1,7 @@ package FS::part_export::communigate_pro; use strict; -use vars qw(@ISA %info %options $DEBUG); +use vars qw(@ISA %info %options %quotas $DEBUG); use Data::Dumper; use Tie::IxHash; use FS::part_export; @@ -15,7 +15,7 @@ tie %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.', }, - 'accountType' => { label => 'Type for newly-created accounts', + 'accountType' => { label => 'Type for newly-created accounts (default when not specified in service)', type => 'select', options => [qw(MultiMailbox TextMailbox MailDirMailbox)], default => 'MultiMailbox', @@ -23,7 +23,7 @@ tie %options, 'Tie::IxHash', 'externalFlag' => { label => 'Create accounts with an external (visible for legacy mailers) INBOX.', type => 'checkbox', }, - 'AccessModes' => { label => 'Access modes', + 'AccessModes' => { label => 'Access modes (default when not specified in service)', default => 'Mail POP IMAP PWD WebMail WebSite', }, 'create_domain' => { label => 'Domain creation API call', @@ -33,7 +33,7 @@ tie %options, 'Tie::IxHash', ; %info = ( - 'svc' => [qw( svc_acct svc_domain )], + 'svc' => [qw( svc_acct svc_domain svc_forward )], 'desc' => 'Real-time export of accounts and domains to a CommuniGate Pro mail server', 'options' => \%options, 'notes' => <<'END' @@ -45,6 +45,13 @@ must be installed as CGP::CLI. END ); +%quotas = ( + 'quota' => 'MaxAccountSize', + 'file_quota' => 'MaxWebSize', + 'file_maxnum' => 'MaxWebFiles', + 'file_maxsize' => 'MaxFileSize', +); + sub rebless { shift; } sub export_username { @@ -55,164 +62,318 @@ sub export_username { sub _export_insert { my( $self, $svc_x ) = (shift, shift); - my @options; + my $table = $svc_x->table; + my $method = "_export_insert_$table"; + $self->$method($svc_x, @_); +} - if ( $svc_x->isa('FS::svc_acct') ) { +sub _export_insert_svc_acct { + my( $self, $svc_acct ) = (shift, shift); + + my @options = ( $svc_acct->svcnum, 'CreateAccount', + 'accountName' => $self->export_username($svc_acct), + 'accountType' => ( $svc_acct->cgp_type + || $self->option('accountType') ), + 'AccessModes' => ( $svc_acct->cgp_accessmodes + || $self->option('AccessModes') ), + 'RealName' => $svc_acct->finger, + 'Password' => $svc_acct->_password, + ); - @options = ( $svc_x->svcnum, 'CreateAccount', - 'accountName' => $self->export_username($svc_x), - 'accountType' => $self->option('accountType'), - 'AccessModes' => $self->option('AccessModes'), - 'RealName' => $svc_x->finger, - 'Password' => $svc_x->_password, - ); - push @options, 'MaxAccountSize' => $svc_x->quota if $svc_x->quota; - push @options, 'externalFlag' => $self->option('externalFlag') - if $self->option('externalFlag'); + push @options, $quotas{$_} => $svc_acct->$_() + foreach grep $svc_acct->$_(), keys %quotas; - } elsif ( $svc_x->isa('FS::svc_domain') ) { + #phase 2: pwdallowed, passwordrecovery, allowed mail rules, + # RPOP modifications, accepts mail to all, add trailer to sent mail + #phase 3: archive messages, mailing lists - my $create = $self->option('create_domain') || 'CreateDomain'; + push @options, 'externalFlag' => $self->option('externalFlag') + if $self->option('externalFlag'); - @options = ( $svc_x->svcnum, $create, $svc_x->domain, - #other domain creation options? - ); - push @options, 'AccountsLimit' => $svc_x->max_accounts - if $svc_x->max_accounts; + #XXX preferences phase 1: message delete method, on logout remove trash + #phase 2: language, time zone, layout, pronto style, send read receipts - } else { - die "guru meditation #14: $svc_x is not FS::svc_acct, or FS::svc_domain"; - } + $self->communigate_pro_queue( @options ); + +} + +sub _export_insert_svc_domain { + my( $self, $svc_domain ) = (shift, shift); + + my $create = $self->option('create_domain') || 'CreateDomain'; + + my @options = ( $svc_domain->svcnum, $create, $svc_domain->domain, + #other domain creation options? + ); + push @options, 'AccountsLimit' => $svc_domain->max_accounts + if $svc_domain->max_accounts; $self->communigate_pro_queue( @options ); } +#sub _export_insert_svc_forward { +#} + sub _export_replace { my( $self, $new, $old ) = (shift, shift, shift); - if ( $new->isa('FS::svc_acct') ) { - - #XXX they probably need the ability to change some of these - return "can't (yet) change username with CommuniGate Pro" - if $old->username ne $new->username; - return "can't (yet) change domain with CommuniGate Pro" - if $self->export_username($old) ne $self->export_username($new); - return "can't (yet) change GECOS with CommuniGate Pro" - if $old->finger ne $new->finger; - return "can't (yet) change quota with CommuniGate Pro" - if $old->quota ne $new->quota; - return '' unless $old->username ne $new->username - || $old->_password ne $new->_password - || $old->finger ne $new->finger - || $old->quota ne $new->quota; - - return '' if '*SUSPENDED* '. $old->_password eq $new->_password; - - #my $err_or_queue = $self->communigate_pro_queue( $new->svcnum,'RenameAccount', - # $old->email, $new->email ); - #return $err_or_queue unless ref($err_or_queue); - #my $jobnum = $err_or_queue->jobnum; + my $table = $new->table; + my $method = "_export_replace_$table"; + $self->$method($new, $old, @_); +} + +sub _export_replace_svc_acct { + my( $self, $new, $old ) = (shift, shift, shift); + #let's just do the rename part realtime rather than trying to queue + #w/dependencies. we don't want FS winding up out-of-sync with the wrong + #username and a queued job anyway. right?? + if ( $self->export_username($old) ne $self->export_username($new) ) { + #my $r = + eval { $self->communigate_pro_runcommand( + 'RenameAccount', + $self->export_username($old), + $self->export_username($new), + ) }; + return $@ if $@; + } + + if ( $new->_password ne $old->_password + && '*SUSPENDED* '.$old->_password ne $new->_password + ) { $self->communigate_pro_queue( $new->svcnum, 'SetAccountPassword', - $self->export_username($new), $new->_password ) - if $new->_password ne $old->_password; + $self->export_username($new), $new->_password + ); + } - } elsif ( $new->isa('FS::svc_domain') ) { + my %settings = (); + + $settings{'RealName'} = $new->finger + if $old->finger ne $new->finger; + $settings{$quotas{$_}} = $new->$_() + foreach grep $old->$_() ne $new->$_(), keys %quotas; + $settings{'AccessModes'} = $new->cgp_accessmodes + if $old->cgp_accessmodes ne $new->cgp_accessmodes; + $settings{'accountType'} = $new->cgp_type + if $old->cgp_type ne $new->cgp_type; + + #phase 2: pwdallowed, passwordrecovery, allowed mail rules, + # RPOP modifications, accepts mail to all, add trailer to sent mail + #phase 3: archive messages, mailing lists + + if ( keys %settings ) { + my $error = $self->communigate_pro_queue( + $new->svcnum, + 'UpdateAccountSettings', + $self->export_username($new), + %settings, + ); + return $error if $error; + } - if ( $old->domain ne $new->domain ) { - $self->communigate_pro_queue( $new->svcnum, 'RenameDomain', - $old->domain, $new->domain, - ); - } + #XXX preferences phase 1: message delete method, on logout remove trash + #phase 2: language, time zone, layout, pronto style, send read receipts - if ( $old->max_accounts ne $new->max_accounts ) { - $self->communigate_pro_queue( $new->svcnum, 'UpdateDomainSettings', - $new->domain, 'AccountsLimit' => ($new->max_accounts || 'default'), - ); - } + ''; + +} - #other kinds of changes? +sub _export_replace_svc_domain { + my( $self, $new, $old ) = (shift, shift, shift); + + if ( $old->domain ne $new->domain ) { + my $error = $self->communigate_pro_queue( $new->svcnum, 'RenameDomain', + $old->domain, $new->domain, + ); + return $error if $error; + } - } else { - die "guru meditation #15: $new is not FS::svc_acct, or FS::svc_domain"; + if ( $old->max_accounts ne $new->max_accounts ) { + my $error = $self->communigate_pro_queue( $new->svcnum, + 'UpdateDomainSettings', + $new->domain, + 'AccountsLimit' => ($new->max_accounts || 'default'), + ); + return $error if $error; } + #other kinds of changes? + + ''; } sub _export_delete { my( $self, $svc_x ) = (shift, shift); - if ( $svc_x->isa('FS::svc_acct') ) { + my $table = $svc_x->table; + my $method = "_export_delete_$table"; + $self->$method($svc_x, @_); +} - $self->communigate_pro_queue( $svc_x->svcnum, 'DeleteAccount', - $self->export_username($svc_x), - ); +sub _export_delete_svc_acct { + my( $self, $svc_acct ) = (shift, shift); - } elsif ( $svc_x->isa('FS::svc_domain') ) { + $self->communigate_pro_queue( $svc_acct->svcnum, 'DeleteAccount', + $self->export_username($svc_acct), + ); - $self->communigate_pro_queue( $svc_x->svcnum, 'DeleteDomain', - $svc_x->domain, - #XXX turn on force option for domain deletion? - ); +} - } else { - die "guru meditation #16: $svc_x is not FS::svc_acct, or FS::svc_domain"; - } +sub _export_delete_svc_domain { + my( $self, $svc_domain ) = (shift, shift); + + $self->communigate_pro_queue( $svc_domain->svcnum, 'DeleteDomain', + $svc_domain->domain, + #XXX turn on force option for domain deletion? + ); } sub _export_suspend { my( $self, $svc_x ) = (shift, shift); - if ( $svc_x->isa('FS::svc_acct') ) { + my $table = $svc_x->table; + my $method = "_export_suspend_$table"; + $self->$method($svc_x, @_); - $self->communigate_pro_queue( $svc_x->svcnum, 'UpdateAccountSettings', - 'accountName' => $self->export_username($svc_x), - 'AccessModes' => 'Mail', - ); +} - } elsif ( $svc_x->isa('FS::svc_domain') ) { +sub _export_suspend_svc_acct { + my( $self, $svc_acct ) = (shift, shift); - #XXX domain operations - } else { - die "guru meditation #17: $svc_x is not FS::svc_acct, or FS::svc_domain"; - } + #XXX is this the desired suspnsion action? + + $self->communigate_pro_queue( + $svc_acct->svcnum, + 'UpdateAccountSettings', + $self->export_username($svc_acct), + 'AccessModes' => 'Mail', + ); + +} + +sub _export_suspend_svc_domain { + my( $self, $svc_domain) = (shift, shift); + + #XXX domain operations + ''; } sub _export_unsuspend { my( $self, $svc_x ) = (shift, shift); - if ( $svc_x->isa('FS::svc_acct') ) { + my $table = $svc_x->table; + my $method = "_export_unsuspend_$table"; + $self->$method($svc_x, @_); - $self->communigate_pro_queue( $svc_x->svcnum, 'UpdateAccountSettings', - 'accountName' => $self->export_username($svc_x), - 'AccessModes' => $self->option('AccessModes'), - ); - } elsif ( $svc_x->isa('FS::svc_domain') ) { +} - #XXX domain operations - } else { - die "guru meditation #18: $svc_x is not FS::svc_acct, or FS::svc_domain"; - } +sub _export_unsuspend_svc_acct { + my( $self, $svc_acct ) = (shift, shift); + + $self->communigate_pro_queue( + $svc_acct->svcnum, + 'UpdateAccountSettings', + $self->export_username($svc_acct), + 'AccessModes' => $self->option('AccessModes'), + ); + +} + +sub _export_unsuspend_svc_domain { + my( $self, $svc_domain) = (shift, shift); + + #XXX domain operations + ''; } + sub export_getsettings { - my($self, $svc_x, $settingsref, $defaultref ) = @_; + my($self, $svc_x) = (shift, shift); + + my $table = $svc_x->table; + my $method = "export_getsettings_$table"; + + $self->can($method) ? $self->$method($svc_x, @_) : ''; + +} + +sub export_getsettings_svc_domain { + my($self, $svc_domain, $settingsref, $defaultref ) = @_; my $settings = eval { $self->communigate_pro_runcommand( 'GetDomainSettings', - $svc_x->domain + $svc_domain->domain ) }; return $@ if $@; my $effective_settings = eval { $self->communigate_pro_runcommand( 'GetDomainEffectiveSettings', - $svc_x->domain + $svc_domain->domain + ) }; + return $@ if $@; + + my $acct_defaults = eval { $self->communigate_pro_runcommand( + 'GetAccountDefaults', + $svc_domain->domain + ) }; + return $@ if $@; + + #warn Dumper($acct_defaults); + + %$effective_settings = ( %$effective_settings, + map { ("Acct. Default $_" => $acct_defaults->{$_}); } + keys(%$acct_defaults) + ); + + #false laziness w/below + + my %defaults = map { $_ => 1 } + grep !exists(${$settings}{$_}), keys %$effective_settings; + + foreach my $key ( grep ref($effective_settings->{$_}), + keys %$effective_settings ) + { + my $value = $effective_settings->{$key}; + if ( ref($value) eq 'ARRAY' ) { + $effective_settings->{$key} = join(', ', @$value); + } else { + #XXX + warn "serializing ". ref($value). " for table display not yet handled"; + } + } + + %{$settingsref} = %$effective_settings; + %{$defaultref} = %defaults; + + ''; +} + +sub export_getsettings_svc_acct { + my($self, $svc_acct, $settingsref, $defaultref ) = @_; + + my $settings = eval { $self->communigate_pro_runcommand( + 'GetAccountSettings', + $svc_acct->email ) }; return $@ if $@; + delete($settings->{'Password'}); + + my $effective_settings = eval { $self->communigate_pro_runcommand( + 'GetAccountEffectiveSettings', + $svc_acct->email + ) }; + return $@ if $@; + + delete($effective_settings->{'Password'}); + + #XXX prefs/effectiveprefs too + + #false laziness w/above + my %defaults = map { $_ => 1 } grep !exists(${$settings}{$_}), keys %$effective_settings; @@ -232,10 +393,18 @@ sub export_getsettings { %{$defaultref} = %defaults; ''; + } sub communigate_pro_queue { my( $self, $svcnum, $method ) = (shift, shift, shift); + my $jobnum = ''; #don't actually care + $self->communigate_pro_queue_dep( \$jobnum, $svcnum, $method, @_); +} + +sub communigate_pro_queue_dep { + my( $self, $jobnumref, $svcnum, $method ) = splice(@_,0,4); + my %kludge_methods = ( 'CreateAccount' => 'CreateAccount', 'UpdateAccountSettings' => 'UpdateAccountSettings', @@ -246,11 +415,12 @@ sub communigate_pro_queue { my $sub = exists($kludge_methods{$method}) ? $kludge_methods{$method} : 'communigate_pro_command'; + my $queue = new FS::queue { 'svcnum' => $svcnum, 'job' => "FS::part_export::communigate_pro::$sub", }; - $queue->insert( + my $error = $queue->insert( $self->machine, $self->option('port'), $self->option('login'), @@ -258,7 +428,9 @@ sub communigate_pro_queue { $method, @_, ); + $$jobnumref = $queue->jobnum unless $error; + return $error; } sub communigate_pro_runcommand { @@ -302,7 +474,7 @@ sub CreateAccount { my $accountType = delete $args{'accountType'}; my $externalFlag = delete $args{'externalFlag'}; $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ]; - my @args = ( accountName => $accountName, + my @args = ( accountName => $accountName, accountType => $accountType, settings => \%args, ); @@ -314,8 +486,7 @@ sub CreateAccount { } sub UpdateAccountSettings { - my( $machine, $port, $login, $password, $method, %args ) = @_; - my $accountName = delete $args{'accountName'}; + my( $machine, $port, $login, $password, $method, $accountName, %args ) = @_; $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ]; my @args = ( $accountName, \%args ); communigate_pro_command( $machine, $port, $login, $password, $method, @args ); diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index 45f0a412e..181628715 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -277,6 +277,24 @@ sub table_info { disable_inventory => 1, disable_select => 1, }, + 'file_quota'=> { + label => 'File storage limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'file_maxnum'=> { + label => 'Number of files limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, + 'file_maxsize'=> { + label => 'File size limit', + type => 'text', + disable_inventory => 1, + disable_select => 1, + }, '_password' => 'Password', 'gid' => { label => 'GID', @@ -1065,6 +1083,10 @@ sub check { || $self->ut_enum( '_password_encoding', [ '', qw( plain crypt ldap ) ] ) + || $self->ut_enum( 'password_selfchange', [ '', 'Y' ] ) + || $self->ut_enum( 'password_recover', [ '', 'Y' ] ) + || $self->ut_alphasn( 'cgp_accessmodes' ) + || $self->ut_alphan( 'cgp_type' ) ; return $error if $error; @@ -1200,8 +1222,12 @@ sub check { or return "Illegal finger: ". $self->getfield('finger'); $self->setfield('finger', $1); - $recref->{quota} =~ /^(\w*)$/ or return "Illegal quota"; - $recref->{quota} = $1; + for (qw( quota file_quota file_maxsize )) { + $recref->{$_} =~ /^(\w*)$/ or return "Illegal $_"; + $recref->{$_} = $1; + } + $recref->{file_maxnum} =~ /^\s*(\d*)\s*$/ or return "Illegal file_maxnum"; + $recref->{file_maxnum} = $1; unless ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) { if ( $recref->{slipip} eq '' ) { diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 2845c8301..065ce701d 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -241,31 +241,77 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% } -% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { - -% } else { +% if ( $communigate ) { + + Mailbox type + + + + + - Quota: - + Mailbox type + XXX checkbox thingie!! + -% } -% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { + +% } else { + + +% } - -% } else { +% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { + +% } else { +% my $quota_label = $communigate ? 'Mail storage limit' : 'Quota'; + + <% $quota_label %> + + +% } + +% tie my %cgp_label, 'Tie::IxHash', +% 'file_quota' => 'File storage limit', +% 'file_maxnum' => 'Number of files limit', +% 'file_maxsize' => 'File size limit', +% ; +% +% foreach my $key (keys %cgp_label) { +% +% if ( !$communigate || $part_svc->part_svc_column($key)->columnflag eq 'F' ){ + +% } else { + + + <% $cgp_label{$key} %> + + +% } +% } + + +% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { + +% } else { IP % } -% + % my %label = ( seconds => 'Time', % upbytes => 'Upload bytes', % downbytes => 'Download bytes', @@ -399,6 +445,9 @@ if ( $cgi->param('error') ) { } +my $communigate = scalar($part_svc->part_export('communigate_pro')); + # || scalar($part_svc->part_export('communigate_pro_singledomain')); + my( $cust_pkg, $cust_main ) = ( '', '' ); if ( $pkgnum ) { $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } ); diff --git a/httemplate/view/elements/svc_export_settings.html b/httemplate/view/elements/svc_export_settings.html new file mode 100644 index 000000000..026280546 --- /dev/null +++ b/httemplate/view/elements/svc_export_settings.html @@ -0,0 +1,28 @@ +% my ( $settings, $defaults ) = $svc_x->export_getsettings; +% if ( keys %$settings ) { + +%# XXX a way to label this "Communigate pro settings".. just a config maybe + External settings + <% ntable('#cccccc',2) %> + +% foreach my $key ( keys %$settings ) { + + <% $key |h %> + + <% $defaults->{$key} ? '' : '' %> + <% $settings->{$key} |h %> + <% $defaults->{$key} ? '' : '' %> + + +% } + + +
+ +% } + +<%init> + +my $svc_x = shift; + + diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 7e94df16d..9135e67e9 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -14,335 +14,63 @@ } - <% include("/elements/header.html",'Account View', menubar( + <% include("/elements/header.html",'View account', menubar( "Cancel this (unaudited) account" => "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')", )) %> % } -% if ( $part_svc->part_export_usage ) { -% -% my $last_bill; -% my %plandata; -% if ( $cust_pkg ) { -% #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really -% #belong in plan data -% %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); } -% split("\n", $cust_pkg->part_pkg->plandata ); -% -% $last_bill = $cust_pkg->last_bill; -% } else { -% $last_bill = 0; -% %plandata = (); -% } -% -% my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time ); -% my $hour = int($seconds/3600); -% my $min = int( ($seconds%3600) / 60 ); -% my $sec = $seconds%60; -% -% my $input = $svc_acct->attribute_since_sqlradacct( -% $last_bill, time, 'AcctInputOctets' -% ) / 1048576; -% my $output = $svc_acct->attribute_since_sqlradacct( -% $last_bill, time, 'AcctOutputOctets' -% ) / 1048576; -% -% +<% include( 'svc_acct/radius_usage.html', + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + 'cust_pkg' => $cust_pkg, + %gopt, + ) +%> - - RADIUS session information
- <% ntable('#cccccc',2) %> - -% if ( $seconds ) { - - Online <% $hour %>h <% $min %>m <% $sec %>s -% } else { - - Has not logged on -% } -% if ( $cust_pkg ) { - - since last bill (<% time2str('%a %b %o %Y', $last_bill) %>) -% if ( length($plandata{recur_included_hours}) ) { - - - <% $plandata{recur_included_hours} %> total hours in plan -% } - -
-% } else { - - (no billing cycle available for unaudited account)
-% } - - - Upload: <% sprintf("%.3f", $input) %> megabytes
- Download: <% sprintf("%.3f", $output) %> megabytes
- Last Login: <% $svc_acct->last_login_text %>
-% my $href = qq!this billing cycle - | <% $href %>;begin=<% time-15552000 %>">past six months - | <% $href %>">all sessions - -
-% } - -% my @part_svc = (); -% if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) { - - - -
- - - -% #print qq!
Send account information!; -% -% if ( $pkgnum ) { -% @part_svc = grep { $_->svcdb eq 'svc_acct' -% && $_->svcpart != $part_svc->svcpart } -% $cust_pkg->available_part_svc; -% } else { -% @part_svc = qsearch('part_svc', { -% svcdb => 'svc_acct', -% disabled => '', -% svcpart => { op=>'!=', value=>$part_svc->svcpart }, -% } ); -% } -% -% } +<% include( 'svc_acct/change_svc_form.html', + 'part_svc' => \@part_svc, + 'svcnum' => $svcnum, + 'pkgnum' => $pkgnum, + %gopt, + ) +%> Service #<% $svcnum %> | Edit this service -% if ( @part_svc ) { - -| - - -% } - - -<% &ntable("#cccccc") %><% &ntable("#cccccc",2) %> - - - Service - <% $part_svc->svc %> - - - Username - <% $svc_acct->username %> - - - Domain - <% $domain %> - - -% if ( $svc_acct->pbxsvc ) { - - PBX - <% $svc_acct->pbx_title %> - -%} - - - Password - -% my $password = $svc_acct->get_cleartext_password; -% if ( $password =~ /^\*\w+\* (.*)$/ ) { -% $password = $1; -% - - (login disabled) -% } -% if ( !$password and -% $svc_acct->_password_encryption ne 'plain' and -% $svc_acct->_password ) { - (<% uc($svc_acct->_password_encryption) %> encrypted) -% } -% elsif ( $conf->exists('showpasswords') ) { - - 
<% encode_entities($password) %>
-% } else { - - (hidden) -% } - - - - -% $password = ''; -% if ( $conf->exists('security_phrase') ) { -% my $sec_phrase = $svc_acct->sec_phrase; -% +<% include( 'svc_acct/change_svc.html', + 'part_svc' => \@part_svc, + %gopt, + ) +%> - - Security phrase - <% $svc_acct->sec_phrase %> - -% } -% if ( $svc_acct->popnum ) { -% my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); -% - - - Access number - <% $svc_acct_pop->text %> - -% } -% if ($svc_acct->uid ne '') { - - - UID - <% $svc_acct->uid %> - -% } -% if ($svc_acct->gid ne '') { - - - GID - <% $svc_acct->gid %> - -% } -% if ($svc_acct->finger ne '') { - - - Real Name - <% $svc_acct->finger %> - -% } -% if ($svc_acct->dir ne '') { - - - Home directory - <% $svc_acct->dir %> - -% } -% if ($svc_acct->shell ne '') { - - - Shell - <% $svc_acct->shell %> - -% } -% if ($svc_acct->quota ne '') { - - - Quota - <% $svc_acct->quota %> - -% } -% if ($svc_acct->slipip) { - - - IP address - - <% ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) - ? "(Dynamic)" - : $svc_acct->slipip - %> - - -% } -% my %ulabel = ( seconds => 'Time', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); -% foreach my $uf ( keys %ulabel ) { -% my $tf = $uf . "_threshold"; -% if ( $svc_acct->$uf ne '' ) { -% my $v = $uf eq 'seconds' -% #? (($svc_acct->$uf < 0 ? '-' : ''). duration_exact($svc_acct->$uf) ) -% ? ($svc_acct->$uf < 0 ? '-' : ''). -% int(abs($svc_acct->$uf)/3600). "hr ". -% sprintf("%02d",(abs($svc_acct->$uf)%3600)/60). "min" -% : FS::UI::bytecount::display_bytecount($svc_acct->$uf); - - <% $ulabel{$uf} %> remaining - <% $v %> - - -% } -% } -% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) { -% $attribute =~ /^radius_(.*)$/; -% my $pattribute = $FS::raddb::attrib{$1}; -% - - - Radius (reply) <% $pattribute %> - <% $svc_acct->getfield($attribute) %> - -% } -% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) { -% $attribute =~ /^rc_(.*)$/; -% my $pattribute = $FS::raddb::attrib{$1}; -% +<% include( 'svc_acct/basics.html', + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + %gopt, + ) +%> - - Radius (check) <% $pattribute %> - <% $svc_acct->getfield($attribute) %> - -% } - - - - RADIUS groups - <% join('
', $svc_acct->radius_groups) %> - -% -%# Can this be abstracted further? Maybe a library function like -%# widget('HTML', 'view', $svc_acct) ? It would definitely make UI -%# style management easier. -% -% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { - - <% $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %> -% } - - -
+
+ +<% include( 'svc_acct/hosting.html', + %gopt, + ) +%> + +%#remove this? does anybody even use it? it was a misunderstood customer +%#request IIRC? +% my $conf = new FS::Conf; +% if ( $conf->exists('svc_acct-notes') ) { +% warn 'WARNING: svc_acct-notes deprecated\n'; +<% join("
", $conf->config('svc_acct-notes') ) %>

- -% if ( @svc_www ) { - Hosting - <% &ntable("#cccccc") %><% &ntable("#cccccc",2) %> -% foreach my $svc_www (@svc_www) { -% my($label, $value) = $svc_www->cust_svc->label; -% my $link = $p. 'view/svc_www.cgi?'. $svc_www->svcnum; - - - <% "$label: $value" %> - - -% } - -

% } -<% join("
", $conf->config('svc_acct-notes') ) %> -

+<% include('elements/svc_export_settings.html', $svc_acct) %> <% joblisting({'svcnum'=>$svcnum}, 1) %> @@ -352,8 +80,6 @@ Service #<% $svcnum %> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('View customer services'); -my $conf = new FS::Conf; - my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '. ' LEFT JOIN cust_pkg USING ( pkgnum ) '. ' LEFT JOIN cust_main USING ( custnum ) '; @@ -389,25 +115,27 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unknown svcpart" unless $part_svc; my $svc = $part_svc->svc; -die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum - unless $svc_acct->domsvc; -my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } ); -die 'Unknown domain (domsvc '. $svc_acct->domsvc. - ' for svc_acct.svcnum '. $svc_acct->svcnum. ')' - unless $svc_domain; -my $domain = $svc_domain->domain; +my @part_svc = (); +if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) { + + if ( $pkgnum ) { + @part_svc = grep { $_->svcdb eq 'svc_acct' + && $_->svcpart != $part_svc->svcpart } + $cust_pkg->available_part_svc; + } else { + @part_svc = qsearch('part_svc', { + svcdb => 'svc_acct', + disabled => '', + svcpart => { op=>'!=', value=>$part_svc->svcpart }, + } ); + } -my @svc_www = qsearch({ - 'select' => 'svc_www.*', - 'table' => 'svc_www', - 'addl_from' => $addl_from, - 'hashref' => { 'usersvc' => $svcnum }, - #XXX shit outta luck if you somehow got them linked across agents - # maybe we should show but not link to them? kinda makes sense... - # (maybe a specific ACL for this situation???) - 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( - 'null_right' => 'View/link unlinked services' - ), -}); +} + +my $communigate = scalar($part_svc->part_export('communigate_pro')); + # || scalar($part_svc->part_export('communigate_pro_singledomain')); + +my %gopt = ( 'communigate' => $communigate, + ); diff --git a/httemplate/view/svc_acct/basics.html b/httemplate/view/svc_acct/basics.html new file mode 100644 index 000000000..752b4833a --- /dev/null +++ b/httemplate/view/svc_acct/basics.html @@ -0,0 +1,202 @@ +<% &ntable("#cccccc") %><% &ntable("#cccccc",2) %> + + + Service + <% $part_svc->svc %> + + + + Username + <% $svc_acct->username %> + + + + Domain + <% $domain %> + + +% if ( $svc_acct->pbxsvc ) { + + PBX + <% $svc_acct->pbx_title %> + +%} + + + Password + +% my $password = $svc_acct->get_cleartext_password; +% if ( $password =~ /^\*\w+\* (.*)$/ ) { +% $password = $1; + (login disabled) +% } +% if ( !$password and +% $svc_acct->_password_encryption ne 'plain' and +% $svc_acct->_password ) { + (<% uc($svc_acct->_password_encryption) %> encrypted) +% } elsif ( $conf->exists('showpasswords') ) { + 
<% encode_entities($password) %>
+% } else { + (hidden) +% } + + +% $password = ''; + +% if ( $conf->exists('security_phrase') ) { +% my $sec_phrase = $svc_acct->sec_phrase; +% + + Security phrase + <% $svc_acct->sec_phrase %> + +% } + +% if ( $svc_acct->popnum ) { +% my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); + + Access number + <% $svc_acct_pop->text %> + +% } + +% if ($svc_acct->uid ne '') { + + UID + <% $svc_acct->uid %> + +% } + +% if ($svc_acct->gid ne '') { + + GID + <% $svc_acct->gid %> + +% } + +% if ($svc_acct->finger ne '') { + + Real Name + <% $svc_acct->finger %> + +% } + +% if ($svc_acct->dir ne '') { + + Home directory + <% $svc_acct->dir %> + +% } + +% if ($svc_acct->shell ne '') { + + Shell + <% $svc_acct->shell %> + +% } + +% if ($svc_acct->quota ne '' && ! $opt{'communigate'} ) { + + Quota + <% $svc_acct->quota %> + +% } elsif ( $opt{'communigate'} ) { + + + Mailbox type + <% $svc_acct->cgp_type %> + + + + Enabled services + <% $svc_acct->cgp_accessmodes %> + + + + Mail storage limit + <% $svc_acct->quota %> + + + + File storage limit + <% $svc_acct->file_quota %> + + + + Number of files limit + <% $svc_acct->file_maxnum %> + + + + File size limit + <% $svc_acct->file_maxsize %> + + +% } + +% if ($svc_acct->slipip) { + + IP address + + <% ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) + ? "(Dynamic)" + : $svc_acct->slipip + %> + + +% } + +<% include('usage.html', + 'svc_acct' => $svc_acct, + ) +%> + +% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) { +% $attribute =~ /^radius_(.*)$/; +% my $pattribute = $FS::raddb::attrib{$1}; + + Radius (reply) <% $pattribute %> + <% $svc_acct->getfield($attribute) %> + + +% } +% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) { +% $attribute =~ /^rc_(.*)$/; +% my $pattribute = $FS::raddb::attrib{$1}; + + Radius (check) <% $pattribute %> + <% $svc_acct->getfield($attribute) %> + +% } + + + RADIUS groups + <% join('
', $svc_acct->radius_groups) %> + + +%# Can this be abstracted further? Maybe a library function like +%# widget('HTML', 'view', $svc_acct) ? It would definitely make UI +%# style management easier. +% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { + <% $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %> +% } + + +<%init> + +my %opt = @_; + +my $conf = new FS::Conf; + +my $svc_acct = $opt{'svc_acct'}; +my $part_svc = $opt{'part_svc'}; + +die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum + unless $svc_acct->domsvc; +my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } ); +die 'Unknown domain (domsvc '. $svc_acct->domsvc. + ' for svc_acct.svcnum '. $svc_acct->svcnum. ')' + unless $svc_domain; +my $domain = $svc_domain->domain; + + diff --git a/httemplate/view/svc_acct/change_svc.html b/httemplate/view/svc_acct/change_svc.html new file mode 100644 index 000000000..33d44a713 --- /dev/null +++ b/httemplate/view/svc_acct/change_svc.html @@ -0,0 +1,21 @@ +% if ( @part_svc || $opt{'showall'} ) { + +| + + +% } + +<%init> + +my %opt = @_; +my @part_svc = @{ $opt{'part_svc'} }; + + diff --git a/httemplate/view/svc_acct/change_svc_form.html b/httemplate/view/svc_acct/change_svc_form.html new file mode 100644 index 000000000..4f10922ba --- /dev/null +++ b/httemplate/view/svc_acct/change_svc_form.html @@ -0,0 +1,23 @@ +% if ( @part_svc || $opt{'showall'} ) { + + +
+ + +% } +<%init> + +my %opt = @_; +my @part_svc = @{ $opt{'part_svc'} }; +my $svcnum = $opt{'svcnum'}; +my $pkgnum = $opt{'pkgnum'}; + + diff --git a/httemplate/view/svc_acct/hosting.html b/httemplate/view/svc_acct/hosting.html new file mode 100644 index 000000000..1d83603b7 --- /dev/null +++ b/httemplate/view/svc_acct/hosting.html @@ -0,0 +1,38 @@ +% if ( @svc_www || $opt{'showall'} ) { + Hosting + <% &ntable("#cccccc") %><% &ntable("#cccccc",2) %> +% foreach my $svc_www (@svc_www) { +% my($label, $value) = $svc_www->cust_svc->label; +% my $link = $p. 'view/svc_www.cgi?'. $svc_www->svcnum; + + + <% "$label: $value" %> + + +% } + +

+% } +<%init> + +my %opt = @_; + +#false laziness w/view_svc_acct.cgi and a zillion other places +my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '. + ' LEFT JOIN cust_pkg USING ( pkgnum ) '. + ' LEFT JOIN cust_main USING ( custnum ) '; + +my @svc_www = qsearch({ + 'select' => 'svc_www.*', + 'table' => 'svc_www', + 'addl_from' => $addl_from, + 'hashref' => { 'usersvc' => $opt{'svcnum'} }, + #XXX shit outta luck if you somehow got them linked across agents + # maybe we should show but not link to them? kinda makes sense... + # (maybe a specific ACL for this situation???) + 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( + 'null_right' => 'View/link unlinked services' + ), +}); + + diff --git a/httemplate/view/svc_acct/radius_usage.html b/httemplate/view/svc_acct/radius_usage.html new file mode 100644 index 000000000..e2253a34a --- /dev/null +++ b/httemplate/view/svc_acct/radius_usage.html @@ -0,0 +1,77 @@ +% if ( $part_svc->part_export_usage ) { +% +% my $last_bill; +% my %plandata; +% if ( $cust_pkg ) { +% #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really +% #belong in plan data +% %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); } +% split("\n", $cust_pkg->part_pkg->plandata ); +% +% $last_bill = $cust_pkg->last_bill; +% } else { +% $last_bill = 0; +% %plandata = (); +% } +% +% my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time ); +% my $hour = int($seconds/3600); +% my $min = int( ($seconds%3600) / 60 ); +% my $sec = $seconds%60; +% +% my $input = $svc_acct->attribute_since_sqlradacct( +% $last_bill, time, 'AcctInputOctets' +% ) / 1048576; +% my $output = $svc_acct->attribute_since_sqlradacct( +% $last_bill, time, 'AcctOutputOctets' +% ) / 1048576; +% +% + + + RADIUS session information
+ <% ntable('#cccccc',2) %> + +% if ( $seconds ) { + + Online <% $hour %>h <% $min %>m <% $sec %>s +% } else { + + Has not logged on +% } +% if ( $cust_pkg ) { + + since last bill (<% time2str('%a %b %o %Y', $last_bill) %>) +% if ( length($plandata{recur_included_hours}) ) { + + - <% $plandata{recur_included_hours} %> total hours in plan +% } + +
+% } else { + + (no billing cycle available for unaudited account)
+% } + + + Upload: <% sprintf("%.3f", $input) %> megabytes
+ Download: <% sprintf("%.3f", $output) %> megabytes
+ Last Login: <% $svc_acct->last_login_text %>
+% my $href = qq!this billing cycle + | <% $href %>;begin=<% time-15552000 %>">past six months + | <% $href %>">all sessions + +
+% } +<%init> + +my %opt = @_; + +my $svc_acct = $opt{'svc_acct'}; +my $part_svc = $opt{'part_svc'}; +my $cust_pkg = $opt{'cust_pkg'}; + + diff --git a/httemplate/view/svc_acct/usage.html b/httemplate/view/svc_acct/usage.html new file mode 100644 index 000000000..9758d8332 --- /dev/null +++ b/httemplate/view/svc_acct/usage.html @@ -0,0 +1,27 @@ +% my %ulabel = ( seconds => 'Time', +% upbytes => 'Upload bytes', +% downbytes => 'Download bytes', +% totalbytes => 'Total bytes', +% ); +% foreach my $uf ( keys %ulabel ) { +% my $tf = $uf . "_threshold"; +% if ( $svc_acct->$uf ne '' ) { +% my $v = $uf eq 'seconds' +% #? (($svc_acct->$uf < 0 ? '-' : ''). duration_exact($svc_acct->$uf) ) +% ? ($svc_acct->$uf < 0 ? '-' : ''). +% int(abs($svc_acct->$uf)/3600). "hr ". +% sprintf("%02d",(abs($svc_acct->$uf)%3600)/60). "min" +% : FS::UI::bytecount::display_bytecount($svc_acct->$uf); + + <% $ulabel{$uf} %> remaining + <% $v %> + + +% } +% } +<%init> + +my %opt = @_; +my $svc_acct = $opt{'svc_acct'}; + + diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi index 3f2d4736a..b0f4ef0cf 100755 --- a/httemplate/view/svc_domain.cgi +++ b/httemplate/view/svc_domain.cgi @@ -169,28 +169,7 @@ DNS records % }
-% my ( $settings, $defaults ) = $svc_domain->export_getsettings; -% if ( keys %$settings ) { - -%# XXX a way to label this "Communigate pro settings".. just a config maybe - External settings - <% ntable('#cccccc',2) %> - -% foreach my $key ( keys %$settings ) { - - <% $key |h %> - - <% $defaults->{$key} ? '' : '' %> - <% $settings->{$key} |h %> - <% $defaults->{$key} ? '' : '' %> - - -% } - - -
- -% } +<% include('elements/svc_export_settings.html', $svc_domain) %> <% joblisting({'svcnum'=>$svcnum}, 1) %>