[pkgsrc/trunk]: pkgsrc/www/fengoffice Add a patch forgot to commit.

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/42118a5be909
branches:  trunk
changeset: 603541:42118a5be909
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon May 07 15:20:32 2012 +0000

description:
Add a patch forgot to commit.

Bump PKGREVISION.

diffstat:

 www/fengoffice/Makefile                                                               |   3 +-
 www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php |  26 ++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r b9dd41cd8592 -r 42118a5be909 www/fengoffice/Makefile
--- a/www/fengoffice/Makefile   Mon May 07 12:55:23 2012 +0000
+++ b/www/fengoffice/Makefile   Mon May 07 15:20:32 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2012/03/22 13:28:11 taca Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/07 15:20:32 taca Exp $
 #
 
 DISTNAME=      fengoffice_2.0.0
 PKGNAME=       ${DISTNAME:S/_/-/:C/.rc$/rc1/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=opengoo/}
 EXTRACT_SUFX=  .zip
diff -r b9dd41cd8592 -r 42118a5be909 www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php     Mon May 07 15:20:32 2012 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.1 2012/05/07 15:20:32 taca Exp $
+
+* Fix variable mistakes to prevent garbled characters.  Still needs to
+  fix essential problem when a header contains multiple encoded strings
+  with diffreent charset.
+
+--- plugins/mail/application/helpers/MailUtilities.class.php.orig      2012-03-05 16:41:35.000000000 +0000
++++ plugins/mail/application/helpers/MailUtilities.class.php
+@@ -271,7 +271,7 @@ class MailUtilities {
+               if ($from_name == ''){
+                       $from_name = $from;
+               } else if (strtoupper($encoding) =='KOI8-R' || strtoupper($encoding) =='CP866' || $from_encoding != 'UTF-8' || !$enc_conv->isUtf8RegExp($from_name)){ //KOI8-R and CP866 are Russian 
encodings which PHP does not detect
+-                      $utf8_from = $enc_conv->convert($encoding, 'UTF-8', $from_name);
++                      $utf8_from = $enc_conv->convert($from_encoding, 'UTF-8', $from_name);
+ 
+                       if ($enc_conv->hasError()) {
+                               $utf8_from = utf8_encode($from_name);
+@@ -286,7 +286,7 @@ class MailUtilities {
+               $subject_encoding = detect_encoding($subject_aux);
+               
+               if (strtoupper($encoding) =='KOI8-R' || strtoupper($encoding) =='CP866' || $subject_encoding != 'UTF-8' || !$enc_conv->isUtf8RegExp($subject_aux)){ //KOI8-R and CP866 are Russian 
encodings which PHP does not detect
+-                      $utf8_subject = $enc_conv->convert($encoding, 'UTF-8', $subject_aux);
++                      $utf8_subject = $enc_conv->convert($subject_encoding, 'UTF-8', $subject_aux);
+                       
+                       if ($enc_conv->hasError()) {
+                               $utf8_subject = utf8_encode($subject_aux);