X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=9c21c44bc4d6aa30efb11164bc54c0866f287c9b;hb=e078ca418dcf3c7b92efcd371ce761df3314c369;hp=065ce701db621c0d0735704918cf6398574ec684;hpb=d2e5d9d1f65fc94eb87eae45b675645e92087f49;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 065ce701d..9c21c44bc 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,
@@ -243,13 +256,16 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
-% if ( $communigate ) {
+% 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' )
+% {
+
- Mailbox type |
- XXX checkbox thingie!!
+ | Enabled services |
+
+ <% include( '/elements/communigate_pro-accessmodes.html',
+ 'curr_value' => $svc_acct->cgp_accessmodes,
+ )
+ %>
|
-
% } else {
-
-
+
% }
@@ -302,6 +329,34 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
% }
+% if ( $communigate ) {
+
+%# false laziness w/svc_domain acct_def
+
+ Message delete method |
+
+
+ |
+
+
+
+ On logout remove trash |
+ |
+
+
+% } else {
+
+
+
+
+% }
+
% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
@@ -496,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 =