Update fengoffice to 2.3.1.1.

There are too many changes to write here from 2.2.4.1,
please refer readme.txt.

5 files changed, 64 insertions, 37 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 54d23a3c89b..a8be633b59b 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/04/06 12:09:25 taca Exp $
+# $NetBSD: Makefile,v 1.26 2013/08/31 02:04:54 taca Exp $
 #
 
-DISTNAME=	fengoffice_2.2.4.1
+DISTNAME=	fengoffice_2.3.1.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 fe4c0d577db..6d0e1168646 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/04/06 12:09:25 taca Exp $
+@comment $NetBSD: PLIST,v 1.14 2013/08/31 02:04:54 taca Exp $
 ${FO_DIR}/.htaccess
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
@@ -974,6 +974,8 @@ ${FO_DIR}/language/fr_fr/site_interface.php
 ${FO_DIR}/language/fr_fr/slimey.js
 ${FO_DIR}/language/fr_fr/timezones.php
 ${FO_DIR}/language/fr_fr/upgrade.php
+${FO_DIR}/language/hr_hr.php
+${FO_DIR}/language/hr_hr/config.php
 ${FO_DIR}/language/hu_hu.php
 ${FO_DIR}/language/hu_hu/_config.php
 ${FO_DIR}/language/hu_hu/actions.php
@@ -1242,6 +1244,10 @@ ${FO_DIR}/language/ru_ru/slimey.js
 ${FO_DIR}/language/ru_ru/timezones.php
 ${FO_DIR}/language/ru_ru/unknown-words.txt
 ${FO_DIR}/language/ru_ru/upgrade.php
+${FO_DIR}/language/sl_sl.php
+${FO_DIR}/language/sl_sl/_config.php
+${FO_DIR}/language/sr_sr.php
+${FO_DIR}/language/sr_sr/_config.php
 ${FO_DIR}/language/tr_tr.php
 ${FO_DIR}/language/tr_tr/_config.php
 ${FO_DIR}/language/tr_tr/actions.php
@@ -2272,7 +2278,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
@@ -3010,6 +3015,8 @@ ${FO_DIR}/plugins/core_dimensions/language/es_la/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/es_la/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/fr_fr/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/fr_fr/lang.php
+${FO_DIR}/plugins/core_dimensions/language/hr_hr/lang.js
+${FO_DIR}/plugins/core_dimensions/language/hr_hr/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/hu_hu/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/hu_hu/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/id_ba/lang.js
@@ -3034,6 +3041,10 @@ ${FO_DIR}/plugins/core_dimensions/language/ro_ro/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/ro_ro/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/ru_ru/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/ru_ru/lang.php
+${FO_DIR}/plugins/core_dimensions/language/sl_sl/lang.js
+${FO_DIR}/plugins/core_dimensions/language/sl_sl/lang.php
+${FO_DIR}/plugins/core_dimensions/language/sr_sr/lang.js
+${FO_DIR}/plugins/core_dimensions/language/sr_sr/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/tr_tr/lang.js
 ${FO_DIR}/plugins/core_dimensions/language/tr_tr/lang.php
 ${FO_DIR}/plugins/core_dimensions/language/uk_ua/lang.js
@@ -3045,6 +3056,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
@@ -3102,6 +3114,8 @@ ${FO_DIR}/plugins/mail/language/es_la/lang.js
 ${FO_DIR}/plugins/mail/language/es_la/lang.php
 ${FO_DIR}/plugins/mail/language/fr_fr/lang.js
 ${FO_DIR}/plugins/mail/language/fr_fr/lang.php
+${FO_DIR}/plugins/mail/language/hr_hr/lang.js
+${FO_DIR}/plugins/mail/language/hr_hr/lang.php
 ${FO_DIR}/plugins/mail/language/hu_hu/lang.js
 ${FO_DIR}/plugins/mail/language/hu_hu/lang.php
 ${FO_DIR}/plugins/mail/language/id_ba/lang.js
@@ -3126,6 +3140,10 @@ ${FO_DIR}/plugins/mail/language/ro_ro/lang.js
 ${FO_DIR}/plugins/mail/language/ro_ro/lang.php
 ${FO_DIR}/plugins/mail/language/ru_ru/lang.js
 ${FO_DIR}/plugins/mail/language/ru_ru/lang.php
+${FO_DIR}/plugins/mail/language/sl_sl/lang.js
+${FO_DIR}/plugins/mail/language/sl_sl/lang.php
+${FO_DIR}/plugins/mail/language/sr_sr/lang.js
+${FO_DIR}/plugins/mail/language/sr_sr/lang.php
 ${FO_DIR}/plugins/mail/language/tr_tr/lang.js
 ${FO_DIR}/plugins/mail/language/tr_tr/lang.php
 ${FO_DIR}/plugins/mail/language/uk_ua/lang.js
@@ -3170,6 +3188,8 @@ ${FO_DIR}/plugins/workspaces/language/es_la/lang.js
 ${FO_DIR}/plugins/workspaces/language/es_la/lang.php
 ${FO_DIR}/plugins/workspaces/language/fr_fr/lang.js
 ${FO_DIR}/plugins/workspaces/language/fr_fr/lang.php
+${FO_DIR}/plugins/workspaces/language/hr_hr/lang.js
+${FO_DIR}/plugins/workspaces/language/hr_hr/lang.php
 ${FO_DIR}/plugins/workspaces/language/hu_hu/lang.js
 ${FO_DIR}/plugins/workspaces/language/hu_hu/lang.php
 ${FO_DIR}/plugins/workspaces/language/id_ba/lang.js
