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.

4 files changed, 26 insertions, 22 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 5d566f8175b..312be588e2e 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2013/12/20 15:49:33 taca Exp $
+# $NetBSD: Makefile,v 1.29 2014/03/29 14:17:06 taca Exp $
 #
 
-DISTNAME=	fengoffice_2.4.0.6
+DISTNAME=	fengoffice_2.5.1
 PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
diff --git a/www/fengoffice/PLIST b/www/fengoffice/PLIST
index c91ea64e738..18995cf4e88 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2013/12/20 15:49:33 taca Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/03/29 14:17:06 taca Exp $
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
 ${FO_DIR}/application/controllers/AccountController.class.php
@@ -56,6 +56,7 @@ ${FO_DIR}/application/helpers/pagination.php
 ${FO_DIR}/application/helpers/permissions.php
 ${FO_DIR}/application/helpers/project_website.php
 ${FO_DIR}/application/helpers/save_member_permissions.php
+${FO_DIR}/application/helpers/save_user_permissions.php
 ${FO_DIR}/application/helpers/tabbednavigation.php
 ${FO_DIR}/application/helpers/textile.php
 ${FO_DIR}/application/index.html
@@ -189,6 +190,10 @@ ${FO_DIR}/application/models/contact_webpages/ContactWebpage.class.php
 ${FO_DIR}/application/models/contact_webpages/ContactWebpages.class.php
 ${FO_DIR}/application/models/contact_webpages/base/BaseContactWebpage.class.php
 ${FO_DIR}/application/models/contact_webpages/base/BaseContactWebpages.class.php
+${FO_DIR}/application/models/contact_widget_options/ContactWidgetOption.class.php
+${FO_DIR}/application/models/contact_widget_options/ContactWidgetOptions.class.php
+${FO_DIR}/application/models/contact_widget_options/base/BaseContactWidgetOption.class.php
+${FO_DIR}/application/models/contact_widget_options/base/BaseContactWidgetOptions.class.php
 ${FO_DIR}/application/models/contact_widgets/ContactWidget.class.php
 ${FO_DIR}/application/models/contact_widgets/ContactWidgets.class.php
 ${FO_DIR}/application/models/contact_widgets/base/BaseContactWidget.class.php
@@ -530,6 +535,7 @@ ${FO_DIR}/application/views/contact/card.php
 ${FO_DIR}/application/views/contact/card_content.php
 ${FO_DIR}/application/views/contact/company_card.php
 ${FO_DIR}/application/views/contact/company_content.php
+${FO_DIR}/application/views/contact/configure_widgets.php
 ${FO_DIR}/application/views/contact/csv_export.php
 ${FO_DIR}/application/views/contact/csv_import.php
 ${FO_DIR}/application/views/contact/edit_contact.php
@@ -701,10 +707,14 @@ ${FO_DIR}/application/widgets/activity_feed/index.php
 ${FO_DIR}/application/widgets/activity_feed/template.php
 ${FO_DIR}/application/widgets/calendar/index.php
 ${FO_DIR}/application/widgets/calendar/template.php
+${FO_DIR}/application/widgets/comments/index.php
+${FO_DIR}/application/widgets/comments/template.php
 ${FO_DIR}/application/widgets/completed_tasks_list/index.php
 ${FO_DIR}/application/widgets/completed_tasks_list/template.php
 ${FO_DIR}/application/widgets/documents/index.php
 ${FO_DIR}/application/widgets/documents/template.php
+${FO_DIR}/application/widgets/emails/index.php
+${FO_DIR}/application/widgets/emails/template.php
 ${FO_DIR}/application/widgets/messages/index.php
 ${FO_DIR}/application/widgets/messages/template.php
 ${FO_DIR}/application/widgets/overdue_upcoming/index.php
@@ -2291,6 +2301,9 @@ ${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/CSS/4.1.1,801ad73acbcf9d3127e1d01768d26453,1.ser
+${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/4.1.1,ddc9b993d7fc8d4a185e8dbf5b9a0996,1.ser
+${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/URI/4.1.1,05c766101e813c246917b022f97b5e6e,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
@@ -3094,7 +3107,6 @@ ${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
@@ -5556,6 +5568,7 @@ ${FO_DIR}/public/upgrade/scripts/NutriaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PamplonaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PastafrolaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/TortaFritaUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/VacioUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/templates/checklist.php
 ${FO_DIR}/public/upgrade/templates/config_file.php
 ${FO_DIR}/public/upgrade/templates/db_migration/0_6_6_dulceDeLeche.php
@@ -5575,6 +5588,7 @@ ${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/db_migration/2_5_vacio.php
 ${FO_DIR}/public/upgrade/templates/installed_version.php
 ${FO_DIR}/public/upgrade/templates/layout.php
 ${FO_DIR}/public/webservices/FilesServices.php
@@ -5586,7 +5600,6 @@ ${FO_DIR}/rebuild_sharing_table.php
 ${FO_DIR}/revision.php
 ${FO_DIR}/robots.txt
 ${FO_DIR}/s.gif
-${FO_DIR}/tmp/dummy.php
 ${FO_DIR}/upload/.htaccess
 ${FO_DIR}/upload/dummy.php
 ${FO_DIR}/upload/index.html
diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo
index 1d6e7762589..5ca11119036 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2013/12/20 15:49:33 taca Exp $
+$NetBSD: distinfo,v 1.19 2014/03/29 14:17:06 taca Exp $
 
-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 (fengoffice_2.5.1.zip) = 4b30367584689381643e4f387a42f1d9008f5dcd
+RMD160 (fengoffice_2.5.1.zip) = 06d2abc6c6b0d85f627bce47202c3c4db4098800
+Size (fengoffice_2.5.1.zip) = 12606167 bytes
 SHA1 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
 SHA1 (patch-ag) = 03f09610de1c7fd41641d4f08eb72876d82b2bbf
-SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 44c2d130086e89d238abca4b23917c8f10d0e014
+SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 54988cf29233407ecb4dd1a06c05d2dd4bac444e
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 000fcc6f694..2c2fbe68423 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.5 2013/12/20 15:49:33 taca Exp $
+$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	2013-12-13 18:33:05.000000000 +0000
+--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2014-02-17 10:24:14.000000000 +0000
 +++ plugins/mail/application/helpers/MailUtilities.class.php
-@@ -274,7 +274,7 @@ class MailUtilities {
+@@ -287,7 +287,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,12 +15,3 @@ $NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.5 20
  	
  				if ($enc_conv->hasError()) {
  					$utf8_from = utf8_encode($from_name);
-@@ -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);