X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=0b54282ef3b52464eec3398e4da3e6dc2772f8c5;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=a59156afdc3fe88334cc53bc18c63088db580cd6;hpb=860ba14587816649210dd43a5728cf4b007bfa54;p=freeside.git

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index a59156afd..0b54282ef 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1461,6 +1461,7 @@ sub tables_hashref {
         'pay_weight',    'real',    'NULL', '', '', '',
         'credit_weight', 'real',    'NULL', '', '', '',
         'agentnum',      'int',     'NULL', '', '', '', 
+        'fcc_ds0s',      'int',     'NULL', '', '', '', 
         'no_auto',      'char',     'NULL',  1, '', '', 
       ],
       'primary_key' => 'pkgpart',
@@ -1660,20 +1661,31 @@ sub tables_hashref {
         'last_login',  @date_type, '', '', 
         'last_logout', @date_type, '', '', 
         #communigate pro fields (quota = MaxAccountSize)
+        'cgp_aliases',     'varchar', 'NULL',     255, '', '',
+        #settings
+        'cgp_type',        'varchar', 'NULL', $char_d, '', '', #AccountType
         'file_quota',      'varchar', 'NULL', $char_d, '', '', #MaxWebSize
         '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, '', '', #PWDAllowed
         'password_recover',   'char', 'NULL',       1, 'Y','', #PasswordRecovery
-        'cgp_type',        'varchar', 'NULL', $char_d, '', '', #AccountType
-        'cgp_aliases',     'varchar', 'NULL',     255, '', '',
-        'cgp_deletemode',  'varchar', 'NULL', $char_d, '', '', #DeleteMode
-        'cgp_emptytrash',  'varchar', 'NULL', $char_d, '', '', #EmptyTrash
         'cgp_rulesallowed','varchar', 'NULL', $char_d, '', '', #RulesAllowed
         'cgp_rpopallowed',    'char', 'NULL',       1, '', '', #RPOPAllowed
         'cgp_mailtoall',      'char', 'NULL',       1, '', '', #MailToAll
         'cgp_addmailtrailer', 'char', 'NULL',       1, '', '', #AddMailTrailer
+        #XXX archive messages, mailing lists
+        #preferences
+        'cgp_deletemode',     'varchar', 'NULL', $char_d, '', '',#DeleteMode
+        'cgp_emptytrash',     'varchar', 'NULL', $char_d, '', '',#EmptyTrash
+        'cgp_language',       'varchar', 'NULL', $char_d, '', '',#Language
+        'cgp_timezone',       'varchar', 'NULL', $char_d, '', '',#TimeZone
+        'cgp_skinname',       'varchar', 'NULL', $char_d, '', '',#SkinName
+        'cgp_prontoskinname', 'varchar', 'NULL', $char_d, '', '',#ProntoSkinName
+        'cgp_sendmdnmode',    'varchar', 'NULL', $char_d, '', '',#SendMDNMode
+        #mail
+#vacation message, redirect all mail, mail rules
+        #XXX RPOP settings
       ],
       'primary_key' => 'svcnum',
       #'unique' => [ [ 'username', 'domsvc' ] ],
@@ -1722,20 +1734,29 @@ sub tables_hashref {
         'trailer',         'text', '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, 'Y', '', 
-        '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, '', '',
-        'acct_def_cgp_rulesallowed','varchar', 'NULL', $char_d, '', '',
-        'acct_def_cgp_rpopallowed',    'char', 'NULL',       1, '', '', 
-        'acct_def_cgp_mailtoall',      'char', 'NULL',       1, '', '', 
-        'acct_def_cgp_addmailtrailer', 'char', 'NULL',       1, '', '', 
-
+        #settings
+        'acct_def_password_selfchange',   'char', 'NULL',       1,  '', '', 
+        'acct_def_password_recover',      'char', 'NULL',       1, 'Y', '', 
+        '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_rulesallowed',   'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_rpopallowed',       'char', 'NULL',       1,  '', '', 
+        'acct_def_cgp_mailtoall',         'char', 'NULL',       1,  '', '', 
+        'acct_def_cgp_addmailtrailer',    'char', 'NULL',       1,  '', '', 
+        #XXX archive messages
+        #preferences
+        'acct_def_cgp_deletemode',     'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_emptytrash',     'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_language',       'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_timezone',       'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_skinname',       'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_prontoskinname', 'varchar', 'NULL', $char_d,  '', '',
+        'acct_def_cgp_sendmdnmode',    'varchar', 'NULL', $char_d,  '', '',
+        #mail
+        #XXX rules, archive rule, spam foldering rule(s)
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ],
@@ -1766,6 +1787,44 @@ sub tables_hashref {
       'index'       => [],
     },
 
+    'cgp_rule' => {
+      'columns' => [
+        'rulenum',  'serial',     '',      '', '', '',
+        'name',    'varchar',     '', $char_d, '', '',
+        'comment', 'varchar', 'NULL', $char_d, '', '',
+        'svcnum',      'int',     '',      '', '', '',
+        'priority',    'int',     '',      '', '', '',
+      ],
+      'primary_key' => 'rulenum',
+      'unique'      => [ [ 'svcnum', 'name' ] ],
+      'index'       => [ [ 'svcnum' ] ],
+    },
+
+    'cgp_rule_condition' => {
+      'columns' => [
+        'ruleconditionnum',  'serial',     '',      '', '', '',
+        'condition',        'varchar',     '', $char_d, '', '',
+        'op',               'varchar', 'NULL', $char_d, '', '',
+        'params',           'varchar', 'NULL',     255, '', '',
+        'rulenum',              'int',     '',      '', '', '',
+      ],
+      'primary_key' => 'ruleconditionnum',
+      'unique'      => [],
+      'index'       => [ [ 'rulenum' ] ],
+    },
+
+    'cgp_rule_action' => {
+       'columns' => [
+        'ruleactionnum',  'serial',     '',      '', '', '',
+        'action',        'varchar',     '', $char_d, '', '',
+        'params',        'varchar', 'NULL',     255, '', '',
+        'rulenum',           'int',     '',      '', '', '',
+      ],
+      'primary_key' => 'ruleactionnum',
+      'unique'      => [],
+      'index'       => [ [ 'rulenum' ] ],
+   },
+
     'svc_forward' => {
       'columns' => [
         'svcnum',   'int',            '',   '', '', '', 
@@ -2466,6 +2525,7 @@ sub tables_hashref {
         'termpart',         'int',     '',      '', '', '',#future use see below
         'rated_price',  'decimal', 'NULL',  '10,4', '', '',
         'status',       'varchar', 'NULL',      32, '', '',
+        'svcnum',           'int', 'NULL',      '', '', '',
       ],
       'primary_key' => 'cdrtermnum',
       'unique'      => [ [ 'acctid', 'termpart' ] ],
@@ -2534,12 +2594,13 @@ sub tables_hashref {
       'columns' => [
         'itemnum',  'serial',      '',      '', '', '',
         'classnum', 'int',         '',      '', '', '',
+        'agentnum', 'int',     'NULL',      '', '', '',
         'item',     'varchar',     '', $char_d, '', '',
         'svcnum',   'int',     'NULL',      '', '', '',
       ],
       'primary_key' => 'itemnum',
       'unique' => [ [ 'classnum', 'item' ] ],
-      'index'  => [ [ 'classnum' ], [ 'svcnum' ] ],
+      'index'  => [ [ 'classnum' ], [ 'agentnum' ], [ 'svcnum' ] ],
     },
 
     'inventory_class' => {