[freeside-commits] branch master updated. 4df629543ef02e870be3073007faaeddcf0d3132

Ivan Kohler ivan at freeside.biz
Tue Dec 5 11:43:40 PST 2017


The branch, master has been updated
       via  4df629543ef02e870be3073007faaeddcf0d3132 (commit)
       via  12c0f8134129c1fedd9580beb7bb13b2c0e9bd8a (commit)
      from  ec8be6c17823eadf046438cce7925329e653c17a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4df629543ef02e870be3073007faaeddcf0d3132
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 5 11:43:39 2017 -0800

    fix logo encoding over xml-api for all functions that call skin_info internally, RT#75279

diff --git a/FS/FS/ClientAPI_XMLRPC.pm b/FS/FS/ClientAPI_XMLRPC.pm
index 511cef4c9..dcf34fdaa 100644
--- a/FS/FS/ClientAPI_XMLRPC.pm
+++ b/FS/FS/ClientAPI_XMLRPC.pm
@@ -47,13 +47,18 @@ our %typefix_skin_info = (
   'menu_bottom_image' => 'base64',
 );
 our %typefix = (
-  'invoice_pdf'        => { 'invoice_pdf' => 'base64', },
-  'legacy_invoice_pdf' => { 'invoice_pdf' => 'base64', },
-  'skin_info'          => \%typefix_skin_info,
-  'login_info'         => \%typefix_skin_info,
-  'invoice_logo'       => { 'logo' => 'base64', },
-  'login_banner_image' => { 'image' => 'base64', },
-  'quotation_print'    => { 'document' => 'base64' },
+  'invoice_pdf'          => { 'invoice_pdf' => 'base64', },
+  'legacy_invoice_pdf'   => { 'invoice_pdf' => 'base64', },
+  'skin_info'            => \%typefix_skin_info,
+  'login_info'           => \%typefix_skin_info,
+  'logout'               => \%typefix_skin_info,
+  'access_info'          => \%typefix_skin_info,
+  'reset_passwd'         => \%typefix_skin_info,
+  'check_reset_passwd'   => \%typefix_skin_info,
+  'process_reset_passwd' => \%typefix_skin_info,
+  'invoice_logo'         => { 'logo' => 'base64', },
+  'login_banner_image'   => { 'image' => 'base64', },
+  'quotation_print'      => { 'document' => 'base64' },
 );
 
 sub AUTOLOAD {
diff --git a/fs_selfservice/FS-SelfService/SelfService/XMLRPC.pm b/fs_selfservice/FS-SelfService/SelfService/XMLRPC.pm
index 14f8a0c44..506dce1de 100644
--- a/fs_selfservice/FS-SelfService/SelfService/XMLRPC.pm
+++ b/fs_selfservice/FS-SelfService/SelfService/XMLRPC.pm
@@ -42,12 +42,18 @@ our %typefix_skin_info = (
   'menu_bottom_image' => 'base64',
 );
 our %typefix = (
-  'invoice_pdf'        => { 'invoice_pdf' => 'base64', },
-  'legacy_invoice_pdf' => { 'invoice_pdf' => 'base64', },
-  'skin_info'          => \%typefix_skin_info,
-  'login_info'         => \%typefix_skin_info,
-  'invoice_logo'       => { 'logo'  => 'base64', },
-  'login_banner_image' => { 'image' => 'base64', },
+  'invoice_pdf'          => { 'invoice_pdf' => 'base64', },
+  'legacy_invoice_pdf'   => { 'invoice_pdf' => 'base64', },
+  'skin_info'            => \%typefix_skin_info,
+  'login_info'           => \%typefix_skin_info,
+  'logout'               => \%typefix_skin_info,
+  'access_info'          => \%typefix_skin_info,
+  'reset_passwd'         => \%typefix_skin_info,
+  'check_reset_passwd'   => \%typefix_skin_info,
+  'process_reset_passwd' => \%typefix_skin_info,
+  'invoice_logo'         => { 'logo'  => 'base64', },
+  'login_banner_image'   => { 'image' => 'base64', },
+  'quotation_print'      => { 'document' => 'base64' },
 );
 
 sub AUTOLOAD {

commit 12c0f8134129c1fedd9580beb7bb13b2c0e9bd8a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 4 17:24:32 2017 -0800

    Revert "Email::Sender::Transport::SMTP::TLS is obsolete and being removed from debian, Email::Sender::Transport::SMTP does starttls starting with deb9 "stretch""
    
    This reverts commit 8036d190629e546818b7418938b4e8fcda3f16a8.

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 0e366e8c7..669c44e70 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -109,7 +109,8 @@ use vars qw( $conf );
 use Date::Format;
 use MIME::Entity;
 use Email::Sender::Simple qw(sendmail);
-use Email::Sender::Transport::SMTP 1.300027; #for SSL/TLS support
+use Email::Sender::Transport::SMTP;
+use Email::Sender::Transport::SMTP::TLS 0.11;
 use FS::UID;
 
 FS::UID->install_callback( sub {
@@ -248,18 +249,18 @@ sub send_email {
   my($port, $enc) = split('-', ($conf->config('smtp-encryption') || '25') );
   $smtp_opt{'port'} = $port;
 
+  my $transport;
   if ( defined($enc) && $enc eq 'starttls' ) {
-    $smtp_opt{'ssl'} = 'starttls';
-  } elsif ( defined($enc) && $enc eq 'tls' ) {
-    $smtp_opt{'ssl'} = 'ssl';
-  }
-
-  if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) {
-    $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password);
+    $smtp_opt{$_} = $conf->config("smtp-$_") for qw(username password);
+    $transport = Email::Sender::Transport::SMTP::TLS->new( %smtp_opt );
+  } else {
+    if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) {
+      $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password);
+    }
+    $smtp_opt{'ssl'} = 1 if defined($enc) && $enc eq 'tls';
+    $transport = Email::Sender::Transport::SMTP->new( %smtp_opt );
   }
   
-  my $transport = Email::Sender::Transport::SMTP->new( %smtp_opt );
-  
   push @to, $options{bcc} if defined($options{bcc});
   # fully unpack all addresses found in @to (including Bcc) to make the
   # envelope list

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI_XMLRPC.pm                           | 19 ++++++++++++-------
 FS/FS/Misc.pm                                       | 21 +++++++++++----------
 fs_selfservice/FS-SelfService/SelfService/XMLRPC.pm | 18 ++++++++++++------
 3 files changed, 35 insertions(+), 23 deletions(-)




More information about the freeside-commits mailing list