X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=dd3af2dc166d767c934c754d3e7f13d3ce433da1;hb=4ecf0133faca10a1e959fd0eeb285ce4f9cae212;hp=113bac08307ef552d1f56ae17e13080415dac948;hpb=f63936fb0404dc44fc8d3aa45c4edd4fa6670821;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 113bac083..dd3af2dc1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -732,7 +732,7 @@ my %payment_gateway_options = (
   {
     'key'         => 'encryption',
     'section'     => 'billing',
-    'description' => 'Enable encryption of credit cards.',
+    'description' => 'Enable encryption of credit cards and echeck numbers',
     'type'        => 'checkbox',
   },
 
@@ -740,20 +740,21 @@ my %payment_gateway_options = (
     'key'         => 'encryptionmodule',
     'section'     => 'billing',
     'description' => 'Use which module for encryption?',
-    'type'        => 'text',
+    'type'        => 'select',
+    'select_enum' => [ '', 'Crypt::OpenSSL::RSA', ],
   },
 
   {
     'key'         => 'encryptionpublickey',
     'section'     => 'billing',
-    'description' => 'Your RSA Public Key - Required if Encryption is turned on.',
+    'description' => 'Encryption public key',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'encryptionprivatekey',
     'section'     => 'billing',
-    'description' => 'Your RSA Private Key - Including this will enable the "Bill Now" feature.  However if the system is compromised, a hacker can use this key to decode the stored credit card information.  This is generally not a good idea.',
+    'description' => 'Encryption private key',
     'type'        => 'textarea',
   },
 
@@ -2475,7 +2476,14 @@ and customer address. Include units.',
                        'paymask,amount,zip' => 'Verify with credit card (or bank account) last 4 digits, payment amount and zip code',
                      ],
   },
-  
+
+  {
+    'key'         => 'selfservice-password_reset_msgnum',
+    'section'     => 'self-service',
+    'description' => 'Template to use for password reset emails.',
+    %msg_template_options,
+  },
+
   {
     'key'         => 'selfservice-recent-did-age',
     'section'     => 'self-service',