communigate: domain account defaults, RT#7083

3 files changed, 78 insertions, 2 deletions

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 76d8ecd7f..ab33667fb 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1638,8 +1638,8 @@ sub tables_hashref {
         'file_maxnum',     'varchar', 'NULL', $char_d, '', '', #MaxWebFiles
         'file_maxsize',    'varchar', 'NULL', $char_d, '', '', #MaxFileSize
         'cgp_accessmodes', 'varchar', 'NULL',     255, '', '', #AccessModes
-        'password_selfchange','char', 'NULL',       1, '', '', 
-        'password_recover',   'char', 'NULL',       1, '', '', 
+        'password_selfchange','char', 'NULL',       1, '', '', #PWDAllowed
+        'password_recover',   'char', 'NULL',       1, '', '', #PasswordRecovery
         'cgp_type',        'varchar', 'NULL', $char_d, '', '', #AccountType
         'cgp_aliases',     'varchar', 'NULL',     255, '', '',
         'cgp_deletemode',  'varchar', 'NULL', $char_d, '', '', #DeleteMode
@@ -1691,6 +1691,15 @@ sub tables_hashref {
         'max_accounts',     'int', 'NULL',       '', '', '',
         'cgp_aliases',  'varchar', 'NULL',      255, '', '',
         'cgp_accessmodes','varchar','NULL',     255, '', '', #DomainAccessModes
+        'acct_def_password_selfchange','char', 'NULL',       1, '', '', 
+        'acct_def_password_recover',   'char', 'NULL',       1, '', '', 
+        'acct_def_cgp_accessmodes', 'varchar', 'NULL',     255, '', '',
+        'acct_def_quota',           'varchar', 'NULL', $char_d, '', '',
+        'acct_def_file_quota',      'varchar', 'NULL', $char_d, '', '',
+        'acct_def_file_maxnum',     'varchar', 'NULL', $char_d, '', '',
+        'acct_def_file_maxsize',    'varchar', 'NULL', $char_d, '', '',
+        'acct_def_cgp_deletemode',  'varchar', 'NULL', $char_d, '', '',
+        'acct_def_cgp_emptytrash',  'varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ],
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 18b9af557..7d3c9c5fd 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -290,6 +290,12 @@ sub table_info {
                            disable_inventory => 1,
                            disable_select    => 1,
                          },
+        'password_selfchange' => { label => 'Password modification',
+                                   type  => 'checkbox',
+                                 },
+        'password_recover'    => { label => 'Password recovery',
+                                   type  => 'checkbox',
+                                 },
         'cgp_deletemode' => { 
                               label => 'Communigate message delete method',
                               type  => 'select',
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index ab45e00a6..b928e26e5 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -135,6 +135,58 @@ sub table_info {
                              disable_inventory => 1,
                              disable_select    => 1,
                            },
+
+      'acct_def_cgp_accessmodes' => { 
+                             label => 'Acct. default Communigate enabled services',
+                             type  => 'communigate_pro-accessmodes',
+                             disable_inventory => 1,
+                             disable_select    => 1,
+                           },
+      'acct_def_password_selfchange' => { label => 'Acct. default Password modification',
+                                 type  => 'checkbox',
+                               },
+      'acct_def_password_recover'    => { label => 'Acct. default Password recovery',
+                                 type  => 'checkbox',
+                               },
+      'acct_def_cgp_deletemode' => { 
+                            label => 'Acct. default Communigate message delete method',
+                            type  => 'select',
+                            select_list => [ 'Move To Trash', 'Immediately', 'Mark' ],
+                            disable_inventory => 1,
+                            disable_select    => 1,
+                          },
+      'acct_def_cgp_emptytrash' => { 
+                            label => 'Acct. default Communigate on logout remove trash',
+                            type  => 'text',
+                            disable_inventory => 1,
+                            disable_select    => 1,
+                          },
+      'acct_def_quota'     => { 
+                       label => 'Acct. default Quota', #Mail storage limit
+                       type => 'text',
+                       disable_inventory => 1,
+                       disable_select => 1,
+                     },
+      'acct_def_file_quota'=> { 
+                       label => 'Acct. default File storage limit',
+                       type => 'text',
+                       disable_inventory => 1,
+                       disable_select => 1,
+                     },
+      'acct_def_file_maxnum'=> { 
+                       label => 'Acct. default Number of files limit',
+                       type => 'text',
+                       disable_inventory => 1,
+                       disable_select => 1,
+                     },
+      'acct_def_file_maxsize'=> { 
+                       label => 'Acct. default File size limit',
+                       type => 'text',
+                       disable_inventory => 1,
+                       disable_select => 1,
+                     },
+
+
     },
   };
 }
@@ -364,6 +416,15 @@ sub check {
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')
               || $self->ut_textn('cgp_aliases') #well
+              || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ])
+              || $self->ut_enum('acct_def_password_recover',    [ '', 'Y' ])
+              || $self->ut_textn('acct_def_cgp_accessmodes')
+              || $self->ut_alphan('acct_def_quota')
+              || $self->ut_alphan('acct_def_file_quota')
+              || $self->ut_alphan('acct_def_maxnum')
+              || $self->ut_alphan('acct_def_maxsize')
+              || $self->ut_alphasn('acct_def_cgp_deletemode')
+              || $self->ut_alphan('acct_def_cgp_emptytrash')
   ;
   return $error if $error;