CVS commit: pkgsrc/www/fengoffice

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec 15 18:27:24 UTC 2019

Modified Files:
        pkgsrc/www/fengoffice: Makefile PLIST distinfo
        pkgsrc/www/fengoffice/patches:
            patch-plugins_mail_application_helpers_MailUtilities.class.php

Log Message:
www/fengoffice: update to 3.7.2.16

Now PHP 7 and later are supported.

Changes are too many to write here, please refer readme.txt in detail.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/fengoffice/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/fengoffice/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/fengoffice/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/fengoffice/Makefile
diff -u pkgsrc/www/fengoffice/Makefile:1.39 pkgsrc/www/fengoffice/Makefile:1.40
--- pkgsrc/www/fengoffice/Makefile:1.39 Mon Nov  4 22:09:54 2019
+++ pkgsrc/www/fengoffice/Makefile      Sun Dec 15 18:27:24 2019
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.39 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2019/12/15 18:27:24 taca Exp $
 #
 
-DISTNAME=      fengoffice_3.2.2.1
+DISTNAME=      fengoffice-${FO_VERSION}
 PKGNAME=       ${DISTNAME:S/_/-/:C/.rc$/rc1/}
-PKGREVISION=   1
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=opengoo/}
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=fengoffice/}
+GITHUB_TYPE=   tag
+GITHUB_PROJECT=        fengoffice
+GITHUB_RELEASE=        ${FO_VERSION}
 
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      http://fengoffice.com/web/community/community_index.php
@@ -15,15 +16,15 @@ LICENSE=    gnu-agpl-v3
 
 CONFLICTS+=    opengoo-[0-9]*
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=5.1.0:../../databases/php-mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql>=7.1:../../databases/php-pdo_mysql
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.1.0:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=5.1.0:../../mail/php-imap
 
-PHP_VERSIONS_ACCEPTED= 56
+FO_VERSION=    3.7.2.16
 
-WRKSRC=                ${WRKDIR}/fengoffice
+#EXTRACT_USING=        bsd-tar
 USE_TOOLS=     pax
 NO_BUILD=      yes
 

Index: pkgsrc/www/fengoffice/PLIST
diff -u pkgsrc/www/fengoffice/PLIST:1.22 pkgsrc/www/fengoffice/PLIST:1.23
--- pkgsrc/www/fengoffice/PLIST:1.22    Sun Sep 27 07:21:39 2015
+++ pkgsrc/www/fengoffice/PLIST Sun Dec 15 18:27:24 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.22 2015/09/27 07:21:39 taca Exp $
+@comment $NetBSD: PLIST,v 1.23 2019/12/15 18:27:24 taca Exp $
+${FO_DIR}/.gitignore
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
 ${FO_DIR}/application/controllers/AccountController.class.php
@@ -17,7 +18,6 @@ ${FO_DIR}/application/controllers/EventC
 ${FO_DIR}/application/controllers/ExternalCalendarController.class.php
 ${FO_DIR}/application/controllers/FeedController.class.php
 ${FO_DIR}/application/controllers/FilesController.class.php
-${FO_DIR}/application/controllers/FormController.class.php
 ${FO_DIR}/application/controllers/GroupController.class.php
 ${FO_DIR}/application/controllers/GuiController.class.php
 ${FO_DIR}/application/controllers/HelpController.class.php
@@ -50,19 +50,25 @@ ${FO_DIR}/application/helpers/chart.php
 ${FO_DIR}/application/helpers/common.php
 ${FO_DIR}/application/helpers/company_website.php
 ${FO_DIR}/application/helpers/contact_render_tab_functions.php
+${FO_DIR}/application/helpers/custom_properties.php
 ${FO_DIR}/application/helpers/dimension.php
 ${FO_DIR}/application/helpers/form.php
 ${FO_DIR}/application/helpers/format.php
 ${FO_DIR}/application/helpers/grouping.php
 ${FO_DIR}/application/helpers/http-cli.php
 ${FO_DIR}/application/helpers/member_parent_changed_refresh_object_permisssions.php
+${FO_DIR}/application/helpers/object_selector.php
 ${FO_DIR}/application/helpers/page.php
 ${FO_DIR}/application/helpers/pageactions.php
 ${FO_DIR}/application/helpers/pagination.php
 ${FO_DIR}/application/helpers/permissions.php
+${FO_DIR}/application/helpers/plugin_installer_functions.php
 ${FO_DIR}/application/helpers/project_website.php
+${FO_DIR}/application/helpers/rebuild_sharing_table_for_pg.php
+${FO_DIR}/application/helpers/reporting.php
 ${FO_DIR}/application/helpers/save_member_permissions.php
 ${FO_DIR}/application/helpers/save_user_permissions.php
+${FO_DIR}/application/helpers/sharing_table.php
 ${FO_DIR}/application/helpers/tabbednavigation.php
 ${FO_DIR}/application/helpers/textile.php
 ${FO_DIR}/application/index.html
@@ -98,6 +104,10 @@ ${FO_DIR}/application/models/administrat
 ${FO_DIR}/application/models/administration_tools/AdministrationTools.class.php
 ${FO_DIR}/application/models/administration_tools/base/BaseAdministrationTool.class.php
 ${FO_DIR}/application/models/administration_tools/base/BaseAdministrationTools.class.php
+${FO_DIR}/application/models/application_log_details/ApplicationLogDetail.class.php
+${FO_DIR}/application/models/application_log_details/ApplicationLogDetails.class.php
+${FO_DIR}/application/models/application_log_details/base/BaseApplicationLogDetail.class.php
+${FO_DIR}/application/models/application_log_details/base/BaseApplicationLogDetails.class.php
 ${FO_DIR}/application/models/application_logs/ApplicationLog.class.php
 ${FO_DIR}/application/models/application_logs/ApplicationLogs.class.php
 ${FO_DIR}/application/models/application_logs/base/BaseApplicationLog.class.php
@@ -123,17 +133,25 @@ ${FO_DIR}/application/models/config_cate
 ${FO_DIR}/application/models/config_categories/base/BaseConfigCategories.class.php
 ${FO_DIR}/application/models/config_categories/base/BaseConfigCategory.class.php
 ${FO_DIR}/application/models/config_handlers/complex/AddressFieldsConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/AllDimensionsConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/ColorPickerConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/ContactPropertySelectorConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/CustomPropertiesByObjectTypeHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/DateFormatConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/DateRangeConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/DragDropPromptConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/FileStorageConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/InitialWorkspaceConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/ListConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/LocalizationConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/MailAccountConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MailDragDropPromptConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MailFieldConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MailTransportConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/ManageableDimensionsConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/MemberConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MilestoneSelectorFilterConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/MultipleListConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MultipleObjectTypeConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/MultipleObjectTypePrefixConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/NewClientContactTypeConfigHandler.class.php
