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.

6 files changed, 29 insertions, 37 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index faf0beff4dc..37ffe65d47e 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/03/04 21:57:21 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2013/03/14 16:33:15 taca Exp $
 #
 
-DISTNAME=	fengoffice_2.2.0
+DISTNAME=	fengoffice_2.2.3.1
 PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
@@ -21,6 +21,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.1.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-imap>=5.1.0:../../mail/php-imap
 
+EXTRACT_DIR=	${WRKDIR}/fengoffice
 WRKSRC=		${WRKDIR}/fengoffice
 USE_TOOLS=	pax
 NO_BUILD=	yes
diff --git a/www/fengoffice/PLIST b/www/fengoffice/PLIST
index 94217c9ceaa..5f84a9a9b5a 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/10/18 14:31:23 taca Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/03/14 16:33:15 taca Exp $
 ${FO_DIR}/.htaccess
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
@@ -688,6 +688,8 @@ ${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/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/messages/index.php
@@ -1152,6 +1154,7 @@ ${FO_DIR}/language/pt_br/_config.php
 ${FO_DIR}/language/pt_br/actions.php
 ${FO_DIR}/language/pt_br/administration.php
 ${FO_DIR}/language/pt_br/calendar.php
+${FO_DIR}/language/pt_br/core_dimensions
 ${FO_DIR}/language/pt_br/countries.php
 ${FO_DIR}/language/pt_br/emails.php
 ${FO_DIR}/language/pt_br/errors.php
@@ -2250,7 +2253,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
@@ -3020,7 +3025,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
@@ -5476,6 +5480,7 @@ ${FO_DIR}/public/webservices/TagsServices.php
 ${FO_DIR}/public/webservices/WebServicesBase.php
 ${FO_DIR}/public/webservices/WorkspaceServices.php
 ${FO_DIR}/readme.txt
+${FO_DIR}/rebuild_sharing_table.php
 ${FO_DIR}/revision.php
 ${FO_DIR}/robots.txt
 ${FO_DIR}/s.gif
diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo
index 8a1cb5b535c..1de448b52b4 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2012/10/18 14:31:23 taca Exp $
+$NetBSD: distinfo,v 1.14 2013/03/14 16:33:15 taca Exp $
 
-SHA1 (fengoffice_2.2.0.zip) = 58fb5a529de71b5794f2bc1b01d0f41a320d25dd
-RMD160 (fengoffice_2.2.0.zip) = 601d726939754b4dede71b6ab47036df08ffbf92
-Size (fengoffice_2.2.0.zip) = 12385701 bytes
-SHA1 (patch-aa) = 9f135a98241ace92ed66babd4042efe9dec0304e
+SHA1 (fengoffice_2.2.3.1.zip) = 958a71e4074a0bfdbeda817974d329acfaec07e3
+RMD160 (fengoffice_2.2.3.1.zip) = a3fb7a68051ea1cbda5b1fbe659da427bdca9a6b
+Size (fengoffice_2.2.3.1.zip) = 12272315 bytes
+SHA1 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
-SHA1 (patch-ag) = a9e0434f1f05cb5735d21a05a91e5cab510759f0
-SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 87f23f47753932583ecd633f7c45588352218b24
+SHA1 (patch-ag) = 3e06d5e9ce3bc679d87d46d5175fee83b95405c1
+SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = c81163db4100e0e3733ba139811a85aa27c8721e
diff --git a/www/fengoffice/patches/patch-aa b/www/fengoffice/patches/patch-aa
index a69f68f5ce6..b8ff187ede8 100644
--- a/www/fengoffice/patches/patch-aa
+++ b/www/fengoffice/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2010/12/02 13:35:24 taca Exp $
+$NetBSD: patch-aa,v 1.4 2013/03/14 16:33:15 taca Exp $
 
 Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
 (mb-iconv.patch from http://www.fengoffice.com/web/bugs/view.php?id=6)
 
---- environment/classes/encoding/EncodingConverter.class.php.orig	2010-12-01 12:33:32.000000000 +0000
+--- environment/classes/encoding/EncodingConverter.class.php.orig	2013-02-06 11:30:10.000000000 +0000
 +++ environment/classes/encoding/EncodingConverter.class.php
 @@ -6,6 +6,16 @@ class EncodingConverter
  	var $_last_err_filename;
  	var $_last_err_line;
  	var $_last_err_func;
-+	private static $gnu_iconv = NULL;
++	private static $gnu_iconv = null;
 +
 +	static function iconv_error($errno, $errstr) {
 +		if (preg_match("/Wrong charset/", $errstr) > 0) {
@@ -22,7 +22,7 @@ Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
  
  	function _handleError($err, $msg, $errfile, $errline, $errcontext) {
  		$trace = debug_backtrace();
-@@ -25,12 +35,29 @@ class EncodingConverter
+@@ -25,6 +35,19 @@ class EncodingConverter
  	}
  
  	function convert($in_enc, $out_enc, $str, $return_original_on_error = true, $ignore_non_compatible = true) {
@@ -41,18 +41,4 @@ Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
 +
  		$this->_last_err = null;
  		set_error_handler(array(&$this, '_handleError'));
--		
--		if ($ignore_non_compatible) $out_enc .= "//IGNORE//TRANSLIT";
--		
--		$retval = iconv($in_enc, $out_enc, $str);
-+
-+		if(!$mbflag) {
-+			if (self::$gnu_iconv)
-+				if ($ignore_non_compatible) $out_enc .= "//IGNORE//TRANSLIT";
-+			$retval = iconv($in_enc, $out_enc, $str);
-+		} else { 
-+			$retval = mb_convert_encoding($str, $out_enc, $in_enc);
-+		}
  		
- 		restore_error_handler();
- 		if ($this->hasError()) {
diff --git a/www/fengoffice/patches/patch-ag b/www/fengoffice/patches/patch-ag
index 686bafd2c97..dbe93366365 100644
--- a/www/fengoffice/patches/patch-ag
+++ b/www/fengoffice/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.2 2011/06/15 15:19:45 taca Exp $
+$NetBSD: patch-ag,v 1.3 2013/03/14 16:33:15 taca Exp $
 
 Use monospace font for mail body.
 
---- public/assets/themes/default/stylesheets/og/co.css.orig	2010-12-01 21:33:33.000000000 +0900
-+++ public/assets/themes/default/stylesheets/og/co.css	2011-01-06 09:40:51.000000000 +0900
-@@ -220,6 +220,11 @@
+--- public/assets/themes/default/stylesheets/og/co.css.orig	2013-02-06 11:30:24.000000000 +0000
++++ public/assets/themes/default/stylesheets/og/co.css
+@@ -225,6 +225,11 @@
  
  /* -----  Email  ----- */
  
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 48ac02f4e44..c9bccb8e193 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.1 2012/05/07 15:20:32 taca Exp $
+$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.2 2013/03/14 16:33:15 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.orig	2013-02-06 11:30:12.000000000 +0000
 +++ plugins/mail/application/helpers/MailUtilities.class.php
-@@ -271,7 +271,7 @@ class MailUtilities {
+@@ -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
@@ -15,7 +15,7 @@ $NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.1 20
  
  			if ($enc_conv->hasError()) {
  				$utf8_from = utf8_encode($from_name);
-@@ -286,7 +286,7 @@ class MailUtilities {
+@@ -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