diff options
| author | taca <taca> | 2012-05-07 15:20:32 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-05-07 15:20:32 +0000 |
| commit | 91090c3112a3275c302a1c9c2ca8ed1f6629936e (patch) | |
| tree | fd77ec78e244050ef70f9fc2849659bc179d04ca /www/fengoffice | |
| parent | 0c89372415ee7eceddd56312de51292ca0839aa3 (diff) | |
| download | pkgsrc-91090c3112a3275c302a1c9c2ca8ed1f6629936e.tar.gz | |
Add a patch forgot to commit.
Bump PKGREVISION.
Diffstat (limited to 'www/fengoffice')
| -rw-r--r-- | www/fengoffice/Makefile | 3 | ||||
| -rw-r--r-- | www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile index fbd9f2fd8ac..4458abb12a3 100644 --- a/www/fengoffice/Makefile +++ b/www/fengoffice/Makefile @@ -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 --git a/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php b/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php new file mode 100644 index 00000000000..48ac02f4e44 --- /dev/null +++ b/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php @@ -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); |