@@ -143,8 +161,12 @@ ${FO_DIR}/application/models/config_hand
 ${FO_DIR}/application/models/config_handlers/complex/SecureSmtpConnectionConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/ShowContextHelpConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/SingleDimensionConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/SingleMemberTypeConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/StatusConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/ThemeConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/TimeAmountConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/TimeFormatConfigHandler.class.php
+${FO_DIR}/application/models/config_handlers/complex/TimezoneConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/UserCompanyConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/UserGroupConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/UserTypeMultipleConfigHandler.class.php
@@ -185,6 +207,10 @@ ${FO_DIR}/application/models/contact_ema
 ${FO_DIR}/application/models/contact_emails/ContactEmails.class.php
 ${FO_DIR}/application/models/contact_emails/base/BaseContactEmail.class.php
 ${FO_DIR}/application/models/contact_emails/base/BaseContactEmails.class.php
+${FO_DIR}/application/models/contact_external_tokens/ContactExternalToken.class.php
+${FO_DIR}/application/models/contact_external_tokens/ContactExternalTokens.class.php
+${FO_DIR}/application/models/contact_external_tokens/base/BaseContactExternalToken.class.php
+${FO_DIR}/application/models/contact_external_tokens/base/BaseContactExternalTokens.class.php
 ${FO_DIR}/application/models/contact_im_values/ContactImValue.class.php
 ${FO_DIR}/application/models/contact_im_values/ContactImValues.class.php
 ${FO_DIR}/application/models/contact_im_values/base/BaseContactImValue.class.php
@@ -229,6 +255,10 @@ ${FO_DIR}/application/models/cron_events
 ${FO_DIR}/application/models/cron_events/CronEvents.class.php
 ${FO_DIR}/application/models/cron_events/base/BaseCronEvent.class.php
 ${FO_DIR}/application/models/cron_events/base/BaseCronEvents.class.php
+${FO_DIR}/application/models/currencies/Currencies.class.php
+${FO_DIR}/application/models/currencies/Currency.class.php
+${FO_DIR}/application/models/currencies/base/BaseCurrencies.class.php
+${FO_DIR}/application/models/currencies/base/BaseCurrency.class.php
 ${FO_DIR}/application/models/custom_properties/CustomProperties.class.php
 ${FO_DIR}/application/models/custom_properties/CustomProperty.class.php
 ${FO_DIR}/application/models/custom_properties/base/BaseCustomProperties.class.php
@@ -241,6 +271,10 @@ ${FO_DIR}/application/models/custom_prop
 ${FO_DIR}/application/models/custom_property_values/CustomPropertyValues.class.php
 ${FO_DIR}/application/models/custom_property_values/base/BaseCustomPropertyValue.class.php
 ${FO_DIR}/application/models/custom_property_values/base/BaseCustomPropertyValues.class.php
+${FO_DIR}/application/models/dimension_associations_configs/DimensionAssociationsConfig.class.php
+${FO_DIR}/application/models/dimension_associations_configs/DimensionAssociationsConfigs.class.php
+${FO_DIR}/application/models/dimension_associations_configs/base/BaseDimensionAssociationsConfig.class.php
+${FO_DIR}/application/models/dimension_associations_configs/base/BaseDimensionAssociationsConfigs.class.php
 ${FO_DIR}/application/models/dimension_member_associations/DimensionMemberAssociation.class.php
 ${FO_DIR}/application/models/dimension_member_associations/DimensionMemberAssociations.class.php
 ${FO_DIR}/application/models/dimension_member_associations/base/BaseDimensionMemberAssociation.class.php
@@ -257,10 +291,18 @@ ${FO_DIR}/application/models/dimension_o
 ${FO_DIR}/application/models/dimension_object_type_hierarchy/DimensionObjectTypeHierarchy.class.php
 ${FO_DIR}/application/models/dimension_object_type_hierarchy/base/BaseDimensionObjectTypeHierarchies.class.php
 ${FO_DIR}/application/models/dimension_object_type_hierarchy/base/BaseDimensionObjectTypeHierarchy.class.php
+${FO_DIR}/application/models/dimension_object_type_options/DimensionObjectTypeOption.class.php
+${FO_DIR}/application/models/dimension_object_type_options/DimensionObjectTypeOptions.class.php
+${FO_DIR}/application/models/dimension_object_type_options/base/BaseDimensionObjectTypeOption.class.php
+${FO_DIR}/application/models/dimension_object_type_options/base/BaseDimensionObjectTypeOptions.class.php
 ${FO_DIR}/application/models/dimension_object_types/DimensionObjectType.class.php
 ${FO_DIR}/application/models/dimension_object_types/DimensionObjectTypes.class.php
 ${FO_DIR}/application/models/dimension_object_types/base/BaseDimensionObjectType.class.php
 ${FO_DIR}/application/models/dimension_object_types/base/BaseDimensionObjectTypes.class.php
+${FO_DIR}/application/models/dimension_options/DimensionOption.class.php
+${FO_DIR}/application/models/dimension_options/DimensionOptions.class.php
+${FO_DIR}/application/models/dimension_options/base/BaseDimensionOption.class.php
+${FO_DIR}/application/models/dimension_options/base/BaseDimensionOptions.class.php
 ${FO_DIR}/application/models/dimensions/Dimension.class.php
 ${FO_DIR}/application/models/dimensions/Dimensions.class.php
 ${FO_DIR}/application/models/dimensions/base/BaseDimension.class.php
@@ -353,6 +395,18 @@ ${FO_DIR}/application/models/object_subs
 ${FO_DIR}/application/models/object_subscriptions/ObjectSubscriptions.class.php
 ${FO_DIR}/application/models/object_subscriptions/base/BaseObjectSubscription.class.php
 ${FO_DIR}/application/models/object_subscriptions/base/BaseObjectSubscriptions.class.php
+${FO_DIR}/application/models/object_type_dependencies/ObjectTypeDependencies.class.php
+${FO_DIR}/application/models/object_type_dependencies/ObjectTypeDependency.class.php
+${FO_DIR}/application/models/object_type_dependencies/base/BaseObjectTypeDependencies.class.php
+${FO_DIR}/application/models/object_type_dependencies/base/BaseObjectTypeDependency.class.php
+${FO_DIR}/application/models/object_type_hierarchies/ObjectTypeHierarchies.class.php
+${FO_DIR}/application/models/object_type_hierarchies/ObjectTypeHierarchy.class.php
+${FO_DIR}/application/models/object_type_hierarchies/base/BaseObjectTypeHierarchies.class.php
+${FO_DIR}/application/models/object_type_hierarchies/base/BaseObjectTypeHierarchy.class.php
+${FO_DIR}/application/models/object_type_hierarchy_options/ObjectTypeHierarchyOption.class.php
+${FO_DIR}/application/models/object_type_hierarchy_options/ObjectTypeHierarchyOptions.class.php
+${FO_DIR}/application/models/object_type_hierarchy_options/base/BaseObjectTypeHierarchyOption.class.php
+${FO_DIR}/application/models/object_type_hierarchy_options/base/BaseObjectTypeHierarchyOptions.class.php
 ${FO_DIR}/application/models/object_types/ObjectType.class.php
 ${FO_DIR}/application/models/object_types/ObjectTypes.class.php
 ${FO_DIR}/application/models/object_types/base/BaseObjectType.class.php
