From d2e5d9d1f65fc94eb87eae45b675645e92087f49 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 20 Feb 2010 22:34:57 +0000 Subject: communigate pro provisioning, RT#7083 --- httemplate/view/elements/svc_export_settings.html | 28 ++ httemplate/view/svc_acct.cgi | 394 ++++------------------ httemplate/view/svc_acct/basics.html | 202 +++++++++++ httemplate/view/svc_acct/change_svc.html | 21 ++ httemplate/view/svc_acct/change_svc_form.html | 23 ++ httemplate/view/svc_acct/hosting.html | 38 +++ httemplate/view/svc_acct/radius_usage.html | 77 +++++ httemplate/view/svc_acct/usage.html | 27 ++ httemplate/view/svc_domain.cgi | 23 +- 9 files changed, 478 insertions(+), 355 deletions(-) create mode 100644 httemplate/view/elements/svc_export_settings.html create mode 100644 httemplate/view/svc_acct/basics.html create mode 100644 httemplate/view/svc_acct/change_svc.html create mode 100644 httemplate/view/svc_acct/change_svc_form.html create mode 100644 httemplate/view/svc_acct/hosting.html create mode 100644 httemplate/view/svc_acct/radius_usage.html create mode 100644 httemplate/view/svc_acct/usage.html (limited to 'httemplate/view') 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) %> -- cgit v1.2.1