@@ -3194,6 +3214,10 @@ ${FO_DIR}/plugins/workspaces/language/ro_ro/lang.js
 ${FO_DIR}/plugins/workspaces/language/ro_ro/lang.php
 ${FO_DIR}/plugins/workspaces/language/ru_ru/lang.js
 ${FO_DIR}/plugins/workspaces/language/ru_ru/lang.php
+${FO_DIR}/plugins/workspaces/language/sl_sl/lang.js
+${FO_DIR}/plugins/workspaces/language/sl_sl/lang.php
+${FO_DIR}/plugins/workspaces/language/sr_sr/lang.js
+${FO_DIR}/plugins/workspaces/language/sr_sr/lang.php
 ${FO_DIR}/plugins/workspaces/language/tr_tr/lang.js
 ${FO_DIR}/plugins/workspaces/language/tr_tr/lang.php
 ${FO_DIR}/plugins/workspaces/language/uk_ua/lang.js
@@ -4495,6 +4519,7 @@ ${FO_DIR}/public/assets/javascript/og/modules/doubleListSelCtrl.js
 ${FO_DIR}/public/assets/javascript/og/modules/linkToObjectForm.js
 ${FO_DIR}/public/assets/javascript/og/modules/massmailerForm.js
 ${FO_DIR}/public/assets/javascript/og/modules/memberListView.js
+${FO_DIR}/public/assets/javascript/og/modules/memberSelector.js
 ${FO_DIR}/public/assets/javascript/og/modules/plugins.js
 ${FO_DIR}/public/assets/javascript/og/modules/updatePermissionsForm.js
 ${FO_DIR}/public/assets/javascript/og/ofc.js
@@ -5475,6 +5500,7 @@ ${FO_DIR}/public/upgrade/scripts/AsadoUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/BondiolaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ChinchulinUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ChivitoUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/ChorizoUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ChurroUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/DulceDeLecheUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/EmpanadaUpgradeScript.class.php
@@ -5503,6 +5529,7 @@ ${FO_DIR}/public/upgrade/templates/db_migration/1_7_pastafrola.php
 ${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/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 a231d39ad7f..7b69a3f5e9e 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2013/04/06 12:09:25 taca Exp $
+$NetBSD: distinfo,v 1.16 2013/08/31 02:04:54 taca Exp $
 
-SHA1 (fengoffice_2.2.4.1.zip) = d44efa6432ef07de0e5cea2f8382439a1bbe0879
-RMD160 (fengoffice_2.2.4.1.zip) = 9b32e096e614c57772f5b76ea072a1e594ab93c7
-Size (fengoffice_2.2.4.1.zip) = 12372854 bytes
+SHA1 (fengoffice_2.3.1.1.zip) = 02309def84e5d91ff190cc98851ea1b19c331fe7
+RMD160 (fengoffice_2.3.1.1.zip) = 1b5f69e8477e4c12ba81bae7d2a7e4074996f6da
+Size (fengoffice_2.3.1.1.zip) = 12430557 bytes
 SHA1 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
-SHA1 (patch-ag) = 3e06d5e9ce3bc679d87d46d5175fee83b95405c1
-SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = c81163db4100e0e3733ba139811a85aa27c8721e
+SHA1 (patch-ag) = 03f09610de1c7fd41641d4f08eb72876d82b2bbf
+SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 7681b2f62181173c70a8edce761b91d9671f5ba2
diff --git a/www/fengoffice/patches/patch-ag b/www/fengoffice/patches/patch-ag
index dbe93366365..750df2f1237 100644
--- a/www/fengoffice/patches/patch-ag
+++ b/www/fengoffice/patches/patch-ag
@@ -1,18 +1,18 @@
-$NetBSD: patch-ag,v 1.3 2013/03/14 16:33:15 taca Exp $
+$NetBSD: patch-ag,v 1.4 2013/08/31 02:04:54 taca Exp $
 
 Use monospace font for mail body.
 
---- 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.orig	2013-07-31 09:38:58.000000000 +0000
 +++ public/assets/themes/default/stylesheets/og/co.css
-@@ -225,6 +225,11 @@
- 
- /* -----  Email  ----- */
+@@ -237,6 +237,11 @@
+   	color: #404566;
+ }
  
 +.email .coViewBody {
 +	font-family: osaka-mono,monospace;
 +	font-size: 12px;
 +}
 +
- .email .coViewHeader {
-   	background: #BABFD9;
-   	border-color: #7882BF;
+ .email .coViewIcon {
+   	background: #DBE0FF;
+   	border-color: #BABFD9;
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 c9bccb8e193..1523e0251bf 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,26 +1,26 @@
-$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.2 2013/03/14 16:33:15 taca Exp $
+$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.3 2013/08/31 02:04:54 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-02-06 11:30:12.000000000 +0000
+--- plugins/mail/application/helpers/MailUtilities.class.php.orig	2013-07-31 09:38:32.000000000 +0000
 +++ plugins/mail/application/helpers/MailUtilities.class.php
-@@ -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);
+@@ -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
+-				$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);
+@@ -289,7 +289,7 @@ class MailUtilities {
+ 			$subject_encoding = detect_encoding($subject_aux);
  			
- 			if ($enc_conv->hasError()) {
- 				$utf8_subject = utf8_encode($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);