@@ -525,7 +579,9 @@ ${FO_DIR}/application/views/access/compl
 ${FO_DIR}/application/views/access/forgot_password.php
 ${FO_DIR}/application/views/access/login.php
 ${FO_DIR}/application/views/access/reset_password.php
+${FO_DIR}/application/views/account/add_token.php
 ${FO_DIR}/application/views/account/edit_avatar.php
+${FO_DIR}/application/views/account/edit_external_tokens.php
 ${FO_DIR}/application/views/account/edit_password.php
 ${FO_DIR}/application/views/account/edit_profile.php
 ${FO_DIR}/application/views/account/index.php
@@ -535,6 +591,7 @@ ${FO_DIR}/application/views/account/user
 ${FO_DIR}/application/views/administration/auto_upgrade.php
 ${FO_DIR}/application/views/administration/clients.php
 ${FO_DIR}/application/views/administration/configuration.php
+${FO_DIR}/application/views/administration/cp_table_template.php
 ${FO_DIR}/application/views/administration/cron_events.php
 ${FO_DIR}/application/views/administration/custom_properties.php
 ${FO_DIR}/application/views/administration/documents.php
@@ -542,6 +599,7 @@ ${FO_DIR}/application/views/administrati
 ${FO_DIR}/application/views/administration/edit_members.php
 ${FO_DIR}/application/views/administration/groups.php
 ${FO_DIR}/application/views/administration/index.php
+${FO_DIR}/application/views/administration/list_custom_properties_for_type.php
 ${FO_DIR}/application/views/administration/list_users.php
 ${FO_DIR}/application/views/administration/mail_accounts.php
 ${FO_DIR}/application/views/administration/members.php
@@ -549,18 +607,19 @@ ${FO_DIR}/application/views/administrati
 ${FO_DIR}/application/views/administration/password_autentify.php
 ${FO_DIR}/application/views/administration/tabs.php
 ${FO_DIR}/application/views/administration/task_templates.php
+${FO_DIR}/application/views/administration/timezones.php
 ${FO_DIR}/application/views/administration/tool_mass_mailer.php
 ${FO_DIR}/application/views/administration/tool_test_email.php
 ${FO_DIR}/application/views/administration/tools.php
 ${FO_DIR}/application/views/administration/upgrade.php
 ${FO_DIR}/application/views/advanced_pagination.php
-${FO_DIR}/application/views/api/index.php
 ${FO_DIR}/application/views/application/system_notices.php
 ${FO_DIR}/application/views/application/user_box.php
 ${FO_DIR}/application/views/back.php
 ${FO_DIR}/application/views/billing/add.php
 ${FO_DIR}/application/views/billing/assign_users.php
 ${FO_DIR}/application/views/billing/index.php
+${FO_DIR}/application/views/billing/list_all.php
 ${FO_DIR}/application/views/breadcrumbs/breadcrumbs_template.php
 ${FO_DIR}/application/views/co/actions.php
 ${FO_DIR}/application/views/co/member_path.php
@@ -574,6 +633,7 @@ ${FO_DIR}/application/views/comment/post
 ${FO_DIR}/application/views/config/default_user_preferences.php
 ${FO_DIR}/application/views/config/update_category.php
 ${FO_DIR}/application/views/config/update_default_user_preferences.php
+${FO_DIR}/application/views/confirm_box.php
 ${FO_DIR}/application/views/contact/add_company.php
 ${FO_DIR}/application/views/contact/add_contact/access_data.php
 ${FO_DIR}/application/views/contact/add_contact/access_data_company.php
@@ -594,13 +654,24 @@ ${FO_DIR}/application/views/contact/list
 ${FO_DIR}/application/views/contact/quick_config_filter_activity.php
 ${FO_DIR}/application/views/contact/tabs/company_data.php
 ${FO_DIR}/application/views/contact/tabs/contact_data.php
+${FO_DIR}/application/views/contact/tabs/more_contact_data.php
 ${FO_DIR}/application/views/contact/update_user_preferences.php
 ${FO_DIR}/application/views/contact/user_card.php
 ${FO_DIR}/application/views/contact/vcard_import.php
 ${FO_DIR}/application/views/contact/view_company.php
 ${FO_DIR}/application/views/cron/getmails.php
+${FO_DIR}/application/views/custom_properties/image_cp_selector.php
+${FO_DIR}/application/views/custom_properties/image_cp_view.php
 ${FO_DIR}/application/views/custom_properties/member_custom_properties.php
 ${FO_DIR}/application/views/custom_properties/object_custom_properties.php
+${FO_DIR}/application/views/custom_properties/selectors/date_multiple.php
+${FO_DIR}/application/views/custom_properties/selectors/datetime_multiple.php
+${FO_DIR}/application/views/custom_properties/selectors/list_multiple.php
+${FO_DIR}/application/views/custom_properties/selectors/memo_multiple.php
+${FO_DIR}/application/views/custom_properties/selectors/numeric_multiple.php
+${FO_DIR}/application/views/custom_properties/selectors/table.php
+${FO_DIR}/application/views/custom_properties/selectors/text_multiple.php
+${FO_DIR}/application/views/custom_properties/table_cp_view.php
 ${FO_DIR}/application/views/custom_properties/view.php
 ${FO_DIR}/application/views/dashboard/activity_feed.php
 ${FO_DIR}/application/views/dashboard/index.php
@@ -622,10 +693,13 @@ ${FO_DIR}/application/views/dashboard/wi
 ${FO_DIR}/application/views/dashboard/widget_pending_tasks.php
 ${FO_DIR}/application/views/dashboard/widget_workspace_description.php
 ${FO_DIR}/application/views/dashboard/widgets/pepe.php
+${FO_DIR}/application/views/dimension/components/bootstrap_multiple_dimension_selector.php
+${FO_DIR}/application/views/dimension/components/bootstrap_view.php
 ${FO_DIR}/application/views/dimension/components/default_view.php
 ${FO_DIR}/application/views/dimension/components/multiple_dimension_selector.php
 ${FO_DIR}/application/views/dimension/components/small_view.php
 ${FO_DIR}/application/views/dimension/list_members.php
