[freeside-commits] freeside/FS/FS Schema.pm, 1.239.2.5, 1.239.2.6 Conf.pm, 1.397.2.5, 1.397.2.6 svc_acct.pm, 1.304.2.1, 1.304.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv9273/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Schema.pm Conf.pm svc_acct.pm 
Log Message:
cardfortress backend support

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.239.2.5
retrieving revision 1.239.2.6
diff -u -w -d -r1.239.2.5 -r1.239.2.6
--- Schema.pm	13 Nov 2010 23:24:03 -0000	1.239.2.5
+++ Schema.pm	10 Dec 2010 22:09:06 -0000	1.239.2.6
@@ -1702,6 +1702,8 @@
         'pbxsvc',    'int', 'NULL', '', '', '',
         'last_login',  @date_type, '', '', 
         'last_logout', @date_type, '', '', 
+        #cardfortress field(s)
+        'cf_privatekey',      'text', 'NULL',      '', '', '',
         #communigate pro fields (quota = MaxAccountSize)
         'cgp_aliases',     'varchar', 'NULL',     255, '', '',
         #settings
@@ -2994,6 +2996,42 @@
       'index'  => [], #recnum
     },
    
+    'nms_device' => {
+      'columns' => [
+        'nms_devicenum', 'serial',     '',      '', '', '',
+        #'agentnum',         'int', 'NULL',      '', '', '',
+        'devicename',   'varchar',     '', $char_d, '', '',
+        'ip',           'varchar',     '',      15, '', '', 
+        'protocol',     'varchar',     '', $char_d, '', '',
+#        'last',     'int',     '',    '', '', '', 
+      ],
+      'primary_key' => 'nms_devicenum',
+      'unique' => [],
+      'index'  => [],
+    },
+   
+    'nms_deviceport' => {
+      'columns' => [
+        'portnum',       'serial',     '', '', '', '', 
+        'nms_devicenum',    'int',     '', '', '', '', 
+        'deviceport',       'int',     '', '', '', '', 
+        #'ip',       'varchar', 'NULL', 15, '', '', 
+        'svcnum',           'int', 'NULL', '', '', '',
+      ],
+      'primary_key' => 'portnum',
+      'unique'      => [ [ 'nms_devicenum', 'deviceport' ] ],
+      'index'       => [ [ 'svcnum' ] ],
+    },
+
+    'svc_port' => {
+      'columns' => [
+        'svcnum',                'int',     '',      '', '', '', 
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [],
+      'index'  => [], #recnum
+    },
+
 
     # name type nullability length default local
 

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.5
retrieving revision 1.397.2.6
diff -u -w -d -r1.397.2.5 -r1.397.2.6
--- Conf.pm	7 Dec 2010 22:26:58 -0000	1.397.2.5
+++ Conf.pm	10 Dec 2010 22:09:06 -0000	1.397.2.6
@@ -4084,6 +4084,13 @@
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_acct-cf_privatekey-message',
+    'section'     => '',
+    'description' => 'For internal use: HTML displayed when cf_privatekey field is set.',
+    'type'        => 'textarea',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.304.2.1
retrieving revision 1.304.2.2
diff -u -w -d -r1.304.2.1 -r1.304.2.2
--- svc_acct.pm	18 Nov 2010 18:55:23 -0000	1.304.2.1
+++ svc_acct.pm	10 Dec 2010 22:09:06 -0000	1.304.2.2
@@ -1207,6 +1207,9 @@
               || $self->ut_enum('_password_encoding', ['',qw(plain crypt ldap)])
               || $self->ut_enum('password_selfchange', [ '', 'Y' ])
               || $self->ut_enum('password_recover',    [ '', 'Y' ])
+              #cardfortress
+              || $self->ut_anything('cf_privatekey')
+              #communigate
               || $self->ut_textn('cgp_accessmodes')
               || $self->ut_alphan('cgp_type')
               || $self->ut_textn('cgp_aliases' ) #well
@@ -1224,7 +1227,6 @@
               || $self->ut_textn('cgp_skinname')
               || $self->ut_textn('cgp_prontoskinname')
               || $self->ut_alphan('cgp_sendmdnmode')
-              #XXX RPOP settings
   ;
   return $error if $error;