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

4 files changed, 58 insertions, 15 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 0418b4a5228..5d566f8175b 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/10/09 14:40:09 taca Exp $
+# $NetBSD: Makefile,v 1.28 2013/12/20 15:49:33 taca Exp $
 #
 
-DISTNAME=	fengoffice_2.3.2.1
+DISTNAME=	fengoffice_2.4.0.6
 PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
@@ -41,6 +41,12 @@ PRINT_PLIST_AWK+= \
 		{ gsub(/${FO_DIR:S|/|\\/|g}/, "$${FO_DIR}"); \
 		print; next; }
 
+REPLACE_INTERPRETER+=	sh
+REPLACE.sh.old=		bash
+REPLACE.sh.new=		/bin/sh
+REPLACE_FILES.sh= \
+	public/assets/javascript/ckeditor/_samples/adobeair/run.sh
+
 .include "../../mk/bsd.prefs.mk"
 
 FO_DIR?=	share/fengoffice
diff --git a/www/fengoffice/PLIST b/www/fengoffice/PLIST
index 1a4be3e945d..c91ea64e738 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2013/10/09 14:40:09 taca Exp $
-${FO_DIR}/.htaccess
+@comment $NetBSD: PLIST,v 1.16 2013/12/20 15:49:33 taca Exp $
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
 ${FO_DIR}/application/controllers/AccountController.class.php
@@ -429,6 +428,10 @@ ${FO_DIR}/application/models/telephone_types/TelephoneType.class.php
 ${FO_DIR}/application/models/telephone_types/TelephoneTypes.class.php
 ${FO_DIR}/application/models/telephone_types/base/BaseTelephoneType.class.php
 ${FO_DIR}/application/models/telephone_types/base/BaseTelephoneTypes.class.php
+${FO_DIR}/application/models/template_milestone/TemplateMilestone.class.php
+${FO_DIR}/application/models/template_milestone/TemplateMilestones.class.php
+${FO_DIR}/application/models/template_milestone/base/BaseTemplateMilestone.class.php
+${FO_DIR}/application/models/template_milestone/base/BaseTemplateMilestones.class.php
 ${FO_DIR}/application/models/template_object_properties/TemplateObjectProperties.class.php
 ${FO_DIR}/application/models/template_object_properties/TemplateObjectProperty.class.php
 ${FO_DIR}/application/models/template_object_properties/base/BaseTemplateObjectProperties.class.php
@@ -441,6 +444,10 @@ ${FO_DIR}/application/models/template_parameters/TemplateParameter.class.php
 ${FO_DIR}/application/models/template_parameters/TemplateParameters.class.php
 ${FO_DIR}/application/models/template_parameters/base/BaseTemplateParameter.class.php
 ${FO_DIR}/application/models/template_parameters/base/BaseTemplateParameters.class.php
+${FO_DIR}/application/models/template_tasks/TemplateTask.class.php
+${FO_DIR}/application/models/template_tasks/TemplateTasks.class.php
+${FO_DIR}/application/models/template_tasks/base/BaseTemplateTask.class.php
+${FO_DIR}/application/models/template_tasks/base/BaseTemplateTasks.class.php
 ${FO_DIR}/application/models/templates/COTemplate.class.php
 ${FO_DIR}/application/models/templates/COTemplates.class.php
 ${FO_DIR}/application/models/templates/base/BaseCOTemplate.class.php
@@ -677,6 +684,9 @@ ${FO_DIR}/application/views/template/get_context.php
 ${FO_DIR}/application/views/template/index.php
 ${FO_DIR}/application/views/template/instantiate_parameters.php
 ${FO_DIR}/application/views/template/view.php
+${FO_DIR}/application/views/template_milestone/add_template_milestone.php
+${FO_DIR}/application/views/template_task/add_template_task.php
+${FO_DIR}/application/views/template_task/view.php
 ${FO_DIR}/application/views/time/index.php
 ${FO_DIR}/application/views/timeslot/add_timeslot.php
 ${FO_DIR}/application/views/timeslot/object_timeslots.php
@@ -796,7 +806,6 @@ ${FO_DIR}/environment/templates/benchmark_timer_brief.php
 ${FO_DIR}/environment/templates/benchmark_timer_full.php
 ${FO_DIR}/environment/templates/dump_error.php
 ${FO_DIR}/favicon.ico
-${FO_DIR}/hooks/email_error_reporting.php
 ${FO_DIR}/hooks/fengoffice_hooks.php
 ${FO_DIR}/hooks/index.html
 ${FO_DIR}/hooks/opengoo_hooks.php
