X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=f2b8e0c4a4adc8200daf4a25d97393a317a87d14;hb=e39f81dae87d882c0ea4f6f1918fa9cae6d2fc61;hp=35c9006f6ed411a120d8ed458e9561e7d38b0fbf;hpb=860ba14587816649210dd43a5728cf4b007bfa54;p=freeside.git

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 35c9006f6..f2b8e0c4a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -255,158 +255,12 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
   </TR>
 % } 
 
-
-% if ( $communigate
-%      && $part_svc->part_svc_column('cgp_type')->columnflag ne 'F' )
-% {
-
-% # settings
-
-  <TR>
-    <TD ALIGN="right">Mailbox type</TD>
-    <TD>
-      <SELECT NAME="cgp_type">
-%       foreach my $option (qw( MultiMailbox TextMailbox MailDirMailbox
-%                               AGrade BGrade CGrade                    )) {
-          <OPTION VALUE="<% $option %>"
-                  <% $option eq $svc_acct->cgp_type() ? 'SELECTED' : '' %>
-          ><% $option %>
-%       }
-      </SELECT>
-    </TD>
-  </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="cgp_type" VALUE="<% $svc_acct->cgp_type() %>">
-% }
-
-
-% #false laziness w/svc_domain
-% if ( $communigate
-%      && $part_svc->part_svc_column('cgp_accessmodes')->columnflag ne 'F' )
-% {
-
-  <TR>
-    <TD ALIGN="right">Enabled services</TD>
-    <TD>
-      <% include( '/elements/communigate_pro-accessmodes.html',
-                    'curr_value' => $svc_acct->cgp_accessmodes,
-                )
-      %>
-    </TD>
-  </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_acct->cgp_accessmodes() |h %>">
-% }
-
-
-% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { 
-  <INPUT TYPE="hidden" NAME="quota" VALUE="<% $svc_acct->quota %>">
-% } else {
-%   my $quota_label = $communigate ? 'Mail storage limit' : 'Quota';
-    <TR>
-      <TD ALIGN="right"><% $quota_label %></TD>
-      <TD><INPUT TYPE="text" NAME="quota" VALUE="<% $svc_acct->quota %>"></TD>
-    </TR>
-% }
-
-% 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' ){
-      <INPUT TYPE="hidden" NAME="<%$key%>" VALUE="<% $svc_acct->$key() |h %>">
-%   } else {
-
-      <TR>
-        <TD ALIGN="right"><% $cgp_label{$key} %></TD>
-        <TD><INPUT TYPE="text" NAME="<% $key %>" VALUE="<% $svc_acct->$key() |h %>"></TD>
-      </TR>
-
-%   }
-% }
-
-% if ( $communigate ) {
-
-%  #preferences
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Password recovery',
-               'field'      => 'password_recover',
-               'curr_value' => $svc_acct->password_recover,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Allowed mail rules',
-               'field'      => 'cgp_rulesallowed',
-               'options'    => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ],
-               'labels'     => {
-                                 '' => 'default (No)', #No always the default?
-                               },
-               'curr_value' => $svc_acct->cgp_rulesallowed,
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'RPOP modifications',
-               'field'      => 'cgp_rpopallowed',
-               'curr_value' => $svc_acct->cgp_rpopallowed,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Accepts mail to "all"',
-               'field'      => 'cgp_mailtoall',
-               'curr_value' => $svc_acct->cgp_mailtoall,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Add trailer to sent mail',
-               'field'      => 'cgp_addmailtrailer',
-               'curr_value' => $svc_acct->cgp_addmailtrailer,
-               'value'      => 'Y',
-            )
-  %>
-
-%# false laziness w/svc_domain acct_def
-  <TR>
-    <TD ALIGN="right">Message delete method</TD>
-    <TD>
-      <SELECT NAME="cgp_deletemode">
-%       for ( 'Move To Trash', 'Immediately', 'Mark' ) {
-          <OPTION VALUE="<% $_ %>"
-                  <% $_ eq $svc_acct->cgp_deletemode ? 'SELECTED' : '' %>
-          ><% $_ %>
-%       }
-      </SELECT>
-    </TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">On logout remove trash</TD>
-    <TD><INPUT TYPE="text" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>"></TD>
-  </TR>
-
-%#XXX language, time zone, layout, printo style, send read receipts
-%#XXX vacation message, redirect all mail, mail rules
-
-% } else {
-
-  <INPUT TYPE="hidden" NAME="cgp_deletemode" VALUE="<% $svc_acct->cgp_deletemode %>">
-  <INPUT TYPE="hidden" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>">
-
-% }
-
+<% include('svc_acct/communigate.html',
+             'svc_acct'    => $svc_acct,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
+          )
+%>
 
 % if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { 
   <INPUT TYPE="hidden" NAME="slipip" VALUE="<% $svc_acct->slipip %>">
@@ -486,6 +340,12 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
 </TABLE>
 <BR>
 
+% if ( $captcha_url ) {
+<IMG SRC="<% $captcha_url %>"><BR>
+Enter the word shown above: <INPUT TYPE="text" NAME="captcha_response"><BR>
+<BR>
+% }
+
 <INPUT TYPE="submit" VALUE="Submit">
 
 </FORM>
@@ -631,4 +491,18 @@ sub max {
   (sort(@_))[-1]
 }
 
+my $captcha_url;
+my ($export_google) = $part_svc->part_export('acct_google');
+if ( $export_google ) {
+  my $error = $export_google->auth_error;
+  if ( $error ) {
+    if ( $error->{'captcha_url'} ) {
+      $captcha_url = $error->{'captcha_url'};
+    }
+    else {
+      $cgi->param('error', $error->{'message'});
+    }
+  } #if $error
+}
+
 </%init>