From 0689d75b6c0c2d30565b64d72b276cad5b195b70 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 22 Feb 2010 03:24:22 +0000 Subject: communigate: domain aliases, enabled services, RT#7083 --- httemplate/edit/process/svc_acct.cgi | 2 +- httemplate/edit/process/svc_domain.cgi | 12 +++++++++ httemplate/edit/svc_domain.cgi | 45 ++++++++++++++++++++++++++-------- 3 files changed, 48 insertions(+), 11 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index a4c60ef9e..0d2c007f1 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -31,7 +31,7 @@ foreach (map { $_,$_."_threshold" } qw( upbytes downbytes totalbytes )) { $cgi->param($_, FS::UI::bytecount::parse_bytecount($cgi->param($_)) ); } -#unmunge cgp_accessmodes (falze laziness-ish w/part_svc.pm::process) +#unmunge cgp_accessmodes (falze laziness-ish w/part_svc.pm::process &svc_domain) unless ( $cgi->param('cgp_accessmodes') ) { $cgi->param('cgp_accessmodes', join(' ', diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi index d8c1a1298..ea97918e8 100755 --- a/httemplate/edit/process/svc_domain.cgi +++ b/httemplate/edit/process/svc_domain.cgi @@ -15,6 +15,18 @@ $FS::svc_domain::whois_hack = 1; $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!"; my $svcnum = $1; +#unmunge cgp_accessmodes (falze laziness-ish w/part_svc.pm::process & svc_acct) +unless ( $cgi->param('cgp_accessmodes') ) { + $cgi->param('cgp_accessmodes', + join(' ', + sort map { /^cgp_accessmodes_([\w\/]+)$/ or die "no way"; $1; } + grep $cgi->param($_), + grep /^cgp_accessmodes_([\w\/]+)$/, + $cgi->param() + ) + ); +} + my $new = new FS::svc_domain ( { map { $_, scalar($cgi->param($_)); diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi index 369d6a0fe..a2b87e4fa 100755 --- a/httemplate/edit/svc_domain.cgi +++ b/httemplate/edit/svc_domain.cgi @@ -38,6 +38,18 @@ Available top-level domains: <% $export->option('tlds') %> +% if ( $communigate +% && $part_svc->part_svc_column('max_accounts')->columnflag !~ /^[FA]$/ ) { + + + Aliases + + + +% } else { + +% } + % if ( $part_svc->part_svc_column('max_accounts')->columnflag =~ /^[FA]$/ ) { % } else { @@ -49,6 +61,24 @@ Available top-level domains: <% $export->option('tlds') %> % } +% if ( $communigate +% && $part_svc->part_svc_column('cgp_accessmodes')->columnflag ne 'F' ) +% { + + + Enabled services + + <% include( '/elements/communigate_pro-accessmodes.html', + 'curr_value' => $svc_domain->cgp_accessmodes, + ) + %> + + + +% } else { + +% } +
@@ -118,19 +148,14 @@ my $action = $svcnum ? 'Edit' : 'Add'; my $svc = $part_svc->getfield('svc'); -my @exports = $part_svc->part_export(); - -my $registrar; -my $export; +my $communigate = scalar($part_svc->part_export('communigate_pro')); + # || scalar($part_svc->part_export('communigate_pro_singledomain')); # Find the first export that does domain registration -foreach (@exports) { - $export = $_ if $_->can('registrar'); -} +my @exports = grep $_->can('registrar'), $part_svc->part_export; +my $export = $exports[0]; # If we have a domain registration export, get the registrar object -if ($export) { - $registrar = $export->registrar; -} +my $registrar = $export ? $export->registrar : ''; my $otaker = getotaker; -- cgit v1.2.1