+${FO_DIR}/application/views/dimension/render_member_selector.php
 ${FO_DIR}/application/views/empty.php
 ${FO_DIR}/application/views/error/db_connect.php
 ${FO_DIR}/application/views/error/error_message.php
@@ -716,6 +790,14 @@ ${FO_DIR}/application/views/object/popup
 ${FO_DIR}/application/views/object/send_reminders.php
 ${FO_DIR}/application/views/object/view_history.php
 ${FO_DIR}/application/views/plugin/index.php
+${FO_DIR}/application/views/report_columns/ReportColumn.class.php
+${FO_DIR}/application/views/report_columns/ReportColumns.class.php
+${FO_DIR}/application/views/report_columns/base/BaseReportColumn.class.php
+${FO_DIR}/application/views/report_columns/base/BaseReportColumns.class.php
+${FO_DIR}/application/views/report_conditions/ReportCondition.class.php
+${FO_DIR}/application/views/report_conditions/ReportConditions.class.php
+${FO_DIR}/application/views/report_conditions/base/BaseReportCondition.class.php
+${FO_DIR}/application/views/report_conditions/base/BaseReportConditions.class.php
 ${FO_DIR}/application/views/reporting/add_chart.php
 ${FO_DIR}/application/views/reporting/add_custom_report.php
 ${FO_DIR}/application/views/reporting/chart_details.php
