head	1.7;
access;
symbols
	pkgsrc-2024Q1:1.7.0.36
	pkgsrc-2024Q1-base:1.7
	pkgsrc-2023Q4:1.7.0.34
	pkgsrc-2023Q4-base:1.7
	pkgsrc-2023Q3:1.7.0.32
	pkgsrc-2023Q3-base:1.7
	pkgsrc-2023Q2:1.7.0.30
	pkgsrc-2023Q2-base:1.7
	pkgsrc-2023Q1:1.7.0.28
	pkgsrc-2023Q1-base:1.7
	pkgsrc-2022Q4:1.7.0.26
	pkgsrc-2022Q4-base:1.7
	pkgsrc-2022Q3:1.7.0.24
	pkgsrc-2022Q3-base:1.7
	pkgsrc-2022Q2:1.7.0.22
	pkgsrc-2022Q2-base:1.7
	pkgsrc-2022Q1:1.7.0.20
	pkgsrc-2022Q1-base:1.7
	pkgsrc-2021Q4:1.7.0.18
	pkgsrc-2021Q4-base:1.7
	pkgsrc-2021Q3:1.7.0.16
	pkgsrc-2021Q3-base:1.7
	pkgsrc-2021Q2:1.7.0.14
	pkgsrc-2021Q2-base:1.7
	pkgsrc-2021Q1:1.7.0.12
	pkgsrc-2021Q1-base:1.7
	pkgsrc-2020Q4:1.7.0.10
	pkgsrc-2020Q4-base:1.7
	pkgsrc-2020Q3:1.7.0.8
	pkgsrc-2020Q3-base:1.7
	pkgsrc-2020Q2:1.7.0.6
	pkgsrc-2020Q2-base:1.7
	pkgsrc-2020Q1:1.7.0.2
	pkgsrc-2020Q1-base:1.7
	pkgsrc-2019Q4:1.7.0.4
	pkgsrc-2019Q4-base:1.7
	pkgsrc-2019Q3:1.6.0.48
	pkgsrc-2019Q3-base:1.6
	pkgsrc-2019Q2:1.6.0.46
	pkgsrc-2019Q2-base:1.6
	pkgsrc-2019Q1:1.6.0.44
	pkgsrc-2019Q1-base:1.6
	pkgsrc-2018Q4:1.6.0.42
	pkgsrc-2018Q4-base:1.6
	pkgsrc-2018Q3:1.6.0.40
	pkgsrc-2018Q3-base:1.6
	pkgsrc-2018Q2:1.6.0.38
	pkgsrc-2018Q2-base:1.6
	pkgsrc-2018Q1:1.6.0.36
	pkgsrc-2018Q1-base:1.6
	pkgsrc-2017Q4:1.6.0.34
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.6.0.32
	pkgsrc-2017Q3-base:1.6
	pkgsrc-2017Q2:1.6.0.28
	pkgsrc-2017Q2-base:1.6
	pkgsrc-2017Q1:1.6.0.26
	pkgsrc-2017Q1-base:1.6
	pkgsrc-2016Q4:1.6.0.24
	pkgsrc-2016Q4-base:1.6
	pkgsrc-2016Q3:1.6.0.22
	pkgsrc-2016Q3-base:1.6
	pkgsrc-2016Q2:1.6.0.20
	pkgsrc-2016Q2-base:1.6
	pkgsrc-2016Q1:1.6.0.18
	pkgsrc-2016Q1-base:1.6
	pkgsrc-2015Q4:1.6.0.16
	pkgsrc-2015Q4-base:1.6
	pkgsrc-2015Q3:1.6.0.14
	pkgsrc-2015Q3-base:1.6
	pkgsrc-2015Q2:1.6.0.12
	pkgsrc-2015Q2-base:1.6
	pkgsrc-2015Q1:1.6.0.10
	pkgsrc-2015Q1-base:1.6
	pkgsrc-2014Q4:1.6.0.8
	pkgsrc-2014Q4-base:1.6
	pkgsrc-2014Q3:1.6.0.6
	pkgsrc-2014Q3-base:1.6
	pkgsrc-2014Q2:1.6.0.4
	pkgsrc-2014Q2-base:1.6
	pkgsrc-2014Q1:1.6.0.2
	pkgsrc-2014Q1-base:1.6
	pkgsrc-2013Q4:1.5.0.2
	pkgsrc-2013Q4-base:1.5
	pkgsrc-2013Q3:1.3.0.2
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.2
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.1.0.6
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.4
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.2
	pkgsrc-2012Q2-base:1.1;
locks; strict;
comment	@# @;


