[freeside-commits] branch master updated. d86acb18972bc027888cf2db0c2a6a34b7da2f55

Ivan ivan at 420.am
Tue Oct 17 14:43:56 PDT 2017


The branch, master has been updated
       via  d86acb18972bc027888cf2db0c2a6a34b7da2f55 (commit)
       via  dfbcb60e8b9207bd9aa7ebd297ff9d2599121bf5 (commit)
       via  929783d1045757abbe5c84ff2439547b0f8eca23 (commit)
       via  9270a9fe7ea00f5a24a9ce3b927f932db6650b23 (commit)
      from  689738f7c234903160cbe23f337c11f8c0621f00 (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 d86acb18972bc027888cf2db0c2a6a34b7da2f55
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 17 14:43:52 2017 -0700

    fix MIME::Entity usage for perl 5.18+, RT#77890

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index a2d1b3e..4d9d57b 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -157,7 +157,10 @@ sub send_email {
       unshift @mimeparts, { 
         'Type'        => ( $options{'content-type'} || 'text/plain' ),
         'Charset'     => 'UTF-8',
-        'Data'        => $options{'body'},
+        'Data'        => ( $options{'content-type'} =~ /^text\//
+                             ? Encode::encode_utf8( $options{'body'} )
+                             : $options{'body'}
+                         ),
         'Encoding'    => ( $options{'content-type'} ? '-SUGGEST' : '7bit' ),
         'Disposition' => 'inline',
       };
@@ -166,7 +169,10 @@ sub send_email {
     
       @mimeargs = (
         'Type'     => ( $options{'content-type'} || 'text/plain' ),
-        'Data'     => $options{'body'},
+        'Data'     => ( $options{'content-type'} =~ /^text\//
+                          ? Encode::encode_utf8( $options{'body'} )
+                          : $options{'body'}
+                      ),
         'Encoding' => ( $options{'content-type'} ? '-SUGGEST' : '7bit' ),
         'Charset'  => 'UTF-8',
       );
@@ -377,7 +383,7 @@ sub generate_email {
     'Encoding'    => 'quoted-printable',
     'Charset'     => 'UTF-8',
     #'Encoding'    => '7bit',
-    'Data'        => $data,
+    'Data'        => Encode::encode_utf8($data),
     'Disposition' => 'inline',
   );
 
@@ -398,7 +404,7 @@ sub generate_email {
                        '    </title>',
                        '  </head>',
                        '  <body bgcolor="#ffffff">',
-                       @html_data,
+                       ( map Encode::encode_utf8($_), @html_data ),
                        '  </body>',
                        '</html>',
                      ],
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 2dcf7d0..7dc8139 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2115,6 +2115,7 @@ Returns an argument list to be passed to L<FS::Misc::send_email>.
 =cut
 
 use MIME::Entity;
+use Encode;
 
 sub generate_email {
 
@@ -2191,7 +2192,7 @@ sub generate_email {
         if $DEBUG;
 
       # 'print_text' argument is no longer used
-      @text = $self->print_text(\%args);
+      @text = map Encode::encode_utf8($_), $self->print_text(\%args);
 
     } else {
 
@@ -2286,7 +2287,7 @@ sub generate_email {
                          '    </title>',
                          '  </head>',
                          '  <body bgcolor="#e8e8e8">',
-                         $html,
+                         Encode::encode_utf8($html),
                          '  </body>',
                          '</html>',
                        ],
diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index 99e7044..3da68d9 100644
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA $DEBUG $me );
 use Data::Dumper;
 use Date::Format qw( time2str );
 use MIME::Entity;
+use Encode;
 use FS::UID qw(dbh);
 use FS::CGI qw(popurl);
 use FS::TicketSystem::RT_Libs;
@@ -374,7 +375,7 @@ sub create_ticket {
              : ( $param{'cc'} ? [ $param{'cc'} ] : [] );
 
   my $mimeobj = MIME::Entity->build(
-    'Data' => $param{'message'},
+    'Data' => Encode::encode_utf8( $param{'message'} ),
     'Type' => ( $param{'mime_type'} || 'text/plain' ),
   );
 

commit dfbcb60e8b9207bd9aa7ebd297ff9d2599121bf5
Merge: 929783d 689738f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 17 14:22:19 2017 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 929783d1045757abbe5c84ff2439547b0f8eca23
Merge: 9270a9f 90430c5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 3 09:36:51 2017 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 9270a9fe7ea00f5a24a9ce3b927f932db6650b23
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 3 09:36:45 2017 -0700

    temporarily disabling torrus source build

diff --git a/Makefile b/Makefile
index c6eef91..e18d39d 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
-TORRUS_ENABLED = 1
+#TORRUS_ENABLED = 1
 
 # for auto-version updates, so we can "make release" more things automatically
 RPM_SPECFILE = rpm/freeside.spec

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

Summary of changes:
 FS/FS/Misc.pm                     |   14 ++++++++++----
 FS/FS/Template_Mixin.pm           |    5 +++--
 FS/FS/TicketSystem/RT_Internal.pm |    3 ++-
 Makefile                          |    2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)




More information about the freeside-commits mailing list