[freeside-commits] freeside/httemplate/edit part_svc.cgi, 1.62.2.7, 1.62.2.8 svc_acct.cgi, 1.53.2.14, 1.53.2.15 svc_domain.cgi, 1.17.2.11, 1.17.2.12

Ivan,,, ivan at wavetail.420.am
Fri Aug 6 14:28:05 PDT 2010


Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv23744/httemplate/edit

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	part_svc.cgi svc_acct.cgi svc_domain.cgi 
Log Message:
communigate phase 3: archive messages, RT#7515

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.62.2.7
retrieving revision 1.62.2.8
diff -u -w -d -r1.62.2.7 -r1.62.2.8
--- part_svc.cgi	20 Apr 2010 04:29:17 -0000	1.62.2.7
+++ part_svc.cgi	6 Aug 2010 21:28:03 -0000	1.62.2.8
@@ -291,12 +291,22 @@
 %                  (grep(/^$rvalue$/, split(',',$value)) ? ' SELECTED>' : '>' ).
 %                  $record->$select_label(). '</OPTION>';
 %            } #next $record
-%          } else { # select_list
+%          } elsif ( $def->{select_list} ) {
 %            foreach my $item ( @{$def->{select_list}} ) {
 %              $html .= qq!<OPTION VALUE="$item"!.
 %                    (grep(/^$item$/, split(',',$value)) ? ' SELECTED>' : '>' ).
 %                    $item. '</OPTION>';
 %            } #next $item
+%          } elsif ( $def->{select_hash} ) {
+%            $def->{select_hash} = tie %{ $def->{select_hash} },
+%                                      'Tie::IxHash',
+%                                      @{ $def->{select_hash} }
+%                if ref($def->{select_hash}) eq 'ARRAY';
+%            foreach my $key ( keys %{$def->{select_hash}} ) {
+%              $html .= qq!<OPTION VALUE="$key"!.
+%                    (grep(/^$key$/, split(',',$value)) ? ' SELECTED>' : '>' ).
+%                    $def->{select_hash}{$key}. '</OPTION>';
+%            } #next $key
 %          } #endif
 %          $html .= '</SELECT>';
 %

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.53.2.14
retrieving revision 1.53.2.15
diff -u -w -d -r1.53.2.14 -r1.53.2.15
--- svc_acct.cgi	23 Jul 2010 10:03:06 -0000	1.53.2.14
+++ svc_acct.cgi	6 Aug 2010 21:28:03 -0000	1.53.2.15
@@ -255,223 +255,13 @@
   </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 ) {
-
-  <% 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',
-            )
-  %>
-
-%  #preferences
-
-%# 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>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'On logout remove trash',
-               'field'      => 'cgp_emptytrash',
-               'options'    => $svc_acct->cgp_emptytrash_values,
-               'labels'     => {
-                                 '' => 'default (92 days)', #right?
-                               },
-               'curr_value' => $svc_acct->cgp_emptytrash,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Language',
-               'field'      => 'cgp_language',
-               'options'    => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ],
-               'labels'     => {
-                                 '' => 'default (English)',
-                               },
-               'curr_value' => $svc_acct->cgp_language,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Time zone',
-               'field'      => 'cgp_timezone',
-               'options'    => $svc_acct->cgp_timezone_values,
-               'labels'     => {
-                                 '' => 'default (HostOS)',
-                               },
-               'curr_value' => $svc_acct->cgp_timezone,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Layout',
-               'field'      => 'cgp_skinname',
-               'options'    => [ '', '***', 'GoldFleece', 'Skin2' ],
-               'labels'     => {
-                                 '' => 'default (***)',
-                               },
-               'curr_value' => $svc_acct->cgp_skinname,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Pronto style',
-               'field'      => 'cgp_prontoskinname',
-               'options'    => [ '', 'Pronto', 'Pronto-darkflame', 'Pronto-steel', 'Pronto-twilight', ],
-
-               'curr_value' => $svc_acct->cgp_prontoskinname,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Send read receipts',
-               'field'      => 'cgp_sendmdnmode',
-               'options'    => [ '', 'Never', 'Manually', 'Automatically' ],
-               'labels'     => {
-                                 '' => 'default (Automatically)',
-                               },
-               'curr_value' => $svc_acct->cgp_language,
+<% include('svc_acct/communigate.html',
+             'svc_acct'    => $svc_acct,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
             )
   %>
 