1.7
date	2019.12.15.18.27.24;	author taca;	state Exp;
branches;
next	1.6;
commitid	yn5Oe0iwZ8X2FPOB;

1.6
date	2014.03.29.14.17.06;	author taca;	state Exp;
branches;
next	1.5;
commitid	s26GBgYuEtlCmBux;

1.5
date	2013.12.20.15.49.33;	author taca;	state Exp;
branches;
next	1.4;
commitid	0TK4pUfZNvix3Thx;

1.4
date	2013.10.09.14.40.09;	author taca;	state Exp;
branches;
next	1.3;
commitid	PbYPqWFrzlicZC8x;

1.3
date	2013.08.31.02.04.54;	author taca;	state Exp;
branches;
next	1.2;
commitid	lQQ73PTvxjwp3y3x;

1.2
date	2013.03.14.16.33.15;	author taca;	state Exp;
branches;
next	1.1;

1.1
date	2012.05.07.15.20.32;	author taca;	state Exp;
branches;
next	;


desc
@@


1.7
log
@www/fengoffice: update to 3.7.2.16

Now PHP 7 and later are supported.

Changes are too many to write here, please refer readme.txt in detail.
@
text
@$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.6 2014/03/29 14:17:06 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	2019-06-30 13:35:46.241680225 +0000
+++ plugins/mail/application/helpers/MailUtilities.class.php
@@@@ -405,7 +405,7 @@@@ class MailUtilities {
 				$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);
@


1.6
log
@Update fengoffice to 2.5.1.

Changelog
=========

Since 2.5.1-rc
----------------
bugfix: can't view object link in notification when an email does not have a subject.

Since 2.5.1-beta
----------------
bugfix: cannot add milestones in templates
bugfix: when adding template, after adding milestone cannot select it when adding a task

Since 2.5.0.6
----------------
bugfix: Template view broken by single quote in property name.
bugfix: when edit a template if have milestones you can't see tasks.
bugfix: don't show members that cannot be used in member selector.

Since 2.5.0.5
----------------
bugfix: Tasks grouping by dimension fixed.

Since 2.5.0.4
----------------
performance: Issue when loading persons dim.
bugfix: Imap folders are not saved when editing an email account.
bugfix: Cannot unclassify mails from classify form.
bugfix: Emessage not shown when inputing dates with incorrect format.
bugfix: Add start date to task view.
bugfix: Get tasks by range query does not include logged user's timezone.
bugfix: In task complete edition form, assigned to are not displayed correctly.
bugfix: Issue in include myself in document notifications.
bugfix: Set db charset when reconnecting in abstract db adapter.

Since 2.5.0.3
----------------
bugfix: Add attachments column in queued_emails in upgrade scripts.
bugfix: Set db charset when reconnecting in abstract db adapter.

Since 2.5.0.2
----------------
bugfix: Render member selectors with preloaded member info.
bugfix: Order by name doesn't work on object list.
bugfix: People widget only display users.

Since 2.5.0.1
----------------
bugfix: on mysql 5.6 have_innodb variable is deprecated

Since 2.5
----------------

feature: Allow to configure dashboard widget position and order for each user.
feature: Allow to configure default dashboard widget position and order for all users.
feature: Comments dashboard widget.
feature: Email dashboard widget.
feature: choose to filter calendar widget or not.
feature: choose the user to filter the tasks widget.

bugfix: when add a timeslot by clock on tasks update the percent complete.
bugfix: if a file doesn't have revision when classify create one.
bugfix: several minor fixes of undefined variables, missing langs, etc.
bugfix: when disabling or reactivating users from company view, users list is not reloaded.
bugfix: member selector displayed wrong data
bugfix: on task add/edit view, assignee combo displayed wrong data
bugfix: subscribers and invited people were not shown correctly
bugfix: encoding when receiving emails
bugfix: when editing a classified timeslot, its context was not shown
bugfix: in file upload, the name is not changed if a new name is entered
bugfix: missing langs and sql changes for email user config options

Since 2.5-rc
----------------

bugfix: general search form submitted by enter key doesn't work in Google Chrome
bugfix: links are now saved as such when using WYSIWYG
bugfix: primary-breadcrumb show exact context
bugfix: mysql transaction problem when sending emails without using a cronjob
bugfix: when making a new installation, users were not shown by default

Since 2.5-beta
----------------