@@ -2282,7 +2291,6 @@ ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.M
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini
-${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/4.1.1,ddc9b993d7fc8d4a185e8dbf5b9a0996,1.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/dummy.php
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/EntityLookup/entities.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -2406,6 +2414,7 @@ ${FO_DIR}/library/swift/lib/classes/Swift/Attachment.php
 ${FO_DIR}/library/swift/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/ByteStream/ArrayByteStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/ByteStream/FileByteStream.php
+${FO_DIR}/library/swift/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterReader.php
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -2415,6 +2424,7 @@ ${FO_DIR}/library/swift/lib/classes/Swift/CharacterReaderFactory/SimpleCharacter
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+${FO_DIR}/library/swift/lib/classes/Swift/ConfigurableSpool.php
 ${FO_DIR}/library/swift/lib/classes/Swift/DependencyContainer.php
 ${FO_DIR}/library/swift/lib/classes/Swift/DependencyException.php
 ${FO_DIR}/library/swift/lib/classes/Swift/EmbeddedFile.php
@@ -2439,6 +2449,7 @@ ${FO_DIR}/library/swift/lib/classes/Swift/Events/TransportChangeListener.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Events/TransportExceptionEvent.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Events/TransportExceptionListener.php
 ${FO_DIR}/library/swift/lib/classes/Swift/FailoverTransport.php
+${FO_DIR}/library/swift/lib/classes/Swift/FileSpool.php
 ${FO_DIR}/library/swift/lib/classes/Swift/FileStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Filterable.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Image.php
@@ -2455,15 +2466,20 @@ ${FO_DIR}/library/swift/lib/classes/Swift/MailTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mailer.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mailer/RecipientIterator.php
+${FO_DIR}/library/swift/lib/classes/Swift/MemorySpool.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Message.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/Attachment.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/CharsetObserver.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+${FO_DIR}/library/swift/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/EmbeddedFile.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/EncodingObserver.php
+${FO_DIR}/library/swift/lib/classes/Swift/Mime/Grammar.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/Header.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/HeaderEncoder.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -2486,18 +2502,22 @@ ${FO_DIR}/library/swift/lib/classes/Swift/Mime/SimpleHeaderSet.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/SimpleMessage.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Mime/SimpleMimeEntity.php
 ${FO_DIR}/library/swift/lib/classes/Swift/MimePart.php
+${FO_DIR}/library/swift/lib/classes/Swift/NullTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/OutputByteStream.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/AntiFloodPlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Decorator/Replacements.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/DecoratorPlugin.php
+${FO_DIR}/library/swift/lib/classes/Swift/Plugins/ImpersonatePlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Logger.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/LoggerPlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
+${FO_DIR}/library/swift/lib/classes/Swift/Plugins/MessageLogger.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+${FO_DIR}/library/swift/lib/classes/Swift/Plugins/RedirectingPlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Reporter.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/ReporterPlugin.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -2509,7 +2529,16 @@ ${FO_DIR}/library/swift/lib/classes/Swift/Preferences.php
 ${FO_DIR}/library/swift/lib/classes/Swift/ReplacementFilterFactory.php
 ${FO_DIR}/library/swift/lib/classes/Swift/RfcComplianceException.php
 ${FO_DIR}/library/swift/lib/classes/Swift/SendmailTransport.php
+${FO_DIR}/library/swift/lib/classes/Swift/SignedMessage.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signer.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signers/BodySigner.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signers/DKIMSigner.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signers/DomainKeySigner.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signers/HeaderSigner.php
+${FO_DIR}/library/swift/lib/classes/Swift/Signers/SMimeSigner.php
 ${FO_DIR}/library/swift/lib/classes/Swift/SmtpTransport.php
+${FO_DIR}/library/swift/lib/classes/Swift/Spool.php
+${FO_DIR}/library/swift/lib/classes/Swift/SpoolTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/StreamFilter.php
 ${FO_DIR}/library/swift/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
 ${FO_DIR}/library/swift/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -2529,12 +2558,16 @@ ${FO_DIR}/library/swift/lib/classes/Swift/Transport/IoBuffer.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/LoadBalancedTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/MailInvoker.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/MailTransport.php
+${FO_DIR}/library/swift/lib/classes/Swift/Transport/NullTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/SendmailTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/SimpleMailInvoker.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/SmtpAgent.php
+${FO_DIR}/library/swift/lib/classes/Swift/Transport/SpoolTransport.php
 ${FO_DIR}/library/swift/lib/classes/Swift/Transport/StreamBuffer.php
 ${FO_DIR}/library/swift/lib/classes/Swift/TransportException.php
+${FO_DIR}/library/swift/lib/classes/Swift/Validate.php
 ${FO_DIR}/library/swift/lib/dependency_maps/cache_deps.php
+${FO_DIR}/library/swift/lib/dependency_maps/message_deps.php
 ${FO_DIR}/library/swift/lib/dependency_maps/mime_deps.php
 ${FO_DIR}/library/swift/lib/dependency_maps/transport_deps.php
 ${FO_DIR}/library/swift/lib/mime_types.php
@@ -3061,6 +3094,7 @@ ${FO_DIR}/plugins/core_dimensions/language/zh_tw/lang.php
 ${FO_DIR}/plugins/core_dimensions/public/assets/javascript/core_dimensions.js
 ${FO_DIR}/plugins/core_dimensions/templates/quickadd_extra_fields.php
 ${FO_DIR}/plugins/core_dimensions/update.php
+${FO_DIR}/plugins/index.html
 ${FO_DIR}/plugins/mail/CHANGELOG.txt
 ${FO_DIR}/plugins/mail/application/controllers/MailController.class.php
 ${FO_DIR}/plugins/mail/application/helpers/MailUtilities.class.php
@@ -5434,6 +5468,7 @@ ${FO_DIR}/public/assets/themes/default/stylesheets/og/reporting.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/search.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/tag_panel.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/tasks.css
+${FO_DIR}/public/assets/themes/default/stylesheets/og/templates.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/time.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/workspace_panel.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin.css
@@ -5516,6 +5551,7 @@ ${FO_DIR}/public/upgrade/scripts/FigazzaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MatambritoUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MilangaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MollejaUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/MorcillaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/NutriaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PamplonaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PastafrolaUpgradeScript.class.php
@@ -5538,6 +5574,7 @@ ${FO_DIR}/public/upgrade/templates/db_migration/2_0_asado.php
 ${FO_DIR}/public/upgrade/templates/db_migration/2_1_molleja.php
 ${FO_DIR}/public/upgrade/templates/db_migration/2_2_pamplona.php
 ${FO_DIR}/public/upgrade/templates/db_migration/2_3_chorizo.php
+${FO_DIR}/public/upgrade/templates/db_migration/2_4_morcilla.php
 ${FO_DIR}/public/upgrade/templates/installed_version.php
 ${FO_DIR}/public/upgrade/templates/layout.php
 ${FO_DIR}/public/webservices/FilesServices.php
diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo
index 9e3315a2dc1..1d6e7762589 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2013/10/09 14:40:09 taca Exp $
+$NetBSD: distinfo,v 1.18 2013/12/20 15:49:33 taca Exp $
 
-SHA1 (fengoffice_2.3.2.1.zip) = 535e5de2c37948b77bdc2e4eeea12188bfc5a5b6
-RMD160 (fengoffice_2.3.2.1.zip) = d84840298d53b1ba816b6eafc4f81741076de960
-Size (fengoffice_2.3.2.1.zip) = 12471728 bytes
+SHA1 (fengoffice_2.4.0.6.zip) = fe3c65c75ee0d06474ace5553a5e1d5748957dd1
+RMD160 (fengoffice_2.4.0.6.zip) = 1b24bfcc04dfb95139060d7e336e3f782eb120a5
+Size (fengoffice_2.4.0.6.zip) = 12974780 bytes
 SHA1 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
 SHA1 (patch-ag) = 03f09610de1c7fd41641d4f08eb72876d82b2bbf
-SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 26ad467c175661d922cac617f383bc58faacb290
+SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 44c2d130086e89d238abca4b23917c8f10d0e014
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
index aa2df9f68dc..000fcc6f694 100644
--- a/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php
+++ b/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php
@@ -1,12 +1,12 @@
-$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.4 2013/10/09 14:40:09 taca Exp $
+$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.5 2013/12/20 15:49:33 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	2013-09-30 07:05:32.000000000 +0000
+--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-12-13 18:33:05.000000000 +0000
 +++ plugins/mail/application/helpers/MailUtilities.class.php
-@@ -269,7 +269,7 @@ class MailUtilities {
+@@ -274,7 +274,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
@@ -15,7 +15,7 @@ $NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.4 20
  	
  				if ($enc_conv->hasError()) {
  					$utf8_from = utf8_encode($from_name);
-@@ -284,7 +284,7 @@ class MailUtilities {
+@@ -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