@@ -740,8 +822,10 @@ ${FO_DIR}/application/views/task/index.p
 ${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_tasks_list.php
 ${FO_DIR}/application/views/task/print_view_all.php
 ${FO_DIR}/application/views/task/subtasks_info.php
+${FO_DIR}/application/views/task/task_change_date_prompt.php
 ${FO_DIR}/application/views/task/task_list.php
 ${FO_DIR}/application/views/task/task_timespan_modal_template.php
 ${FO_DIR}/application/views/task/tasks_list_row_template.php
@@ -760,6 +844,7 @@ ${FO_DIR}/application/views/template/vie
 ${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/edit_timeslot.php
 ${FO_DIR}/application/views/time/index.php
 ${FO_DIR}/application/views/timeslot/add_timeslot.php
 ${FO_DIR}/application/views/timeslot/object_timeslots.php
@@ -770,6 +855,7 @@ ${FO_DIR}/application/views/tool/transla
 ${FO_DIR}/application/views/webpage/add.php
 ${FO_DIR}/application/views/webpage/view.php
 ${FO_DIR}/application/views/webpage/view_content.php
+${FO_DIR}/application/views/widget/render_template_with_options.php
 ${FO_DIR}/application/widgets/active_context_info/index.php
 ${FO_DIR}/application/widgets/active_context_info/template.php
 ${FO_DIR}/application/widgets/activity_feed/index.php
@@ -791,16 +877,19 @@ ${FO_DIR}/application/widgets/overdue_up
 ${FO_DIR}/application/widgets/people/index.php
 ${FO_DIR}/application/widgets/people/template.php
 ${FO_DIR}/cache/.htaccess
-${FO_DIR}/cache/dummy.txt
 ${FO_DIR}/ck_upload_handler.php
-${FO_DIR}/config/.htaccess
+${FO_DIR}/composer.json
 ${FO_DIR}/config/ldap.config.example.php
 ${FO_DIR}/cron.php
 ${FO_DIR}/crossdomain.xml
+${FO_DIR}/custom_langs/en_us.php
+${FO_DIR}/custom_langs/es_la.php
+${FO_DIR}/custom_langs/pl_pl.php
 ${FO_DIR}/cut_users_permissions_by_role_and_max_perm.php
 ${FO_DIR}/dummy.php
 ${FO_DIR}/environment/classes/AutoLoader.class.php
 ${FO_DIR}/environment/classes/Cookie.class.php
+${FO_DIR}/environment/classes/Countries.class.php
 ${FO_DIR}/environment/classes/CountryCodes.class.php
 ${FO_DIR}/environment/classes/Env.class.php
 ${FO_DIR}/environment/classes/Error.class.php
@@ -878,6 +967,7 @@ ${FO_DIR}/environment/library/database/D
 ${FO_DIR}/environment/library/database/DBResult.class.php
 ${FO_DIR}/environment/library/database/adapters/AbstractDBAdapter.class.php
 ${FO_DIR}/environment/library/database/adapters/MysqlDBAdapter.class.php
+${FO_DIR}/environment/library/database/adapters/MysqliDBAdapter.class.php
 ${FO_DIR}/environment/library/database/adapters/PdoMysqlDBAdapter.class.php
 ${FO_DIR}/environment/library/database/database.php
 ${FO_DIR}/environment/library/database/errors/DBAdapterDnx.class.php
@@ -892,6 +982,7 @@ ${FO_DIR}/hooks/index.html
 ${FO_DIR}/hooks/opengoo_hooks.php
 ${FO_DIR}/index.php
 ${FO_DIR}/init.php
+${FO_DIR}/language/[nl_nl].php
 ${FO_DIR}/language/ar_sa.php
 ${FO_DIR}/language/ar_sa/_config.php
 ${FO_DIR}/language/ar_sa/actions.php
@@ -928,7 +1019,6 @@ ${FO_DIR}/language/cs_cz/general.php
 ${FO_DIR}/language/cs_cz/help.php
 ${FO_DIR}/language/cs_cz/help/account.html
 ${FO_DIR}/language/cs_cz/help/dashboard.html
-${FO_DIR}/language/cs_cz/help/dummy.txt
 ${FO_DIR}/language/cs_cz/help/no_help.html
 ${FO_DIR}/language/cs_cz/lang.js
 ${FO_DIR}/language/cs_cz/messages.php
@@ -953,7 +1043,6 @@ ${FO_DIR}/language/de_de/general.php
 ${FO_DIR}/language/de_de/help.php
 ${FO_DIR}/language/de_de/help/account.html
 ${FO_DIR}/language/de_de/help/dashboard.html
-${FO_DIR}/language/de_de/help/dummy.txt
 ${FO_DIR}/language/de_de/help/no_help.html
 ${FO_DIR}/language/de_de/lang.js
 ${FO_DIR}/language/de_de/messages.php
@@ -1042,7 +1131,6 @@ ${FO_DIR}/language/es_es/errors.php
 ${FO_DIR}/language/es_es/fields.php
 ${FO_DIR}/language/es_es/general.php
 ${FO_DIR}/language/es_es/help.php
-${FO_DIR}/language/es_es/help/dummy.txt
 ${FO_DIR}/language/es_es/lang.js
 ${FO_DIR}/language/es_es/messages.php
 ${FO_DIR}/language/es_es/more.php
@@ -1064,7 +1152,6 @@ ${FO_DIR}/language/es_la/errors.php
 ${FO_DIR}/language/es_la/fields.php
 ${FO_DIR}/language/es_la/general.php
 ${FO_DIR}/language/es_la/help.php
-${FO_DIR}/language/es_la/help/dummy.txt
 ${FO_DIR}/language/es_la/lang.js
 ${FO_DIR}/language/es_la/messages.php
 ${FO_DIR}/language/es_la/more.php
@@ -1087,7 +1174,6 @@ ${FO_DIR}/language/fr_ca/export.php
 ${FO_DIR}/language/fr_ca/fields.php
 ${FO_DIR}/language/fr_ca/general.php
 ${FO_DIR}/language/fr_ca/help.php
-${FO_DIR}/language/fr_ca/help/dummy.txt
 ${FO_DIR}/language/fr_ca/lang.js
 ${FO_DIR}/language/fr_ca/messages.php
 ${FO_DIR}/language/fr_ca/more.php
@@ -1110,7 +1196,6 @@ ${FO_DIR}/language/fr_fr/export.php
 ${FO_DIR}/language/fr_fr/fields.php
 ${FO_DIR}/language/fr_fr/general.php
 ${FO_DIR}/language/fr_fr/help.php
-${FO_DIR}/language/fr_fr/help/dummy.txt
 ${FO_DIR}/language/fr_fr/lang.js
 ${FO_DIR}/language/fr_fr/messages.php
 ${FO_DIR}/language/fr_fr/objects.php
@@ -1133,7 +1218,6 @@ ${FO_DIR}/language/hu_hu/errors.php
 ${FO_DIR}/language/hu_hu/fields.php
 ${FO_DIR}/language/hu_hu/general.php
 ${FO_DIR}/language/hu_hu/help.php
-${FO_DIR}/language/hu_hu/help/dummy.txt
 ${FO_DIR}/language/hu_hu/lang.js
 ${FO_DIR}/language/hu_hu/messages.php
 ${FO_DIR}/language/hu_hu/new_window.php
@@ -1175,7 +1259,6 @@ ${FO_DIR}/language/it_it/errors.php
 ${FO_DIR}/language/it_it/fields.php
 ${FO_DIR}/language/it_it/general.php
 ${FO_DIR}/language/it_it/help.php
-${FO_DIR}/language/it_it/help/dummy.txt
 ${FO_DIR}/language/it_it/lang.js
 ${FO_DIR}/language/it_it/messages.php
 ${FO_DIR}/language/it_it/objects.php
@@ -1198,7 +1281,6 @@ ${FO_DIR}/language/ja_jp/general.php
 ${FO_DIR}/language/ja_jp/help.php
 ${FO_DIR}/language/ja_jp/help/account.html
 ${FO_DIR}/language/ja_jp/help/dashboard.html
-${FO_DIR}/language/ja_jp/help/dummy.txt
 ${FO_DIR}/language/ja_jp/help/no_help.html
 ${FO_DIR}/language/ja_jp/lang.js
 ${FO_DIR}/language/ja_jp/messages.php
@@ -1286,9 +1368,9 @@ ${FO_DIR}/language/nl_nl/errors.php
 ${FO_DIR}/language/nl_nl/fields.php
 ${FO_DIR}/language/nl_nl/general.php
 ${FO_DIR}/language/nl_nl/help.php
-${FO_DIR}/language/nl_nl/help/dummy.txt
 ${FO_DIR}/language/nl_nl/lang.js
 ${FO_DIR}/language/nl_nl/messages.php
+${FO_DIR}/language/nl_nl/more.php
 ${FO_DIR}/language/nl_nl/objects.php
 ${FO_DIR}/language/nl_nl/project_interface.php
 ${FO_DIR}/language/nl_nl/reporting.php
@@ -1308,7 +1390,6 @@ ${FO_DIR}/language/pl_pl/export.php
 ${FO_DIR}/language/pl_pl/fields.php
 ${FO_DIR}/language/pl_pl/general.php
 ${FO_DIR}/language/pl_pl/help.php
-${FO_DIR}/language/pl_pl/help/dummy.txt
 ${FO_DIR}/language/pl_pl/lang.js
 ${FO_DIR}/language/pl_pl/messages.php
 ${FO_DIR}/language/pl_pl/objects.php
@@ -1332,7 +1413,6 @@ ${FO_DIR}/language/pt_br/general.php
 ${FO_DIR}/language/pt_br/help.php
 ${FO_DIR}/language/pt_br/help/account.html
 ${FO_DIR}/language/pt_br/help/dashboard.html
-${FO_DIR}/language/pt_br/help/dummy.txt
 ${FO_DIR}/language/pt_br/help/no_help.html
 ${FO_DIR}/language/pt_br/html_to_pdf.php
 ${FO_DIR}/language/pt_br/lang.js
@@ -1379,7 +1459,6 @@ ${FO_DIR}/language/ru_ru/general.php
 ${FO_DIR}/language/ru_ru/help.php
 ${FO_DIR}/language/ru_ru/help/account.html
 ${FO_DIR}/language/ru_ru/help/dashboard.html
-${FO_DIR}/language/ru_ru/help/dummy.txt
 ${FO_DIR}/language/ru_ru/help/no_help.html
 ${FO_DIR}/language/ru_ru/lang.js
 ${FO_DIR}/language/ru_ru/messages.php
@@ -1430,8 +1509,12 @@ ${FO_DIR}/language/tr_tr/errors.php
 ${FO_DIR}/language/tr_tr/fields.php
 ${FO_DIR}/language/tr_tr/general.php
 ${FO_DIR}/language/tr_tr/help.php
+${FO_DIR}/language/tr_tr/help/account.html
+${FO_DIR}/language/tr_tr/help/dashboard.html
+${FO_DIR}/language/tr_tr/help/no_help.html
 ${FO_DIR}/language/tr_tr/lang.js
 ${FO_DIR}/language/tr_tr/messages.php
+${FO_DIR}/language/tr_tr/more.php
 ${FO_DIR}/language/tr_tr/objects.php
 ${FO_DIR}/language/tr_tr/project_interface.php
 ${FO_DIR}/language/tr_tr/reporting.php
@@ -1452,7 +1535,6 @@ ${FO_DIR}/language/uk_ua/general.php
 ${FO_DIR}/language/uk_ua/help.php
 ${FO_DIR}/language/uk_ua/help/account.html
 ${FO_DIR}/language/uk_ua/help/dashboard.html
-${FO_DIR}/language/uk_ua/help/dummy.txt
 ${FO_DIR}/language/uk_ua/help/no_help.html
 ${FO_DIR}/language/uk_ua/html_to_pdf.php
 ${FO_DIR}/language/uk_ua/lang.js
@@ -1477,7 +1559,6 @@ ${FO_DIR}/language/zh_cn/errors.php
 ${FO_DIR}/language/zh_cn/fields.php
 ${FO_DIR}/language/zh_cn/general.php
 ${FO_DIR}/language/zh_cn/help.php
-${FO_DIR}/language/zh_cn/help/dummy.txt
 ${FO_DIR}/language/zh_cn/lang.js
 ${FO_DIR}/language/zh_cn/messages.php
 ${FO_DIR}/language/zh_cn/new_window.php
@@ -1499,7 +1580,6 @@ ${FO_DIR}/language/zh_tw/countries.php
 ${FO_DIR}/language/zh_tw/emails.php
 ${FO_DIR}/language/zh_tw/errors.php
 ${FO_DIR}/language/zh_tw/general.php
-${FO_DIR}/language/zh_tw/help/dummy.txt
 ${FO_DIR}/language/zh_tw/lang.js
 ${FO_DIR}/language/zh_tw/messages.php
 ${FO_DIR}/language/zh_tw/objects.php
@@ -2571,7 +2651,7 @@ ${FO_DIR}/library/htmlpurifier/standalon
 ${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/dummy.php
+${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/4.1.1,ddc9b993d7fc8d4a185e8dbf5b9a0996,1.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/EntityLookup/entities.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/Filter/YouTube.php
@@ -2955,6 +3035,9 @@ ${FO_DIR}/plugins/core_dimensions/update
 ${FO_DIR}/plugins/mail/CHANGELOG.txt
 ${FO_DIR}/plugins/mail/application/controllers/MailController.class.php
 ${FO_DIR}/plugins/mail/application/helpers/MailUtilities.class.php
+${FO_DIR}/plugins/mail/application/helpers/Part.php
+${FO_DIR}/plugins/mail/application/helpers/functions.php
+${FO_DIR}/plugins/mail/application/helpers/send_outbox_emails.php
 ${FO_DIR}/plugins/mail/application/models/mail_account_contacts/MailAccountContact.class.php
 ${FO_DIR}/plugins/mail/application/models/mail_account_contacts/MailAccountContacts.class.php
 ${FO_DIR}/plugins/mail/application/models/mail_account_contacts/base/BaseMailAccountContact.class.php
@@ -3056,6 +3139,8 @@ ${FO_DIR}/plugins/mail/public/assets/jav
 ${FO_DIR}/plugins/mail/public/assets/javascript/MailAccountMenu.js
 ${FO_DIR}/plugins/mail/public/assets/javascript/MailCombo.js
 ${FO_DIR}/plugins/mail/public/assets/javascript/MailManager.js
+${FO_DIR}/plugins/mail/public/assets/javascript/mail.js
+${FO_DIR}/plugins/mail/public/assets/javascript/og/overrides/extfix.js
 ${FO_DIR}/plugins/mail/update.php
 ${FO_DIR}/plugins/workspaces/application/models/Workspace.class.php
 ${FO_DIR}/plugins/workspaces/application/models/Workspaces.class.php
@@ -3069,6 +3154,7 @@ ${FO_DIR}/plugins/workspaces/application
 ${FO_DIR}/plugins/workspaces/hooks/workspaces_hooks.php
 ${FO_DIR}/plugins/workspaces/info.php
 ${FO_DIR}/plugins/workspaces/install/index.html
+${FO_DIR}/plugins/workspaces/install/install.php
 ${FO_DIR}/plugins/workspaces/install/sql/mysql_initial_data.php
 ${FO_DIR}/plugins/workspaces/install/sql/mysql_schema.php
 ${FO_DIR}/plugins/workspaces/language/ca_es/lang.js
@@ -3132,12 +3218,15 @@ ${FO_DIR}/plugins/workspaces/language/zh
 ${FO_DIR}/plugins/workspaces/public/assets/css/workspaces.css
 ${FO_DIR}/plugins/workspaces/public/assets/javascript/workspaces.js
 ${FO_DIR}/plugins/workspaces/update.php
-${FO_DIR}/public/API/utils/FengApiFormat.class.php
 ${FO_DIR}/public/assets/flash/SoundBridge.swf
 ${FO_DIR}/public/assets/flash/open-flash-chart.swf
 ${FO_DIR}/public/assets/flash/visorFreemind.swf
 ${FO_DIR}/public/assets/javascript/bootstrap/bootstrap-popover.js
 ${FO_DIR}/public/assets/javascript/bootstrap/bootstrap-tooltip.js
+${FO_DIR}/public/assets/javascript/bootstrap/bootstrap.bundle.min.js
+${FO_DIR}/public/assets/javascript/bootstrap/bootstrap.min.js
+${FO_DIR}/public/assets/javascript/bootstrap/bootstrap_helper.js
+${FO_DIR}/public/assets/javascript/bootstrap/popper.min.js
 ${FO_DIR}/public/assets/javascript/ckeditor/.htaccess
 ${FO_DIR}/public/assets/javascript/ckeditor/CHANGES.html
 ${FO_DIR}/public/assets/javascript/ckeditor/adapters/jquery.js
@@ -3725,6 +3814,7 @@ ${FO_DIR}/public/assets/javascript/extjs
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sl-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sr-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sv_SE-min.js
+${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sv_se.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-th-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-tr-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-ua.js
@@ -4050,6 +4140,7 @@ ${FO_DIR}/public/assets/javascript/jquer
 ${FO_DIR}/public/assets/javascript/jquery/jquery.scrollTo-min.js
 ${FO_DIR}/public/assets/javascript/jquery/jquery.simplemodal.1.4.4.min.js
 ${FO_DIR}/public/assets/javascript/jquery/jquery.tools.min.js
+${FO_DIR}/public/assets/javascript/jstz/jstz.min.js
 ${FO_DIR}/public/assets/javascript/og/ArchivedObjects.js
 ${FO_DIR}/public/assets/javascript/og/AutocompleteTextarea.js
 ${FO_DIR}/public/assets/javascript/og/Breadcrumbs.js
@@ -4082,6 +4173,7 @@ ${FO_DIR}/public/assets/javascript/og/Im
 ${FO_DIR}/public/assets/javascript/og/InfinitePagingToolbar.js
 ${FO_DIR}/public/assets/javascript/og/LinkedObjectsManager.js
 ${FO_DIR}/public/assets/javascript/og/LoginDialog.js
+${FO_DIR}/public/assets/javascript/og/MainTabs.js
 ${FO_DIR}/public/assets/javascript/og/MemberCache.js
 ${FO_DIR}/public/assets/javascript/og/MemberChooser.js
 ${FO_DIR}/public/assets/javascript/og/MemberChooserPanel.js
@@ -4093,7 +4185,10 @@ ${FO_DIR}/public/assets/javascript/og/Me
 ${FO_DIR}/public/assets/javascript/og/MemberTreeAjax.js
 ${FO_DIR}/public/assets/javascript/og/MessageManager.js
 ${FO_DIR}/public/assets/javascript/og/ObjectBreadcrumbs.js
+${FO_DIR}/public/assets/javascript/og/ObjectGrid.js
+${FO_DIR}/public/assets/javascript/og/ObjectList.js
 ${FO_DIR}/public/assets/javascript/og/ObjectPicker.js
+${FO_DIR}/public/assets/javascript/og/ObjectSelector.js
 ${FO_DIR}/public/assets/javascript/og/ObjectSubtypesFunctions.js
 ${FO_DIR}/public/assets/javascript/og/OverviewManager.js
 ${FO_DIR}/public/assets/javascript/og/Permissions.js
@@ -4268,6 +4363,7 @@ ${FO_DIR}/public/assets/javascript/slime
 ${FO_DIR}/public/assets/javascript/slimey/toolbar.js
 ${FO_DIR}/public/assets/javascript/slimey/tools.js
 ${FO_DIR}/public/assets/javascript/wztooltip/wz_tooltip.js
+${FO_DIR}/public/assets/jquery-colResizable/colResizable-1.5.source.js
 ${FO_DIR}/public/assets/sounds/info.mp3
 ${FO_DIR}/public/assets/themes/default/extjs/css/ext-all.css
 ${FO_DIR}/public/assets/themes/default/extjs/images/default/box/corners-blue.gif
@@ -4505,6 +4601,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/16x16/chkon.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/classify.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/collapse.png
+${FO_DIR}/public/assets/themes/default/images/16x16/collapse_grey.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/comment.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/companies.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/company.png
@@ -4523,6 +4620,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/16x16/email.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/exclamation.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/expand.png
+${FO_DIR}/public/assets/themes/default/images/16x16/expand_grey.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/fax.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/folder.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/gantt.png
@@ -4722,6 +4820,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/48x48/company_archived.png
 ${FO_DIR}/public/assets/themes/default/images/48x48/company_trashed.png
 ${FO_DIR}/public/assets/themes/default/images/48x48/config.png
+${FO_DIR}/public/assets/themes/default/images/48x48/config_2.png
 ${FO_DIR}/public/assets/themes/default/images/48x48/configuration.png
 ${FO_DIR}/public/assets/themes/default/images/48x48/contact.png
 ${FO_DIR}/public/assets/themes/default/images/48x48/contact_archived.png
@@ -4821,6 +4920,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/box/tb-blue.gif
 ${FO_DIR}/public/assets/themes/default/images/box/tb.gif
 ${FO_DIR}/public/assets/themes/default/images/default-avatar.png
+${FO_DIR}/public/assets/themes/default/images/default-company.png
 ${FO_DIR}/public/assets/themes/default/images/feng_logo.png
 ${FO_DIR}/public/assets/themes/default/images/feng_logo2.png
 ${FO_DIR}/public/assets/themes/default/images/feng_logo_extra_small.png
@@ -4845,6 +4945,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/filetypes/doc.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/font.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/html.png
+${FO_DIR}/public/assets/themes/default/images/filetypes/ics.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/image.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/mov.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/pdf.png
@@ -4906,6 +5007,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_forward.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_mark_read.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_receive.png
+${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_replied.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_reply.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_replyall.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/mail_send.png
@@ -4954,6 +5056,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/view_calendar_month.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/view_calendar_week.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/view_calendar_week5.png
+${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/view_more.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/warning.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/workspace.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/16x16/zip-add.png
@@ -4984,6 +5087,7 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/24x22/tasks.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/24x22/time.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/24x22/time_color.png
+${FO_DIR}/public/assets/themes/default/images/icons-feng-3/24x22/time_color_new.png
 ${FO_DIR}/public/assets/themes/default/images/icons-feng-3/24x22/trash.png
 ${FO_DIR}/public/assets/themes/default/images/icons/asc.png
 ${FO_DIR}/public/assets/themes/default/images/icons/attach.png
@@ -5064,6 +5168,9 @@ ${FO_DIR}/public/assets/themes/default/i
 ${FO_DIR}/public/assets/themes/default/images/logtypes/projectwebpages.gif
 ${FO_DIR}/public/assets/themes/default/images/row-separator.png
 ${FO_DIR}/public/assets/themes/default/images/rx/grid_drag.png
+${FO_DIR}/public/assets/themes/default/images/task/elbow-end.gif
+${FO_DIR}/public/assets/themes/default/images/task/elbow-line.gif
+${FO_DIR}/public/assets/themes/default/images/task/elbow.gif
 ${FO_DIR}/public/assets/themes/default/jquery/imgareaselect/border-anim-h.gif
 ${FO_DIR}/public/assets/themes/default/jquery/imgareaselect/border-anim-v.gif
 ${FO_DIR}/public/assets/themes/default/jquery/imgareaselect/border-h.gif
@@ -5081,6 +5188,7 @@ ${FO_DIR}/public/assets/themes/default/j
 ${FO_DIR}/public/assets/themes/default/jquery/smoothness/images/ui-icons_2e83ff_256x240.png
 ${FO_DIR}/public/assets/themes/default/jquery/smoothness/images/ui-icons_454545_256x240.png
 ${FO_DIR}/public/assets/themes/default/jquery/smoothness/images/ui-icons_888888_256x240.png
+${FO_DIR}/public/assets/themes/default/jquery/smoothness/images/ui-icons_999999_256x240.png
 ${FO_DIR}/public/assets/themes/default/jquery/smoothness/images/ui-icons_cd0a0a_256x240.png
 ${FO_DIR}/public/assets/themes/default/jquery/smoothness/jquery-ui.css
 ${FO_DIR}/public/assets/themes/default/reesecal/default.css
@@ -5185,8 +5293,12 @@ ${FO_DIR}/public/assets/themes/default/s
 ${FO_DIR}/public/assets/themes/default/slimey/slimey.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/admin/admin.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/bootstrap.css
+${FO_DIR}/public/assets/themes/default/stylesheets/bootstrap/bootstrap-grid.min.css
+${FO_DIR}/public/assets/themes/default/stylesheets/bootstrap/bootstrap-reboot.min.css
+${FO_DIR}/public/assets/themes/default/stylesheets/bootstrap/bootstrap.min.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/bootstrap/bootstrap_tooltips_popovers.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/calendar_print.css
+${FO_DIR}/public/assets/themes/default/stylesheets/custom-properties/general.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/dialog.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/event/day.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/event/week.css
@@ -5197,6 +5309,7 @@ ${FO_DIR}/public/assets/themes/default/s
 ${FO_DIR}/public/assets/themes/default/stylesheets/general/rewrites.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/login.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/administration.css
+${FO_DIR}/public/assets/themes/default/stylesheets/og/basics.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/ckeditor_override.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/co.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/co_input.css
@@ -5211,7 +5324,9 @@ ${FO_DIR}/public/assets/themes/default/s
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/more.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/notie.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/object_picker.css
+${FO_DIR}/public/assets/themes/default/stylesheets/og/object_selector.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/og.css
+${FO_DIR}/public/assets/themes/default/stylesheets/og/pdf_export.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/printTasks.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/reporting.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/search.css
@@ -5226,7 +5341,6 @@ ${FO_DIR}/public/assets/themes/default/s
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin1.5-beta.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/project/project.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/website.css
-${FO_DIR}/public/files/dummy.txt
 ${FO_DIR}/public/help/help.html
 ${FO_DIR}/public/help/index.html
 ${FO_DIR}/public/index.html
@@ -5253,7 +5367,6 @@ ${FO_DIR}/public/install/installation/te
 ${FO_DIR}/public/install/installation/templates/plugins.php
 ${FO_DIR}/public/install/installation/templates/sql/mysql_initial_data.php
 ${FO_DIR}/public/install/installation/templates/sql/mysql_schema.php
-${FO_DIR}/public/install/installation/templates/sql/plugins/dummy.txt
 ${FO_DIR}/public/install/installation/templates/system_config_form.php
 ${FO_DIR}/public/install/installation/templates/welcome.php
 ${FO_DIR}/public/install/library/classes/ChecklistItem.class.php
@@ -5281,6 +5394,7 @@ ${FO_DIR}/public/upgrade/assets/style.cs
 ${FO_DIR}/public/upgrade/complete_migration.php
 ${FO_DIR}/public/upgrade/console.php
 ${FO_DIR}/public/upgrade/helpers/rebuild_tasks_tree.php
+${FO_DIR}/public/upgrade/helpers/update_user_timezones.php
 ${FO_DIR}/public/upgrade/include.php
 ${FO_DIR}/public/upgrade/index.php
 ${FO_DIR}/public/upgrade/library/classes/ChecklistItem.class.php
@@ -5292,8 +5406,10 @@ ${FO_DIR}/public/upgrade/library/classes
 ${FO_DIR}/public/upgrade/library/classes/ScriptUpgraderScript.class.php
 ${FO_DIR}/public/upgrade/library/classes/Template.class.php
 ${FO_DIR}/public/upgrade/library/functions.php
+${FO_DIR}/public/upgrade/scripts/AnisUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ArazaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/AsadoUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/BauruUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/BondiolaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ButiaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ChinchulinUpgradeScript.class.php
@@ -5310,6 +5426,7 @@ ${FO_DIR}/public/upgrade/scripts/Molleja
 ${FO_DIR}/public/upgrade/scripts/MondongoUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MorcillaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/NutriaUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/PaellaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PamplonaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/PastafrolaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/ProvoloneUpgradeScript.class.php
@@ -5344,12 +5461,13 @@ ${FO_DIR}/public/webservices/TagsService
 ${FO_DIR}/public/webservices/WebServicesBase.php
 ${FO_DIR}/public/webservices/WorkspaceServices.php
 ${FO_DIR}/readme.txt
+${FO_DIR}/rebuild_contact_member_cache.php
 ${FO_DIR}/rebuild_contact_member_cahe.php
+${FO_DIR}/rebuild_object_members_optimization.php
 ${FO_DIR}/rebuild_sharing_table.php
 ${FO_DIR}/revision.php
 ${FO_DIR}/robots.txt
 ${FO_DIR}/s.gif
+${FO_DIR}/tmp/.htaccess
 ${FO_DIR}/upload/.htaccess
-${FO_DIR}/upload/dummy.php
-${FO_DIR}/upload/index.html
 ${FO_DIR}/version.php

Index: pkgsrc/www/fengoffice/distinfo
diff -u pkgsrc/www/fengoffice/distinfo:1.25 pkgsrc/www/fengoffice/distinfo:1.26
--- pkgsrc/www/fengoffice/distinfo:1.25 Wed Nov  4 02:46:53 2015
+++ pkgsrc/www/fengoffice/distinfo      Sun Dec 15 18:27:24 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 02:46:53 agc Exp $
+$NetBSD: distinfo,v 1.26 2019/12/15 18:27:24 taca Exp $
 
-SHA1 (fengoffice_3.2.2.1.zip) = dc5b947cf52cdd40ef97ac645255220c7a958a11
-RMD160 (fengoffice_3.2.2.1.zip) = 774c6273d00fff4a0ba768faac5f02ff9cdef193
-SHA512 (fengoffice_3.2.2.1.zip) = 07e77138f0d4419d85057771a49f67853de0a7608154263820ebec6a473da107918d159e7570fd747463fb94935b20009f7d5f6cc043a5592af20ee62064d1cf
-Size (fengoffice_3.2.2.1.zip) = 13937297 bytes
+SHA1 (fengoffice-3.7.2.16.tar.gz) = 0e7b2ef0f88f1c7f803ae1ee6ee69e371e9e2fa7
+RMD160 (fengoffice-3.7.2.16.tar.gz) = 46f80427923803af47ba1a1b9b45c35dc68fbaef
+SHA512 (fengoffice-3.7.2.16.tar.gz) = 5a610cfc6f507957696e1ef17945ee8f82e5871ae7be838c320d2508715487a4fea76e8d611eaf14e0f06f70d4e3bfb1853273cb7a2b8f5a7fc31c2129f8b497
+Size (fengoffice-3.7.2.16.tar.gz) = 11899877 bytes
 SHA1 (patch-aa) = 0162718439c36bbc4c867c943b78854f863929c5
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
 SHA1 (patch-ag) = 03f09610de1c7fd41641d4f08eb72876d82b2bbf
-SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 54988cf29233407ecb4dd1a06c05d2dd4bac444e
+SHA1 (patch-plugins_mail_application_helpers_MailUtilities.class.php) = 93741e3264a6e3233bf67bb01f12099f5e809eef

Index: pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php
diff -u pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php:1.6 
pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php:1.7
--- pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php:1.6    Sat Mar 29 14:17:06 2014
+++ pkgsrc/www/fengoffice/patches/patch-plugins_mail_application_helpers_MailUtilities.class.php        Sun Dec 15 18:27:24 2019
@@ -1,17 +1,17 @@
-$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.6 2014/03/29 14:17:06 taca Exp $
+$NetBSD: patch-plugins_mail_application_helpers_MailUtilities.class.php,v 1.7 2019/12/15 18:27:24 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      2014-02-17 10:24:14.000000000 +0000
+--- plugins/mail/application/helpers/MailUtilities.class.php.orig      2019-06-30 13:35:46.241680225 +0000
 +++ plugins/mail/application/helpers/MailUtilities.class.php
-@@ -287,7 +287,7 @@ class MailUtilities {
-                       if ($from_name == ''){
+@@ -405,7 +405,7 @@ class MailUtilities {
                                $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);
-       
++                              $utf8_from = $enc_conv->convert($from_encoding, 'UTF-8', $from_name);
+ 
                                if ($enc_conv->hasError()) {
                                        $utf8_from = utf8_encode($from_name);