bugfix: if a file doesn't have a revision, when classifying an email create one.
bugfix: when adding a timeslot by clock on tasks, task progress bar was not updated correctly.
bugfix: fixed custom reports using boolean conditions in false.
bugfix: problems with paging on the overview list.
bugfix: on activity widget, when clicking on a member, change dimension.
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.5 2013/12/20 15:49:33 taca Exp $
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2014-02-17 10:24:14.000000000 +0000
d9 1
a9 2
@@@@ -287,7 +287,7 @@@@ class MailUtilities {
 			if ($from_name == ''){
d12 1
d14 2
a15 2
+                $utf8_from = $enc_conv->convert($from_encoding, 'UTF-8', $from_name);
 	
@


1.5
log
@Update fengoffice to 2.4.0.6.  (This is a leaf package and this update
contains security fix.)

Since 2.4.0.5
- bugfix: Don't send notification when add mail.

Since 2.4.0.4
- bugfix: Deprecated functions usage.
- bugfix: Emtpy trash can was using a deprecated function with performance issues.
- bugfix: Missing parameters in function invocation.

Since 2.4.0.3
- bugfix: can't delete template task, permission denied.

Since 2.4.0.2
- bugfix: langs customer_folder and project_folder.
- bugfix: can't add contacts from mail.
- bugfix: on activity widget move action don't display.
- bugfix: when create user, notifications break mysql transaction.

Since 2.4.0.1
- bugfix: cron process to emtpy trash can does not delete members asociated to contacts.

Since 2.4.0
- bugfix: tab order fix in quick add task;
- bugfix: issue when create a subtask from task view;

Since 2.4-rc
- fetaure: error message improved when upload limit is reached.
- bugfix: on gantt, names of the tasks were not displayed completely.
- bugfix: on gantt, the time estimation for tasks was not displayed correctly.
- bugfix: date custom properties default value does not use user's timezone.
- bugfix: on people widget add user combo is not ordered by name.
- bugfix: on activity widget dates have gmt errors.
- bugfix: general search allways search for empty string.
- bugfix: url files are not saved correctly when url is not absolute.
- bugfix: imap fetch fixed when last email does not exists in server.
- bugfix: only invite automatically the "filtered user" when adding a new event, not when editing an existing one.
- bugfix: variable member_deleted uninitialized in a cycle, maintains the value of previous iterations and fills the log warnings.
- bugfix: don't display group-mailer button if user doesn't have an email account.
- bugfix: allow mail rules for all incoming messages, useful for autoreplies.
- bugfix: the invitations of the events created on google calendar will have the same special ID of the event.

Since 2.4-beta
- feature: alert users if they have mails in the outbox
- feature: contact custom reports - added columns for address, phones, webpages and im.
- feature: display time estimation in time reports when grouping by tasks
- feature: config option to add default permissions to users when creating a member.
- system: upgrade Swift Mailer from version 4.0.6 to 5.0.1, this improves and solves some issues when sending emails with exchange servers
- bugfix: on user login when save timezone don't change the update_on value
- bugfix: solved an issue when editing a repetitive task and changing its previous repetition value
- bugfix: solved when editing a template task can't remove a dimension member
- bugfix: solved using repeating tasks when applying a template
- bugfix: on tasks and timeslots reports, if grouped by task it diplay milestones
- bugfix: allow the creation of templates in the root (View all)
- bugfix: Users are now shown by default in the People tab.
- bugfix: when printing the task list view, tasks now display their progress and estimation
- bugfix: on general search prevent multiple form submit.

Since 2.3.2.1
- feature: templates have been greatly improved: they have changed completely for good!
- feature: remember selection on total task execution time report
- feature: when sending an email, if a word containing attach is found and no attachment if found, it triggers an alert.
- feature: new user config option to set how many members are shown in breadcrumbs
- feature: update plugins after running upgrade from console.
- feature: add root permission when creating executive or superior users.
- feature: contact edit form has been improved

- bugfix: when uploading avatars, if it is .png and its size is smaller than 128x128 the image is not resized
- bugfix: when sending an mail, the sender is now subscribed to it
- bugfix: when adding a file from an email attachment, its now set to be created by the account owner
- bugfix: reporting pagination fixed
- bugfix: custom reports, csv and pdf export only exports the active page..now it exports everything!
- bugfix: don't collapse task group after performing an action to the task when group is expanded.
- bugfix: email parsing removes enters and some emails were not shown correctly
- bugfix: people widget in french used to cause a syntax error
- bugfix: don't classify email in account's member if conversation is already classified.
- bugfix: task filtering by user has been improved: it loads faster and more accurate
- bugfix: the users selectbox for assignees has been improved: it loads faster and more accurate
- bugfix: check for "can manage contacts" in system permissions if column exists
- bugfix: email parsing does not fetch addresses when they are separated by semicolon
- bugfix: tasks assigned to filter doesn't filter correctly when logged user is an internal collaborator and users can add objects without classifying them.
- bugfix: search result pagination issue
- bugfix: search results ordered by date again
- bugfix: add to searchable objects failed for some emails
- bugfix: custom properties migration fix
- bugfix: feng 1 to feng 2 upgrade improved
- bugfix: style fixes in administration tabs
- bugfix: checkbox in contact tab now is working properly. initially it does not show the users
- bugfix: google calendar sync issue for events with over 100 chars has been solved
- bugfix: contact csv export fixed: when no contact is selected => export all contact csv export fixed
- bugfix: some undefined variables have been defined
- bugfix: some translations that were missing were added
- security: remove xss from request parameters
- performance: search engine has been greatly improved
- other: the search button is disabled until returns the search result
- other: when upgrading to 2.4 the completed tasks from feng 1 will change to 100% in completed percentage
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.4 2013/10/09 14:40:09 taca Exp $
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-12-13 18:33:05.000000000 +0000
d9 1
a9 1
@@@@ -274,7 +274,7 @@@@ class MailUtilities {
a17 9
@@@@ -289,7 +289,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);
@


1.4
log
@Update fengoffice to 2.3.2.1.

Changelog
=========

Since 2.3.2
----------------

bugfix: When creating members, do not assign permissions for all executives (or superior users) if member has a parent.


Since 2.3.2-rc2
----------------

bugfix: Cannot filter overview by tag.
bugfix: Tasks tooltip in calendar views shows description as html.
bugfix: Permissions issue when editing and subscribing for non-admins for not classiffied objects.


Since 2.3.2-rc
----------------

bugfix: Show can_manage_billing permission.
bugfix: Missing lang on javascript langs.
bugfix: Javascript plugin langs are not loaded.
bugfix: When requesting completed tasks for calendar month view, it does not filter by dates and calendar hangs if there are too much tasks.
bugfix: Administration / dimensions does not show members for dimensions that don't define permissions.
bugfix: Permissions fix when email module is not installed.
bugfix: Company object type name fixed.
bugfix: Try to reconect to database if not conected when executing a query (if connection is lost while performing other tasks).
bugfix: When users cannot see other user's tasks they can view them using the search.
bugfix: Group permissions not applied in assigned to combo (when adding or editing tasks).
bugfix: Minor bugfixes in 1.7 -> 2.x upgrade.
bugfix: Activity widget: logs for members (workspaces, etc.) were not displayed.
bugfix: General search sql query improved.
bugfix: Don't include context in the user edited notification.
bugfix: Don't show worked hours if user doesn't have permissions for it.
bugfix: Don't send archived mails.

feature: Only administrators can change system permissions.
feature: Users can change permissions of users of the same type (only dimension member permissions).
feature: Set permissions to executive, manager and admins when creating a new member.

Since 2.3.2-beta
----------------

bugfix: Archiving a submember does not archive its objects.
bugfix: Error 500 when adding group.
bugfix: Installer fixes.
bugfix: Modified the insert in read objects for emails.
bugfix: Minor bugfixes in document listing.
bugfix: Sql error when $selected_columns ins an empty array in ContentDataObjects::listing() function
bugfix: root permissions not set when installing new feng office.
bugfix: Person report fixed when displaying email field.
bugfix: contacts are always created when sending mails.
bugfix: Tasks list milestone grouping fixed.

preformance: Search query improved.
performance: Insert/delete into sharing table 500 objects x query when saving user permissions.
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.3 2013/08/31 02:04:54 taca Exp $
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-09-30 07:05:32.000000000 +0000
d9 1
a9 1
@@@@ -269,7 +269,7 @@@@ class MailUtilities {
d18 1
a18 1
@@@@ -284,7 +284,7 @@@@ class MailUtilities {
@


1.3
log
@Update fengoffice to 2.3.1.1.

There are too many changes to write here from 2.2.4.1,
please refer readme.txt.
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.2 2013/03/14 16:33:15 taca Exp $
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-07-31 09:38:32.000000000 +0000
d9 1
a9 1
@@@@ -274,7 +274,7 @@@@ class MailUtilities {
d18 1
a18 1
@@@@ -289,7 +289,7 @@@@ class MailUtilities {
@


1.2
log
@Update fengoffice to 2.2.3.1.

Since 2.2.3.1-beta
------------------
bugfix: Search in a member does not find file contents.
bugfix: Click on "search everywhere" does not find file contents.
bugfix: Groups listed alphabetically in the Administration Panel.
bugfix: Monthly view calendar print shows empty calendar.
bugfix: Improvements in performance of overview widgets.
bugfix: Timeslots are not reclassified reclassifying tasks.
bugfix: Cannot delete members if it has objects.
bugfix: Member deletion does not clean all related tables.
bugfix: Only managers or superior roles can change other user passwords.
bugfix: Several missing langs and undefined variables warnings clean.
bugfix: Db error when adding two workspaces with the same name.
bugfix: Quick add files - all radio buttons can be selected.

system: Russian translations updated.

Since 2.2.2
----------------
bugfix: Owner company cannot be classified.
bugfix: Task list group by user fix.
bugfix: Add pdf and docx files to searchable objects.
bugfix: js managers bugfixes.
bugfix: Cannot edit/delete mails from deleted accounts.
bugfix: Error in tasks reports when ordering by 'order' column.
bugfix: Fixes in migration from 1.X of custom properties.

usability: Reports can be edited to allow execution in every context.
usability: Performance improved in tasks list.
usability: Users are filtered by permissions in 'People' dimension when filtering by a workspace.
usability: Contacts are filtered in 'People' dimension when filtering by a workspace if they belong to the workspace.

system: Portuguese language updated.

Since 2.2.1
----------------
bugfix: logged_user fix when classifying attachments
bugfix: go back instead of redirect when editing file properties.
bugfix: chmod after mkdir when repository file backend creates directory
bugfix: Several template instatiation fixes
bugfix: mail classification bugfix
bugfix: allow to classify mails in workspaces,tags
bugfix: administration/users: 10 users per page fix
bugfix: do not use objects in estimated-worked widget, use raw data for better performance
bugfix: language fixes
bugfix: cannot use assigned_to combo when adding tasks in ie
bugfix: ie compatibility fix in calendar toolbars
bugfix: enable/disable cron events for calendar export/import when adding/deleting accounts
bugfix: html tags in task tooltip description at calendar
bugfix: cvs export prints html tags
bugfix: users with can_manage_security cannot manage groups
bugfix: view week calendar views don't show tasks all days if task starts or ends in another week
bugfix: dont show timeslots of other users if cannot see assigned to other's tasks
bugfix: ext buttons hechos a lo chancho
bugfix: patch if not exists function array_fill_keys (para php < 5.2)
bugfix: break large words in task description
bugfix: administrator cannot log in to admin panel when asking for credentials
bugfix: cannot edit file after uploaded from object picker
bugfix: getTimeValue when 12:XX AM
bugfix: bugfix in custom reports with boolean conditions on custom properties
bugfix: admin users paging fix
bugfix: migration companies comments fix

Since 2.2.1-rc
----------------
bugfix: Cannot manage plugins if no super admin.
bugfix: Reports were not grouping unclassified objects.
bugfix: Reports grouping misses a group.
bugfix: Fixed findById function in ContentDataObjects.
bugfix: Fixed Email plugin installation.
bugfix: Fixed translations for dimension names.
bugfix: Error with company logo when sending notifications.
bugfix: Time report fix when selecting custom dates and listing paused timeslots.
bugfix: Fix when getting plugin's javascript translations.

Since 2.2
----------------
bugfix: Calendar monthly view bugs with repeating events.
bugfix: Permissions system fix.
bugfix: Projects appear in object picker.
bugfix: language fixes (en_us, es_la, es_es).
bugfix: Error in calendar when user has timezone=0.
bugfix: Formatted tasks description and notes content does not shows italics and quotes when viewing.
bugfix: Compressing files does not create compressed file in the current context.
bugfix: Sometimes can subscribe users with no permissions to the object.
bugfix: Activity widget bug with general timeslots.
bugfix: Error when selecting default workspace in mail account edition.
bugfix: User types are not transalted.
bugfix: Prevent double generation of tasks when completing a repetitive task instance (double click on complete link).
bugfix: CSV export fixes at Total tasks times report.

usability: Create events according the filtered user.
usability: Config option to show tab icons.
usability: Config option to enable/disable milestones.
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.1 2012/05/07 15:20:32 taca Exp $
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-02-06 11:30:12.000000000 +0000
d9 11
a19 15
@@@@ -272,7 +272,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);
@@@@ -287,7 +287,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);
d21 6
a26 2
 			if ($enc_conv->hasError()) {
 				$utf8_subject = utf8_encode($subject_aux);
@


1.1
log
@Add a patch forgot to commit.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d7 1
a7 1
--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2012-03-05 16:41:35.000000000 +0000
d9 1
a9 1
@@@@ -271,7 +271,7 @@@@ class MailUtilities {
d18 1
a18 1
@@@@ -286,7 +286,7 @@@@ class MailUtilities {
@

