[freeside-commits] freeside/FS/FS Conf.pm, 1.468.2.15, 1.468.2.16 msg_template.pm, 1.21.2.1, 1.21.2.2 ClientAPI_XMLRPC.pm, 1.5.2.6, 1.5.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Conf.pm msg_template.pm ClientAPI_XMLRPC.pm 
Log Message:
selfservice password reset, RT#13656

Index: msg_template.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/msg_template.pm,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -w -d -r1.21.2.1 -r1.21.2.2
--- msg_template.pm	5 Aug 2011 07:25:42 -0000	1.21.2.1
+++ msg_template.pm	30 Oct 2011 23:28:25 -0000	1.21.2.2
@@ -262,6 +262,10 @@
 Destination address.  The default is to use the customer's 
 invoicing_list addresses.  Multiple addresses may be comma-separated.
 
+=item substitutions
+
+A hash reference of additional substitutions
+
 =back
 
 =cut
@@ -324,8 +328,12 @@
       } 
     } 
   } 
-  $_ = encode_entities($_ || '') foreach values(%hash);
 
+  if ( $opt{substitutions} ) {
+    $hash{$_} = $opt{substitutions}->{$_} foreach keys %{$opt{substitutions}};
+  }
+
+  $_ = encode_entities($_ || '') foreach values(%hash);
 
   ###
   # clean up template

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.468.2.15
retrieving revision 1.468.2.16
diff -u -w -d -r1.468.2.15 -r1.468.2.16
--- Conf.pm	26 Oct 2011 21:56:49 -0000	1.468.2.15
+++ Conf.pm	30 Oct 2011 23:28:25 -0000	1.468.2.16
@@ -2478,6 +2478,13 @@
   },
   
   {
+    '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',
     'description' => 'If specified, defines "recent", in number of seconds, for "Download recently allocated DIDs" in self-service.',

Index: ClientAPI_XMLRPC.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/ClientAPI_XMLRPC.pm,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -w -d -r1.5.2.6 -r1.5.2.7
--- ClientAPI_XMLRPC.pm	28 Oct 2011 01:32:21 -0000	1.5.2.6
+++ ClientAPI_XMLRPC.pm	30 Oct 2011 23:28:25 -0000	1.5.2.7
@@ -111,6 +111,8 @@
   'unprovision_svc'           => 'MyAccount/unprovision_svc',
   'myaccount_passwd'          => 'MyAccount/myaccount_passwd',
   'reset_passwd'              => 'MyAccount/reset_passwd',
+  'check_reset_passwd'        => 'MyAccount/check_reset_passwd',
+  'process_reset_passwd'      => 'MyAccount/process_reset_passwd',
   'create_ticket'             => 'MyAccount/create_ticket',
   'get_ticket'                => 'MyAccount/get_ticket',
   'adjust_ticket_priority'    => 'MyAccount/adjust_ticket_priority',