diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/fengoffice/Makefile | 4 | ||||
-rw-r--r-- | www/fengoffice/PLIST | 12 | ||||
-rw-r--r-- | www/fengoffice/distinfo | 10 | ||||
-rw-r--r-- | www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php | 8 |
4 files changed, 21 insertions, 13 deletions
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile index a8be633b59b..0418b4a5228 100644 --- a/www/fengoffice/Makefile +++ b/www/fengoffice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2013/08/31 02:04:54 taca Exp $ +# $NetBSD: Makefile,v 1.27 2013/10/09 14:40:09 taca Exp $ # -DISTNAME= fengoffice_2.3.1.1 +DISTNAME= fengoffice_2.3.2.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 6d0e1168646..1a4be3e945d 100644 --- a/www/fengoffice/PLIST +++ b/www/fengoffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2013/08/31 02:04:54 taca Exp $ +@comment $NetBSD: PLIST,v 1.15 2013/10/09 14:40:09 taca Exp $ ${FO_DIR}/.htaccess ${FO_DIR}/application/application.php ${FO_DIR}/application/controllers/AccessController.class.php @@ -56,6 +56,7 @@ ${FO_DIR}/application/helpers/pageactions.php ${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/tabbednavigation.php ${FO_DIR}/application/helpers/textile.php ${FO_DIR}/application/index.html @@ -662,10 +663,12 @@ ${FO_DIR}/application/views/task/new_list_tasks.php ${FO_DIR}/application/views/task/previous_task_list.php ${FO_DIR}/application/views/task/print_task.php ${FO_DIR}/application/views/task/print_view_all.php +${FO_DIR}/application/views/task/subtasks_info.php ${FO_DIR}/application/views/task/task_list.php ${FO_DIR}/application/views/task/view.php ${FO_DIR}/application/views/task/view_milestones.php ${FO_DIR}/application/views/task/view_tasks.php +${FO_DIR}/application/views/task/work_performed.php ${FO_DIR}/application/views/template/add.php ${FO_DIR}/application/views/template/add_to.php ${FO_DIR}/application/views/template/assign_to_ws.php @@ -793,6 +796,7 @@ ${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 @@ -2278,6 +2282,7 @@ ${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 @@ -3056,7 +3061,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 @@ -5255,6 +5259,10 @@ ${FO_DIR}/public/assets/themes/default/images/layout/login/b3.png ${FO_DIR}/public/assets/themes/default/images/layout/login/b4.png ${FO_DIR}/public/assets/themes/default/images/layout/login/b5.png ${FO_DIR}/public/assets/themes/default/images/layout/login/background.png +${FO_DIR}/public/assets/themes/default/images/layout/login/content-background.jpg +${FO_DIR}/public/assets/themes/default/images/layout/login/footer-background.jpg +${FO_DIR}/public/assets/themes/default/images/layout/login/header-background.jpg +${FO_DIR}/public/assets/themes/default/images/layout/login/logo.png ${FO_DIR}/public/assets/themes/default/images/layout/login/m1.png ${FO_DIR}/public/assets/themes/default/images/layout/login/m5.png ${FO_DIR}/public/assets/themes/default/images/layout/login/mt1.png diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo index 7b69a3f5e9e..9e3315a2dc1 100644 --- a/www/fengoffice/distinfo +++ b/www/fengoffice/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2013/08/31 02:04:54 taca Exp $ +$NetBSD: distinfo,v 1.17 2013/10/09 14:40:09 taca Exp $ -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 (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 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5 SHA1 (patch-ag) = 03f09610de1c7fd41641d4f08eb72876d82b2bbf -SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 7681b2f62181173c70a8edce761b91d9671f5ba2 +SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 26ad467c175661d922cac617f383bc58faacb290 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 1523e0251bf..aa2df9f68dc 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.3 2013/08/31 02:04:54 taca Exp $ +$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.4 2013/10/09 14:40:09 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-07-31 09:38:32.000000000 +0000 +--- plugins/mail/application/helpers/MailUtilities.class.php.orig 2013-09-30 07:05:32.000000000 +0000 +++ plugins/mail/application/helpers/MailUtilities.class.php -@@ -274,7 +274,7 @@ class MailUtilities { +@@ -269,7 +269,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.3 20 if ($enc_conv->hasError()) { $utf8_from = utf8_encode($from_name); -@@ -289,7 +289,7 @@ class MailUtilities { +@@ -284,7 +284,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 |