-%#XXX vacation message, redirect all mail, mail rules
-
-% } else {
-
-%   for (qw( password_recover cgp_rulesallowed cgp_rpopallowed cgp_mailtoall
-%            cgp_addmailtrailer
-%            cgp_deletemode cgp_emptytrash cgp_language cgp_timezone
-%            cgp_skinname cgp_sendmdnmode
-%          ) ) {
-
-      <INPUT TYPE="hidden" NAME="<% $_ %>" VALUE="<% $svc_acct->$_() %>">
-%   }
-
-% }
-
-
 % if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { 
   <INPUT TYPE="hidden" NAME="slipip" VALUE="<% $svc_acct->slipip %>">
 % } else { 

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_domain.cgi,v
retrieving revision 1.17.2.11
retrieving revision 1.17.2.12
diff -u -w -d -r1.17.2.11 -r1.17.2.12
--- svc_domain.cgi	23 Jul 2010 10:03:06 -0000	1.17.2.11
+++ svc_domain.cgi	6 Aug 2010 21:28:03 -0000	1.17.2.12
@@ -16,6 +16,7 @@
       <INPUT TYPE="text" NAME="domain" VALUE="<% $domain %>" SIZE=28 MAXLENGTH=63>
 %   } else {
       <B><% $domain %></B>
+      <INPUT TYPE="hidden" NAME="domain" VALUE="<% $domain %>">
 %   }
 
 % if ($export) {
@@ -38,270 +39,23 @@
   </TD>
 </TR>
 
-% if ( $communigate ) {
-  <TR>
-    <TD ALIGN="right">Administrator domain</TD>
-    <TD>
-      <% include('/elements/select-domain.html',
-                   'element_name' => 'parent_svcnum',
-                   'curr_value'   => $svc_domain->parent_svcnum,
-                   'empty_label'  => '(none)',
-                )
-      %>
-    </TD>
-  </TR>
-% } else {
-  <INPUT TYPE="hidden" NAME="parent_svcnum" VALUE="<% $svc_domain->parent_svcnum %>">
-% }
-
-% if ( $communigate
-%      && $part_svc->part_svc_column('cgp_aliases')->columnflag !~ /^[FA]$/ ) {
-
-    <TR>
-      <TD ALIGN="right">Aliases</TD>
-      <TD><INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_domain->cgp_aliases %>"></TD>
-    </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="cgp_aliases" VALUE="<% $svc_domain->cgp_aliases %>">
-% }
-
-% if ( $part_svc->part_svc_column('max_accounts')->columnflag =~ /^[FA]$/ ) {
-    <INPUT TYPE="hidden" NAME="max_accounts" VALUE="<% $svc_domain->max_accounts %>">
-% } else {
-    <TR>
-      <TD ALIGN="right">Maximum number of accounts</TD>
-      <TD>
-        <INPUT TYPE="text" NAME="max_accounts" SIZE=5 MAXLENGTH=6 VALUE="<% $svc_domain->max_accounts %>">
-      </TD>
-    </TR>
-% }
-
-% 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_domain->cgp_accessmodes,
+<% include('svc_domain/communigate-basics.html',
+             'svc_domain'  => $svc_domain,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
                 )
       %>
-    </TD>
-  </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_domain->cgp_accessmodes() |h %>">
-% }
-
-% if ( $communigate
-%      && $part_svc->part_svc_column('trailer')->columnflag ne 'F' )
-% {
-
-  <TR>
-    <TD ALIGN="right">Mail trailer</TD>
-    <TD>
-      <TEXTAREA NAME="trailer" ROWS=5 COLS=60><% $svc_domain->trailer() |h %></TEXTAREA>
-    </TD>
-  </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="trailer" VALUE="<% $svc_domain->trailer() |h %>">
-% }
-
 
 </TABLE>
 <BR>
 
