X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=99e4b74a41484909c6a079bc9433b2124bf9c870;hb=5293815430d6592f8358b1fbe6d1dc77fa3a3825;hp=2845c830161c91fada6be784f0e6171fbb643f75;hpb=fb9a4b8b235157095779965ffbd9e95934c8bbae;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 2845c8301..99e4b74a4 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -54,7 +54,7 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
%}else{
%}
-
+
%
%my $sec_phrase = $svc_acct->sec_phrase;
%if ( $conf->exists('security_phrase')
@@ -123,6 +123,19 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
+
+% if ( $communigate ) {
+
+
+ Aliases |
+ |
+
+
+% } else {
+
+% }
+
+
<% include('/elements/tr-select-svc_pbx.html',
'curr_value' => $svc_acct->pbxsvc,
'part_svc' => $part_svc,
@@ -241,31 +254,119 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
-% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) {
+% if ( $communigate
+% && $part_svc->part_svc_column('cgp_type')->columnflag ne 'F' )
+% {
+
+
+ Mailbox type |
+
+
+ |
+
+
+% } else {
+
+% }
+
+
+% #false laziness w/svc_domain
+% if ( $communigate
+% && $part_svc->part_svc_column('cgp_accessmodes')->columnflag ne 'F' )
+% {
+
+
+ Enabled services |
+
+ <% include( '/elements/communigate_pro-accessmodes.html',
+ 'curr_value' => $svc_acct->cgp_accessmodes,
+ )
+ %>
+ |
+
+
+% } else {
+
+% }
+
+
+% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) {
-% } else {
+% } 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 ( $communigate ) {
+
+%# false laziness w/svc_domain acct_def
- Quota: |
- |
+ Message delete method |
+
+
+ |
+
+
+
+ On logout remove trash |
+ |
-% }
-% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
+% } else {
-
-% } else {
+
+
+% }
+
+% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
+
+% } else {
IP |
|
% }
-%
+
% my %label = ( seconds => 'Time',
% upbytes => 'Upload bytes',
% downbytes => 'Download bytes',
@@ -399,6 +500,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 } );
@@ -447,22 +551,17 @@ my $svc = $part_svc->getfield('svc');
my $otaker = getotaker;
my $username = $svc_acct->username;
-my $password;
-my $password_encryption = $svc_acct->_password_encryption;
-my $password_encoding = $svc_acct->_password_encoding;
-
-if($svcnum) {
- if($password = $svc_acct->get_cleartext_password) {
- if (! $conf->exists('showpasswords')) {
- $password = '*HIDDEN*';
- }
- }
- elsif($svc_acct->_password and $password_encryption ne 'plain') {
+
+my $password = '';
+if ( $cgi->param('error') ) {
+ $password = $cgi->param('clear_password');
+} elsif ( $svcnum ) {
+ my $password_encryption = $svc_acct->_password_encryption;
+ if ( $password = $svc_acct->get_cleartext_password ) {
+ $password = '*HIDDEN*' unless $conf->exists('showpasswords');
+ } elsif( $svc_acct->_password and $password_encryption ne 'plain' ) {
$password = "(".uc($password_encryption)." encrypted)";
}
- else {
- $password = '';
- }
}
my $ulen =