-% if ( $communigate ) {
-
-Account defaults
-<% ntable("#cccccc",2) %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Password modification',
-               'field'      => 'acct_def_password_selfchange',
-               'curr_value' => $svc_domain->acct_def_password_selfchange,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Password recovery',
-               'field'      => 'acct_def_password_recover',
-               'curr_value' => $svc_domain->acct_def_password_recover,
-               'value'      => 'Y',
-            )
-  %>
-
-  <TR>
-    <TD ALIGN="right">Enabled services
-    </TD>
-    <TD><% include('/elements/communigate_pro-accessmodes.html',
-                     'element_name_prefix' => 'acct_def_cgp_accessmodes_',
-                     'curr_value' => $svc_domain->acct_def_cgp_accessmodes,
-                  )
-        %>
-    </TD>
-  </TR>
-
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'Mail storage limit',
-               'field'      => 'acct_def_quota',
-               'curr_value' => $svc_domain->acct_def_quota,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'File storage limit',
-               'field'      => 'acct_def_file_quota',
-               'curr_value' => $svc_domain->acct_def_file_quota,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'Files limit',
-               'field'      => 'acct_def_file_maxnum',
-               'curr_value' => $svc_domain->acct_def_file_maxnum,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'File size limit',
-               'field'      => 'acct_def_file_maxsize',
-               'curr_value' => $svc_domain->acct_def_file_maxsize,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Allowed mail rules',
-               'field'      => 'acct_def_cgp_rulesallowed',
-               'options'    => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ],
-               'labels'     => {
-                                 '' => 'default (No)', #No always the default?
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_rulesallowed,
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'RPOP modifications',
-               'field'      => 'acct_def_cgp_rpopallowed',
-               'curr_value' => $svc_domain->acct_def_cgp_rpopallowed,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Accepts mail to "all"',
-               'field'      => 'acct_def_cgp_mailtoall',
-               'curr_value' => $svc_domain->acct_def_cgp_mailtoall,
-               'value'      => 'Y',
-            )
-  %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      => 'Add trailer to sent mail',
-               'field'      => 'acct_def_cgp_addmailtrailer',
-               'curr_value' => $svc_domain->acct_def_cgp_addmailtrailer,
-               'value'      => 'Y',
-            )
-  %>
-
-%# false laziness w/svc_acct acct_def
-  <TR>
-    <TD ALIGN="right">Message delete method</TD>
-    <TD>
-      <SELECT NAME="acct_def_cgp_deletemode">
-%       for ( 'Move To Trash', 'Immediately', 'Mark' ) {
-          <OPTION VALUE="<% $_ %>"
-                  <% $_ eq $svc_domain->acct_def_cgp_deletemode ? 'SELECTED' : '' %>
-          ><% $_ %>
-%       }
-      </SELECT>
-    </TD>
-  </TR>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'On logout remove trash',
-               'field'      => 'acct_def_cgp_emptytrash',
-               'options'    => $svc_domain->cgp_emptytrash_values,
-               'labels'     => {
-                                 '' => 'default (92 days)', #right?
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_emptytrash,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Language',
-               'field'      => 'acct_def_cgp_language',
-               'options'    => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ],
-               'labels'     => {
-                                 '' => 'default (English)',
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_language,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Time zone',
-               'field'      => 'acct_def_cgp_timezone',
-               'options'    => $svc_domain->cgp_timezone_values,
-               'labels'     => {
-                                 '' => 'default (HostOS)',
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_timezone,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Layout',
-               'field'      => 'acct_def_cgp_skinname',
-               'options'    => [ '', '***', 'GoldFleece', 'Skin2' ],
-               'labels'     => {
-                                 '' => 'default (***)',
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_skinname,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Pronto style',
-               'field'      => 'acct_def_cgp_prontoskinname',
-               'options'    =>  [ '', 'Pronto', 'Pronto-darkflame', 'Pronto-steel', 'Pronto-twilight', ],
-               'curr_value' => $svc_domain->acct_def_cgp_prontoskinname,
-            )
-  %>
-
-  <% include('/elements/tr-select.html',
-               'label'      => 'Send read receipts',
-               'field'      => 'acct_def_cgp_sendmdnmode',
-               'options'    => [ '', 'Never', 'Manually', 'Automatically' ],
-               'labels'     => {
-                                 '' => 'default (Automatically)',
-                               },
-               'curr_value' => $svc_domain->acct_def_cgp_language,
+<% include('svc_domain/communigate-acct_defaults.html',
+             'svc_domain'  => $svc_domain,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
             )
   %>
 
-%              #XXX rules, archive rule, spam foldering rule(s)
-
-</TABLE>
-<BR>
-
-% } else {
-
-%   foreach my $f (qw( password_selfchange password_recover cgp_accessmodes
-%                      quota file_quota file_maxnum file_maxsize
-%                      cgp_rulesallowed cgp_rpopallowed cgp_mailtoall
-%                      cgp_addmailtrailer
-%                      cgp_deletemode cgp_emptytrash cgp_language
-%                      cgp_timezone cgp_skinname cgp_sendmdnmode
-%                 )) {
-      <INPUT TYPE="hidden" NAME="acct_def_<%$f%>" VALUE="<% $svc_domain->get("acct_def_$f") %>">
-%   }
-
-% }
-
 <INPUT TYPE="submit" VALUE="Submit">
 
 </FORM>



More information about the freeside-commits mailing list