From c66ab3a7b34d03c71a4fc57091c59b44434a0f15 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Thu, 7 Oct 2021 08:13:50 -0400
Subject: [PATCH] civicrm release-5.42.0
---
civicrm.php | 4 +-
civicrm/CRM/ACL/BAO/ACL.php | 21 +-
civicrm/CRM/ACL/BAO/ACLEntityRole.php | 4 +-
civicrm/CRM/ACL/BAO/Cache.php | 27 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
civicrm/CRM/Activity/BAO/Activity.php | 11 +-
civicrm/CRM/Activity/DAO/Activity.php | 8 +-
civicrm/CRM/Activity/Form/Activity.php | 4 +-
civicrm/CRM/Activity/Form/Task/Batch.php | 2 +-
civicrm/CRM/Activity/Form/Task/FileOnCase.php | 2 +-
civicrm/CRM/Activity/Form/Task/PDF.php | 119 +-
.../Activity/Form/Task/PDFLetterCommon.php | 12 +-
civicrm/CRM/Activity/Form/Task/PickOption.php | 2 +-
.../CRM/Activity/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Activity/Tokens.php | 8 +-
civicrm/CRM/Admin/Form/Extensions.php | 21 +-
civicrm/CRM/Admin/Form/Job.php | 2 +-
civicrm/CRM/Admin/Form/MessageTemplates.php | 2 +-
civicrm/CRM/Admin/Form/OptionGroup.php | 2 +-
civicrm/CRM/Admin/Form/ScheduleReminders.php | 10 +-
civicrm/CRM/Admin/Form/Setting/Case.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Date.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Debugging.php | 2 +-
.../CRM/Admin/Form/Setting/Localization.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Mail.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Mapping.php | 2 +-
.../CRM/Admin/Form/Setting/Miscellaneous.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Path.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Search.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Smtp.php | 2 +-
civicrm/CRM/Admin/Form/Setting/UF.php | 2 +-
.../Form/Setting/UpdateConfigBackend.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Url.php | 2 +-
civicrm/CRM/Badge/BAO/Layout.php | 7 +-
civicrm/CRM/Batch/BAO/EntityBatch.php | 9 +-
civicrm/CRM/Batch/DAO/EntityBatch.php | 6 +-
civicrm/CRM/Batch/Form/Entry.php | 213 +-
civicrm/CRM/Campaign/BAO/Campaign.php | 35 +-
civicrm/CRM/Campaign/BAO/Petition.php | 21 -
civicrm/CRM/Campaign/DAO/CampaignGroup.php | 8 +-
civicrm/CRM/Campaign/DAO/Survey.php | 8 +-
civicrm/CRM/Campaign/Form/Campaign.php | 2 +-
civicrm/CRM/Campaign/Form/Gotv.php | 2 +-
civicrm/CRM/Campaign/Form/Petition.php | 8 +-
.../CRM/Campaign/Form/Petition/Signature.php | 2 +-
civicrm/CRM/Campaign/Form/Search.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Campaign.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Petition.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Survey.php | 2 +-
civicrm/CRM/Campaign/Form/Survey.php | 2 +-
civicrm/CRM/Campaign/Form/Survey/Delete.php | 2 +-
civicrm/CRM/Campaign/Form/Survey/Main.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Interview.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Release.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Reserve.php | 2 +-
civicrm/CRM/Case/BAO/Case.php | 6 -
civicrm/CRM/Case/Form/Task/PDF.php | 21 +-
civicrm/CRM/Contact/BAO/Contact.php | 2 +-
civicrm/CRM/Contact/BAO/ContactType.php | 8 +-
civicrm/CRM/Contact/BAO/Group.php | 9 +-
civicrm/CRM/Contact/BAO/Relationship.php | 7 -
civicrm/CRM/Contact/BAO/SavedSearch.php | 13 +
civicrm/CRM/Contact/DAO/SavedSearch.php | 6 +-
civicrm/CRM/Contact/Form/Edit/Email.php | 21 +-
civicrm/CRM/Contact/Form/Search/Criteria.php | 4 +-
civicrm/CRM/Contact/Form/Task/EmailCommon.php | 39 +-
civicrm/CRM/Contact/Form/Task/EmailTrait.php | 115 +-
civicrm/CRM/Contact/Form/Task/PDF.php | 20 +-
.../CRM/Contact/Form/Task/PDFLetterCommon.php | 56 +-
civicrm/CRM/Contact/Form/Task/PDFTrait.php | 204 ++
civicrm/CRM/Contact/Import/Parser/Contact.php | 2 +-
civicrm/CRM/Contact/Page/AJAX.php | 4 +-
civicrm/CRM/Contact/Page/View/Note.php | 132 +-
civicrm/CRM/Contribute/BAO/Contribution.php | 379 ++-
.../CRM/Contribute/BAO/ContributionPage.php | 2 +-
.../CRM/Contribute/BAO/ContributionRecur.php | 6 +-
civicrm/CRM/Contribute/DAO/Contribution.php | 8 +-
.../CRM/Contribute/DAO/ContributionPage.php | 8 +-
.../CRM/Contribute/DAO/ContributionRecur.php | 8 +-
.../CRM/Contribute/Form/AdditionalInfo.php | 6 +-
civicrm/CRM/Contribute/Form/Contribution.php | 1 +
.../Contribute/Form/Contribution/Confirm.php | 1 +
.../CRM/Contribute/Form/ContributionView.php | 42 +-
civicrm/CRM/Contribute/Form/Task/Email.php | 11 +
civicrm/CRM/Contribute/Form/Task/PDF.php | 2 +-
.../CRM/Contribute/Form/Task/PDFLetter.php | 37 +-
.../Contribute/Form/UpdateSubscription.php | 23 +-
civicrm/CRM/Contribute/Page/Tab.php | 20 +-
civicrm/CRM/Contribute/Tokens.php | 134 +-
civicrm/CRM/Core/BAO/ActionSchedule.php | 78 +-
civicrm/CRM/Core/BAO/Address.php | 7 +-
civicrm/CRM/Core/BAO/ConfigSetting.php | 5 +-
civicrm/CRM/Core/BAO/CustomValueTable.php | 8 +-
civicrm/CRM/Core/BAO/Email.php | 23 +
civicrm/CRM/Core/BAO/EntityTag.php | 23 +-
civicrm/CRM/Core/BAO/Job.php | 17 +-
civicrm/CRM/Core/BAO/MessageTemplate.php | 144 +-
civicrm/CRM/Core/BAO/Note.php | 78 +-
civicrm/CRM/Core/BAO/UFField.php | 10 +-
civicrm/CRM/Core/CodeGen/Specification.php | 3 +
civicrm/CRM/Core/Component.php | 26 +-
civicrm/CRM/Core/Component/Info.php | 16 +-
civicrm/CRM/Core/Config.php | 2 +
civicrm/CRM/Core/DAO.php | 9 +-
civicrm/CRM/Core/DAO/Address.php | 4 +-
civicrm/CRM/Core/DAO/AllCoreTables.php | 6 +-
civicrm/CRM/Core/DAO/County.php | 3 +-
civicrm/CRM/Core/DAO/Email.php | 6 +-
civicrm/CRM/Core/EntityTokens.php | 226 +-
civicrm/CRM/Core/Form.php | 3 +-
.../CRM/Core/Form/Task/PDFLetterCommon.php | 30 +-
civicrm/CRM/Core/Invoke.php | 2 +-
civicrm/CRM/Core/OptionGroup.php | 8 +-
civicrm/CRM/Core/Payment/AuthorizeNetIPN.php | 41 +-
civicrm/CRM/Core/PseudoConstant.php | 4 +-
civicrm/CRM/Core/SelectValues.php | 9 +-
civicrm/CRM/Core/Transaction.php | 4 +-
civicrm/CRM/Custom/Form/Field.php | 8 +-
civicrm/CRM/Dedupe/BAO/DedupeRule.php | 1 +
civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php | 1 +
civicrm/CRM/Event/BAO/Event.php | 2 +-
civicrm/CRM/Event/BAO/Participant.php | 12 +-
civicrm/CRM/Event/DAO/Event.php | 8 +-
civicrm/CRM/Event/DAO/Participant.php | 8 +-
civicrm/CRM/Event/Form/Participant.php | 2 +-
civicrm/CRM/Event/Form/ParticipantView.php | 4 +-
civicrm/CRM/Event/Form/Task/PDF.php | 20 +-
civicrm/CRM/Event/Page/EventInfo.php | 4 +-
civicrm/CRM/Financial/BAO/FinancialType.php | 45 -
civicrm/CRM/Financial/Page/AJAX.php | 6 +-
civicrm/CRM/Grant/BAO/Grant.php | 7 -
civicrm/CRM/Import/DataSource/CSV.php | 4 +
civicrm/CRM/Logging/ReportDetail.php | 35 +
civicrm/CRM/Mailing/BAO/MailingJob.php | 15 +-
civicrm/CRM/Mailing/BAO/TrackableURL.php | 3 +-
civicrm/CRM/Mailing/DAO/Mailing.php | 8 +-
civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php | 2 +-
civicrm/CRM/Member/BAO/Membership.php | 131 +-
civicrm/CRM/Member/BAO/MembershipBlock.php | 11 +-
civicrm/CRM/Member/BAO/MembershipPayment.php | 11 +-
civicrm/CRM/Member/DAO/Membership.php | 8 +-
civicrm/CRM/Member/DAO/MembershipStatus.php | 3 +-
civicrm/CRM/Member/DAO/MembershipType.php | 3 +-
civicrm/CRM/Member/Form.php | 23 +
civicrm/CRM/Member/Form/Membership.php | 107 +-
civicrm/CRM/Member/Form/Task/PDFLetter.php | 105 +-
.../CRM/Member/Form/Task/PDFLetterCommon.php | 24 +-
civicrm/CRM/Note/Form/Note.php | 4 +-
civicrm/CRM/Pledge/BAO/Pledge.php | 7 -
civicrm/CRM/Pledge/BAO/PledgePayment.php | 22 +-
civicrm/CRM/Pledge/DAO/Pledge.php | 8 +-
civicrm/CRM/Price/BAO/LineItem.php | 17 +-
civicrm/CRM/Price/BAO/PriceFieldValue.php | 11 +-
civicrm/CRM/Price/Page/Field.php | 4 +-
civicrm/CRM/Profile/Page/Dynamic.php | 2 +-
.../Page/MultipleRecordFieldsListing.php | 7 +-
civicrm/CRM/Queue/Service.php | 2 +-
.../CRM/Report/Form/Contribute/Summary.php | 21 +
civicrm/CRM/SMS/Form/Upload.php | 5 +-
civicrm/CRM/Upgrade/Incremental/Base.php | 20 +
civicrm/CRM/Upgrade/Incremental/General.php | 4 +-
.../Upgrade/Incremental/php/FiveFortyTwo.php | 87 +
.../Incremental/sql/5.42.alpha1.mysql.tpl | 1 +
civicrm/CRM/Utils/Address/USPS.php | 1 +
civicrm/CRM/Utils/AutoClean.php | 20 +
civicrm/CRM/Utils/File.php | 30 +-
civicrm/CRM/Utils/Geocode/Google.php | 2 +-
civicrm/CRM/Utils/Mail.php | 14 +-
civicrm/CRM/Utils/Recent.php | 90 +-
civicrm/CRM/Utils/Rule.php | 38 +-
civicrm/CRM/Utils/System.php | 26 -
civicrm/CRM/Utils/Token.php | 24 +-
.../API/Subscriber/DynamicFKAuthorization.php | 3 -
.../Event/MailingQueryEvent.php | 12 +
civicrm/Civi/Api4/Action/Entity/Get.php | 94 +-
.../Civi/Api4/Generic/AbstractSaveAction.php | 2 +-
.../Api4/Generic/BasicGetFieldsAction.php | 26 +
civicrm/Civi/Api4/Generic/BasicSaveAction.php | 4 +-
civicrm/Civi/Api4/Membership.php | 23 +
civicrm/Civi/Api4/MembershipBlock.php | 23 +
civicrm/Civi/Api4/MembershipStatus.php | 23 +
civicrm/Civi/Api4/Query/Api4SelectQuery.php | 123 +-
civicrm/Civi/Api4/Query/SqlExpression.php | 14 +
civicrm/Civi/Api4/Query/SqlFunction.php | 14 -
civicrm/Civi/Api4/Query/SqlFunctionLOWER.php | 2 +
civicrm/Civi/Api4/Query/SqlFunctionRAND.php | 32 +
civicrm/Civi/Api4/Query/SqlFunctionUPPER.php | 2 +
civicrm/Civi/Api4/Query/SqlNumber.php | 2 +
civicrm/Civi/Api4/Query/SqlString.php | 2 +
civicrm/Civi/Api4/SavedSearch.php | 8 +-
.../Api4/Service/Schema/Joinable/Joinable.php | 10 +-
civicrm/Civi/Api4/Service/Schema/Joiner.php | 84 +-
.../Civi/Api4/Service/Schema/SchemaMap.php | 39 +-
civicrm/Civi/Api4/Service/Spec/FieldSpec.php | 22 +-
.../Spec/Provider/ContactGetSpecProvider.php | 1 +
.../EntityBatchCreationSpecProvider.php | 36 +
.../Provider/EntityTagFilterSpecProvider.php | 1 +
.../MembershipCreationSpecProvider.php | 51 +
.../Civi/Api4/Service/Spec/SpecFormatter.php | 19 +-
civicrm/Civi/Api4/Utils/CoreUtil.php | 12 +-
civicrm/Civi/Api4/Utils/ReflectionUtils.php | 45 +
civicrm/Civi/Core/Container.php | 2 +
civicrm/Civi/Core/Event/EventScanner.php | 2 +-
.../Schema/Traits/MagicGetterSetterTrait.php | 36 +-
.../Civi/Schema/Traits/OptionsSpecTrait.php | 15 +
civicrm/Civi/Test/ContactTestTrait.php | 3 +-
civicrm/Civi/Token/TokenCompatSubscriber.php | 47 +-
civicrm/Civi/Token/TokenProcessor.php | 7 +-
.../Exception/WorkflowMessageException.php | 18 +
civicrm/Civi/WorkflowMessage/FieldSpec.php | 98 +
.../GenericWorkflowMessage.php | 95 +
.../Traits/AddressingTrait.php | 336 +++
.../Traits/FinalHelperTrait.php | 85 +
.../Traits/ReflectiveWorkflowTrait.php | 306 +++
.../Civi/WorkflowMessage/WorkflowMessage.php | 173 ++
.../WorkflowMessageInterface.php | 114 +
civicrm/ang/angularFileUpload.ang.php | 2 +-
civicrm/api/v3/Note.php | 4 +-
civicrm/api/v3/Order.php | 41 +-
.../angular-file-upload/.babelrc | 13 +
...load-e60440287b4df1cbc04045e77a8c05f5.json | 7 +-
.../angular-file-upload/CONTRIBUTING.md | 80 +
.../angular-file-upload/Gruntfile.coffee | 58 -
.../angular-file-upload/README.md | 57 +-
.../angular-file-upload/WebpackConfig.js | 72 +
.../angular-file-upload.js | 1341 ----------
.../angular-file-upload.min.js | 7 -
.../angular-file-upload.min.map | 1 -
.../angular-file-upload/bower.json | 4 +-
.../dist/angular-file-upload.js | 2161 +++++++++++++++++
.../dist/angular-file-upload.js.map | 1 +
.../dist/angular-file-upload.min.js | 7 +
.../dist/angular-file-upload.min.js.map | 1 +
.../angular-file-upload/gulpfile.js | 35 +
.../angular-file-upload/package.json | 47 +-
.../angular-file-upload/src/intro.js | 11 -
.../angular-file-upload/src/module.js | 1322 ----------
.../angular-file-upload/src/outro.js | 2 -
civicrm/civicrm-version.php | 2 +-
civicrm/composer.json | 8 +-
civicrm/composer.lock | 23 +-
civicrm/css/civicrm.css | 29 +
civicrm/css/joomla.css | 27 +-
civicrm/css/menubar-joomla.css | 15 +-
.../afform/admin/CRM/AfformAdmin/Upgrader.php | 7 +-
.../Civi/AfformAdmin/AfformAdminMeta.php | 33 +-
.../Civi/Api4/Action/Afform/LoadAdminData.php | 28 +-
.../afform/admin/afformEntities/Activity.php | 1 +
.../afform/admin/afformEntities/Address.php | 6 +
.../ext/afform/admin/afformEntities/Email.php | 6 +
.../afform/admin/afformEntities/Household.php | 1 +
.../ext/afform/admin/afformEntities/IM.php | 6 +
.../admin/afformEntities/Individual.php | 1 +
.../admin/afformEntities/Organization.php | 1 +
.../ext/afform/admin/afformEntities/Phone.php | 6 +
.../afform/admin/afformEntities/Website.php | 6 +
.../ang/afAdmin/afAdminList.controller.js | 2 +-
civicrm/ext/afform/admin/ang/afGuiEditor.css | 9 +-
civicrm/ext/afform/admin/ang/afGuiEditor.js | 9 +-
.../afGuiContainerMultiToggle.component.js | 115 +
.../afGuiContainerMultiToggle.html | 14 +
.../ang/afGuiEditor/afGuiEditor.component.js | 7 +-
.../ang/afGuiEditor/afGuiEntity.component.js | 19 +-
.../admin/ang/afGuiEditor/config-form.html | 8 +
.../elements/afGuiContainer-menu.html | 4 +-
.../elements/afGuiContainer.component.js | 28 +-
.../afGuiEditor/elements/afGuiContainer.html | 15 +-
.../elements/afGuiField.component.js | 2 +
.../admin/ang/afGuiEditor/inputType/File.html | 3 +
.../ang/afGuiEditor/inputType/Select.html | 3 +
civicrm/ext/afform/admin/info.xml | 2 +-
.../afform/core/CRM/Afform/AfformScanner.php | 2 +-
.../ext/afform/core/CRM/Afform/ArrayHtml.php | 2 +-
.../core/CRM/Afform/BAO/AfformSubmission.php | 6 +
.../core/CRM/Afform/DAO/AfformSubmission.php | 247 ++
.../ext/afform/core/CRM/Afform/Upgrader.php | 67 +
.../afform/core/CRM/Afform/Upgrader/Base.php | 396 +++
.../Civi/Afform/AfformMetadataInjector.php | 4 +-
.../Civi/Afform/Event/AfformSubmitEvent.php | 19 +-
.../Api4/Action/Afform/AbstractProcessor.php | 5 +-
.../core/Civi/Api4/Action/Afform/Get.php | 56 +-
.../core/Civi/Api4/Action/Afform/Submit.php | 90 +-
.../Civi/Api4/Action/Afform/SubmitFile.php | 140 ++
civicrm/ext/afform/core/Civi/Api4/Afform.php | 26 +-
.../core/Civi/Api4/AfformSubmission.php | 14 +
.../core/Civi/Api4/Utils/AfformSaveTrait.php | 2 +-
civicrm/ext/afform/core/afform.civix.php | 8 +-
civicrm/ext/afform/core/afform.php | 2 +-
.../afform/core/ang/af/afField.component.js | 21 +
.../afform/core/ang/af/afForm.component.js | 63 +-
.../afform/core/ang/af/afRepeat.directive.js | 11 +-
.../ext/afform/core/ang/af/fields/File.html | 3 +
civicrm/ext/afform/core/ang/afCore.ang.php | 2 +-
civicrm/ext/afform/core/ang/afCore.css | 3 +
...ff.html => afblockContactAddress.aff.html} | 0
.../core/ang/afblockContactAddress.aff.json | 6 +
....aff.html => afblockContactEmail.aff.html} | 0
.../core/ang/afblockContactEmail.aff.json | 6 +
...ult.aff.html => afblockContactIM.aff.html} | 0
.../afform/core/ang/afblockContactIM.aff.json | 6 +
....aff.html => afblockContactPhone.aff.html} | 0
.../core/ang/afblockContactPhone.aff.json | 6 +
...ff.html => afblockContactWebsite.aff.html} | 0
.../core/ang/afblockContactWebsite.aff.json | 6 +
.../core/ang/afblockNameHousehold.aff.json | 4 +-
.../core/ang/afblockNameIndividual.aff.json | 4 +-
.../core/ang/afblockNameOrganization.aff.json | 4 +-
.../core/ang/afjoinAddressDefault.aff.json | 7 -
.../core/ang/afjoinEmailDefault.aff.json | 7 -
.../afform/core/ang/afjoinIMDefault.aff.json | 7 -
.../core/ang/afjoinPhoneDefault.aff.json | 7 -
.../core/ang/afjoinWebsiteDefault.aff.json | 7 -
civicrm/ext/afform/core/info.xml | 2 +-
.../Afform/AfformSubmission.entityType.php | 10 +
.../schema/CRM/Afform/AfformSubmission.xml | 66 +
civicrm/ext/afform/html/info.xml | 2 +-
civicrm/ext/afform/mock/info.xml | 2 +-
.../phpunit/api/v4/AfformContactUsageTest.php | 23 +-
.../api/v4/AfformCustomFieldUsageTest.php | 10 +-
.../phpunit/api/v4/AfformFileUploadTest.php | 163 ++
civicrm/ext/authx/info.xml | 2 +-
.../ext/ckeditor4/CRM/Ckeditor4/Upgrader.php | 116 +-
civicrm/ext/ckeditor4/info.xml | 2 +-
.../ext/contributioncancelactions/info.xml | 2 +-
civicrm/ext/eventcart/info.xml | 2 +-
civicrm/ext/ewaysingle/info.xml | 2 +-
civicrm/ext/financialacls/financialacls.php | 10 +
civicrm/ext/financialacls/info.xml | 2 +-
.../settings/financialacls.setting.php | 22 +
.../Financialacls/MembershipTypesTest.php | 5 +-
civicrm/ext/flexmailer/info.xml | 2 +-
civicrm/ext/greenwich/info.xml | 2 +-
civicrm/ext/legacycustomsearches/info.xml | 2 +-
.../ext/oauth-client/CRM/OAuth/Upgrader.php | 128 +-
civicrm/ext/oauth-client/info.xml | 10 +-
civicrm/ext/payflowpro/info.xml | 2 +-
civicrm/ext/recaptcha/info.xml | 2 +-
.../recaptcha/lib/recaptcha/recaptchalib.php | 2 +-
.../ext/search_kit/CRM/Search/Upgrader.php | 12 +-
.../SearchDisplay/AbstractRunAction.php | 425 ++++
.../Api4/Action/SearchDisplay/Download.php | 112 +
.../Action/SearchDisplay/GetSearchTasks.php | 11 +
.../Civi/Api4/Action/SearchDisplay/Run.php | 336 +--
.../search_kit/Civi/Api4/SearchDisplay.php | 10 +
civicrm/ext/search_kit/Civi/Search/Admin.php | 1 +
.../ext/search_kit/ang/crmSearchAdmin.ang.php | 1 +
.../search_kit/ang/crmSearchAdmin.module.js | 77 +-
.../{compose/criteria.html => compose.html} | 0
.../ang/crmSearchAdmin/compose/controls.html | 14 -
.../ang/crmSearchAdmin/compose/debug.html | 10 -
.../ang/crmSearchAdmin/compose/pager.html | 35 -
.../ang/crmSearchAdmin/compose/results.html | 35 -
.../crmSearchAdmin.component.js | 410 +---
.../ang/crmSearchAdmin/crmSearchAdmin.html | 7 +-
.../crmSearchAdminDisplay.component.js | 143 +-
.../crmSearchAdminDisplaySort.html | 2 +-
.../crmSearchAdminLinkGroup.component.js | 16 +-
.../crmSearchAdminTokenSelect.component.js | 18 +
.../crmSearchAdminTokenSelect.html | 4 +-
.../displays/colType/field.html | 15 +
.../displays/colType/include.html | 9 +
.../crmSearchAdmin/displays/colType/menu.html | 6 +-
.../displays/common/addColMenu.html | 2 +-
.../searchAdminPagerConfig.component.js | 48 +
.../common/searchAdminPagerConfig.html | 33 +
.../displays/common/searchButtonConfig.html | 13 +
.../searchAdminDisplayGrid.component.js | 32 +
.../displays/searchAdminDisplayGrid.html | 46 +
.../searchAdminDisplayList.component.js | 4 +-
.../displays/searchAdminDisplayList.html | 17 +-
.../searchAdminDisplayTable.component.js | 4 +-
.../displays/searchAdminDisplayTable.html | 15 +-
.../crmSearchAdminResultsTable.component.js | 130 +
.../crmSearchAdminResultsTable.html | 31 +
.../crmSearchAdmin/resultsTable/debug.html | 17 +
.../crmSearchAdmin/searchList.controller.js | 76 -
.../ang/crmSearchAdmin/searchList.html | 124 -
.../crmSearchAdmin/searchListing/afforms.html | 26 +
.../crmSearchAdmin/searchListing/buttons.html | 9 +
.../crmSearchAdminSearchListing.component.js | 161 ++
.../crmSearchAdminSearchListing.html | 12 +
.../searchListing/displays.html | 16 +
.../search_kit/ang/crmSearchDisplay.module.js | 162 +-
.../ang/crmSearchDisplay/Pager.html | 50 +-
.../ang/crmSearchDisplay/SearchButton.html | 5 +
.../ang/crmSearchDisplay/colType/field.html | 10 +-
.../ang/crmSearchDisplay/colType/include.html | 1 +
.../ang/crmSearchDisplay/colType/menu.html | 2 +-
.../crmSearchDisplayEditable.component.js | 6 +-
.../traits/searchDisplayBaseTrait.service.js | 190 ++
.../searchDisplaySortableTrait.service.js | 45 +
.../ang/crmSearchDisplayGrid.ang.php | 17 +
.../ang/crmSearchDisplayGrid.module.js | 7 +
.../crmSearchDisplayGrid.component.js | 29 +
.../crmSearchDisplayGrid.html | 8 +
.../crmSearchDisplayGridItems.html | 8 +
.../crmSearchDisplayList.component.js | 5 -
.../crmSearchDisplayList.html | 1 +
.../crmSearchDisplayTable.component.js | 101 +-
.../crmSearchDisplayTable.html | 24 +-
.../crmSearchDisplayTableBody.html | 14 +
.../search_kit/ang/crmSearchPage.module.js | 8 +-
.../crmSearchInput.component.js | 2 +-
.../crmSearchInputVal.component.js | 16 +-
.../crmSearchTaskDelete.ctrl.js | 25 +-
.../crmSearchTasks/crmSearchTaskDelete.html | 2 +-
.../crmSearchTaskDownload.ctrl.js | 78 +
.../crmSearchTasks/crmSearchTaskDownload.html | 32 +
.../crmSearchTaskUpdate.ctrl.js | 29 +-
.../crmSearchTasks.component.js | 26 +-
.../ang/crmSearchTasks/crmSearchTasks.html | 4 +-
.../traits/searchDisplayTasksTrait.service.js | 82 +
.../traits/searchTaskBaseTrait.service.js | 31 +
civicrm/ext/search_kit/css/crmSearchAdmin.css | 17 -
civicrm/ext/search_kit/info.xml | 2 +-
.../managed/SearchDisplayType.mgd.php | 11 +
civicrm/ext/search_kit/search_kit.php | 15 +
.../v4/SearchDisplay/SearchDownloadTest.php | 97 +
.../api/v4/SearchDisplay/SearchRunTest.php | 34 +-
civicrm/ext/sequentialcreditnotes/info.xml | 2 +-
.../packages/HTML/QuickForm/Rule/Email.php | 34 +-
.../packages/kcfinder/integration/civicrm.php | 2 +-
civicrm/release-notes.md | 11 +
civicrm/release-notes/5.42.0.md | 761 ++++++
civicrm/settings/Contribute.setting.php | 16 -
civicrm/sql/civicrm.mysql | 4 +-
civicrm/sql/civicrm_data.mysql | 15 +-
civicrm/sql/civicrm_generated.mysql | 536 ++--
.../CRM/Admin/Page/ExtensionDetails.tpl | 23 +-
.../templates/CRM/Case/Form/Search/Common.tpl | 4 +-
.../templates/CRM/Contact/Form/Edit/Email.tpl | 4 +-
.../Contact/Form/Search/AdvancedCriteria.tpl | 6 +-
.../Contact/Form/Search/Criteria/Basic.tpl | 10 +-
.../CRM/Contact/Form/Search/Intro.tpl | 17 +-
.../templates/CRM/Contact/Form/Task/Email.tpl | 3 +-
.../Form/ContributionPage/Settings.tpl | 6 +-
.../CRM/Contribute/Form/ContributionView.tpl | 29 +-
civicrm/templates/CRM/Core/Form/Field.tpl | 2 +-
.../templates/CRM/Form/basicFormFields.tpl | 2 +-
civicrm/templates/CRM/Group/Form/Search.tpl | 17 +-
.../CRM/Member/Page/MembershipStatus.tpl | 2 +-
.../Page/MultipleRecordFieldsListing.tpl | 2 +-
.../templates/CRM/common/customDataBlock.tpl | 2 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +-
civicrm/vendor/composer/autoload_static.php | 12 +-
civicrm/vendor/composer/installed.json | 22 +-
civicrm/vendor/pear/db/DB.php | 10 +-
civicrm/vendor/pear/db/PATCHES.txt | 2 +-
civicrm/vendor/pear/db/composer.json | 2 +-
civicrm/xml/schema/Activity/Activity.xml | 6 +
civicrm/xml/schema/Batch/EntityBatch.xml | 3 +
civicrm/xml/schema/Campaign/CampaignGroup.xml | 6 +
civicrm/xml/schema/Campaign/Survey.xml | 6 +
civicrm/xml/schema/Contact/SavedSearch.xml | 4 +
.../xml/schema/Contribute/Contribution.xml | 6 +
.../schema/Contribute/ContributionPage.xml | 6 +
.../schema/Contribute/ContributionRecur.xml | 6 +
civicrm/xml/schema/Core/Address.xml | 2 +
civicrm/xml/schema/Core/County.xml | 1 +
civicrm/xml/schema/Core/Email.xml | 4 +
civicrm/xml/schema/Event/Event.xml | 6 +
civicrm/xml/schema/Event/Participant.xml | 6 +
civicrm/xml/schema/Mailing/Mailing.xml | 6 +
civicrm/xml/schema/Member/Membership.xml | 6 +
.../xml/schema/Member/MembershipStatus.xml | 1 +
civicrm/xml/schema/Member/MembershipType.xml | 1 +
civicrm/xml/schema/Pledge/Pledge.xml | 6 +
civicrm/xml/templates/civicrm_data.tpl | 13 +-
civicrm/xml/version.xml | 2 +-
470 files changed, 11805 insertions(+), 7104 deletions(-)
create mode 100644 civicrm/CRM/Contact/Form/Task/PDFTrait.php
create mode 100644 civicrm/CRM/Upgrade/Incremental/php/FiveFortyTwo.php
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.42.alpha1.mysql.tpl
create mode 100644 civicrm/Civi/Api4/Membership.php
create mode 100644 civicrm/Civi/Api4/MembershipBlock.php
create mode 100644 civicrm/Civi/Api4/MembershipStatus.php
create mode 100644 civicrm/Civi/Api4/Query/SqlFunctionRAND.php
create mode 100644 civicrm/Civi/Api4/Service/Spec/Provider/EntityBatchCreationSpecProvider.php
create mode 100644 civicrm/Civi/Api4/Service/Spec/Provider/MembershipCreationSpecProvider.php
create mode 100644 civicrm/Civi/WorkflowMessage/Exception/WorkflowMessageException.php
create mode 100644 civicrm/Civi/WorkflowMessage/FieldSpec.php
create mode 100644 civicrm/Civi/WorkflowMessage/GenericWorkflowMessage.php
create mode 100644 civicrm/Civi/WorkflowMessage/Traits/AddressingTrait.php
create mode 100644 civicrm/Civi/WorkflowMessage/Traits/FinalHelperTrait.php
create mode 100644 civicrm/Civi/WorkflowMessage/Traits/ReflectiveWorkflowTrait.php
create mode 100644 civicrm/Civi/WorkflowMessage/WorkflowMessage.php
create mode 100644 civicrm/Civi/WorkflowMessage/WorkflowMessageInterface.php
create mode 100644 civicrm/bower_components/angular-file-upload/.babelrc
create mode 100644 civicrm/bower_components/angular-file-upload/CONTRIBUTING.md
delete mode 100644 civicrm/bower_components/angular-file-upload/Gruntfile.coffee
create mode 100644 civicrm/bower_components/angular-file-upload/WebpackConfig.js
delete mode 100644 civicrm/bower_components/angular-file-upload/angular-file-upload.js
delete mode 100644 civicrm/bower_components/angular-file-upload/angular-file-upload.min.js
delete mode 100644 civicrm/bower_components/angular-file-upload/angular-file-upload.min.map
create mode 100644 civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js
create mode 100644 civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js.map
create mode 100644 civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js
create mode 100644 civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js.map
create mode 100644 civicrm/bower_components/angular-file-upload/gulpfile.js
delete mode 100644 civicrm/bower_components/angular-file-upload/src/intro.js
delete mode 100644 civicrm/bower_components/angular-file-upload/src/module.js
delete mode 100644 civicrm/bower_components/angular-file-upload/src/outro.js
create mode 100644 civicrm/ext/afform/admin/afformEntities/Address.php
create mode 100644 civicrm/ext/afform/admin/afformEntities/Email.php
create mode 100644 civicrm/ext/afform/admin/afformEntities/IM.php
create mode 100644 civicrm/ext/afform/admin/afformEntities/Phone.php
create mode 100644 civicrm/ext/afform/admin/afformEntities/Website.php
create mode 100644 civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.component.js
create mode 100644 civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.html
create mode 100644 civicrm/ext/afform/admin/ang/afGuiEditor/inputType/File.html
create mode 100644 civicrm/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
create mode 100644 civicrm/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
create mode 100644 civicrm/ext/afform/core/CRM/Afform/Upgrader.php
create mode 100644 civicrm/ext/afform/core/CRM/Afform/Upgrader/Base.php
create mode 100644 civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
create mode 100644 civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
create mode 100644 civicrm/ext/afform/core/ang/af/fields/File.html
rename civicrm/ext/afform/core/ang/{afjoinAddressDefault.aff.html => afblockContactAddress.aff.html} (100%)
create mode 100644 civicrm/ext/afform/core/ang/afblockContactAddress.aff.json
rename civicrm/ext/afform/core/ang/{afjoinEmailDefault.aff.html => afblockContactEmail.aff.html} (100%)
create mode 100644 civicrm/ext/afform/core/ang/afblockContactEmail.aff.json
rename civicrm/ext/afform/core/ang/{afjoinIMDefault.aff.html => afblockContactIM.aff.html} (100%)
create mode 100644 civicrm/ext/afform/core/ang/afblockContactIM.aff.json
rename civicrm/ext/afform/core/ang/{afjoinPhoneDefault.aff.html => afblockContactPhone.aff.html} (100%)
create mode 100644 civicrm/ext/afform/core/ang/afblockContactPhone.aff.json
rename civicrm/ext/afform/core/ang/{afjoinWebsiteDefault.aff.html => afblockContactWebsite.aff.html} (100%)
create mode 100644 civicrm/ext/afform/core/ang/afblockContactWebsite.aff.json
delete mode 100644 civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.json
delete mode 100644 civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.json
delete mode 100644 civicrm/ext/afform/core/ang/afjoinIMDefault.aff.json
delete mode 100644 civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.json
delete mode 100644 civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
create mode 100644 civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
create mode 100644 civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml
create mode 100644 civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformFileUploadTest.php
create mode 100644 civicrm/ext/financialacls/settings/financialacls.setting.php
create mode 100644 civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
create mode 100644 civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
rename civicrm/ext/search_kit/ang/crmSearchAdmin/{compose/criteria.html => compose.html} (100%)
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/compose/controls.html
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/compose/debug.html
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/compose/results.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/include.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.component.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.component.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/debug.html
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.controller.js
delete mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/displays.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplay/colType/include.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplaySortableTrait.service.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayGrid.module.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.component.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGridItems.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.ctrl.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.html
create mode 100644 civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
create mode 100644 civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchTaskBaseTrait.service.js
create mode 100644 civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
create mode 100644 civicrm/release-notes/5.42.0.md
diff --git a/civicrm.php b/civicrm.php
index 19ee433b91..7e1cf6f6e8 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.41.2
+ * Version: 5.42.0
* Requires at least: 4.9
* Requires PHP: 7.2
* Author: CiviCRM LLC
@@ -54,7 +54,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: when it changes, will force Javascript & CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.41.2');
+define('CIVICRM_PLUGIN_VERSION', '5.42.0');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/ACL/BAO/ACL.php b/civicrm/CRM/ACL/BAO/ACL.php
index e105339192..82aaf8dabc 100644
--- a/civicrm/CRM/ACL/BAO/ACL.php
+++ b/civicrm/CRM/ACL/BAO/ACL.php
@@ -18,7 +18,7 @@
/**
* Access Control List
*/
-class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
+class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL implements \Civi\Test\HookInterface {
/**
* Available operations for pseudoconstant.
@@ -433,16 +433,21 @@ SELECT g.*
* Delete ACL records.
*
* @param int $aclId
- * ID of the ACL record to be deleted.
- *
+ * @deprecated
*/
public static function del($aclId) {
- // delete all entries from the acl cache
- CRM_ACL_BAO_Cache::resetCache();
+ self::deleteRecord(['id' => $aclId]);
+ }
- $acl = new CRM_ACL_DAO_ACL();
- $acl->id = $aclId;
- $acl->delete();
+ /**
+ * Event fired before an action is taken on an ACL record.
+ * @param \Civi\Core\Event\PreEvent $event
+ */
+ public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
+ // Reset cache when deleting an ACL record
+ if ($event->action === 'delete') {
+ CRM_ACL_BAO_Cache::resetCache();
+ }
}
/**
diff --git a/civicrm/CRM/ACL/BAO/ACLEntityRole.php b/civicrm/CRM/ACL/BAO/ACLEntityRole.php
index 177d07ffa6..fba736ac8a 100644
--- a/civicrm/CRM/ACL/BAO/ACLEntityRole.php
+++ b/civicrm/CRM/ACL/BAO/ACLEntityRole.php
@@ -69,10 +69,10 @@ class CRM_ACL_BAO_ACLEntityRole extends CRM_ACL_DAO_ACLEntityRole {
*
* @param int $entityRoleId
* ID of the EntityRole record to be deleted.
- *
+ * @deprecated
*/
public static function del($entityRoleId) {
- return parent::deleteRecord(['id' => $entityRoleId]);
+ return self::deleteRecord(['id' => $entityRoleId]);
}
}
diff --git a/civicrm/CRM/ACL/BAO/Cache.php b/civicrm/CRM/ACL/BAO/Cache.php
index 138ee803f2..eac03d8b10 100644
--- a/civicrm/CRM/ACL/BAO/Cache.php
+++ b/civicrm/CRM/ACL/BAO/Cache.php
@@ -153,12 +153,28 @@ WHERE modified_date IS NULL
],
];
CRM_Core_DAO::singleValueQuery($query, $params);
+ self::flushACLContactCache();
+ }
+
+ /**
+ * Remove Entries from `civicrm_acl_contact_cache` for a specific ACLed user
+ * @param int $userID - contact_id of the ACLed user
+ *
+ */
+ public static function deleteContactCacheEntry($userID) {
+ CRM_Core_DAO::executeQuery("DELETE FROM civicrm_acl_contact_cache WHERE user_id = %1", [1 => [$userID, 'Positive']]);
+ }
+
+ /**
+ * Flush the contents of the acl contact cache.
+ */
+ protected static function flushACLContactCache(): void {
unset(Civi::$statics['CRM_ACL_API']);
// CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE civicrm_acl_contact_cache"); // No, force-commits transaction
// CRM_Core_DAO::singleValueQuery("DELETE FROM civicrm_acl_contact_cache"); // Transaction-safe
if (CRM_Core_Transaction::isActive()) {
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, function () {
- CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE civicrm_acl_contact_cache");
+ CRM_Core_DAO::singleValueQuery('TRUNCATE TABLE civicrm_acl_contact_cache');
});
}
else {
@@ -166,13 +182,4 @@ WHERE modified_date IS NULL
}
}
- /**
- * Remove Entries from `civicrm_acl_contact_cache` for a specific ACLed user
- * @param int $userID - contact_id of the ACLed user
- *
- */
- public static function deleteContactCacheEntry($userID) {
- CRM_Core_DAO::executeQuery("DELETE FROM civicrm_acl_contact_cache WHERE user_id = %1", [1 => [$userID, 'Positive']]);
- }
-
}
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index 8301d13ddd..6c49a0037a 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -30,7 +30,7 @@ class CRM_ACL_Form_WordPress_Permissions extends CRM_Core_Form {
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle('WordPress Access Control');
+ $this->setTitle('WordPress Access Control');
// Get the core permissions array
$permissionsArray = self::getPermissionArray();
diff --git a/civicrm/CRM/Activity/BAO/Activity.php b/civicrm/CRM/Activity/BAO/Activity.php
index f07bdba02f..d60d201b0c 100644
--- a/civicrm/CRM/Activity/BAO/Activity.php
+++ b/civicrm/CRM/Activity/BAO/Activity.php
@@ -217,15 +217,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
self::logActivityAction($activity, $logMsg);
}
- // delete the recently created Activity
- if ($result) {
- $activityRecent = [
- 'id' => $activity->id,
- 'type' => 'Activity',
- ];
- CRM_Utils_Recent::del($activityRecent);
- }
-
$transaction->commit();
if (isset($activity)) {
// CRM-8708
@@ -1059,7 +1050,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
$subjectToken = CRM_Utils_Token::getTokens($subject);
$messageToken = CRM_Utils_Token::getTokens($text);
$messageToken = array_merge($messageToken, CRM_Utils_Token::getTokens($html));
- $allTokens = array_merge($messageToken, $subjectToken);
+ $allTokens = CRM_Utils_Array::crmArrayMerge($messageToken, $subjectToken);
if (!$from) {
$from = "$fromDisplayName <$fromEmail>";
diff --git a/civicrm/CRM/Activity/DAO/Activity.php b/civicrm/CRM/Activity/DAO/Activity.php
index 3fd10d995e..a3cf77585f 100644
--- a/civicrm/CRM/Activity/DAO/Activity.php
+++ b/civicrm/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Activity/Activity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3724c8dbc64bff361edd263e78780dbe)
+ * (GenCodeChecksum:3a511b57e91904eb91c445524853106a)
*/
/**
@@ -686,6 +686,12 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'activity_engagement_level' => [
diff --git a/civicrm/CRM/Activity/Form/Activity.php b/civicrm/CRM/Activity/Form/Activity.php
index 85650351dc..ac0ba84bec 100644
--- a/civicrm/CRM/Activity/Form/Activity.php
+++ b/civicrm/CRM/Activity/Form/Activity.php
@@ -1243,10 +1243,10 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
if (CRM_Contact_BAO_Contact::checkDomainContact($this->_currentlyViewedContactId)) {
$displayName .= ' (' . ts('default organization') . ')';
}
- CRM_Utils_System::setTitle($displayName . ' - ' . $activityTypeDisplayLabel);
+ $this->setTitle($displayName . ' - ' . $activityTypeDisplayLabel);
}
else {
- CRM_Utils_System::setTitle(ts('%1 Activity', [1 => $activityTypeDisplayLabel]));
+ $this->setTitle(ts('%1 Activity', [1 => $activityTypeDisplayLabel]));
}
}
}
diff --git a/civicrm/CRM/Activity/Form/Task/Batch.php b/civicrm/CRM/Activity/Form/Task/Batch.php
index cfbe6ff238..db778bf1d1 100644
--- a/civicrm/CRM/Activity/Form/Task/Batch.php
+++ b/civicrm/CRM/Activity/Form/Task/Batch.php
@@ -90,7 +90,7 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
throw new CRM_Core_Exception('The profile id is missing');
}
$this->_title = ts('Update multiple activities') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId);
- CRM_Utils_System::setTitle($this->_title);
+ $this->setTitle($this->_title);
$this->addDefaultButtons(ts('Save'));
$this->_fields = [];
diff --git a/civicrm/CRM/Activity/Form/Task/FileOnCase.php b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
index 58a15bc62e..79bad07a9b 100644
--- a/civicrm/CRM/Activity/Form/Task/FileOnCase.php
+++ b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
@@ -52,7 +52,7 @@ class CRM_Activity_Form_Task_FileOnCase extends CRM_Activity_Form_Task {
$session = CRM_Core_Session::singleton();
$this->_userContext = $session->readUserContext();
- CRM_Utils_System::setTitle(ts('File on Case'));
+ $this->setTitle(ts('File on Case'));
}
/**
diff --git a/civicrm/CRM/Activity/Form/Task/PDF.php b/civicrm/CRM/Activity/Form/Task/PDF.php
index 1e21a8701e..7744ae949c 100644
--- a/civicrm/CRM/Activity/Form/Task/PDF.php
+++ b/civicrm/CRM/Activity/Form/Task/PDF.php
@@ -9,45 +9,51 @@
+--------------------------------------------------------------------+
*/
+use Civi\Token\TokenProcessor;
+
/**
* This class provides the functionality to create PDF/Word letters for activities.
*/
class CRM_Activity_Form_Task_PDF extends CRM_Activity_Form_Task {
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* Build all the data structures needed to build the form.
*/
- public function preProcess() {
+ public function preProcess(): void {
parent::preProcess();
- CRM_Activity_Form_Task_PDFLetterCommon::preProcess($this);
- }
-
- /**
- * Set defaults for the pdf.
- *
- * @return array
- */
- public function setDefaultValues() {
- return CRM_Activity_Form_Task_PDFLetterCommon::setDefaultValues();
+ $this->setTitle('Print/Merge Document');
}
/**
* Build the form object.
+ *
+ * @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
- CRM_Activity_Form_Task_PDFLetterCommon::buildQuickForm($this);
+ $this->addPDFElementsToForm();
// Remove types other than pdf as they are not working (have never worked) and don't want fix
// for them to block pdf.
// @todo debug & fix....
$this->add('select', 'document_type', ts('Document Type'), ['pdf' => ts('Portable Document Format (.pdf)')]);
-
}
/**
* Process the form after the input has been submitted and validated.
*/
public function postProcess() {
- CRM_Activity_Form_Task_PDFLetterCommon::postProcess($this);
+ $form = $this;
+ $activityIds = $form->_activityHolderIds;
+ $formValues = $form->controller->exportValues($form->getName());
+ $html_message = CRM_Core_Form_Task_PDFLetterCommon::processTemplate($formValues);
+
+ // Do the rest in another function to make testing easier
+ $form->createDocument($activityIds, $html_message, $formValues);
+
+ $form->postProcessHook();
+
+ CRM_Utils_System::civiExit(1);
}
/**
@@ -56,7 +62,90 @@ class CRM_Activity_Form_Task_PDF extends CRM_Activity_Form_Task {
* @return array
*/
public function listTokens() {
- return CRM_Activity_Form_Task_PDFLetterCommon::listTokens();
+ return $this->createTokenProcessor()->listTokens();
+ }
+
+ /**
+ * Create a token processor
+ *
+ * @return \Civi\Token\TokenProcessor
+ */
+ public function createTokenProcessor() {
+ return new TokenProcessor(\Civi::dispatcher(), [
+ 'controller' => get_class(),
+ 'smarty' => FALSE,
+ 'schema' => ['activityId'],
+ ]);
+ }
+
+ /**
+ * Produce the document from the activities
+ * This uses the new token processor
+ *
+ * @param array $activityIds array of activity ids
+ * @param string $html_message message text with tokens
+ * @param array $formValues formValues from the form
+ *
+ * @return array
+ */
+ public function createDocument($activityIds, $html_message, $formValues) {
+ $tp = $this->createTokenProcessor();
+ $tp->addMessage('body_html', $html_message, 'text/html');
+
+ foreach ($activityIds as $activityId) {
+ $tp->addRow()->context('activityId', $activityId);
+ }
+ $tp->evaluate();
+
+ return $this->renderFromRows($tp->getRows(), 'body_html', $formValues);
+ }
+
+ /**
+ * Render html from rows
+ *
+ * @param $rows
+ * @param string $msgPart
+ * The name registered with the TokenProcessor
+ * @param array $formValues
+ * The values submitted through the form
+ *
+ * @return string
+ * If formValues['is_unit_test'] is true, otherwise outputs document to browser
+ */
+ public function renderFromRows($rows, $msgPart, $formValues) {
+ $html = [];
+ foreach ($rows as $row) {
+ $html[] = $row->render($msgPart);
+ }
+
+ if (!empty($formValues['is_unit_test'])) {
+ return $html;
+ }
+
+ if (!empty($html)) {
+ $this->outputFromHtml($formValues, $html);
+ }
+ }
+
+ /**
+ * Output the pdf or word document from the generated html.
+ *
+ * @param array $formValues
+ * @param array $html
+ */
+ protected function outputFromHtml($formValues, array $html) {
+ if (!empty($formValues['subject'])) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($formValues['subject'], '_', 200);
+ }
+ else {
+ $fileName = 'CiviLetter';
+ }
+ if ($formValues['document_type'] === 'pdf') {
+ CRM_Utils_PDF_Utils::html2pdf($html, $fileName . '.pdf', FALSE, $formValues);
+ }
+ else {
+ CRM_Utils_PDF_Document::html2doc($html, $fileName . '.' . $formValues['document_type'], $formValues);
+ }
}
}
diff --git a/civicrm/CRM/Activity/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Activity/Form/Task/PDFLetterCommon.php
index 424249fb5c..271211731f 100644
--- a/civicrm/CRM/Activity/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Activity/Form/Task/PDFLetterCommon.php
@@ -15,6 +15,7 @@ use Civi\Token\TokenProcessor;
* This class provides the common functionality for creating PDF letter for
* activities.
*
+ * @deprecated
*/
class CRM_Activity_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetterCommon {
@@ -26,12 +27,13 @@ class CRM_Activity_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLette
* @return void
*/
public static function postProcess(&$form) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$activityIds = $form->_activityHolderIds;
$formValues = $form->controller->exportValues($form->getName());
- $html_message = self::processTemplate($formValues);
+ $html_message = CRM_Core_Form_Task_PDFLetterCommon::processTemplate($formValues);
// Do the rest in another function to make testing easier
- self::createDocument($activityIds, $html_message, $formValues);
+ $form->createDocument($activityIds, $html_message, $formValues);
$form->postProcessHook();
@@ -46,9 +48,12 @@ class CRM_Activity_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLette
* @param string $html_message message text with tokens
* @param array $formValues formValues from the form
*
+ * @deprecated
+ *
* @return string
*/
public static function createDocument($activityIds, $html_message, $formValues) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$tp = self::createTokenProcessor();
$tp->addMessage('body_html', $html_message, 'text/html');
@@ -63,9 +68,12 @@ class CRM_Activity_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLette
/**
* Create a token processor
*
+ * @deprecated
+ *
* @return \Civi\Token\TokenProcessor
*/
public static function createTokenProcessor() {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
return new TokenProcessor(\Civi::dispatcher(), [
'controller' => get_class(),
'smarty' => FALSE,
diff --git a/civicrm/CRM/Activity/Form/Task/PickOption.php b/civicrm/CRM/Activity/Form/Task/PickOption.php
index f51e6dc09d..6bb2158dea 100644
--- a/civicrm/CRM/Activity/Form/Task/PickOption.php
+++ b/civicrm/CRM/Activity/Form/Task/PickOption.php
@@ -60,7 +60,7 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task {
$session = CRM_Core_Session::singleton();
$this->_userContext = $session->readUserContext();
- CRM_Utils_System::setTitle(ts('Send Email to Contacts'));
+ $this->setTitle(ts('Send Email to Contacts'));
$validate = FALSE;
//validations
diff --git a/civicrm/CRM/Activity/Form/Task/PickProfile.php b/civicrm/CRM/Activity/Form/Task/PickProfile.php
index 5f484cf281..9d515ba8e1 100644
--- a/civicrm/CRM/Activity/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Activity/Form/Task/PickProfile.php
@@ -54,7 +54,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task {
$session = CRM_Core_Session::singleton();
$this->_userContext = $session->readUserContext();
- CRM_Utils_System::setTitle(ts('Update multiple activities'));
+ $this->setTitle(ts('Update multiple activities'));
$validate = FALSE;
// Validations.
diff --git a/civicrm/CRM/Activity/Tokens.php b/civicrm/CRM/Activity/Tokens.php
index 66663dd7c4..bfcb4e76e5 100644
--- a/civicrm/CRM/Activity/Tokens.php
+++ b/civicrm/CRM/Activity/Tokens.php
@@ -84,6 +84,7 @@ class CRM_Activity_Tokens extends AbstractTokenSubscriber {
// Multiple revisions of the activity.
// Q: Could we simplify & move the extra AND clauses into `where(...)`?
$e->query->param('casEntityJoinExpr', 'e.id = reminder.entity_id AND e.is_current_revision = 1 AND e.is_deleted = 0');
+ $e->query->select('e.id AS tokenContext_' . $this->getEntityContextSchema());
}
/**
@@ -91,9 +92,7 @@ class CRM_Activity_Tokens extends AbstractTokenSubscriber {
*/
public function prefetch(TokenValueEvent $e) {
// Find all the entity IDs
- $entityIds
- = $e->getTokenProcessor()->getContextValues('actionSearchResult', 'entityID')
- + $e->getTokenProcessor()->getContextValues($this->getEntityContextSchema());
+ $entityIds = $e->getTokenProcessor()->getContextValues($this->getEntityContextSchema());
if (!$entityIds) {
return NULL;
@@ -144,8 +143,7 @@ class CRM_Activity_Tokens extends AbstractTokenSubscriber {
'activity_id' => 'id',
];
- // Get ActivityID either from actionSearchResult (for scheduled reminders) if exists
- $activityId = $row->context['actionSearchResult']->entityID ?? $row->context[$this->getEntityContextSchema()];
+ $activityId = $row->context[$this->getEntityContextSchema()];
$activity = $prefetch['activity'][$activityId];
diff --git a/civicrm/CRM/Admin/Form/Extensions.php b/civicrm/CRM/Admin/Form/Extensions.php
index dc7687671b..7ee7df2f91 100644
--- a/civicrm/CRM/Admin/Form/Extensions.php
+++ b/civicrm/CRM/Admin/Form/Extensions.php
@@ -20,6 +20,16 @@
*/
class CRM_Admin_Form_Extensions extends CRM_Admin_Form {
+ /**
+ * @var string
+ */
+ private $_key;
+
+ /**
+ * @var string
+ */
+ private $label;
+
/**
* Form pre-processing.
*/
@@ -39,6 +49,7 @@ class CRM_Admin_Form_Extensions extends CRM_Admin_Form {
if (!CRM_Utils_Type::validate($this->_key, 'ExtensionKey') && !empty($this->_key)) {
throw new CRM_Core_Exception('Extension Key does not match expected standard');
}
+ $this->label = $remoteExtensionRows[$this->_key]['label'] ?? $this->_key;
$session = CRM_Core_Session::singleton();
$url = CRM_Utils_System::url('civicrm/admin/extensions', 'reset=1&action=browse');
$session->pushUserContext($url);
@@ -86,35 +97,35 @@ class CRM_Admin_Form_Extensions extends CRM_Admin_Form {
case CRM_Core_Action::ADD:
$buttonName = ts('Install');
$title = ts('Install "%1"?', [
- 1 => $this->_key,
+ 1 => $this->label,
]);
break;
case CRM_Core_Action::UPDATE:
$buttonName = ts('Download and Install');
$title = ts('Download and Install "%1"?', [
- 1 => $this->_key,
+ 1 => $this->label,
]);
break;
case CRM_Core_Action::DELETE:
$buttonName = ts('Uninstall');
$title = ts('Uninstall "%1"?', [
- 1 => $this->_key,
+ 1 => $this->label,
]);
break;
case CRM_Core_Action::ENABLE:
$buttonName = ts('Enable');
$title = ts('Enable "%1"?', [
- 1 => $this->_key,
+ 1 => $this->label,
]);
break;
case CRM_Core_Action::DISABLE:
$buttonName = ts('Disable');
$title = ts('Disable "%1"?', [
- 1 => $this->_key,
+ 1 => $this->label,
]);
break;
}
diff --git a/civicrm/CRM/Admin/Form/Job.php b/civicrm/CRM/Admin/Form/Job.php
index 26217bcdaf..f8e7afc4d8 100644
--- a/civicrm/CRM/Admin/Form/Job.php
+++ b/civicrm/CRM/Admin/Form/Job.php
@@ -31,7 +31,7 @@ class CRM_Admin_Form_Job extends CRM_Admin_Form {
parent::preProcess();
$this->setContext();
- CRM_Utils_System::setTitle(ts('Manage - Scheduled Jobs'));
+ $this->setTitle(ts('Manage - Scheduled Jobs'));
if ($this->_id) {
$refreshURL = CRM_Utils_System::url('civicrm/admin/job',
diff --git a/civicrm/CRM/Admin/Form/MessageTemplates.php b/civicrm/CRM/Admin/Form/MessageTemplates.php
index f090410596..1c2fcd199b 100644
--- a/civicrm/CRM/Admin/Form/MessageTemplates.php
+++ b/civicrm/CRM/Admin/Form/MessageTemplates.php
@@ -213,7 +213,7 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Core_Form {
if ($this->_action & CRM_Core_Action::VIEW) {
$this->freeze();
- CRM_Utils_System::setTitle(ts('View System Default Message Template'));
+ $this->setTitle(ts('View System Default Message Template'));
}
}
diff --git a/civicrm/CRM/Admin/Form/OptionGroup.php b/civicrm/CRM/Admin/Form/OptionGroup.php
index d981640425..8cb2a62f5e 100644
--- a/civicrm/CRM/Admin/Form/OptionGroup.php
+++ b/civicrm/CRM/Admin/Form/OptionGroup.php
@@ -40,7 +40,7 @@ class CRM_Admin_Form_OptionGroup extends CRM_Admin_Form {
if ($this->_action & CRM_Core_Action::DELETE) {
return;
}
- CRM_Utils_System::setTitle(ts('Dropdown Options'));
+ $this->setTitle(ts('Dropdown Options'));
$this->applyFilter('__ALL__', 'trim');
diff --git a/civicrm/CRM/Admin/Form/ScheduleReminders.php b/civicrm/CRM/Admin/Form/ScheduleReminders.php
index 882cc0b94e..7218283ed3 100644
--- a/civicrm/CRM/Admin/Form/ScheduleReminders.php
+++ b/civicrm/CRM/Admin/Form/ScheduleReminders.php
@@ -695,8 +695,14 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
* @return array
*/
public function listTokens() {
- $tokens = CRM_Core_SelectValues::contactTokens();
- $tokens = array_merge(CRM_Core_SelectValues::activityTokens(), $tokens);
+ $tokenProcessor = new \Civi\Token\TokenProcessor(\Civi::dispatcher(), [
+ 'controller' => get_class(),
+ 'smarty' => FALSE,
+ 'schema' => ['activityId'],
+ ]);
+ $tokens = $tokenProcessor->listTokens();
+
+ $tokens = array_merge(CRM_Core_SelectValues::contactTokens(), $tokens);
$tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens);
$tokens = array_merge(CRM_Core_SelectValues::membershipTokens(), $tokens);
$tokens = array_merge(CRM_Core_SelectValues::contributionTokens(), $tokens);
diff --git a/civicrm/CRM/Admin/Form/Setting/Case.php b/civicrm/CRM/Admin/Form/Setting/Case.php
index 58331a8b2f..6ab3a59dd8 100644
--- a/civicrm/CRM/Admin/Form/Setting/Case.php
+++ b/civicrm/CRM/Admin/Form/Setting/Case.php
@@ -32,7 +32,7 @@ class CRM_Admin_Form_Setting_Case extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - CiviCase'));
+ $this->setTitle(ts('Settings - CiviCase'));
parent::buildQuickForm();
}
diff --git a/civicrm/CRM/Admin/Form/Setting/Date.php b/civicrm/CRM/Admin/Form/Setting/Date.php
index bf497fb42e..a85078cd82 100644
--- a/civicrm/CRM/Admin/Form/Setting/Date.php
+++ b/civicrm/CRM/Admin/Form/Setting/Date.php
@@ -38,7 +38,7 @@ class CRM_Admin_Form_Setting_Date extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Date'));
+ $this->setTitle(ts('Settings - Date'));
parent::buildQuickForm();
}
diff --git a/civicrm/CRM/Admin/Form/Setting/Debugging.php b/civicrm/CRM/Admin/Form/Setting/Debugging.php
index 4fe2b7b1a8..53cec8c6c6 100644
--- a/civicrm/CRM/Admin/Form/Setting/Debugging.php
+++ b/civicrm/CRM/Admin/Form/Setting/Debugging.php
@@ -32,7 +32,7 @@ class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts(' Settings - Debugging and Error Handling '));
+ $this->setTitle(ts(' Settings - Debugging and Error Handling '));
if (CRM_Core_Config::singleton()->userSystem->supports_UF_Logging == '1') {
$this->_settings['userFrameworkLogging'] = CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME;
}
diff --git a/civicrm/CRM/Admin/Form/Setting/Localization.php b/civicrm/CRM/Admin/Form/Setting/Localization.php
index 53a26fe99b..5cd32ae551 100644
--- a/civicrm/CRM/Admin/Form/Setting/Localization.php
+++ b/civicrm/CRM/Admin/Form/Setting/Localization.php
@@ -45,7 +45,7 @@ class CRM_Admin_Form_Setting_Localization extends CRM_Admin_Form_Setting {
public function buildQuickForm() {
$config = CRM_Core_Config::singleton();
- CRM_Utils_System::setTitle(ts('Settings - Localization'));
+ $this->setTitle(ts('Settings - Localization'));
$warningTitle = json_encode(ts("Warning"));
$defaultLocaleOptions = CRM_Admin_Form_Setting_Localization::getDefaultLocaleOptions();
diff --git a/civicrm/CRM/Admin/Form/Setting/Mail.php b/civicrm/CRM/Admin/Form/Setting/Mail.php
index eb99863fc4..4bfe45d35a 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mail.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mail.php
@@ -35,7 +35,7 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - CiviMail'));
+ $this->setTitle(ts('Settings - CiviMail'));
$this->addFormRule(['CRM_Admin_Form_Setting_Mail', 'formRule']);
parent::buildQuickForm();
}
diff --git a/civicrm/CRM/Admin/Form/Setting/Mapping.php b/civicrm/CRM/Admin/Form/Setting/Mapping.php
index e6bbea5ea1..07071e0d6c 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mapping.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mapping.php
@@ -31,7 +31,7 @@ class CRM_Admin_Form_Setting_Mapping extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Mapping and Geocoding Providers'));
+ $this->setTitle(ts('Settings - Mapping and Geocoding Providers'));
parent::buildQuickForm();
}
diff --git a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
index c1e2498251..1540e6a52d 100644
--- a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -65,7 +65,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Misc (Undelete, PDFs, Limits, Logging, etc.)'));
+ $this->setTitle(ts('Misc (Undelete, PDFs, Limits, Logging, etc.)'));
$this->assign('validTriggerPermission', CRM_Core_DAO::checkTriggerViewPermission(FALSE));
// dev/core#1812 Assign multilingual status.
diff --git a/civicrm/CRM/Admin/Form/Setting/Path.php b/civicrm/CRM/Admin/Form/Setting/Path.php
index aa17363a29..19c4de7023 100644
--- a/civicrm/CRM/Admin/Form/Setting/Path.php
+++ b/civicrm/CRM/Admin/Form/Setting/Path.php
@@ -35,7 +35,7 @@ class CRM_Admin_Form_Setting_Path extends CRM_Admin_Form_Setting {
* @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Upload Directories'));
+ $this->setTitle(ts('Settings - Upload Directories'));
parent::buildQuickForm();
$directories = [
diff --git a/civicrm/CRM/Admin/Form/Setting/Search.php b/civicrm/CRM/Admin/Form/Setting/Search.php
index ee4d855af9..8b1aaa21be 100644
--- a/civicrm/CRM/Admin/Form/Setting/Search.php
+++ b/civicrm/CRM/Admin/Form/Setting/Search.php
@@ -42,7 +42,7 @@ class CRM_Admin_Form_Setting_Search extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Search Preferences'));
+ $this->setTitle(ts('Settings - Search Preferences'));
parent::buildQuickForm();
diff --git a/civicrm/CRM/Admin/Form/Setting/Smtp.php b/civicrm/CRM/Admin/Form/Setting/Smtp.php
index 6877f201f8..cf44ea62d6 100644
--- a/civicrm/CRM/Admin/Form/Setting/Smtp.php
+++ b/civicrm/CRM/Admin/Form/Setting/Smtp.php
@@ -47,7 +47,7 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
];
$this->addRadio('outBound_option', ts('Select Mailer'), $outBoundOption, $props['outBound_option'] ?? []);
- CRM_Utils_System::setTitle(ts('Settings - Outbound Mail'));
+ $this->setTitle(ts('Settings - Outbound Mail'));
$this->add('text', 'sendmail_path', ts('Sendmail Path'));
$this->add('text', 'sendmail_args', ts('Sendmail Argument'));
$this->add('text', 'smtpServer', ts('SMTP Server'), CRM_Utils_Array::value('smtpServer', $props));
diff --git a/civicrm/CRM/Admin/Form/Setting/UF.php b/civicrm/CRM/Admin/Form/Setting/UF.php
index c59013a076..6ffda9f229 100644
--- a/civicrm/CRM/Admin/Form/Setting/UF.php
+++ b/civicrm/CRM/Admin/Form/Setting/UF.php
@@ -36,7 +36,7 @@ class CRM_Admin_Form_Setting_UF extends CRM_Admin_Form_Setting {
$this->_settings['wpBasePage'] = CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME;
}
- CRM_Utils_System::setTitle(
+ $this->setTitle(
ts('Settings - %1 Integration', [1 => $this->_uf])
);
diff --git a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index a4f73d6cb6..a1f2683b2b 100644
--- a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -24,7 +24,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Cleanup Caches and Update Paths'));
+ $this->setTitle(ts('Settings - Cleanup Caches and Update Paths'));
$this->addButtons([
[
diff --git a/civicrm/CRM/Admin/Form/Setting/Url.php b/civicrm/CRM/Admin/Form/Setting/Url.php
index a81c1e5313..ae9aa93084 100644
--- a/civicrm/CRM/Admin/Form/Setting/Url.php
+++ b/civicrm/CRM/Admin/Form/Setting/Url.php
@@ -32,7 +32,7 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
* Build the form object.
*/
public function buildQuickForm() {
- CRM_Utils_System::setTitle(ts('Settings - Resource URLs'));
+ $this->setTitle(ts('Settings - Resource URLs'));
$settingFields = civicrm_api('setting', 'getfields', [
'version' => 3,
]);
diff --git a/civicrm/CRM/Badge/BAO/Layout.php b/civicrm/CRM/Badge/BAO/Layout.php
index b69409e1cb..e631eb0ae3 100644
--- a/civicrm/CRM/Badge/BAO/Layout.php
+++ b/civicrm/CRM/Badge/BAO/Layout.php
@@ -106,13 +106,10 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel {
* Delete name labels.
*
* @param int $printLabelId
- * ID of the name label to be deleted.
- *
+ * @deprecated
*/
public static function del($printLabelId) {
- $printLabel = new CRM_Core_DAO_PrintLabel();
- $printLabel->id = $printLabelId;
- $printLabel->delete();
+ self::deleteRecord(['id' => $printLabelId]);
}
/**
diff --git a/civicrm/CRM/Batch/BAO/EntityBatch.php b/civicrm/CRM/Batch/BAO/EntityBatch.php
index b37fbb85c4..025a877b8e 100644
--- a/civicrm/CRM/Batch/BAO/EntityBatch.php
+++ b/civicrm/CRM/Batch/BAO/EntityBatch.php
@@ -29,19 +29,14 @@ class CRM_Batch_BAO_EntityBatch extends CRM_Batch_DAO_EntityBatch {
/**
* Remove entries from entity batch.
* @param array|int $params
+ * @deprecated
* @return CRM_Batch_DAO_EntityBatch
*/
public static function del($params) {
if (!is_array($params)) {
$params = ['id' => $params];
}
- $entityBatch = new CRM_Batch_DAO_EntityBatch();
- $entityId = $params['id'] ?? NULL;
- CRM_Utils_Hook::pre('delete', 'EntityBatch', $entityId, $params);
- $entityBatch->copyValues($params);
- $entityBatch->delete();
- CRM_Utils_Hook::post('delete', 'EntityBatch', $entityBatch->id, $entityBatch);
- return $entityBatch;
+ return self::deleteRecord($params);
}
}
diff --git a/civicrm/CRM/Batch/DAO/EntityBatch.php b/civicrm/CRM/Batch/DAO/EntityBatch.php
index c3108dae19..3a14e16132 100644
--- a/civicrm/CRM/Batch/DAO/EntityBatch.php
+++ b/civicrm/CRM/Batch/DAO/EntityBatch.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Batch/EntityBatch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9a6509e0c6f8869d4cdaeebd7e0073a3)
+ * (GenCodeChecksum:916ca7535e5e9d344f17456a973fdad6)
*/
/**
@@ -129,6 +129,10 @@ class CRM_Batch_DAO_EntityBatch extends CRM_Core_DAO {
'entity' => 'EntityBatch',
'bao' => 'CRM_Batch_BAO_EntityBatch',
'localizable' => 0,
+ 'pseudoconstant' => [
+ 'optionGroupName' => 'entity_batch_extends',
+ 'optionEditPath' => 'civicrm/admin/options/entity_batch_extends',
+ ],
'add' => '3.3',
],
'entity_id' => [
diff --git a/civicrm/CRM/Batch/Form/Entry.php b/civicrm/CRM/Batch/Form/Entry.php
index fca0f59190..77ffafc521 100644
--- a/civicrm/CRM/Batch/Form/Entry.php
+++ b/civicrm/CRM/Batch/Form/Entry.php
@@ -231,13 +231,13 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
$batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id', ['flip' => 1], 'validate');
// get the profile information
if ($this->_batchInfo['type_id'] == $batchTypes['Contribution']) {
- CRM_Utils_System::setTitle(ts('Batch Data Entry for Contributions'));
+ $this->setTitle(ts('Batch Data Entry for Contributions'));
}
elseif ($this->_batchInfo['type_id'] == $batchTypes['Membership']) {
- CRM_Utils_System::setTitle(ts('Batch Data Entry for Memberships'));
+ $this->setTitle(ts('Batch Data Entry for Memberships'));
}
elseif ($this->_batchInfo['type_id'] == $batchTypes['Pledge Payment']) {
- CRM_Utils_System::setTitle(ts('Batch Data Entry for Pledge Payments'));
+ $this->setTitle(ts('Batch Data Entry for Pledge Payments'));
}
$this->_fields = CRM_Core_BAO_UFGroup::getFields($this->_profileId, FALSE, CRM_Core_Action::VIEW);
@@ -820,12 +820,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
}
// end of contribution related section
- $membershipParams = [
- 'start_date' => $value['membership_start_date'] ?? NULL,
- 'end_date' => $value['membership_end_date'] ?? NULL,
- 'join_date' => $value['membership_join_date'] ?? NULL,
- 'campaign_id' => $value['member_campaign_id'] ?? NULL,
- ];
+ $membershipParams = $this->getCurrentRowMembershipParams();
if ($this->currentRowIsRenew()) {
// The following parameter setting may be obsolete.
@@ -835,10 +830,9 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
'end_date' => $value['membership_end_date'] ?? NULL,
'start_date' => $value['membership_start_date'] ?? NULL,
];
- $membershipSource = $value['source'] ?? NULL;
+
$membership = $this->legacyProcessMembership(
- $value['contact_id'], $value['membership_type_id'],
- $value['custom'], $membershipSource, ['campaign_id' => $value['member_campaign_id'] ?? NULL], $formDates
+ $value['custom'], $formDates
);
// make contribution entry
@@ -942,7 +936,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
'toName' => $form->_contributorDisplayName,
'toEmail' => $form->_contributorEmail,
'PDFFilename' => ts('receipt') . '.pdf',
- 'isEmailPdf' => Civi::settings()->get('invoicing') && Civi::settings()->get('invoice_is_email_pdf'),
+ 'isEmailPdf' => Civi::settings()->get('invoice_is_email_pdf'),
'contributionId' => $this->getCurrentRowContributionID(),
'isTest' => (bool) ($form->_action & CRM_Core_Action::PREVIEW),
]
@@ -1005,12 +999,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
}
/**
- * @param int $contactID
- * @param int $membershipTypeID
* @param $customFieldsFormatted
- * @param $membershipSource
- * @param $isPayLater
- * @param array $memParams
* @param array $formDates
*
* @return CRM_Member_BAO_Membership
@@ -1018,155 +1007,64 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
* @throws \CRM_Core_Exception
* @throws \CiviCRM_API3_Exception
*/
- protected function legacyProcessMembership($contactID, $membershipTypeID, $customFieldsFormatted, $membershipSource, $memParams = [], $formDates = []): CRM_Member_DAO_Membership {
+ protected function legacyProcessMembership($customFieldsFormatted, $formDates = []): CRM_Member_DAO_Membership {
$updateStatusId = FALSE;
$changeToday = NULL;
- $is_test = FALSE;
$numRenewTerms = 1;
- $allStatus = CRM_Member_PseudoConstant::membershipStatus();
$format = '%Y%m%d';
- $statusFormat = '%Y-%m-%d';
- $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipType($membershipTypeID);
$ids = [];
$isPayLater = NULL;
+ $memParams = $this->getCurrentRowMembershipParams();
$currentMembership = $this->getCurrentMembership();
- if ($currentMembership) {
-
- // Do NOT do anything.
- //1. membership with status : PENDING/CANCELLED (CRM-2395)
- //2. Paylater/IPN renew. CRM-4556.
- if (in_array($currentMembership['status_id'], [
- array_search('Pending', $allStatus),
- // CRM-15475
- array_search('Cancelled', CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)),
- ])) {
-
- $memParams = array_merge([
- 'id' => $currentMembership['id'],
- 'status_id' => $currentMembership['status_id'],
- 'start_date' => $currentMembership['start_date'],
- 'end_date' => $currentMembership['end_date'],
- 'join_date' => $currentMembership['join_date'],
- 'membership_type_id' => $membershipTypeID,
- 'max_related' => !empty($membershipTypeDetails['max_related']) ? $membershipTypeDetails['max_related'] : NULL,
- 'membership_activity_status' => $isPayLater ? 'Scheduled' : 'Completed',
- ], $memParams);
-
- return CRM_Member_BAO_Membership::create($memParams);
- }
-
- // Now Renew the membership
- if (!$currentMembership['is_current_member']) {
- // membership is not CURRENT
-
- // CRM-7297 Membership Upsell - calculate dates based on new membership type
- $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($currentMembership['id'],
- $changeToday,
- $membershipTypeID,
- $numRenewTerms
- );
+ // Now Renew the membership
+ if (!$currentMembership['is_current_member']) {
+ // membership is not CURRENT
- $currentMembership['join_date'] = CRM_Utils_Date::customFormat($currentMembership['join_date'], $format);
- foreach (['start_date', 'end_date'] as $dateType) {
- $currentMembership[$dateType] = $formDates[$dateType] ?? NULL;
- if (empty($currentMembership[$dateType])) {
- $currentMembership[$dateType] = $dates[$dateType] ?? NULL;
- }
- }
- $currentMembership['is_test'] = $is_test;
-
- if (!empty($membershipSource)) {
- $currentMembership['source'] = $membershipSource;
- }
-
- if (!empty($currentMembership['id'])) {
- $ids['membership'] = $currentMembership['id'];
- }
- $memParams = array_merge($currentMembership, $memParams);
- $memParams['membership_type_id'] = $membershipTypeID;
+ // CRM-7297 Membership Upsell - calculate dates based on new membership type
+ $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($currentMembership['id'],
+ $changeToday,
+ $this->getCurrentRowMembershipTypeID(),
+ $numRenewTerms
+ );
- //set the log start date.
- $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
+ foreach (['start_date', 'end_date'] as $dateType) {
+ $memParams[$dateType] = $memParams[$dateType] ?: ($dates[$dateType] ?? NULL);
}
- else {
-
- // CURRENT Membership
- $membership = new CRM_Member_DAO_Membership();
- $membership->id = $currentMembership['id'];
- $membership->find(TRUE);
- // CRM-7297 Membership Upsell - calculate dates based on new membership type
- $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id,
- $changeToday,
- $membershipTypeID,
- $numRenewTerms
- );
- // Insert renewed dates for CURRENT membership
- $memParams['join_date'] = CRM_Utils_Date::isoToMysql($membership->join_date);
- $memParams['start_date'] = $formDates['start_date'] ?? CRM_Utils_Date::isoToMysql($membership->start_date);
- $memParams['end_date'] = $formDates['end_date'] ?? NULL;
- if (empty($memParams['end_date'])) {
- $memParams['end_date'] = $dates['end_date'] ?? NULL;
- }
- $memParams['membership_type_id'] = $membershipTypeID;
+ $ids['membership'] = $currentMembership['id'];
- //set the log start date.
- $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
-
- //CRM-18067
- if (!empty($membershipSource)) {
- $memParams['source'] = $membershipSource;
- }
- elseif (empty($membership->source)) {
- $memParams['source'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership',
- $currentMembership['id'],
- 'source'
- );
- }
-
- if (!empty($currentMembership['id'])) {
- $ids['membership'] = $currentMembership['id'];
- }
- $memParams['membership_activity_status'] = $isPayLater ? 'Scheduled' : 'Completed';
- }
+ //set the log start date.
+ $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
}
else {
- // NEW Membership
- $memParams = array_merge([
- 'contact_id' => $contactID,
- 'membership_type_id' => $membershipTypeID,
- ], $memParams);
-
- $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeID, NULL, NULL, NULL, $numRenewTerms);
-
- foreach (['join_date', 'start_date', 'end_date'] as $dateType) {
- $memParams[$dateType] = $formDates[$dateType] ?? NULL;
- if (empty($memParams[$dateType])) {
- $memParams[$dateType] = $dates[$dateType] ?? NULL;
- }
- }
- $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate(CRM_Utils_Date::customFormat($dates['start_date'],
- $statusFormat),
- CRM_Utils_Date::customFormat($dates['end_date'],
- $statusFormat
- ),
- CRM_Utils_Date::customFormat($dates['join_date'],
- $statusFormat
- ),
- 'now',
- TRUE,
- $membershipTypeID,
- $memParams
+ // CURRENT Membership
+ $membership = new CRM_Member_DAO_Membership();
+ $membership->id = $currentMembership['id'];
+ $membership->find(TRUE);
+ // CRM-7297 Membership Upsell - calculate dates based on new membership type
+ $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id,
+ $changeToday,
+ $this->getCurrentRowMembershipTypeID(),
+ $numRenewTerms
);
- $updateStatusId = $status['id'] ?? NULL;
- if (!empty($membershipSource)) {
- $memParams['source'] = $membershipSource;
+ // Insert renewed dates for CURRENT membership
+ $memParams['join_date'] = CRM_Utils_Date::isoToMysql($membership->join_date);
+ $memParams['start_date'] = $formDates['start_date'] ?? CRM_Utils_Date::isoToMysql($membership->start_date);
+ $memParams['end_date'] = $formDates['end_date'] ?? NULL;
+ if (empty($memParams['end_date'])) {
+ $memParams['end_date'] = $dates['end_date'] ?? NULL;
}
- $memParams['is_test'] = $is_test;
- $memParams['is_pay_later'] = $isPayLater;
+
+ //set the log start date.
+ $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
+
+ if (!empty($currentMembership['id'])) {
+ $ids['membership'] = $currentMembership['id'];
+ }
+ $memParams['membership_activity_status'] = $isPayLater ? 'Scheduled' : 'Completed';
}
//CRM-4555
@@ -1244,9 +1142,12 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
* Is the current row a renewal.
*
* @return bool
+ *
+ * @throws \CRM_Core_Exception
+ * @throws \CiviCRM_API3_Exception
*/
private function currentRowIsRenew(): bool {
- return $this->currentRowIsRenewOption === 2;
+ return $this->currentRowIsRenewOption === 2 && $this->getCurrentMembership();
}
/**
@@ -1270,4 +1171,18 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
return $this->currentRowExistingMembership;
}
+ /**
+ * Get the params as related to the membership entity.
+ *
+ * @return array
+ */
+ private function getCurrentRowMembershipParams(): array {
+ return [
+ 'start_date' => $this->currentRow['membership_start_date'] ?? NULL,
+ 'end_date' => $this->currentRow['membership_end_date'] ?? NULL,
+ 'join_date' => $this->currentRow['membership_join_date'] ?? NULL,
+ 'campaign_id' => $this->currentRow['member_campaign_id'] ?? NULL,
+ ];
+ }
+
}
diff --git a/civicrm/CRM/Campaign/BAO/Campaign.php b/civicrm/CRM/Campaign/BAO/Campaign.php
index 9c1a0447c1..a4dc88945d 100644
--- a/civicrm/CRM/Campaign/BAO/Campaign.php
+++ b/civicrm/CRM/Campaign/BAO/Campaign.php
@@ -77,24 +77,18 @@ class CRM_Campaign_BAO_Campaign extends CRM_Campaign_DAO_Campaign {
* Delete the campaign.
*
* @param int $id
- * Id of the campaign.
*
- * @return bool|mixed
+ * @deprecated
+ * @return bool|int
*/
public static function del($id) {
- if (!$id) {
+ try {
+ self::deleteRecord(['id' => $id]);
+ }
+ catch (CRM_Core_Exception $e) {
return FALSE;
}
-
- CRM_Utils_Hook::pre('delete', 'Campaign', $id);
-
- $dao = new CRM_Campaign_DAO_Campaign();
- $dao->id = $id;
- $result = $dao->delete();
-
- CRM_Utils_Hook::post('delete', 'Campaign', $id, $dao);
-
- return $result;
+ return 1;
}
/**
@@ -301,20 +295,11 @@ Order By camp.title";
/**
* Is CiviCampaign enabled.
+ *
* @return bool
*/
- public static function isCampaignEnable() {
- static $isEnable = NULL;
-
- if (!isset($isEnable)) {
- $isEnable = FALSE;
- $config = CRM_Core_Config::singleton();
- if (in_array('CiviCampaign', $config->enableComponents)) {
- $isEnable = TRUE;
- }
- }
-
- return $isEnable;
+ public static function isCampaignEnable(): bool {
+ return in_array('CiviCampaign', CRM_Core_Config::singleton()->enableComponents, TRUE);
}
/**
diff --git a/civicrm/CRM/Campaign/BAO/Petition.php b/civicrm/CRM/Campaign/BAO/Petition.php
index a13450f148..5d3d55a5f0 100644
--- a/civicrm/CRM/Campaign/BAO/Petition.php
+++ b/civicrm/CRM/Campaign/BAO/Petition.php
@@ -448,27 +448,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )";
return $signature;
}
- /**
- * This function returns all entities assigned to a specific tag.
- *
- * @param object $tag
- * An object of a tag.
- *
- * @return array
- * array of contact ids
- */
- public function getEntitiesByTag($tag) {
- $contactIds = [];
- $entityTagDAO = new CRM_Core_DAO_EntityTag();
- $entityTagDAO->tag_id = $tag['id'];
- $entityTagDAO->find();
-
- while ($entityTagDAO->fetch()) {
- $contactIds[] = $entityTagDAO->entity_id;
- }
- return $contactIds;
- }
-
/**
* Check if contact has signed this petition.
*
diff --git a/civicrm/CRM/Campaign/DAO/CampaignGroup.php b/civicrm/CRM/Campaign/DAO/CampaignGroup.php
index 4e57abbf6c..0e559e1d1d 100644
--- a/civicrm/CRM/Campaign/DAO/CampaignGroup.php
+++ b/civicrm/CRM/Campaign/DAO/CampaignGroup.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:223af3013edf80baca1b0cde031cad41)
+ * (GenCodeChecksum:978c5e6110b6905764ed276943711ac4)
*/
/**
@@ -141,6 +141,12 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.3',
],
'group_type' => [
diff --git a/civicrm/CRM/Campaign/DAO/Survey.php b/civicrm/CRM/Campaign/DAO/Survey.php
index ff8493c33f..b46e6235c0 100644
--- a/civicrm/CRM/Campaign/DAO/Survey.php
+++ b/civicrm/CRM/Campaign/DAO/Survey.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Campaign/Survey.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4b168e929887a0c86a634bb72d4f317a)
+ * (GenCodeChecksum:45c10db72afe877c41ddb78b79153648)
*/
/**
@@ -278,6 +278,12 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.3',
],
'activity_type_id' => [
diff --git a/civicrm/CRM/Campaign/Form/Campaign.php b/civicrm/CRM/Campaign/Form/Campaign.php
index d6e7e2e03c..e558d4502b 100644
--- a/civicrm/CRM/Campaign/Form/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Campaign.php
@@ -75,7 +75,7 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
$title = ts('Delete Campaign');
}
if ($title) {
- CRM_Utils_System::setTitle($title);
+ $this->setTitle($title);
}
$session = CRM_Core_Session::singleton();
diff --git a/civicrm/CRM/Campaign/Form/Gotv.php b/civicrm/CRM/Campaign/Form/Gotv.php
index cea96a40ba..870f0ea381 100644
--- a/civicrm/CRM/Campaign/Form/Gotv.php
+++ b/civicrm/CRM/Campaign/Form/Gotv.php
@@ -72,7 +72,7 @@ class CRM_Campaign_Form_Gotv extends CRM_Core_Form {
}
//set the form title.
- CRM_Utils_System::setTitle(ts('GOTV (Voter Tracking)'));
+ $this->setTitle(ts('GOTV (Voter Tracking)'));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Petition.php b/civicrm/CRM/Campaign/Form/Petition.php
index 4cb12eed34..021b4785d5 100644
--- a/civicrm/CRM/Campaign/Form/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Petition.php
@@ -57,10 +57,10 @@ class CRM_Campaign_Form_Petition extends CRM_Core_Form {
$this->_surveyId = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
if ($this->_action & CRM_Core_Action::UPDATE) {
- CRM_Utils_System::setTitle(ts('Edit Survey'));
+ $this->setTitle(ts('Edit Survey'));
}
else {
- CRM_Utils_System::setTitle(ts('Delete Survey'));
+ $this->setTitle(ts('Delete Survey'));
}
}
@@ -89,10 +89,10 @@ class CRM_Campaign_Form_Petition extends CRM_Core_Form {
$this->_surveyId = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
if ($this->_action & CRM_Core_Action::UPDATE) {
- CRM_Utils_System::setTitle(ts('Edit Petition'));
+ $this->setTitle(ts('Edit Petition'));
}
else {
- CRM_Utils_System::setTitle(ts('Delete Petition'));
+ $this->setTitle(ts('Delete Petition'));
}
}
diff --git a/civicrm/CRM/Campaign/Form/Petition/Signature.php b/civicrm/CRM/Campaign/Form/Petition/Signature.php
index 2d1e5df0a1..f4a3d14a79 100644
--- a/civicrm/CRM/Campaign/Form/Petition/Signature.php
+++ b/civicrm/CRM/Campaign/Form/Petition/Signature.php
@@ -230,7 +230,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form {
}
$this->setDefaultValues();
- CRM_Utils_System::setTitle($this->petition['title']);
+ $this->setTitle($this->petition['title']);
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Search.php b/civicrm/CRM/Campaign/Form/Search.php
index e110db8d6e..5244c8b904 100644
--- a/civicrm/CRM/Campaign/Form/Search.php
+++ b/civicrm/CRM/Campaign/Form/Search.php
@@ -144,7 +144,7 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search {
}
//set the form title.
- CRM_Utils_System::setTitle(ts('Find Respondents To %1', array(1 => ucfirst($this->_operation))));
+ $this->setTitle(ts('Find Respondents To %1', array(1 => ucfirst($this->_operation))));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Campaign.php b/civicrm/CRM/Campaign/Form/Search/Campaign.php
index a6cc366820..3778ccea92 100644
--- a/civicrm/CRM/Campaign/Form/Search/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Search/Campaign.php
@@ -54,7 +54,7 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
$this->assign('suppressForm', TRUE);
//set the form title.
- CRM_Utils_System::setTitle(ts('Find Campaigns'));
+ $this->setTitle(ts('Find Campaigns'));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Petition.php b/civicrm/CRM/Campaign/Form/Search/Petition.php
index 438b885dbf..49b94a1226 100644
--- a/civicrm/CRM/Campaign/Form/Search/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Search/Petition.php
@@ -44,7 +44,7 @@ class CRM_Campaign_Form_Search_Petition extends CRM_Core_Form {
$this->assign('suppressForm', TRUE);
//set the form title.
- CRM_Utils_System::setTitle(ts('Find Petition'));
+ $this->setTitle(ts('Find Petition'));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Survey.php b/civicrm/CRM/Campaign/Form/Search/Survey.php
index 968b99eafa..6ad51606c7 100644
--- a/civicrm/CRM/Campaign/Form/Search/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Search/Survey.php
@@ -45,7 +45,7 @@ class CRM_Campaign_Form_Search_Survey extends CRM_Core_Form {
$this->assign('suppressForm', TRUE);
//set the form title.
- CRM_Utils_System::setTitle(ts('Find Survey'));
+ $this->setTitle(ts('Find Survey'));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey.php b/civicrm/CRM/Campaign/Form/Survey.php
index 212ed03148..a15aa03dea 100644
--- a/civicrm/CRM/Campaign/Form/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Survey.php
@@ -72,7 +72,7 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
CRM_Campaign_BAO_Survey::retrieve($params, $surveyInfo);
$this->_surveyTitle = $surveyInfo['title'];
$this->assign('surveyTitle', $this->_surveyTitle);
- CRM_Utils_System::setTitle(ts('Configure Survey - %1', [1 => $this->_surveyTitle]));
+ $this->setTitle(ts('Configure Survey - %1', [1 => $this->_surveyTitle]));
}
$this->assign('action', $this->_action);
diff --git a/civicrm/CRM/Campaign/Form/Survey/Delete.php b/civicrm/CRM/Campaign/Form/Survey/Delete.php
index db6dd11488..16715221ea 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Delete.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Delete.php
@@ -47,7 +47,7 @@ class CRM_Campaign_Form_Survey_Delete extends CRM_Core_Form {
CRM_Campaign_BAO_Survey::retrieve($params, $surveyInfo);
$this->_surveyTitle = $surveyInfo['title'];
$this->assign('surveyTitle', $this->_surveyTitle);
- CRM_Utils_System::setTitle(ts('Delete Survey') . ' - ' . $this->_surveyTitle);
+ $this->setTitle(ts('Delete Survey') . ' - ' . $this->_surveyTitle);
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/Main.php b/civicrm/CRM/Campaign/Form/Survey/Main.php
index 0838d9a3cf..44b760763e 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Main.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Main.php
@@ -47,7 +47,7 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey {
$this->_action = CRM_Utils_Request::retrieve('action', 'String', $this);
if ($this->_action & CRM_Core_Action::UPDATE) {
- CRM_Utils_System::setTitle(ts('Configure Survey') . ' - ' . $this->_surveyTitle);
+ $this->setTitle(ts('Configure Survey') . ' - ' . $this->_surveyTitle);
}
// Add custom data to form
diff --git a/civicrm/CRM/Campaign/Form/Task/Interview.php b/civicrm/CRM/Campaign/Form/Task/Interview.php
index 19df2380e9..b57daae79e 100644
--- a/civicrm/CRM/Campaign/Form/Task/Interview.php
+++ b/civicrm/CRM/Campaign/Form/Task/Interview.php
@@ -235,7 +235,7 @@ WHERE {$clause}
//set the title.
$this->_surveyTypeId = $this->_surveyValues['activity_type_id'] ?? NULL;
$surveyTypeLabel = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'activity_type_id', $this->_surveyTypeId);
- CRM_Utils_System::setTitle(ts('Record %1 Responses', [1 => $surveyTypeLabel]));
+ $this->setTitle(ts('Record %1 Responses', [1 => $surveyTypeLabel]));
}
public function validateIds() {
diff --git a/civicrm/CRM/Campaign/Form/Task/Release.php b/civicrm/CRM/Campaign/Form/Task/Release.php
index 4607e2154a..4f56053799 100644
--- a/civicrm/CRM/Campaign/Form/Task/Release.php
+++ b/civicrm/CRM/Campaign/Form/Task/Release.php
@@ -109,7 +109,7 @@ class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
}
//set the title.
- CRM_Utils_System::setTitle(ts('Release Respondents'));
+ $this->setTitle(ts('Release Respondents'));
}
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Reserve.php b/civicrm/CRM/Campaign/Form/Task/Reserve.php
index b0b814b690..97c1b72d06 100644
--- a/civicrm/CRM/Campaign/Form/Task/Reserve.php
+++ b/civicrm/CRM/Campaign/Form/Task/Reserve.php
@@ -99,7 +99,7 @@ class CRM_Campaign_Form_Task_Reserve extends CRM_Campaign_Form_Task {
}
//set the title.
- CRM_Utils_System::setTitle(ts('Reserve Respondents'));
+ $this->setTitle(ts('Reserve Respondents'));
}
public function validateSurvey() {
diff --git a/civicrm/CRM/Case/BAO/Case.php b/civicrm/CRM/Case/BAO/Case.php
index 65846ce83a..5014e4a0cd 100644
--- a/civicrm/CRM/Case/BAO/Case.php
+++ b/civicrm/CRM/Case/BAO/Case.php
@@ -217,12 +217,6 @@ WHERE civicrm_case.id = %1";
CRM_Utils_Hook::post('delete', 'Case', $caseId, $case);
- // remove case from recent items.
- $caseRecent = [
- 'id' => $caseId,
- 'type' => 'Case',
- ];
- CRM_Utils_Recent::del($caseRecent);
return TRUE;
}
diff --git a/civicrm/CRM/Case/Form/Task/PDF.php b/civicrm/CRM/Case/Form/Task/PDF.php
index 380892b15d..65954ea272 100644
--- a/civicrm/CRM/Case/Form/Task/PDF.php
+++ b/civicrm/CRM/Case/Form/Task/PDF.php
@@ -19,6 +19,9 @@
* This class provides the functionality to create PDF letter for a group of contacts.
*/
class CRM_Case_Form_Task_PDF extends CRM_Case_Form_Task {
+
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* All the existing templates in the system.
*
@@ -34,28 +37,12 @@ class CRM_Case_Form_Task_PDF extends CRM_Case_Form_Task {
* Build all the data structures needed to build the form.
*/
public function preProcess() {
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
+ $this->preProcessPDF();
$this->skipOnHold = $this->skipDeceased = FALSE;
parent::preProcess();
$this->setContactIDs();
}
- /**
- * Set defaults for the pdf.
- *
- * @return array
- */
- public function setDefaultValues() {
- return CRM_Contact_Form_Task_PDFLetterCommon::setDefaultValues();
- }
-
- /**
- * Build the form object.
- */
- public function buildQuickForm() {
- CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
- }
-
/**
* Process the form after the input has been submitted and validated.
*/
diff --git a/civicrm/CRM/Contact/BAO/Contact.php b/civicrm/CRM/Contact/BAO/Contact.php
index 7e2ff0b74e..cb855c0b46 100644
--- a/civicrm/CRM/Contact/BAO/Contact.php
+++ b/civicrm/CRM/Contact/BAO/Contact.php
@@ -1063,7 +1063,7 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
}
//delete the contact id from recently view
- CRM_Utils_Recent::delContact($id);
+ CRM_Utils_Recent::del(['contact_id' => $id]);
self::updateContactCache($id, empty($restore));
// delete any prevnext/dupe cache entry
diff --git a/civicrm/CRM/Contact/BAO/ContactType.php b/civicrm/CRM/Contact/BAO/ContactType.php
index 18b62ab86e..790fe70b6a 100644
--- a/civicrm/CRM/Contact/BAO/ContactType.php
+++ b/civicrm/CRM/Contact/BAO/ContactType.php
@@ -863,7 +863,10 @@ WHERE ($subtypeClause)";
* @throws \API_Exception
*/
protected static function getAllContactTypes() {
- if (!Civi::cache('contactTypes')->has('all')) {
+ $cache = Civi::cache('contactTypes');
+ $cacheKey = 'all_' . $GLOBALS['tsLocale'];
+ $contactTypes = $cache->get($cacheKey);
+ if ($contactTypes === NULL) {
$contactTypes = (array) ContactType::get(FALSE)
->setSelect(['id', 'name', 'label', 'description', 'is_active', 'is_reserved', 'image_URL', 'parent_id', 'parent_id:name', 'parent_id:label'])
->execute()->indexBy('name');
@@ -873,9 +876,8 @@ WHERE ($subtypeClause)";
$contactTypes[$id]['parent_label'] = $contactType['parent_id:label'];
unset($contactTypes[$id]['parent_id:name'], $contactTypes[$id]['parent_id:label']);
}
- Civi::cache('contactTypes')->set('all', $contactTypes);
+ $cache->set($cacheKey, $contactTypes);
}
- $contactTypes = Civi::cache('contactTypes')->get('all');
return $contactTypes;
}
diff --git a/civicrm/CRM/Contact/BAO/Group.php b/civicrm/CRM/Contact/BAO/Group.php
index 48e5802ab2..3079dda7c9 100644
--- a/civicrm/CRM/Contact/BAO/Group.php
+++ b/civicrm/CRM/Contact/BAO/Group.php
@@ -116,13 +116,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
$transaction->commit();
CRM_Utils_Hook::post('delete', 'Group', $id, $group);
-
- // delete the recently created Group
- $groupRecent = [
- 'id' => $id,
- 'type' => 'Group',
- ];
- CRM_Utils_Recent::del($groupRecent);
}
/**
@@ -912,7 +905,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
CRM_Core_DAO::storeValues($object, $values[$object->id]);
if ($object->saved_search_id) {
- $values[$object->id]['title'] .= ' (' . ts('Smart Group') . ')';
+ $values[$object->id]['class'][] = "crm-smart-group";
// check if custom search, if so fix view link
$customSearchID = CRM_Core_DAO::getFieldValue(
'CRM_Contact_DAO_SavedSearch',
diff --git a/civicrm/CRM/Contact/BAO/Relationship.php b/civicrm/CRM/Contact/BAO/Relationship.php
index cacd788ac9..c4aa4de85e 100644
--- a/civicrm/CRM/Contact/BAO/Relationship.php
+++ b/civicrm/CRM/Contact/BAO/Relationship.php
@@ -744,13 +744,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
CRM_Utils_Hook::post('delete', 'Relationship', $id, $relationship);
- // delete the recently created Relationship
- $relationshipRecent = [
- 'id' => $id,
- 'type' => 'Relationship',
- ];
- CRM_Utils_Recent::del($relationshipRecent);
-
return $relationship;
}
diff --git a/civicrm/CRM/Contact/BAO/SavedSearch.php b/civicrm/CRM/Contact/BAO/SavedSearch.php
index 3d3c4f2785..f430ccc84f 100644
--- a/civicrm/CRM/Contact/BAO/SavedSearch.php
+++ b/civicrm/CRM/Contact/BAO/SavedSearch.php
@@ -473,4 +473,17 @@ LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_
return CRM_Utils_System::url($path, ['reset' => 1, 'ssID' => $id]);
}
+ /**
+ * Retrieve pseudoconstant options for $this->api_entity field
+ * @return array
+ */
+ public static function getApiEntityOptions() {
+ return Civi\Api4\Entity::get(FALSE)
+ ->addSelect('name', 'title_plural')
+ ->addOrderBy('title_plural')
+ ->execute()
+ ->indexBy('name')
+ ->column('title_plural');
+ }
+
}
diff --git a/civicrm/CRM/Contact/DAO/SavedSearch.php b/civicrm/CRM/Contact/DAO/SavedSearch.php
index c0ecd2a212..c8fff17301 100644
--- a/civicrm/CRM/Contact/DAO/SavedSearch.php
+++ b/civicrm/CRM/Contact/DAO/SavedSearch.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contact/SavedSearch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c884fe02dfd203d381429f83672e1a9e)
+ * (GenCodeChecksum:bca384578ea59c0cf4f0a80617c788fe)
*/
/**
@@ -219,6 +219,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
'localizable' => 0,
'html' => [
'type' => 'Text',
+ 'label' => ts("Label"),
],
'add' => '5.32',
],
@@ -277,6 +278,9 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
'entity' => 'SavedSearch',
'bao' => 'CRM_Contact_BAO_SavedSearch',
'localizable' => 0,
+ 'pseudoconstant' => [
+ 'callback' => 'CRM_Contact_BAO_SavedSearch::getApiEntityOptions',
+ ],
'add' => '5.24',
],
'api_params' => [
diff --git a/civicrm/CRM/Contact/Form/Edit/Email.php b/civicrm/CRM/Contact/Form/Edit/Email.php
index a0716dfe49..c75865bd82 100644
--- a/civicrm/CRM/Contact/Form/Edit/Email.php
+++ b/civicrm/CRM/Contact/Form/Edit/Email.php
@@ -81,14 +81,19 @@ class CRM_Contact_Form_Edit_Email {
$form->addElement('radio', "email[$blockId][is_primary]", '', '', '1', $js);
if (CRM_Utils_System::getClassName($form) == 'CRM_Contact_Form_Contact') {
-
- $form->add('textarea', "email[$blockId][signature_text]", ts('Signature (Text)'),
- ['rows' => 2, 'cols' => 40]
- );
-
- $form->add('wysiwyg', "email[$blockId][signature_html]", ts('Signature (HTML)'),
- ['rows' => 2, 'cols' => 40]
- );
+ // Only display the signature fields if this contact has a CMS account
+ // because they can only send email if they have access to the CRM
+ if (!empty($form->_contactId)) {
+ $ufID = CRM_Core_BAO_UFMatch::getUFId($form->_contactId);
+ if ($ufID) {
+ $form->add('textarea', "email[$blockId][signature_text]", ts('Signature (Text)'),
+ ['rows' => 2, 'cols' => 40]
+ );
+ $form->add('wysiwyg', "email[$blockId][signature_html]", ts('Signature (HTML)'),
+ ['rows' => 2, 'cols' => 40]
+ );
+ }
+ }
}
}
}
diff --git a/civicrm/CRM/Contact/Form/Search/Criteria.php b/civicrm/CRM/Contact/Form/Search/Criteria.php
index 6bcad01d86..38bd2cc156 100644
--- a/civicrm/CRM/Contact/Form/Search/Criteria.php
+++ b/civicrm/CRM/Contact/Form/Search/Criteria.php
@@ -335,7 +335,7 @@ class CRM_Contact_Form_Search_Criteria {
'tag_types_text' => ['name' => 'tag_types_text'],
'tag_search' => [
'name' => 'tag_search',
- 'help' => ['id' => 'id-all-tags'],
+ 'help' => ['id' => 'id-all-tags', 'file' => NULL],
],
'tag_set' => [
'name' => 'tag_set',
@@ -345,7 +345,7 @@ class CRM_Contact_Form_Search_Criteria {
'all_tag_types' => [
'name' => 'all_tag_types',
'class' => 'search-field__span-3 search-field__checkbox',
- 'help' => ['id' => 'id-all-tag-types'],
+ 'help' => ['id' => 'id-all-tag-types', 'file' => NULL],
],
'phone_numeric' => [
'name' => 'phone_numeric',
diff --git a/civicrm/CRM/Contact/Form/Task/EmailCommon.php b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
index 02a4df9d54..07b0e8247d 100644
--- a/civicrm/CRM/Contact/Form/Task/EmailCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
@@ -28,14 +28,9 @@ class CRM_Contact_Form_Task_EmailCommon {
* @param CRM_Core_Form $form
* @param bool $bounce determine if we want to throw a status bounce.
*
- * @throws \CiviCRM_API3_Exception
+ * @throws \API_Exception
*/
public static function preProcessFromAddress(&$form, $bounce = TRUE) {
- if (!isset($form->_single)) {
- // @todo ensure this is already set.
- $form->_single = FALSE;
- }
-
$form->_emails = [];
// @TODO remove these line and to it somewhere more appropriate. Currently some classes (e.g Case
@@ -54,20 +49,13 @@ class CRM_Contact_Form_Task_EmailCommon {
$form->_emails = $fromEmailValues;
$defaults = [];
$form->_fromEmails = $fromEmailValues;
+ if (is_numeric(key($form->_fromEmails))) {
+ $emailID = (int) key($form->_fromEmails);
+ $defaults = CRM_Core_BAO_Email::getEmailSignatureDefaults($emailID);
+ }
if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
$defaults['from_email_address'] = current(CRM_Core_BAO_Domain::getNameAndEmail(FALSE, TRUE));
}
- if (is_numeric(key($form->_fromEmails))) {
- // Add signature
- $defaultEmail = civicrm_api3('email', 'getsingle', ['id' => key($form->_fromEmails)]);
- $defaults = [];
- if (!empty($defaultEmail['signature_html'])) {
- $defaults['html_message'] = '<br/><br/>--' . $defaultEmail['signature_html'];
- }
- if (!empty($defaultEmail['signature_text'])) {
- $defaults['text_message'] = "\n\n--\n" . $defaultEmail['signature_text'];
- }
- }
$form->setDefaults($defaults);
}
@@ -76,28 +64,17 @@ class CRM_Contact_Form_Task_EmailCommon {
*
* @param array $fields
* The input form values.
- * @param array $dontCare
- * @param array $self
- * Additional values form 'this'.
*
* @return bool|array
* true if no errors, else array of errors
*/
- public static function formRule($fields, $dontCare, $self) {
+ public static function formRule(array $fields) {
+ CRM_Core_Error::deprecatedFunctionWarning('no replacement');
$errors = [];
- $template = CRM_Core_Smarty::singleton();
-
- if (isset($fields['html_message'])) {
- $htmlMessage = str_replace(["\n", "\r"], ' ', $fields['html_message']);
- $htmlMessage = str_replace('"', '\"', $htmlMessage);
- $template->assign('htmlContent', $htmlMessage);
- }
-
//Added for CRM-1393
if (!empty($fields['saveTemplate']) && empty($fields['saveTemplateName'])) {
- $errors['saveTemplateName'] = ts("Enter name to save message template");
+ $errors['saveTemplateName'] = ts('Enter name to save message template');
}
-
return empty($errors) ? TRUE : $errors;
}
diff --git a/civicrm/CRM/Contact/Form/Task/EmailTrait.php b/civicrm/CRM/Contact/Form/Task/EmailTrait.php
index df222411a1..2e78e168a4 100644
--- a/civicrm/CRM/Contact/Form/Task/EmailTrait.php
+++ b/civicrm/CRM/Contact/Form/Task/EmailTrait.php
@@ -30,8 +30,6 @@ trait CRM_Contact_Form_Task_EmailTrait {
*/
public $_single = FALSE;
- public $_noEmails = FALSE;
-
/**
* All the existing templates in the system.
*
@@ -57,19 +55,6 @@ trait CRM_Contact_Form_Task_EmailTrait {
*/
public $_toContactIds = [];
- /**
- * Store only "cc" contact ids.
- * @var array
- */
- public $_ccContactIds = [];
-
- /**
- * Store only "bcc" contact ids.
- *
- * @var array
- */
- public $_bccContactIds = [];
-
/**
* Is the form being loaded from a search action.
*
@@ -120,13 +105,14 @@ trait CRM_Contact_Form_Task_EmailTrait {
* Call trait preProcess function.
*
* This function exists as a transitional arrangement so classes overriding
- * preProcess can still call it. Ideally it will be melded into preProcess later.
+ * preProcess can still call it. Ideally it will be melded into preProcess
+ * later.
*
- * @throws \CiviCRM_API3_Exception
* @throws \CRM_Core_Exception
+ * @throws \API_Exception
*/
protected function traitPreProcess() {
- CRM_Contact_Form_Task_EmailCommon::preProcessFromAddress($this);
+ $this->preProcessFromAddress();
if ($this->isSearchContext()) {
// Currently only the contact email form is callable outside search context.
parent::preProcess();
@@ -138,6 +124,40 @@ trait CRM_Contact_Form_Task_EmailTrait {
}
}
+ /**
+ * Pre Process Form Addresses to be used in Quickform
+ *
+ * @throws \API_Exception
+ * @throws \CRM_Core_Exception
+ */
+ protected function preProcessFromAddress(): void {
+ $form = $this;
+ $form->_emails = [];
+
+ // @TODO remove these line and to it somewhere more appropriate. Currently some classes (e.g Case
+ // are having to re-write contactIds afterwards due to this inappropriate variable setting
+ // If we don't have any contact IDs, use the logged in contact ID
+ $form->_contactIds = $form->_contactIds ?: [CRM_Core_Session::getLoggedInContactID()];
+
+ $fromEmailValues = CRM_Core_BAO_Email::getFromEmail();
+
+ if (empty($fromEmailValues)) {
+ CRM_Core_Error::statusBounce(ts('Your user record does not have a valid email address and no from addresses have been configured.'));
+ }
+
+ $form->_emails = $fromEmailValues;
+ $defaults = [];
+ $form->_fromEmails = $fromEmailValues;
+ if (is_numeric(key($form->_fromEmails))) {
+ $emailID = (int) key($form->_fromEmails);
+ $defaults = CRM_Core_BAO_Email::getEmailSignatureDefaults($emailID);
+ }
+ if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
+ $defaults['from_email_address'] = current(CRM_Core_BAO_Domain::getNameAndEmail(FALSE, TRUE));
+ }
+ $form->setDefaults($defaults);
+ }
+
/**
* Build the form object.
*
@@ -258,12 +278,12 @@ trait CRM_Contact_Form_Task_EmailTrait {
if ($this->_single) {
// also fix the user context stack
- if ($this->_caseId) {
+ if ($this->getCaseID()) {
$ccid = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseContact', $this->_caseId,
'contact_id', 'case_id'
);
$url = CRM_Utils_System::url('civicrm/contact/view/case',
- "&reset=1&action=view&cid={$ccid}&id={$this->_caseId}"
+ "&reset=1&action=view&cid={$ccid}&id=" . $this->getCaseID()
);
}
elseif ($this->_context) {
@@ -331,7 +351,7 @@ trait CRM_Contact_Form_Task_EmailTrait {
//Added for CRM-15984: Add campaign field
CRM_Campaign_BAO_Campaign::addCampaign($this);
- $this->addFormRule(['CRM_Contact_Form_Task_EmailCommon', 'formRule'], $this);
+ $this->addFormRule([__CLASS__, 'saveTemplateFormRule'], $this);
CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'templates/CRM/Contact/Form/Task/EmailCommon.js', 0, 'html-header');
}
@@ -413,7 +433,7 @@ trait CRM_Contact_Form_Task_EmailTrait {
}
// send the mail
- list($sent, $activityIds) = CRM_Activity_BAO_Activity::sendEmail(
+ [$sent, $activityIds] = CRM_Activity_BAO_Activity::sendEmail(
$formattedContactDetails,
$this->getSubject($formValues['subject']),
$formValues['text_message'],
@@ -426,9 +446,9 @@ trait CRM_Contact_Form_Task_EmailTrait {
$bcc,
array_keys($this->_toContactDetails),
$additionalDetails,
- $this->getVar('_contributionIds') ?? [],
+ $this->getContributionIDs(),
CRM_Utils_Array::value('campaign_id', $formValues),
- $this->getVar('_caseId')
+ $this->getCaseID()
);
if ($sent) {
@@ -592,11 +612,12 @@ trait CRM_Contact_Form_Task_EmailTrait {
* @param string $subject
*
* @return string
+ * @throws \CRM_Core_Exception
*/
protected function getSubject(string $subject):string {
// CRM-5916: prepend case id hash to CiviCase-originating emails’ subjects
- if (isset($this->_caseId) && is_numeric($this->_caseId)) {
- $hash = substr(sha1(CIVICRM_SITE_KEY . $this->_caseId), 0, 7);
+ if ($this->getCaseID()) {
+ $hash = substr(sha1(CIVICRM_SITE_KEY . $this->getCaseID()), 0, 7);
$subject = "[case #$hash] $subject";
}
return $subject;
@@ -644,4 +665,46 @@ trait CRM_Contact_Form_Task_EmailTrait {
return $followupStatus;
}
+ /**
+ * Form rule.
+ *
+ * @param array $fields
+ * The input form values.
+ *
+ * @return bool|array
+ * true if no errors, else array of errors
+ */
+ public static function saveTemplateFormRule(array $fields) {
+ $errors = [];
+ //Added for CRM-1393
+ if (!empty($fields['saveTemplate']) && empty($fields['saveTemplateName'])) {
+ $errors['saveTemplateName'] = ts('Enter name to save message template');
+ }
+ return empty($errors) ? TRUE : $errors;
+ }
+
+ /**
+ * Get selected contribution IDs.
+ *
+ * @return array
+ */
+ protected function getContributionIDs(): array {
+ return [];
+ }
+
+ /**
+ * Get case ID - if any.
+ *
+ * @return int|null
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function getCaseID(): ?int {
+ $caseID = CRM_Utils_Request::retrieve('caseid', 'String', $this);
+ if ($caseID) {
+ return (int) $caseID;
+ }
+ return NULL;
+ }
+
}
diff --git a/civicrm/CRM/Contact/Form/Task/PDF.php b/civicrm/CRM/Contact/Form/Task/PDF.php
index 59b14006da..03f040bff2 100644
--- a/civicrm/CRM/Contact/Form/Task/PDF.php
+++ b/civicrm/CRM/Contact/Form/Task/PDF.php
@@ -20,6 +20,8 @@
*/
class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* All the existing templates in the system.
*
@@ -39,7 +41,7 @@ class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
public function preProcess() {
$this->skipOnHold = $this->skipDeceased = FALSE;
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
+ $this->preProcessPDF();
// store case id if present
$this->_caseId = CRM_Utils_Request::retrieve('caseid', 'CommaSeparatedIntegers', $this, FALSE);
@@ -56,10 +58,11 @@ class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
// in search context 'id' is the default profile id for search display
// CRM-11227
$this->_activityId = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE);
- }
-
- if ($cid) {
- CRM_Contact_Form_Task_PDFLetterCommon::preProcessSingle($this, $cid);
+ $this->_contactIds = explode(',', $cid);
+ // put contact display name in title for single contact mode
+ if (count($this->_contactIds) === 1) {
+ CRM_Utils_System::setTitle(ts('Print/Merge Document for %1', [1 => CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $cid, 'display_name')]));
+ }
$this->_single = TRUE;
}
else {
@@ -72,23 +75,24 @@ class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
* Set default values for the form.
*/
public function setDefaultValues() {
- $defaults = [];
+ $defaults = $this->getPDFDefaultValues();
if (isset($this->_activityId)) {
$params = ['id' => $this->_activityId];
CRM_Activity_BAO_Activity::retrieve($params, $defaults);
$defaults['html_message'] = $defaults['details'] ?? NULL;
}
- $defaults = $defaults + CRM_Contact_Form_Task_PDFLetterCommon::setDefaultValues();
return $defaults;
}
/**
* Build the form object.
+ *
+ * @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
//enable form element
$this->assign('suppressForm', FALSE);
- CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
+ $this->addPDFElementsToForm();
}
/**
diff --git a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
index 51ac8c9ad6..ce093ac680 100644
--- a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -39,30 +39,32 @@ class CRM_Contact_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetter
/**
* Build all the data structures needed to build the form.
*
+ * @deprecated
+ *
* @param CRM_Core_Form $form
*/
public static function preProcess(&$form) {
- CRM_Contact_Form_Task_EmailCommon::preProcessFromAddress($form);
- $messageText = [];
- $messageSubject = [];
- $dao = new CRM_Core_BAO_MessageTemplate();
- $dao->is_active = 1;
- $dao->find();
- while ($dao->fetch()) {
- $messageText[$dao->id] = $dao->msg_text;
- $messageSubject[$dao->id] = $dao->msg_subject;
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
+ $defaults = [];
+ $form->_fromEmails = CRM_Core_BAO_Email::getFromEmail();
+ if (is_numeric(key($form->_fromEmails))) {
+ $emailID = (int) key($form->_fromEmails);
+ $defaults = CRM_Core_BAO_Email::getEmailSignatureDefaults($emailID);
}
-
- $form->assign('message', $messageText);
- $form->assign('messageSubject', $messageSubject);
- parent::preProcess($form);
+ if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
+ $defaults['from_email_address'] = current(CRM_Core_BAO_Domain::getNameAndEmail(FALSE, TRUE));
+ }
+ $form->setDefaults($defaults);
+ $form->setTitle('Print/Merge Document');
}
/**
+ * @deprecated
* @param CRM_Core_Form $form
* @param int $cid
*/
public static function preProcessSingle(&$form, $cid) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$form->_contactIds = explode(',', $cid);
// put contact display name in title for single contact mode
if (count($form->_contactIds) === 1) {
@@ -178,8 +180,10 @@ class CRM_Contact_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetter
$mimeType = self::getMimeType($type);
// ^^ Useful side-effect: consistently throws error for unrecognized types.
+ $fileName = self::getFileName($form);
+ $fileName = "$fileName.$type";
+
if ($type == 'pdf') {
- $fileName = "CiviLetter.$type";
CRM_Utils_PDF_Utils::html2pdf($html, $fileName, FALSE, $formValues);
}
elseif (!empty($formValues['document_file_path'])) {
@@ -187,7 +191,6 @@ class CRM_Contact_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetter
CRM_Utils_PDF_Document::printDocuments($html, $fileName, $type, $zip);
}
else {
- $fileName = "CiviLetter.$type";
CRM_Utils_PDF_Document::html2doc($html, $fileName, $formValues);
}
@@ -215,6 +218,29 @@ class CRM_Contact_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetter
CRM_Utils_System::civiExit();
}
+ /**
+ * Returns the filename for the pdf by striping off unwanted characters and limits the length to 200 characters.
+ *
+ * @param CRM_Core_Form $form
+ *
+ * @return string
+ * The name of the file.
+ */
+ private static function getFileName(CRM_Core_Form $form) {
+ if (!empty($form->getSubmittedValue('pdf_file_name'))) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($form->getSubmittedValue('pdf_file_name'), '_', 200);
+ }
+ elseif (!empty($form->getSubmittedValue('subject'))) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($form->getSubmittedValue('subject'), '_', 200);
+ }
+ else {
+ $fileName = 'CiviLetter';
+ }
+ $fileName = self::isLiveMode($form) ? $fileName : $fileName . '_preview';
+
+ return $fileName;
+ }
+
/**
* @param CRM_Core_Form $form
* @param string $html_message
diff --git a/civicrm/CRM/Contact/Form/Task/PDFTrait.php b/civicrm/CRM/Contact/Form/Task/PDFTrait.php
new file mode 100644
index 0000000000..9ac741c0a1
--- /dev/null
+++ b/civicrm/CRM/Contact/Form/Task/PDFTrait.php
@@ -0,0 +1,204 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * This class provides the common functionality for tasks that send emails.
+ */
+trait CRM_Contact_Form_Task_PDFTrait {
+
+ /**
+ * Set defaults for the pdf.
+ *
+ * @return array
+ */
+ public function setDefaultValues(): array {
+ return $this->getPDFDefaultValues();
+ }
+
+ /**
+ * Set default values.
+ */
+ protected function getPDFDefaultValues(): array {
+ $defaultFormat = CRM_Core_BAO_PdfFormat::getDefaultValues();
+ $defaultFormat['format_id'] = $defaultFormat['id'];
+ return $defaultFormat;
+ }
+
+ /**
+ * Build the form object.
+ *
+ * @throws \CRM_Core_Exception
+ */
+ public function buildQuickForm(): void {
+ $this->addPDFElementsToForm();
+ }
+
+ /**
+ * Build the form object.
+ *
+ * @throws \CRM_Core_Exception
+ */
+ public function addPDFElementsToForm(): void {
+ $form = $this;
+ // This form outputs a file so should never be submitted via ajax
+ $form->preventAjaxSubmit();
+
+ //Added for CRM-12682: Add activity subject and campaign fields
+ CRM_Campaign_BAO_Campaign::addCampaign($form);
+ $form->add(
+ 'text',
+ 'subject',
+ ts('Activity Subject'),
+ ['size' => 45, 'maxlength' => 255],
+ FALSE
+ );
+
+ // Added for core#2121,
+ // To support sending a custom pdf filename before downloading.
+ $form->addElement('hidden', 'pdf_file_name');
+
+ $form->addSelect('format_id', [
+ 'label' => ts('Select Format'),
+ 'placeholder' => ts('Default'),
+ 'entity' => 'message_template',
+ 'field' => 'pdf_format_id',
+ 'option_url' => 'civicrm/admin/pdfFormats',
+ ]);
+ $form->add(
+ 'select',
+ 'paper_size',
+ ts('Paper Size'),
+ [0 => ts('- default -')] + CRM_Core_BAO_PaperSize::getList(TRUE),
+ FALSE,
+ ['onChange' => "selectPaper( this.value ); showUpdateFormatChkBox();"]
+ );
+ $form->add(
+ 'select',
+ 'orientation',
+ ts('Orientation'),
+ CRM_Core_BAO_PdfFormat::getPageOrientations(),
+ FALSE,
+ ['onChange' => "updatePaperDimensions(); showUpdateFormatChkBox();"]
+ );
+ $form->add(
+ 'select',
+ 'metric',
+ ts('Unit of Measure'),
+ CRM_Core_BAO_PdfFormat::getUnits(),
+ FALSE,
+ ['onChange' => "selectMetric( this.value );"]
+ );
+ $form->add(
+ 'text',
+ 'margin_left',
+ ts('Left Margin'),
+ ['size' => 8, 'maxlength' => 8, 'onkeyup' => "showUpdateFormatChkBox();"],
+ TRUE
+ );
+ $form->add(
+ 'text',
+ 'margin_right',
+ ts('Right Margin'),
+ ['size' => 8, 'maxlength' => 8, 'onkeyup' => "showUpdateFormatChkBox();"],
+ TRUE
+ );
+ $form->add(
+ 'text',
+ 'margin_top',
+ ts('Top Margin'),
+ ['size' => 8, 'maxlength' => 8, 'onkeyup' => "showUpdateFormatChkBox();"],
+ TRUE
+ );
+ $form->add(
+ 'text',
+ 'margin_bottom',
+ ts('Bottom Margin'),
+ ['size' => 8, 'maxlength' => 8, 'onkeyup' => "showUpdateFormatChkBox();"],
+ TRUE
+ );
+
+ $config = CRM_Core_Config::singleton();
+ /** CRM-15883 Suppressing Stationery path field until we switch from DOMPDF to a library that supports it.
+ * if ($config->wkhtmltopdfPath == FALSE) {
+ * $form->add(
+ * 'text',
+ * 'stationery',
+ * ts('Stationery (relative path to PDF you wish to use as the background)'),
+ * array('size' => 25, 'maxlength' => 900, 'onkeyup' => "showUpdateFormatChkBox();"),
+ * FALSE
+ * );
+ * }
+ */
+ $form->add('checkbox', 'bind_format', ts('Always use this Page Format with the selected Template'));
+ $form->add('checkbox', 'update_format', ts('Update Page Format (this will affect all templates that use this format)'));
+
+ $form->assign('useThisPageFormat', ts('Always use this Page Format with the new template?'));
+ $form->assign('useSelectedPageFormat', ts('Should the new template always use the selected Page Format?'));
+ $form->assign('totalSelectedContacts', !is_null($form->_contactIds) ? count($form->_contactIds) : 0);
+
+ $form->add('select', 'document_type', ts('Document Type'), CRM_Core_SelectValues::documentFormat());
+
+ $documentTypes = implode(',', CRM_Core_SelectValues::documentApplicationType());
+ $form->addElement('file', "document_file", 'Upload Document', 'size=30 maxlength=255 accept="' . $documentTypes . '"');
+ $form->addUploadElement("document_file");
+
+ CRM_Mailing_BAO_Mailing::commonCompose($form);
+
+ $buttons = [];
+ if ($form->get('action') != CRM_Core_Action::VIEW) {
+ $buttons[] = [
+ 'type' => 'upload',
+ 'name' => ts('Download Document'),
+ 'isDefault' => TRUE,
+ 'icon' => 'fa-download',
+ ];
+ $buttons[] = [
+ 'type' => 'submit',
+ 'name' => ts('Preview'),
+ 'subName' => 'preview',
+ 'icon' => 'fa-search',
+ 'isDefault' => FALSE,
+ ];
+ }
+ $buttons[] = [
+ 'type' => 'cancel',
+ 'name' => $form->get('action') == CRM_Core_Action::VIEW ? ts('Done') : ts('Cancel'),
+ ];
+ $form->addButtons($buttons);
+
+ $form->addFormRule(['CRM_Core_Form_Task_PDFLetterCommon', 'formRule'], $form);
+ }
+
+ /**
+ * Prepare form.
+ */
+ public function preProcessPDF(): void {
+ $form = $this;
+ $defaults = [];
+ $form->_fromEmails = CRM_Core_BAO_Email::getFromEmail();
+ if (is_numeric(key($form->_fromEmails))) {
+ $emailID = (int) key($form->_fromEmails);
+ $defaults = CRM_Core_BAO_Email::getEmailSignatureDefaults($emailID);
+ }
+ if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
+ $defaults['from_email_address'] = current(CRM_Core_BAO_Domain::getNameAndEmail(FALSE, TRUE));
+ }
+ $form->setDefaults($defaults);
+ $form->setTitle('Print/Merge Document');
+ }
+
+}
diff --git a/civicrm/CRM/Contact/Import/Parser/Contact.php b/civicrm/CRM/Contact/Import/Parser/Contact.php
index 70da804370..bc5c305797 100644
--- a/civicrm/CRM/Contact/Import/Parser/Contact.php
+++ b/civicrm/CRM/Contact/Import/Parser/Contact.php
@@ -1068,7 +1068,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
}
// check for values for custom fields for checkboxes and multiselect
- if ($isSerialized) {
+ if ($isSerialized && $dataType != 'ContactReference') {
$value = trim($value);
$value = str_replace('|', ',', $value);
$mulValues = explode(',', $value);
diff --git a/civicrm/CRM/Contact/Page/AJAX.php b/civicrm/CRM/Contact/Page/AJAX.php
index d2de1806a4..86dd300d90 100644
--- a/civicrm/CRM/Contact/Page/AJAX.php
+++ b/civicrm/CRM/Contact/Page/AJAX.php
@@ -578,8 +578,8 @@ LIMIT {$offset}, {$rowCount}
'src_email' => 'ce2.email',
'dst_postcode' => 'ca1.postal_code',
'src_postcode' => 'ca2.postal_code',
- 'dst_street' => 'ca1.street',
- 'src_street' => 'ca2.street',
+ 'dst_street' => 'ca1.street_address',
+ 'src_street' => 'ca2.street_address',
];
foreach ($mappings as $key => $dbName) {
diff --git a/civicrm/CRM/Contact/Page/View/Note.php b/civicrm/CRM/Contact/Page/View/Note.php
index f7ffb06e7a..64e8101128 100644
--- a/civicrm/CRM/Contact/Page/View/Note.php
+++ b/civicrm/CRM/Contact/Page/View/Note.php
@@ -20,20 +20,6 @@
*/
class CRM_Contact_Page_View_Note extends CRM_Core_Page {
- /**
- * The action links for notes that we need to display for the browse screen
- *
- * @var array
- */
- public static $_links = NULL;
-
- /**
- * The action links for comments that we need to display for the browse screen
- *
- * @var array
- */
- public static $_commentLinks = NULL;
-
/**
* Notes found running the browse function
* @var array
@@ -158,7 +144,7 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
$session->pushUserContext($url);
if (CRM_Utils_Request::retrieve('confirmed', 'Boolean')) {
- CRM_Core_BAO_Note::del($this->_id);
+ $this->delete();
CRM_Utils_System::redirect($url);
}
@@ -233,82 +219,74 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
}
/**
- * Delete the note object from the db.
+ * Delete the note object from the db and set a status msg.
*/
public function delete() {
- CRM_Core_BAO_Note::del($this->_id);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $this->_id]);
+ $status = ts('Selected Note has been deleted successfully.');
+ CRM_Core_Session::setStatus($status, ts('Deleted'), 'success');
}
/**
* Get action links.
*
- * @return array
- * (reference) of action links
+ * @return array[]
*/
- public static function &links() {
- if (!(self::$_links)) {
- $deleteExtra = ts('Are you sure you want to delete this note?');
-
- self::$_links = [
- CRM_Core_Action::VIEW => [
- 'name' => ts('View'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=view&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
- 'title' => ts('View Note'),
- ],
- CRM_Core_Action::UPDATE => [
- 'name' => ts('Edit'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=update&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
- 'title' => ts('Edit Note'),
- ],
- CRM_Core_Action::ADD => [
- 'name' => ts('Comment'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=add&reset=1&cid=%%cid%%&parentId=%%id%%&selectedChild=note',
- 'title' => ts('Add Comment'),
- ],
- CRM_Core_Action::DELETE => [
- 'name' => ts('Delete'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
- 'title' => ts('Delete Note'),
- ],
- ];
- }
- return self::$_links;
+ public static function links() {
+ return [
+ CRM_Core_Action::VIEW => [
+ 'name' => ts('View'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=view&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+ 'title' => ts('View Note'),
+ ],
+ CRM_Core_Action::UPDATE => [
+ 'name' => ts('Edit'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=update&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+ 'title' => ts('Edit Note'),
+ ],
+ CRM_Core_Action::ADD => [
+ 'name' => ts('Comment'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=add&reset=1&cid=%%cid%%&parentId=%%id%%&selectedChild=note',
+ 'title' => ts('Add Comment'),
+ ],
+ CRM_Core_Action::DELETE => [
+ 'name' => ts('Delete'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+ 'title' => ts('Delete Note'),
+ ],
+ ];
}
/**
* Get action links for comments.
*
- * @return array
- * (reference) of action links
+ * @return array[]
*/
- public static function &commentLinks() {
- if (!(self::$_commentLinks)) {
- self::$_commentLinks = [
- CRM_Core_Action::VIEW => [
- 'name' => ts('View'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=view&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
- 'title' => ts('View Comment'),
- ],
- CRM_Core_Action::UPDATE => [
- 'name' => ts('Edit'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=update&reset=1&cid=%%cid%%&id={id}&parentId=%%pid%%&selectedChild=note',
- 'title' => ts('Edit Comment'),
- ],
- CRM_Core_Action::DELETE => [
- 'name' => ts('Delete'),
- 'url' => 'civicrm/contact/view/note',
- 'qs' => 'action=delete&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
- 'title' => ts('Delete Comment'),
- ],
- ];
- }
- return self::$_commentLinks;
+ public static function commentLinks() {
+ return [
+ CRM_Core_Action::VIEW => [
+ 'name' => ts('View'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=view&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
+ 'title' => ts('View Comment'),
+ ],
+ CRM_Core_Action::UPDATE => [
+ 'name' => ts('Edit'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=update&reset=1&cid=%%cid%%&id={id}&parentId=%%pid%%&selectedChild=note',
+ 'title' => ts('Edit Comment'),
+ ],
+ CRM_Core_Action::DELETE => [
+ 'name' => ts('Delete'),
+ 'url' => 'civicrm/contact/view/note',
+ 'qs' => 'action=delete&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
+ 'title' => ts('Delete Comment'),
+ ],
+ ];
}
}
diff --git a/civicrm/CRM/Contribute/BAO/Contribution.php b/civicrm/CRM/Contribute/BAO/Contribution.php
index d1a068c485..6fdfb2e8b0 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -537,8 +537,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
['activity_type_id:name', '=', 'Contribution'],
])->execute()->first();
- $campaignParams = isset($params['campaign_id']) ? ['campaign_id' => ($params['campaign_id'] ?? NULL)] : [];
- $activityParams = array_merge([
+ $activityParams = [
'activity_type_id:name' => 'Contribution',
'source_record_id' => $contribution->id,
'activity_date_time' => $contribution->receive_date,
@@ -546,8 +545,9 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
'status_id:name' => $isCompleted ? 'Completed' : 'Scheduled',
'skipRecentView' => TRUE,
'subject' => CRM_Activity_BAO_Activity::getActivitySubject($contribution),
+ 'campaign_id' => !is_numeric($contribution->campaign_id) ? NULL : $contribution->campaign_id,
'id' => $existingActivity['id'] ?? NULL,
- ], $campaignParams);
+ ];
if (!$activityParams['id']) {
$activityParams['source_contact_id'] = (int) ($params['source_contact_id'] ?? (CRM_Core_Session::getLoggedInContactID() ?: $contribution->contact_id));
$activityParams['target_contact_id'] = ($activityParams['source_contact_id'] === (int) $contribution->contact_id) ? [] : [$contribution->contact_id];
@@ -1517,7 +1517,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = c.contact_id )
$note = CRM_Core_BAO_Note::getNote($id, 'civicrm_contribution');
$noteId = key($note);
if ($noteId) {
- CRM_Core_BAO_Note::del($noteId, FALSE);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $noteId]);
}
$dao = new CRM_Contribute_DAO_Contribution();
@@ -1529,13 +1529,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = c.contact_id )
CRM_Utils_Hook::post('delete', 'Contribution', $dao->id, $dao);
- // delete the recently created Contribution
- $contributionRecent = [
- 'id' => $id,
- 'type' => 'Contribution',
- ];
- CRM_Utils_Recent::del($contributionRecent);
-
return $results;
}
@@ -2078,44 +2071,21 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_
*
*/
public static function transitionComponents($params) {
+ $contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $params['contribution_status_id']);
+ $previousStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $params['previous_contribution_status_id']);
// @todo fix the one place that calls this function to use Payment.create
// remove this.
// get minimum required values.
- $contactId = $params['contact_id'] ?? NULL;
- $componentId = $params['component_id'] ?? NULL;
- $componentName = $params['componentName'] ?? NULL;
- $contributionId = $params['contribution_id'] ?? NULL;
- $contributionStatusId = $params['contribution_status_id'] ?? NULL;
-
- // if we already processed contribution object pass previous status id.
- $previousContriStatusId = $params['previous_contribution_status_id'] ?? NULL;
-
- $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
+ $contributionId = $params['contribution_id'];
+ $contributionStatusId = $params['contribution_status_id'];
// we process only ( Completed, Cancelled, or Failed ) contributions.
- if (!$contributionId ||
- !in_array($contributionStatusId, [
- array_search('Completed', $contributionStatuses),
- ])
- ) {
+ if (!$contributionId || $contributionStatus !== 'Completed') {
return;
}
- if (!$componentName || !$componentId) {
- // get the related component details.
- $componentDetails = self::getComponentDetails($contributionId);
- }
- else {
- $componentDetails['contact_id'] = $contactId;
- $componentDetails['component'] = $componentName;
-
- if ($componentName === 'event') {
- $componentDetails['participant'] = $componentId;
- }
- else {
- $componentDetails['membership'] = $componentId;
- }
- }
+ // get the related component details.
+ $componentDetails = self::getComponentDetails($contributionId);
if (!empty($componentDetails['contact_id'])) {
$componentDetails['contact_id'] = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution',
@@ -2169,183 +2139,167 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_
'status_id'
);
}
- if ($contributionStatusId == array_search('Completed', $contributionStatuses)) {
-
- // only pending contribution related object processed.
- if ($previousContriStatusId &&
- !in_array($contributionStatuses[$previousContriStatusId], [
- 'Pending',
- 'Partially paid',
- ])
- ) {
- // this is case when we already processed contribution object.
- return;
- }
- elseif (!$previousContriStatusId &&
- !in_array($contributionStatuses[$contribution->contribution_status_id], [
- 'Pending',
- 'Partially paid',
- ])
- ) {
- // this is case when we are going to process contribution object later.
- return;
- }
- if (is_array($memberships)) {
- foreach ($memberships as $membership) {
- if ($membership) {
- $format = '%Y%m%d';
+ // only pending contribution related object processed.
+ if (!in_array($previousStatus, ['Pending', 'Partially paid'])) {
+ // this is case when we already processed contribution object.
+ return;
+ }
- //CRM-4523
- $currentMembership = CRM_Member_BAO_Membership::getContactMembership($membership->contact_id,
- $membership->membership_type_id,
- $membership->is_test, $membership->id
- );
+ if (is_array($memberships)) {
+ foreach ($memberships as $membership) {
+ if ($membership) {
+ $format = '%Y%m%d';
- // CRM-8141 update the membership type with the value recorded in log when membership created/renewed
- // this picks up membership type changes during renewals
- $sql = "
- SELECT membership_type_id
- FROM civicrm_membership_log
- WHERE membership_id=$membership->id
- ORDER BY id DESC
- LIMIT 1;";
- $dao = CRM_Core_DAO::executeQuery($sql);
- if ($dao->fetch()) {
- if (!empty($dao->membership_type_id)) {
- $membership->membership_type_id = $dao->membership_type_id;
- $membership->save();
- }
- }
- // else fall back to using current membership type
- // Figure out number of terms
- $numterms = 1;
- $lineitems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contributionId);
- foreach ($lineitems as $lineitem) {
- if ($membership->membership_type_id == ($lineitem['membership_type_id'] ?? NULL)) {
- $numterms = $lineitem['membership_num_terms'] ?? NULL;
-
- // in case membership_num_terms comes through as null or zero
- $numterms = $numterms >= 1 ? $numterms : 1;
- break;
- }
- }
+ //CRM-4523
+ $currentMembership = CRM_Member_BAO_Membership::getContactMembership($membership->contact_id,
+ $membership->membership_type_id,
+ $membership->is_test, $membership->id
+ );
- // CRM-15735-to update the membership status as per the contribution receive date
- $joinDate = NULL;
- $oldStatus = $membership->status_id;
- if (!empty($params['receive_date'])) {
- $joinDate = $params['receive_date'];
- $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($membership->start_date,
- $membership->end_date,
- $membership->join_date,
- $params['receive_date'],
- FALSE,
- $membership->membership_type_id,
- (array) $membership
- );
- $membership->status_id = CRM_Utils_Array::value('id', $status, $membership->status_id);
+ // CRM-8141 update the membership type with the value recorded in log when membership created/renewed
+ // this picks up membership type changes during renewals
+ $sql = "
+ SELECT membership_type_id
+ FROM civicrm_membership_log
+ WHERE membership_id=$membership->id
+ ORDER BY id DESC
+ LIMIT 1;";
+ $dao = CRM_Core_DAO::executeQuery($sql);
+ if ($dao->fetch()) {
+ if (!empty($dao->membership_type_id)) {
+ $membership->membership_type_id = $dao->membership_type_id;
$membership->save();
}
-
- if ($currentMembership) {
- CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership, NULL);
- $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id, NULL, NULL, $numterms);
- $dates['join_date'] = CRM_Utils_Date::customFormat($currentMembership['join_date'], $format);
- }
- else {
- $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membership->membership_type_id, $joinDate, NULL, NULL, $numterms);
+ }
+ // else fall back to using current membership type
+ // Figure out number of terms
+ $numterms = 1;
+ $lineitems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contributionId);
+ foreach ($lineitems as $lineitem) {
+ if ($membership->membership_type_id == ($lineitem['membership_type_id'] ?? NULL)) {
+ $numterms = $lineitem['membership_num_terms'] ?? NULL;
+
+ // in case membership_num_terms comes through as null or zero
+ $numterms = $numterms >= 1 ? $numterms : 1;
+ break;
}
+ }
- //get the status for membership.
- $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
- $dates['end_date'],
- $dates['join_date'],
- 'now',
- TRUE,
+ // CRM-15735-to update the membership status as per the contribution receive date
+ $joinDate = NULL;
+ $oldStatus = $membership->status_id;
+ if (!empty($params['receive_date'])) {
+ $joinDate = $params['receive_date'];
+ $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($membership->start_date,
+ $membership->end_date,
+ $membership->join_date,
+ $params['receive_date'],
+ FALSE,
$membership->membership_type_id,
(array) $membership
);
+ $membership->status_id = CRM_Utils_Array::value('id', $status, $membership->status_id);
+ $membership->save();
+ }
- $formattedParams = [
- 'status_id' => CRM_Utils_Array::value('id', $calcStatus,
- array_search('Current', $membershipStatuses)
- ),
- 'join_date' => CRM_Utils_Date::customFormat($dates['join_date'], $format),
- 'start_date' => CRM_Utils_Date::customFormat($dates['start_date'], $format),
- 'end_date' => CRM_Utils_Date::customFormat($dates['end_date'], $format),
- ];
+ if ($currentMembership) {
+ CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership, NULL);
+ $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id, NULL, NULL, $numterms);
+ $dates['join_date'] = CRM_Utils_Date::customFormat($currentMembership['join_date'], $format);
+ }
+ else {
+ $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membership->membership_type_id, $joinDate, NULL, NULL, $numterms);
+ }
- CRM_Utils_Hook::pre('edit', 'Membership', $membership->id, $formattedParams);
+ //get the status for membership.
+ $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
+ $dates['end_date'],
+ $dates['join_date'],
+ 'now',
+ TRUE,
+ $membership->membership_type_id,
+ (array) $membership
+ );
- $membership->copyValues($formattedParams);
- $membership->save();
+ $formattedParams = [
+ 'status_id' => CRM_Utils_Array::value('id', $calcStatus,
+ array_search('Current', $membershipStatuses)
+ ),
+ 'join_date' => CRM_Utils_Date::customFormat($dates['join_date'], $format),
+ 'start_date' => CRM_Utils_Date::customFormat($dates['start_date'], $format),
+ 'end_date' => CRM_Utils_Date::customFormat($dates['end_date'], $format),
+ ];
- //updating the membership log
- $membershipLog = $formattedParams;
- $logStartDate = CRM_Utils_Date::customFormat($dates['log_start_date'] ?? NULL, $format);
- $logStartDate = ($logStartDate) ? CRM_Utils_Date::isoToMysql($logStartDate) : $formattedParams['start_date'];
-
- $membershipLog['start_date'] = $logStartDate;
- $membershipLog['membership_id'] = $membership->id;
- $membershipLog['modified_id'] = $membership->contact_id;
- $membershipLog['modified_date'] = date('Ymd');
- $membershipLog['membership_type_id'] = $membership->membership_type_id;
-
- CRM_Member_BAO_MembershipLog::add($membershipLog);
-
- //update related Memberships.
- CRM_Member_BAO_Membership::updateRelatedMemberships($membership->id, $formattedParams);
-
- foreach (['Membership Signup', 'Membership Renewal'] as $activityType) {
- $scheduledActivityID = CRM_Utils_Array::value('id',
- civicrm_api3('Activity', 'Get',
- [
- 'source_record_id' => $membership->id,
- 'activity_type_id' => $activityType,
- 'status_id' => 'Scheduled',
- 'options' => [
- 'limit' => 1,
- 'sort' => 'id DESC',
- ],
- ]
- )
- );
- // 1. Update Schedule Membership Signup/Renewal activity to completed on successful payment of pending membership
- // 2. OR Create renewal activity scheduled if its membership renewal will be paid later
- if ($scheduledActivityID) {
- CRM_Activity_BAO_Activity::addActivity($membership, $activityType, $membership->contact_id, ['id' => $scheduledActivityID]);
- break;
- }
- }
+ CRM_Utils_Hook::pre('edit', 'Membership', $membership->id, $formattedParams);
- // track membership status change if any
- if (!empty($oldStatus) && $membership->status_id != $oldStatus) {
- $allStatus = CRM_Member_BAO_Membership::buildOptions('status_id', 'get');
- CRM_Activity_BAO_Activity::addActivity($membership,
- 'Change Membership Status',
- NULL,
+ $membership->copyValues($formattedParams);
+ $membership->save();
+
+ //updating the membership log
+ $membershipLog = $formattedParams;
+ $logStartDate = CRM_Utils_Date::customFormat($dates['log_start_date'] ?? NULL, $format);
+ $logStartDate = ($logStartDate) ? CRM_Utils_Date::isoToMysql($logStartDate) : $formattedParams['start_date'];
+
+ $membershipLog['start_date'] = $logStartDate;
+ $membershipLog['membership_id'] = $membership->id;
+ $membershipLog['modified_id'] = $membership->contact_id;
+ $membershipLog['modified_date'] = date('Ymd');
+ $membershipLog['membership_type_id'] = $membership->membership_type_id;
+
+ CRM_Member_BAO_MembershipLog::add($membershipLog);
+
+ //update related Memberships.
+ CRM_Member_BAO_Membership::updateRelatedMemberships($membership->id, $formattedParams);
+
+ foreach (['Membership Signup', 'Membership Renewal'] as $activityType) {
+ $scheduledActivityID = CRM_Utils_Array::value('id',
+ civicrm_api3('Activity', 'Get',
[
- 'subject' => "Status changed from {$allStatus[$oldStatus]} to {$allStatus[$membership->status_id]}",
- 'source_contact_id' => $membershipLog['modified_id'],
- 'priority_id' => 'Normal',
+ 'source_record_id' => $membership->id,
+ 'activity_type_id' => $activityType,
+ 'status_id' => 'Scheduled',
+ 'options' => [
+ 'limit' => 1,
+ 'sort' => 'id DESC',
+ ],
]
- );
+ )
+ );
+ // 1. Update Schedule Membership Signup/Renewal activity to completed on successful payment of pending membership
+ // 2. OR Create renewal activity scheduled if its membership renewal will be paid later
+ if ($scheduledActivityID) {
+ CRM_Activity_BAO_Activity::addActivity($membership, $activityType, $membership->contact_id, ['id' => $scheduledActivityID]);
+ break;
}
+ }
- CRM_Utils_Hook::post('edit', 'Membership', $membership->id, $membership);
+ // track membership status change if any
+ if (!empty($oldStatus) && $membership->status_id != $oldStatus) {
+ $allStatus = CRM_Member_BAO_Membership::buildOptions('status_id', 'get');
+ CRM_Activity_BAO_Activity::addActivity($membership,
+ 'Change Membership Status',
+ NULL,
+ [
+ 'subject' => "Status changed from {$allStatus[$oldStatus]} to {$allStatus[$membership->status_id]}",
+ 'source_contact_id' => $membershipLog['modified_id'],
+ 'priority_id' => 'Normal',
+ ]
+ );
}
+
+ CRM_Utils_Hook::post('edit', 'Membership', $membership->id, $membership);
}
}
+ }
- if ($participant) {
- $updatedStatusId = array_search('Registered', $participantStatuses);
- CRM_Event_BAO_Participant::updateParticipantStatus($participant->id, $oldStatus, $updatedStatusId, TRUE);
- }
+ if ($participant) {
+ $updatedStatusId = array_search('Registered', $participantStatuses);
+ CRM_Event_BAO_Participant::updateParticipantStatus($participant->id, $oldStatus, $updatedStatusId, TRUE);
+ }
- if ($pledgePayment) {
- CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID, $pledgePaymentIDs, $contributionStatusId);
- }
+ if ($pledgePayment) {
+ CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID, $pledgePaymentIDs, $contributionStatusId);
}
}
@@ -4689,19 +4643,23 @@ LIMIT 1;";
);
$dates['join_date'] = $currentMembership['join_date'];
}
+ if ('Pending' === CRM_Core_PseudoConstant::getName('CRM_Member_BAO_Membership', 'status_id', $membership['status_id'])) {
+ $membershipParams['skipStatusCal'] = '';
+ }
+ else {
+ //get the status for membership.
+ $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
+ $dates['end_date'],
+ $dates['join_date'],
+ 'now',
+ TRUE,
+ $membershipParams['membership_type_id'],
+ $membershipParams
+ );
- //get the status for membership.
- $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
- $dates['end_date'],
- $dates['join_date'],
- 'now',
- TRUE,
- $membershipParams['membership_type_id'],
- $membershipParams
- );
-
- unset($dates['end_date']);
- $membershipParams['status_id'] = CRM_Utils_Array::value('id', $calcStatus, 'New');
+ unset($dates['end_date']);
+ $membershipParams['status_id'] = CRM_Utils_Array::value('id', $calcStatus, 'New');
+ }
//we might be renewing membership,
//so make status override false.
$membershipParams['is_override'] = FALSE;
@@ -5180,14 +5138,11 @@ LIMIT 1;";
*
* @param int $contributionID
*
- * @return string
+ * @return string|null
*/
- public static function getInvoiceNumber($contributionID) {
- if ($invoicePrefix = self::checkContributeSettings('invoice_prefix')) {
- return $invoicePrefix . $contributionID;
- }
-
- return NULL;
+ public static function getInvoiceNumber(int $contributionID): ?string {
+ $invoicePrefix = Civi::settings()->get('invoice_prefix');
+ return $invoicePrefix ? $invoicePrefix . $contributionID : NULL;
}
/**
diff --git a/civicrm/CRM/Contribute/BAO/ContributionPage.php b/civicrm/CRM/Contribute/BAO/ContributionPage.php
index f5656cdefe..447f38395f 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionPage.php
@@ -440,7 +440,7 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio
$sendTemplateParams['cc'] = $values['cc_receipt'] ?? NULL;
$sendTemplateParams['bcc'] = $values['bcc_receipt'] ?? NULL;
//send email with pdf invoice
- if (Civi::settings()->get('invoicing') && Civi::settings()->get('invoice_is_email_pdf')) {
+ if (Civi::settings()->get('invoice_is_email_pdf')) {
$sendTemplateParams['isEmailPdf'] = TRUE;
$sendTemplateParams['contributionId'] = $values['contribution_id'];
}
diff --git a/civicrm/CRM/Contribute/BAO/ContributionRecur.php b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
index b468a8fa37..d7a67001f2 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
@@ -554,7 +554,11 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id )
unset($overrides['financial_type_id']);
}
$result = array_merge($templateContribution, $overrides);
- $result['line_item'][$order->getPriceSetID()] = $lineItems;
+ // Line items aren't always written to a contribution, for mystery reasons.
+ // Checking for their existence prevents $order->getPriceSetID returning NULL.
+ if ($lineItems) {
+ $result['line_item'][$order->getPriceSetID()] = $lineItems;
+ }
// If the template contribution was made on-behalf then add the
// relevant values to ensure the activity reflects that.
$relatedContact = CRM_Contribute_BAO_Contribution::getOnbehalfIds($result['id']);
diff --git a/civicrm/CRM/Contribute/DAO/Contribution.php b/civicrm/CRM/Contribute/DAO/Contribution.php
index 25a8b10d19..91ad894806 100644
--- a/civicrm/CRM/Contribute/DAO/Contribution.php
+++ b/civicrm/CRM/Contribute/DAO/Contribution.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/Contribution.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9e26b2d7dbaf18117d12aae5bb1b0378)
+ * (GenCodeChecksum:b14fa847767daf3723033f41dbca9612)
*/
/**
@@ -872,6 +872,12 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'creditnote_id' => [
diff --git a/civicrm/CRM/Contribute/DAO/ContributionPage.php b/civicrm/CRM/Contribute/DAO/ContributionPage.php
index 6e7510f754..83270c9b3d 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionPage.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bba87623f1ecb7c432b3e59cb159b5ea)
+ * (GenCodeChecksum:5f0160b47f79e1eeb1f920b4e221953d)
*/
/**
@@ -1059,6 +1059,12 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'is_share' => [
diff --git a/civicrm/CRM/Contribute/DAO/ContributionRecur.php b/civicrm/CRM/Contribute/DAO/ContributionRecur.php
index 967b890b5e..4913ac61c7 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionRecur.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b51d7abea248616355265be7ec255050)
+ * (GenCodeChecksum:6c94785d608dc72c00b663ee8ad4e180)
*/
/**
@@ -788,6 +788,12 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '4.1',
],
'is_email_receipt' => [
diff --git a/civicrm/CRM/Contribute/Form/AdditionalInfo.php b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
index 0cbd83f97c..442bc286c4 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalInfo.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
@@ -241,7 +241,9 @@ class CRM_Contribute_Form_AdditionalInfo {
*/
public static function processNote($params, $contactID, $contributionID, $contributionNoteID = NULL) {
if (CRM_Utils_System::isNull($params['note']) && $contributionNoteID) {
- CRM_Core_BAO_Note::del($contributionNoteID);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $contributionNoteID]);
+ $status = ts('Selected Note has been deleted successfully.');
+ CRM_Core_Session::setStatus($status, ts('Deleted'), 'success');
return;
}
//process note
@@ -442,7 +444,7 @@ class CRM_Contribute_Form_AdditionalInfo {
'toEmail' => $contributorEmail,
'isTest' => $form->_mode == 'test',
'PDFFilename' => ts('receipt') . '.pdf',
- 'isEmailPdf' => Civi::settings()->get('invoicing') && Civi::settings()->get('invoice_is_email_pdf'),
+ 'isEmailPdf' => Civi::settings()->get('invoice_is_email_pdf'),
]
);
diff --git a/civicrm/CRM/Contribute/Form/Contribution.php b/civicrm/CRM/Contribute/Form/Contribution.php
index 748fd6cfdd..644f35a9b6 100644
--- a/civicrm/CRM/Contribute/Form/Contribution.php
+++ b/civicrm/CRM/Contribute/Form/Contribution.php
@@ -1166,6 +1166,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
}
catch (CiviCRM_API3_Exception $e) {
if ($e->getErrorCode() != 'contribution_completed') {
+ \Civi::log()->error('CRM_Contribute_Form_Contribution::processCreditCard CiviCRM_API3_Exception: ' . $e->getMessage());
throw new CRM_Core_Exception('Failed to update contribution in database');
}
}
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
index 62942b2aeb..967ac63d02 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
@@ -2575,6 +2575,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
}
catch (CiviCRM_API3_Exception $e) {
if ($e->getErrorCode() != 'contribution_completed') {
+ \Civi::log()->error('CRM_Contribute_Form_Contribution_Confirm::completeTransaction CiviCRM_API3_Exception: ' . $e->getMessage());
throw new CRM_Core_Exception('Failed to update contribution in database');
}
}
diff --git a/civicrm/CRM/Contribute/Form/ContributionView.php b/civicrm/CRM/Contribute/Form/ContributionView.php
index 4c7d39931c..02b3ce815f 100644
--- a/civicrm/CRM/Contribute/Form/ContributionView.php
+++ b/civicrm/CRM/Contribute/Form/ContributionView.php
@@ -25,6 +25,9 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
*/
public function preProcess() {
$id = $this->get('id');
+ if (empty($id)) {
+ throw new CRM_Core_Exception('Contribution ID is required');
+ }
$params = ['id' => $id];
$context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this);
$this->assign('context', $context);
@@ -96,13 +99,11 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, NULL, $id);
$premiumId = NULL;
- if ($id) {
- $dao = new CRM_Contribute_DAO_ContributionProduct();
- $dao->contribution_id = $id;
- if ($dao->find(TRUE)) {
- $premiumId = $dao->id;
- $productID = $dao->product_id;
- }
+ $dao = new CRM_Contribute_DAO_ContributionProduct();
+ $dao->contribution_id = $id;
+ if ($dao->find(TRUE)) {
+ $premiumId = $dao->id;
+ $productID = $dao->product_id;
}
if ($premiumId) {
@@ -139,31 +140,8 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
$this->assign($name, $value);
}
- $lineItems = [];
- $displayLineItems = FALSE;
- if ($id) {
- $lineItems = [CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id))];
- $firstLineItem = reset($lineItems[0]);
- if (empty($firstLineItem['price_set_id'])) {
- // CRM-20297 All we care is that it's not QuickConfig, so no price set
- // is no problem.
- $displayLineItems = TRUE;
- }
- else {
- try {
- $priceSet = civicrm_api3('PriceSet', 'getsingle', [
- 'id' => $firstLineItem['price_set_id'],
- 'return' => 'is_quick_config, id',
- ]);
- $displayLineItems = !$priceSet['is_quick_config'];
- }
- catch (CiviCRM_API3_Exception $e) {
- throw new CRM_Core_Exception('Cannot find price set by ID');
- }
- }
- }
+ $lineItems = [CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id))];
$this->assign('lineItem', $lineItems);
- $this->assign('displayLineItems', $displayLineItems);
$values['totalAmount'] = $values['total_amount'];
$this->assign('displayLineItemFinancialType', TRUE);
@@ -177,7 +155,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
}
// assign values to the template
- $this->assign($values);
+ $this->assignVariables($values, array_keys($values));
$invoicing = CRM_Invoicing_Utils::isInvoicingEnabled();
$this->assign('invoicing', $invoicing);
$this->assign('isDeferred', Civi::settings()->get('deferred_revenue_enabled'));
diff --git a/civicrm/CRM/Contribute/Form/Task/Email.php b/civicrm/CRM/Contribute/Form/Task/Email.php
index 509c0e7dc0..db83653ea5 100644
--- a/civicrm/CRM/Contribute/Form/Task/Email.php
+++ b/civicrm/CRM/Contribute/Form/Task/Email.php
@@ -21,6 +21,17 @@
class CRM_Contribute_Form_Task_Email extends CRM_Contribute_Form_Task {
use CRM_Contact_Form_Task_EmailTrait;
+ /**
+ * Get selected contribution IDs.
+ *
+ * @return array
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function getContributionIDs(): array {
+ return $this->getIDs();
+ }
+
/**
* List available tokens for this form.
*
diff --git a/civicrm/CRM/Contribute/Form/Task/PDF.php b/civicrm/CRM/Contribute/Form/Task/PDF.php
index a114dfbab9..a34d5ded18 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDF.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDF.php
@@ -193,7 +193,7 @@ AND {$this->_componentClause}";
if ($elements['createPdf']) {
CRM_Utils_PDF_Utils::html2pdf($message,
- 'civicrmContributionReceipt.pdf',
+ 'receipt.pdf',
FALSE,
$elements['params']['pdf_format_id']
);
diff --git a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
index 2e25054fcb..330e1e2d59 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
@@ -20,6 +20,8 @@
*/
class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* All the existing templates in the system.
*
@@ -36,7 +38,7 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
*/
public function preProcess() {
$this->skipOnHold = $this->skipDeceased = FALSE;
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
+ $this->preProcessPDF();
parent::preProcess();
$this->assign('single', $this->isSingle());
}
@@ -55,7 +57,7 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
* @return array
*/
public function setDefaultValues() {
- $defaults = [];
+ $defaults = $this->getPDFDefaultValues();
if (isset($this->_activityId)) {
$params = ['id' => $this->_activityId];
CRM_Activity_BAO_Activity::retrieve($params, $defaults);
@@ -64,24 +66,21 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
else {
$defaults['thankyou_update'] = 1;
}
- $defaults = $defaults + CRM_Contact_Form_Task_PDFLetterCommon::setDefaultValues();
return $defaults;
}
/**
* Build the form object.
+ *
+ * @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
//enable form element
$this->assign('suppressForm', FALSE);
- // Build common form elements
- // use contact form as a base
- CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
-
// Contribute PDF tasks allow you to email as well, so we need to add email address to those forms
$this->add('select', 'from_email_address', ts('From Email Address'), $this->_fromEmails, TRUE);
- CRM_Core_Form_Task_PDFLetterCommon::buildQuickForm($this);
+ $this->addPDFElementsToForm();
// specific need for contributions
$this->add('static', 'more_options_header', NULL, ts('Thank-you Letter Options'));
@@ -241,13 +240,19 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
//CRM-19761
if (!empty($html)) {
- $type = $this->getSubmittedValue('document_type');
+ // Set the filename for the PDF using the Activity Subject, if defined. Remove unwanted characters and limit the length to 200 characters.
+ if (!empty($formValues['subject'])) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($formValues['subject'], '_', 200);
+ }
+ else {
+ $fileName = 'CiviLetter';
+ }
- if ($type === 'pdf') {
- CRM_Utils_PDF_Utils::html2pdf($html, "CiviLetter.pdf", FALSE, $formValues);
+ if ($this->getSubmittedValue('document_type') === 'pdf') {
+ CRM_Utils_PDF_Utils::html2pdf($html, $fileName . '.pdf', FALSE, $formValues);
}
else {
- CRM_Utils_PDF_Document::html2doc($html, "CiviLetter.$type", $formValues);
+ CRM_Utils_PDF_Document::html2doc($html, $fileName . '.' . $this->getSubmittedValue('document_type'), $formValues);
}
}
@@ -545,8 +550,12 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
// no change to normal behaviour to avoid risk of breakage
$tokenHtml = CRM_Utils_Token::replaceContributionTokens($html_message, $contribution, TRUE, $messageToken);
}
- $useSmarty = (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY);
- return CRM_Core_BAO_MessageTemplate::renderMessageTemplate(['text' => '', 'html' => $tokenHtml, 'subject' => ''], !$useSmarty, $contact['contact_id'], ['contact' => $contact])['html'];
+ $tokenContext = [
+ 'smarty' => (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY),
+ 'contactId' => $contact['contact_id'],
+ ];
+ $smarty = ['contact' => $contact];
+ return CRM_Core_TokenSmarty::render(['html' => $tokenHtml], $tokenContext, $smarty)['html'];
}
}
diff --git a/civicrm/CRM/Contribute/Form/UpdateSubscription.php b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
index 31e16f76cf..0fa0639900 100644
--- a/civicrm/CRM/Contribute/Form/UpdateSubscription.php
+++ b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
@@ -14,6 +14,7 @@
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
+use Civi\Payment\Exception\PaymentProcessorException;
/**
* This class generates form components generic to recurring contributions.
@@ -111,7 +112,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
$this->assign('editableScheduleFields', array_diff($this->editableScheduleFields, $alreadyHardCodedFields));
if ($this->_subscriptionDetails->contact_id) {
- list($this->_donorDisplayName, $this->_donorEmail) = CRM_Contact_BAO_Contact::getContactDetails($this->_subscriptionDetails->contact_id);
+ [$this->_donorDisplayName, $this->_donorEmail] = CRM_Contact_BAO_Contact::getContactDetails($this->_subscriptionDetails->contact_id);
}
CRM_Utils_System::setTitle(ts('Update Recurring Contribution'));
@@ -210,18 +211,16 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
if ($this->_paymentProcessorObj->supports('changeSubscriptionAmount')) {
try {
$updateSubscription = $this->_paymentProcessorObj->changeSubscriptionAmount($message, $params);
+ if ($updateSubscription instanceof CRM_Core_Error) {
+ CRM_Core_Error::deprecatedWarning('An exception should be thrown');
+ throw new PaymentProcessorException(ts('Could not update the Recurring contribution details'));
+ }
}
- catch (\Civi\Payment\Exception\PaymentProcessorException $e) {
+ catch (PaymentProcessorException $e) {
CRM_Core_Error::statusBounce($e->getMessage());
}
}
- if (is_a($updateSubscription, 'CRM_Core_Error')) {
- CRM_Core_Error::displaySessionError($updateSubscription);
- $status = ts('Could not update the Recurring contribution details');
- $msgTitle = ts('Update Error');
- $msgType = 'error';
- }
- elseif ($updateSubscription) {
+ if ($updateSubscription) {
// Handle custom data
$params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, $this->contributionRecurID, 'ContributionRecur');
// save the changes
@@ -296,7 +295,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
$receiptFrom = "$domainValues[0] <$domainValues[1]>";
}
- list($donorDisplayName, $donorEmail) = CRM_Contact_BAO_Contact::getContactDetails($contactID);
+ [$donorDisplayName, $donorEmail] = CRM_Contact_BAO_Contact::getContactDetails($contactID);
$tplParams = [
'recur_frequency_interval' => $this->_subscriptionDetails->frequency_interval,
@@ -319,7 +318,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
'toName' => $donorDisplayName,
'toEmail' => $donorEmail,
];
- list($sent) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
+ [$sent] = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
}
}
@@ -333,7 +332,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
CRM_Utils_System::setUFMessage($status);
}
// keep result as 1, since we not displaying anything on the redirected page anyway
- return CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contribute/subscriptionstatus',
+ CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contribute/subscriptionstatus',
"reset=1&task=update&result=1"));
}
}
diff --git a/civicrm/CRM/Contribute/Page/Tab.php b/civicrm/CRM/Contribute/Page/Tab.php
index 695ebfc6e7..ebbf05e714 100644
--- a/civicrm/CRM/Contribute/Page/Tab.php
+++ b/civicrm/CRM/Contribute/Page/Tab.php
@@ -59,16 +59,6 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
];
$templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($recurID);
- if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) {
- // Use constant CRM_Core_Action::PREVIEW as there is no such thing as view template.
- // And reusing view will mangle the actions.
- $links[CRM_Core_Action::PREVIEW] = [
- 'name' => ts('View Template'),
- 'title' => ts('View Template Contribution'),
- 'url' => 'civicrm/contact/view/contribution',
- 'qs' => "reset=1&id={$templateContribution['id']}&cid=%%cid%%&action=view&context={$context}&force_create_template=1",
- ];
- }
if (
(CRM_Core_Permission::check('edit contributions') || $context !== 'contribution') &&
($paymentProcessorObj->supports('ChangeSubscriptionAmount')
@@ -102,6 +92,16 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
'qs' => "reset=1&crid=%%crid%%&cid=%%cid%%&context={$context}",
];
}
+ if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) {
+ // Use constant CRM_Core_Action::PREVIEW as there is no such thing as view template.
+ // And reusing view will mangle the actions.
+ $links[CRM_Core_Action::PREVIEW] = [
+ 'name' => ts('View Template'),
+ 'title' => ts('View Template Contribution'),
+ 'url' => 'civicrm/contact/view/contribution',
+ 'qs' => "reset=1&id={$templateContribution['id']}&cid=%%cid%%&action=view&context={$context}&force_create_template=1",
+ ];
+ }
return $links;
}
diff --git a/civicrm/CRM/Contribute/Tokens.php b/civicrm/CRM/Contribute/Tokens.php
index 0cdfc560fc..6569c6a72e 100644
--- a/civicrm/CRM/Contribute/Tokens.php
+++ b/civicrm/CRM/Contribute/Tokens.php
@@ -10,10 +10,6 @@
+--------------------------------------------------------------------+
*/
-use Civi\ActionSchedule\Event\MailingQueryEvent;
-use Civi\Token\TokenProcessor;
-use Civi\Token\TokenRow;
-
/**
* Class CRM_Contribute_Tokens
*
@@ -24,13 +20,6 @@ use Civi\Token\TokenRow;
*/
class CRM_Contribute_Tokens extends CRM_Core_EntityTokens {
- /**
- * @return string
- */
- protected function getEntityName(): string {
- return 'contribution';
- }
-
/**
* @return string
*/
@@ -51,129 +40,10 @@ class CRM_Contribute_Tokens extends CRM_Core_EntityTokens {
}
/**
- * Metadata about the entity fields.
- *
- * @var array
- */
- protected $fieldMetadata = [];
-
- /**
- * Get a list of tokens for the entity for which access is permitted to.
- *
- * This list is historical and we need to question whether we
- * should filter out any fields (other than those fields, like api_key
- * on the contact entity) with permissions defined.
- *
* @return array
*/
- protected function getExposedFields(): array {
- return [
- 'contribution_page_id',
- 'source',
- 'id',
- 'receive_date',
- 'total_amount',
- 'fee_amount',
- 'net_amount',
- 'non_deductible_amount',
- 'trxn_id',
- 'invoice_id',
- 'currency',
- 'cancel_date',
- 'receipt_date',
- 'thankyou_date',
- 'tax_amount',
- 'contribution_status_id',
- 'financial_type_id',
- 'payment_instrument_id',
- ];
- }
-
- /**
- * Get tokens supporting the syntax we are migrating to.
- *
- * In general these are tokens that were not previously supported
- * so we can add them in the preferred way or that we have
- * undertaken some, as yet to be written, db update.
- *
- * See https://lab.civicrm.org/dev/core/-/issues/2650
- *
- * @return string[]
- */
- public function getBasicTokens(): array {
- $return = [];
- foreach ($this->getExposedFields() as $fieldName) {
- $return[$fieldName] = $this->getFieldMetadata()[$fieldName]['title'];
- }
- return $return;
- }
-
- /**
- * Class constructor.
- */
- public function __construct() {
- $tokens = $this->getAllTokens();
- parent::__construct('contribution', $tokens);
- }
-
- /**
- * Check if the token processor is active.
- *
- * @param \Civi\Token\TokenProcessor $processor
- *
- * @return bool
- */
- public function checkActive(TokenProcessor $processor) {
- return !empty($processor->context['actionMapping'])
- && $processor->context['actionMapping']->getEntity() === 'civicrm_contribution';
- }
-
- /**
- * Alter action schedule query.
- *
- * @param \Civi\ActionSchedule\Event\MailingQueryEvent $e
- */
- public function alterActionScheduleQuery(MailingQueryEvent $e): void {
- if ($e->mapping->getEntity() !== 'civicrm_contribution') {
- return;
- }
-
- $fields = $this->getFieldMetadata();
- foreach (array_keys($this->getBasicTokens()) as $token) {
- $e->query->select('e.' . $fields[$token]['name'] . ' AS ' . $this->getEntityAlias() . $token);
- }
- foreach (array_keys($this->getPseudoTokens()) as $token) {
- $split = explode(':', $token);
- $e->query->select('e.' . $fields[$split[0]]['name'] . ' AS ' . $this->getEntityAlias() . $split[0]);
- }
- }
-
- /**
- * @inheritDoc
- * @throws \CRM_Core_Exception
- */
- public function evaluateToken(TokenRow $row, $entity, $field, $prefetch = NULL) {
- $actionSearchResult = $row->context['actionSearchResult'];
- $aliasedField = $this->getEntityAlias() . $field;
- $fieldValue = $actionSearchResult->{$aliasedField} ?? NULL;
-
- if ($this->isPseudoField($field)) {
- $split = explode(':', $field);
- return $row->tokens($entity, $field, $this->getPseudoValue($split[0], $split[1], $actionSearchResult->{"contrib_$split[0]"} ?? NULL));
- }
- if ($this->isMoneyField($field)) {
- return $row->format('text/plain')->tokens($entity, $field,
- \CRM_Utils_Money::format($fieldValue, $actionSearchResult->contrib_currency));
- }
- if ($this->isDateField($field)) {
- return $row->format('text/plain')->tokens($entity, $field, \CRM_Utils_Date::customFormat($fieldValue));
- }
- if ($this->isCustomField($field)) {
- $row->customToken($entity, \CRM_Core_BAO_CustomField::getKeyID($field), $actionSearchResult->entity_id);
- }
- else {
- $row->format('text/plain')->tokens($entity, $field, (string) $fieldValue);
- }
+ public function getCurrencyFieldName() {
+ return ['currency'];
}
}
diff --git a/civicrm/CRM/Core/BAO/ActionSchedule.php b/civicrm/CRM/Core/BAO/ActionSchedule.php
index e804f3bc76..209097cb6b 100644
--- a/civicrm/CRM/Core/BAO/ActionSchedule.php
+++ b/civicrm/CRM/Core/BAO/ActionSchedule.php
@@ -213,20 +213,11 @@ FROM civicrm_action_schedule cas
* Delete a Reminder.
*
* @param int $id
- * ID of the Reminder to be deleted.
- *
+ * @deprecated
* @throws CRM_Core_Exception
*/
public static function del($id) {
- if ($id) {
- $dao = new CRM_Core_DAO_ActionSchedule();
- $dao->id = $id;
- if ($dao->find(TRUE)) {
- $dao->delete();
- return;
- }
- }
- throw new CRM_Core_Exception(ts('Invalid value passed to delete function.'));
+ self::deleteRecord(['id' => $id]);
}
/**
@@ -267,38 +258,51 @@ FROM civicrm_action_schedule cas
);
$multilingual = CRM_Core_I18n::isMultilingual();
+ $tokenProcessor = self::createTokenProcessor($actionSchedule, $mapping);
while ($dao->fetch()) {
+ $row = $tokenProcessor->addRow()
+ ->context('contactId', $dao->contactID)
+ ->context('actionSearchResult', (object) $dao->toArray());
+
// switch language if necessary
if ($multilingual) {
$preferred_language = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $dao->contactID, 'preferred_language');
- CRM_Core_BAO_ActionSchedule::setCommunicationLanguage($actionSchedule->communication_language, $preferred_language);
+ $row->context('locale', CRM_Core_BAO_ActionSchedule::pickLocale($actionSchedule->communication_language, $preferred_language));
}
- $errors = [];
- try {
- $tokenProcessor = self::createTokenProcessor($actionSchedule, $mapping);
- $tokenProcessor->addRow()
- ->context('contactId', $dao->contactID)
- ->context('actionSearchResult', (object) $dao->toArray());
- foreach ($tokenProcessor->evaluate()->getRows() as $tokenRow) {
- if ($actionSchedule->mode === 'SMS' || $actionSchedule->mode === 'User_Preference') {
- CRM_Utils_Array::extend($errors, self::sendReminderSms($tokenRow, $actionSchedule, $dao->contactID));
- }
-
- if ($actionSchedule->mode === 'Email' || $actionSchedule->mode === 'User_Preference') {
- CRM_Utils_Array::extend($errors, self::sendReminderEmail($tokenRow, $actionSchedule, $dao->contactID));
- }
- // insert activity log record if needed
- if ($actionSchedule->record_activity && empty($errors)) {
- $caseID = empty($dao->case_id) ? NULL : $dao->case_id;
- CRM_Core_BAO_ActionSchedule::createMailingActivity($tokenRow, $mapping, $dao->contactID, $dao->entityID, $caseID);
+ foreach ($dao->toArray() as $key => $value) {
+ if (preg_match('/^tokenContext_(.*)/', $key, $m)) {
+ if (!in_array($m[1], $tokenProcessor->context['schema'])) {
+ $tokenProcessor->context['schema'][] = $m[1];
}
+ $row->context($m[1], $value);
}
}
- catch (\Civi\Token\TokenException $e) {
- $errors['token_exception'] = $e->getMessage();
+ }
+
+ $tokenProcessor->evaluate();
+ foreach ($tokenProcessor->getRows() as $tokenRow) {
+ $dao = $tokenRow->context['actionSearchResult'];
+ $errors = [];
+
+ // It's possible, eg, that sendReminderEmail fires Hook::alterMailParams() and that some listener use ts().
+ $swapLocale = empty($row->context['locale']) ? NULL : \CRM_Utils_AutoClean::swapLocale($row->context['locale']);
+
+ if ($actionSchedule->mode === 'SMS' || $actionSchedule->mode === 'User_Preference') {
+ CRM_Utils_Array::extend($errors, self::sendReminderSms($tokenRow, $actionSchedule, $dao->contactID));
+ }
+
+ if ($actionSchedule->mode === 'Email' || $actionSchedule->mode === 'User_Preference') {
+ CRM_Utils_Array::extend($errors, self::sendReminderEmail($tokenRow, $actionSchedule, $dao->contactID));
+ }
+ // insert activity log record if needed
+ if ($actionSchedule->record_activity && empty($errors)) {
+ $caseID = empty($dao->case_id) ? NULL : $dao->case_id;
+ CRM_Core_BAO_ActionSchedule::createMailingActivity($tokenRow, $mapping, $dao->contactID, $dao->entityID, $caseID);
}
+ unset($swapLocale);
+
// update action log record
$logParams = [
'id' => $dao->reminderID,
@@ -401,10 +405,11 @@ FROM civicrm_action_schedule cas
}
/**
- * @param $communication_language
- * @param $preferred_language
+ * @param string|null $communication_language
+ * @param string|null $preferred_language
+ * @return string
*/
- public static function setCommunicationLanguage($communication_language, $preferred_language) {
+ public static function pickLocale($communication_language, $preferred_language) {
$currentLocale = CRM_Core_I18n::getLocale();
$language = $currentLocale;
@@ -425,8 +430,7 @@ FROM civicrm_action_schedule cas
}
// change the language
- $i18n = CRM_Core_I18n::singleton();
- $i18n->setLocale($language);
+ return $language;
}
/**
diff --git a/civicrm/CRM/Core/BAO/Address.php b/civicrm/CRM/Core/BAO/Address.php
index 14516f1f7b..480501d815 100644
--- a/civicrm/CRM/Core/BAO/Address.php
+++ b/civicrm/CRM/Core/BAO/Address.php
@@ -104,7 +104,7 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address {
// call the function to sync shared address and create relationships
// if address is already shared, share master_id with all children and update relationships accordingly
// (prevent chaining 2) CRM-21214
- self::processSharedAddress($address->id, $params);
+ self::processSharedAddress($address->id, $params, $hook);
// lets call the post hook only after we've done all the follow on processing
CRM_Utils_Hook::post($hook, 'Address', $address->id, $address);
@@ -956,8 +956,9 @@ SELECT is_primary,
* Address id.
* @param array $params
* Associated array of address params.
+ * @param string $parentOperation Operation being taken on the parent entity.
*/
- public static function processSharedAddress($addressId, $params) {
+ public static function processSharedAddress($addressId, $params, $parentOperation = NULL) {
$query = 'SELECT id, contact_id FROM civicrm_address WHERE master_id = %1';
$dao = CRM_Core_DAO::executeQuery($query, [1 => [$addressId, 'Integer']]);
@@ -996,7 +997,7 @@ SELECT is_primary,
$addressDAO->copyValues($params);
$addressDAO->id = $dao->id;
$addressDAO->save();
- $addressDAO->copyCustomFields($addressId, $addressDAO->id);
+ $addressDAO->copyCustomFields($addressId, $addressDAO->id, $parentOperation);
}
}
diff --git a/civicrm/CRM/Core/BAO/ConfigSetting.php b/civicrm/CRM/Core/BAO/ConfigSetting.php
index 7fd74c1aeb..972ad1260d 100644
--- a/civicrm/CRM/Core/BAO/ConfigSetting.php
+++ b/civicrm/CRM/Core/BAO/ConfigSetting.php
@@ -360,11 +360,8 @@ class CRM_Core_BAO_ConfigSetting {
* @param array $enabledComponents
*/
public static function setEnabledComponents($enabledComponents) {
- // fix the config object. update db.
+ // The on_change trigger on this setting will trigger a cache flush
Civi::settings()->set('enable_components', $enabledComponents);
-
- // also force reset of component array
- CRM_Core_Component::getEnabledComponents(TRUE);
}
/**
diff --git a/civicrm/CRM/Core/BAO/CustomValueTable.php b/civicrm/CRM/Core/BAO/CustomValueTable.php
index 714c9c7b43..fa5373b087 100644
--- a/civicrm/CRM/Core/BAO/CustomValueTable.php
+++ b/civicrm/CRM/Core/BAO/CustomValueTable.php
@@ -155,7 +155,8 @@ class CRM_Core_BAO_CustomValueTable {
case 'File':
if (!$field['file_id']) {
- throw new CRM_Core_Exception('Missing parameter file_id');
+ $value = 'null';
+ break;
}
// need to add/update civicrm_entity_file
@@ -395,15 +396,16 @@ class CRM_Core_BAO_CustomValueTable {
* @param $entityTable
* @param int $entityID
* @param $customFieldExtends
+ * @param $parentOperation
*/
- public static function postProcess(&$params, $entityTable, $entityID, $customFieldExtends) {
+ public static function postProcess(&$params, $entityTable, $entityID, $customFieldExtends, $parentOperation = NULL) {
$customData = CRM_Core_BAO_CustomField::postProcess($params,
$entityID,
$customFieldExtends
);
if (!empty($customData)) {
- self::store($customData, $entityTable, $entityID);
+ self::store($customData, $entityTable, $entityID, $parentOperation);
}
}
diff --git a/civicrm/CRM/Core/BAO/Email.php b/civicrm/CRM/Core/BAO/Email.php
index 1e947294a5..5341997ecb 100644
--- a/civicrm/CRM/Core/BAO/Email.php
+++ b/civicrm/CRM/Core/BAO/Email.php
@@ -15,6 +15,8 @@
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
+use Civi\Api4\Email;
+
/**
* This class contains functions for email handling.
*/
@@ -383,4 +385,25 @@ AND reset_date IS NULL
}
}
+ /**
+ * Get default text for a message with the signature from the email sender populated.
+ *
+ * @param int $emailID
+ *
+ * @return array
+ *
+ * @throws \API_Exception
+ * @throws \Civi\API\Exception\UnauthorizedException
+ */
+ public static function getEmailSignatureDefaults(int $emailID): array {
+ // Add signature
+ $defaultEmail = Email::get(FALSE)
+ ->addSelect('signature_html', 'signature_text')
+ ->addWhere('id', '=', $emailID)->execute()->first();
+ return [
+ 'html_message' => empty($defaultEmail['signature_html']) ? '' : '<br/><br/>--' . $defaultEmail['signature_html'],
+ 'text_message' => empty($defaultEmail['signature_text']) ? '' : "\n\n--\n" . $defaultEmail['signature_text'],
+ ];
+ }
+
}
diff --git a/civicrm/CRM/Core/BAO/EntityTag.php b/civicrm/CRM/Core/BAO/EntityTag.php
index 9000ade79c..580729a87c 100644
--- a/civicrm/CRM/Core/BAO/EntityTag.php
+++ b/civicrm/CRM/Core/BAO/EntityTag.php
@@ -96,7 +96,8 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
* Delete the tag for a contact.
*
* @param array $params
- * (reference ) an assoc array of name/value pairs.
+ *
+ * WARNING: Nonstandard params searches by tag_id rather than id!
*/
public static function del(&$params) {
//invoke pre hook
@@ -290,26 +291,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
}
}
- /**
- * This function returns all entities assigned to a specific tag.
- *
- * @param object $tag
- * An object of a tag.
- *
- * @return array
- * array of entity ids
- */
- public function getEntitiesByTag($tag) {
- $entityIds = [];
- $entityTagDAO = new CRM_Core_DAO_EntityTag();
- $entityTagDAO->tag_id = $tag->id;
- $entityTagDAO->find();
- while ($entityTagDAO->fetch()) {
- $entityIds[] = $entityTagDAO->entity_id;
- }
- return $entityIds;
- }
-
/**
* Get contact tags.
*
diff --git a/civicrm/CRM/Core/BAO/Job.php b/civicrm/CRM/Core/BAO/Job.php
index e78458fd2c..dbb736ec96 100644
--- a/civicrm/CRM/Core/BAO/Job.php
+++ b/civicrm/CRM/Core/BAO/Job.php
@@ -85,25 +85,14 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job {
* Function to delete scheduled job.
*
* @param $jobID
- * ID of the job to be deleted.
*
* @return bool|null
+ * @deprecated
* @throws CRM_Core_Exception
*/
public static function del($jobID) {
- if (!$jobID) {
- throw new CRM_Core_Exception(ts('Invalid value passed to delete function.'));
- }
-
- $dao = new CRM_Core_DAO_Job();
- $dao->id = $jobID;
- if (!$dao->find(TRUE)) {
- return NULL;
- }
-
- if ($dao->delete()) {
- return TRUE;
- }
+ self::deleteRecord(['id' => $jobID]);
+ return TRUE;
}
/**
diff --git a/civicrm/CRM/Core/BAO/MessageTemplate.php b/civicrm/CRM/Core/BAO/MessageTemplate.php
index 2bd753b70d..6d9aced734 100644
--- a/civicrm/CRM/Core/BAO/MessageTemplate.php
+++ b/civicrm/CRM/Core/BAO/MessageTemplate.php
@@ -16,6 +16,7 @@
*/
use Civi\Api4\MessageTemplate;
+use Civi\WorkflowMessage\WorkflowMessage;
require_once 'Mail/mime.php';
@@ -364,6 +365,37 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
$diverted->save();
}
+ /**
+ * Render a message template.
+ *
+ * This method is very similar to `sendTemplate()` - accepting most of the same arguments
+ * and emitting similar hooks. However, it specifically precludes the possibility of
+ * sending a message. It only renders.
+ *
+ * @param $params
+ * Mixed render parameters. See sendTemplate() for more details.
+ * @return array
+ * Rendered message, consistent of 'subject', 'text', 'html'
+ * Ex: ['subject' => 'Hello Bob', 'text' => 'It\'s been so long since we sent you an automated notification!']
+ * @throws \API_Exception
+ * @throws \CRM_Core_Exception
+ * @see sendTemplate()
+ */
+ public static function renderTemplate($params) {
+ $forbidden = ['from', 'toName', 'toEmail', 'cc', 'bcc', 'replyTo'];
+ $intersect = array_intersect($forbidden, array_keys($params));
+ if (!empty($intersect)) {
+ throw new \CRM_Core_Exception(sprintf("renderTemplate() received forbidden fields (%s)",
+ implode(',', $intersect)));
+ }
+
+ $mailContent = [];
+ // sendTemplate has had an obscure feature - if you omit `toEmail`, then it merely renders.
+ // At some point, we may want to invert the relation between renderTemplate/sendTemplate, but for now this is a smaller patch.
+ [$sent, $mailContent['subject'], $mailContent['text'], $mailContent['html']] = static::sendTemplate($params);
+ return $mailContent;
+ }
+
/**
* Send an email from the specified template based on an array of params.
*
@@ -376,15 +408,34 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
* @throws \API_Exception
*/
public static function sendTemplate($params) {
- $defaults = [
- // option value name of the template
+ $modelDefaults = [
+ // instance of WorkflowMessageInterface, containing a list of data to provide to the message-template
+ 'model' => NULL,
+ // Symbolic name of the workflow step. Matches the option-value-name of the template.
'valueName' => NULL,
- // ID of the template
- 'messageTemplateID' => NULL,
- // contact id if contact tokens are to be replaced
- 'contactId' => NULL,
// additional template params (other than the ones already set in the template singleton)
'tplParams' => [],
+ // additional token params (passed to the TokenProcessor)
+ // INTERNAL: 'tokenContext' is currently only intended for use within civicrm-core only. For downstream usage, future updates will provide comparable public APIs.
+ 'tokenContext' => [],
+ // properties to import directly to the model object
+ 'modelProps' => NULL,
+ // contact id if contact tokens are to be replaced; alias for tokenContext.contactId
+ 'contactId' => NULL,
+ ];
+ $viewDefaults = [
+ // ID of the specific template to load
+ 'messageTemplateID' => NULL,
+ // content of the message template
+ // Ex: ['msg_subject' => 'Hello {contact.display_name}', 'msg_html' => '...', 'msg_text' => '...']
+ // INTERNAL: 'messageTemplate' is currently only intended for use within civicrm-core only. For downstream usage, future updates will provide comparable public APIs.
+ 'messageTemplate' => NULL,
+ // whether this is a test email (and hence should include the test banner)
+ 'isTest' => FALSE,
+ // Disable Smarty?
+ 'disableSmarty' => FALSE,
+ ];
+ $envelopeDefaults = [
// the From: header
'from' => NULL,
// the recipient’s name
@@ -399,33 +450,36 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
'replyTo' => NULL,
// email attachments
'attachments' => NULL,
- // whether this is a test email (and hence should include the test banner)
- 'isTest' => FALSE,
// filename of optional PDF version to add as attachment (do not include path)
'PDFFilename' => NULL,
- // Disable Smarty?
- 'disableSmarty' => FALSE,
];
- $params = array_merge($defaults, $params);
- // Core#644 - handle Email ID passed as "From".
- if (isset($params['from'])) {
- $params['from'] = CRM_Utils_Mail::formatFromAddress($params['from']);
- }
+ // Allow WorkflowMessage to run any filters/mappings/cleanups.
+ $model = $params['model'] ?? WorkflowMessage::create($params['valueName'] ?? 'UNKNOWN');
+ $params = WorkflowMessage::exportAll(WorkflowMessage::importAll($model, $params));
+ unset($params['model']);
+ // Subsequent hooks use $params. Retaining the $params['model'] might be nice - but don't do it unless you figure out how to ensure data-consistency (eg $params['tplParams'] <=> $params['model']).
+ // If you want to expose the model via hook, consider interjecting a new Hook::alterWorkflowMessage($model) between `importAll()` and `exportAll()`.
+
+ $params = array_merge($modelDefaults, $viewDefaults, $envelopeDefaults, $params);
CRM_Utils_Hook::alterMailParams($params, 'messageTemplate');
if (!is_int($params['messageTemplateID']) && !is_null($params['messageTemplateID'])) {
CRM_Core_Error::deprecatedWarning('message template id should be an integer');
$params['messageTemplateID'] = (int) $params['messageTemplateID'];
}
- $mailContent = self::loadTemplate((string) $params['valueName'], $params['isTest'], $params['messageTemplateID'] ?? NULL, $params['groupName'] ?? '');
-
- // Overwrite subject from form field
- if (!empty($params['subject'])) {
- $mailContent['subject'] = $params['subject'];
+ $mailContent = self::loadTemplate((string) $params['valueName'], $params['isTest'], $params['messageTemplateID'] ?? NULL, $params['groupName'] ?? '', $params['messageTemplate'], $params['subject'] ?? NULL);
+
+ $params['tokenContext'] = array_merge([
+ 'smarty' => (bool) !$params['disableSmarty'],
+ 'contactId' => $params['contactId'],
+ ], $params['tokenContext']);
+ $rendered = CRM_Core_TokenSmarty::render(CRM_Utils_Array::subset($mailContent, ['text', 'html', 'subject']), $params['tokenContext'], $params['tplParams']);
+ if (isset($rendered['subject'])) {
+ $rendered['subject'] = trim(preg_replace('/[\r\n]+/', ' ', $rendered['subject']));
}
-
- $mailContent = self::renderMessageTemplate($mailContent, (bool) $params['disableSmarty'], $params['contactId'] ?? NULL, $params['tplParams']);
+ $nullSet = ['subject' => NULL, 'text' => NULL, 'html' => NULL];
+ $mailContent = array_merge($nullSet, $mailContent, $rendered);
// send the template, honouring the target user’s preferences (if any)
$sent = FALSE;
@@ -451,6 +505,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
$config = CRM_Core_Config::singleton();
if (isset($params['isEmailPdf']) && $params['isEmailPdf'] == 1) {
+ // FIXME: $params['contributionId'] is not modeled in the parameter list. When is it supplied? Should probably move to tokenContext.contributionId.
$pdfHtml = CRM_Contribute_BAO_ContributionPage::addInvoicePdfToEmail($params['contributionId'], $params['contactId']);
if (empty($params['attachments'])) {
$params['attachments'] = [];
@@ -502,12 +557,18 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
* @param bool $isTest
* @param int|null $messageTemplateID
* @param string $groupName
+ * @param array|null $messageTemplateOverride
+ * Optionally, record with msg_subject, msg_text, msg_html.
+ * If omitted, the record will be loaded from workflowName/messageTemplateID.
+ * @param string|null $subjectOverride
+ * This option is the older, wonkier version of $messageTemplate['msg_subject']...
*
* @return array
* @throws \API_Exception
* @throws \CRM_Core_Exception
*/
- protected static function loadTemplate(string $workflowName, bool $isTest, int $messageTemplateID = NULL, $groupName = NULL): array {
+ protected static function loadTemplate(string $workflowName, bool $isTest, int $messageTemplateID = NULL, $groupName = NULL, ?array $messageTemplateOverride = NULL, ?string $subjectOverride = NULL): array {
+ $base = ['msg_subject' => NULL, 'msg_text' => NULL, 'msg_html' => NULL, 'pdf_format_id' => NULL];
if (!$workflowName && !$messageTemplateID) {
throw new CRM_Core_Exception(ts("Message template's option value or ID missing."));
}
@@ -522,12 +583,12 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
else {
$apiCall->addWhere('workflow_name', '=', $workflowName);
}
- $messageTemplate = $apiCall->execute()->first();
- if (empty($messageTemplate['id'])) {
+ $messageTemplate = array_merge($base, $apiCall->execute()->first() ?: [], $messageTemplateOverride ?: []);
+ if (empty($messageTemplate['id']) && empty($messageTemplateOverride)) {
if ($messageTemplateID) {
throw new CRM_Core_Exception(ts('No such message template: id=%1.', [1 => $messageTemplateID]));
}
- throw new CRM_Core_Exception(ts('No message template with workflow name %2.', [2 => $workflowName]));
+ throw new CRM_Core_Exception(ts('No message template with workflow name %1.', [1 => $workflowName]));
}
$mailContent = [
@@ -564,33 +625,12 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
$mailContent['html'] = preg_replace('/<body(.*)$/im', "<body\\1\n{$testText['msg_html']}", $mailContent['html']);
}
- return $mailContent;
- }
-
- /**
- * Render the message template, resolving tokens and smarty tokens.
- *
- * As with all BAO methods this should not be called directly outside
- * of tested core code and is highly likely to change.
- *
- * @param array $mailContent
- * @param bool $disableSmarty
- * @param int|NULL $contactID
- * @param array $smartyAssigns
- *
- * @return array
- */
- public static function renderMessageTemplate(array $mailContent, bool $disableSmarty, $contactID, array $smartyAssigns): array {
- $tokenContext = ['smarty' => !$disableSmarty];
- if ($contactID) {
- $tokenContext['contactId'] = $contactID;
- }
- $result = CRM_Core_TokenSmarty::render(CRM_Utils_Array::subset($mailContent, ['text', 'html', 'subject']), $tokenContext, $smartyAssigns);
- if (isset($mailContent['subject'])) {
- $result['subject'] = trim(preg_replace('/[\r\n]+/', ' ', $result['subject']));
+ if (!empty($subjectOverride)) {
+ CRM_Core_Error::deprecatedWarning('CRM_Core_BAO_MessageTemplate: $params[subject] is deprecated. Use $params[messageTemplate][msg_subject] instead.');
+ $mailContent['subject'] = $subjectOverride;
}
- $nullSet = ['subject' => NULL, 'text' => NULL, 'html' => NULL];
- return array_merge($nullSet, $mailContent, $result);
+
+ return $mailContent;
}
}
diff --git a/civicrm/CRM/Core/BAO/Note.php b/civicrm/CRM/Core/BAO/Note.php
index 85cc99bd2b..3f6080a7a6 100644
--- a/civicrm/CRM/Core/BAO/Note.php
+++ b/civicrm/CRM/Core/BAO/Note.php
@@ -18,7 +18,7 @@
/**
* BAO object for crm_note table.
*/
-class CRM_Core_BAO_Note extends CRM_Core_DAO_Note {
+class CRM_Core_BAO_Note extends CRM_Core_DAO_Note implements \Civi\Test\HookInterface {
use CRM_Core_DynamicFKAccessTrait;
/**
@@ -270,53 +270,34 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note {
return $notes;
}
+ /**
+ * Event fired prior to modifying a Note.
+ * @param \Civi\Core\Event\PreEvent $event
+ */
+ public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
+ if ($event->action === 'delete' && $event->id) {
+ // When deleting a note, also delete child notes
+ // This causes recursion as this hook is called again while deleting child notes,
+ // So the children of children, etc. will also be deleted.
+ foreach (self::getDescendentIds($event->id) as $child) {
+ self::deleteRecord(['id' => $child]);
+ }
+ }
+ }
+
/**
* Delete the notes.
*
* @param int $id
- * Note id.
- * @param bool $showStatus
- * Do we need to set status or not.
*
- * @return int|null
- * no of deleted notes on success, null otherwise
+ * @deprecated
+ * @return int
*/
- public static function del($id, $showStatus = TRUE) {
- $return = NULL;
- $recent = array($id);
- $note = new CRM_Core_DAO_Note();
- $note->id = $id;
- $note->find();
- $note->fetch();
- if ($note->entity_table == 'civicrm_note') {
- $status = ts('Selected Comment has been deleted successfully.');
- }
- else {
- $status = ts('Selected Note has been deleted successfully.');
- }
-
- // Delete all descendents of this Note
- foreach (self::getDescendentIds($id) as $childId) {
- $childNote = new CRM_Core_DAO_Note();
- $childNote->id = $childId;
- $childNote->delete();
- $recent[] = $childId;
- }
-
- $return = $note->delete();
- if ($showStatus) {
- CRM_Core_Session::setStatus($status, ts('Deleted'), 'success');
- }
+ public static function del($id) {
+ // CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
+ self::deleteRecord(['id' => $id]);
- // delete the recently created Note
- foreach ($recent as $recentId) {
- $noteRecent = array(
- 'id' => $recentId,
- 'type' => 'Note',
- );
- CRM_Utils_Recent::del($noteRecent);
- }
- return $return;
+ return 1;
}
/**
@@ -509,26 +490,21 @@ ORDER BY modified_date desc";
}
/**
- * Given a note id, get a list of the ids of all notes that are descendents of that note
+ * Get direct children of given parentId note
*
* @param int $parentId
- * Id of the given note.
- * @param array $ids
- * (reference) one-dimensional array to store found descendent ids.
*
* @return array
- * One-dimensional array containing ids of all desendent notes
+ * One-dimensional array containing ids of child notes
*/
- public static function getDescendentIds($parentId, &$ids = []) {
- // get direct children of given parentId note
+ public static function getDescendentIds($parentId) {
+ $ids = [];
$note = new CRM_Core_DAO_Note();
$note->entity_table = 'civicrm_note';
$note->entity_id = $parentId;
$note->find();
while ($note->fetch()) {
- // foreach child, add to ids list, and recurse
$ids[] = $note->id;
- self::getDescendentIds($note->id, $ids);
}
return $ids;
}
@@ -561,7 +537,7 @@ WHERE participant.contact_id = %1 AND note.entity_table = 'civicrm_participant'
$contactNoteId = CRM_Core_DAO::executeQuery($contactQuery, $params);
while ($contactNoteId->fetch()) {
- self::del($contactNoteId->id, FALSE);
+ self::deleteRecord(['id' => $contactNoteId->id]);
}
}
diff --git a/civicrm/CRM/Core/BAO/UFField.php b/civicrm/CRM/Core/BAO/UFField.php
index 2e1a4dc56d..b26e8831b2 100644
--- a/civicrm/CRM/Core/BAO/UFField.php
+++ b/civicrm/CRM/Core/BAO/UFField.php
@@ -157,17 +157,11 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField {
* Delete the profile Field.
*
* @param int $id
- * Field Id.
- *
+ * @deprecated
* @return bool
- *
*/
public static function del($id) {
- //delete field field
- $field = new CRM_Core_DAO_UFField();
- $field->id = $id;
- $field->delete();
- return TRUE;
+ return (bool) self::deleteRecord(['id' => $id]);
}
/**
diff --git a/civicrm/CRM/Core/CodeGen/Specification.php b/civicrm/CRM/Core/CodeGen/Specification.php
index f230088797..30bec91f67 100644
--- a/civicrm/CRM/Core/CodeGen/Specification.php
+++ b/civicrm/CRM/Core/CodeGen/Specification.php
@@ -456,6 +456,9 @@ class CRM_Core_CodeGen_Specification {
'callback',
// Path to options edit form
'optionEditPath',
+ // Should options for this field be prefetched (for presenting on forms).
+ // The default is TRUE, but adding FALSE helps when there could be many options
+ 'prefetch',
];
foreach ($validOptions as $pseudoOption) {
if (!empty($fieldXML->pseudoconstant->$pseudoOption)) {
diff --git a/civicrm/CRM/Core/Component.php b/civicrm/CRM/Core/Component.php
index c594c3b6d8..7661eb3e04 100644
--- a/civicrm/CRM/Core/Component.php
+++ b/civicrm/CRM/Core/Component.php
@@ -37,7 +37,6 @@ class CRM_Core_Component {
private static function &_info($force = FALSE) {
if (!isset(Civi::$statics[__CLASS__]['info'])|| $force) {
Civi::$statics[__CLASS__]['info'] = [];
- $c = [];
$config = CRM_Core_Config::singleton();
$c = self::getComponents();
@@ -122,9 +121,13 @@ class CRM_Core_Component {
return self::_info($force);
}
+ /**
+ * Triggered by on_change callback of the 'enable_components' setting.
+ */
public static function flushEnabledComponents() {
unset(Civi::$statics[__CLASS__]);
CRM_Core_BAO_Navigation::resetNavigation();
+ Civi::cache('metadata')->clear();
}
/**
@@ -203,24 +206,6 @@ class CRM_Core_Component {
return $files;
}
- /**
- * @return array
- */
- public static function &menu() {
- $info = self::_info();
- $items = [];
- foreach ($info as $name => $comp) {
- $mnu = $comp->getMenuObject();
-
- $ret = $mnu->permissioned();
- $items = array_merge($items, $ret);
-
- $ret = $mnu->main($task);
- $items = array_merge($items, $ret);
- }
- return $items;
- }
-
/**
* @param string $componentName
*
@@ -231,9 +216,6 @@ class CRM_Core_Component {
if (!empty($info[$componentName])) {
return $info[$componentName]->componentID;
}
- else {
- return;
- }
}
/**
diff --git a/civicrm/CRM/Core/Component/Info.php b/civicrm/CRM/Core/Component/Info.php
index 33dabe3639..604fcd7a65 100644
--- a/civicrm/CRM/Core/Component/Info.php
+++ b/civicrm/CRM/Core/Component/Info.php
@@ -221,20 +221,7 @@ abstract class CRM_Core_Component_Info {
*/
public function isEnabled() {
$config = CRM_Core_Config::singleton();
- if (in_array($this->info['name'], $config->enableComponents)) {
- return TRUE;
- }
- return FALSE;
- }
-
- /**
- * Provides component's menu definition object.
- *
- * @return mixed
- * component's menu definition object
- */
- public function getMenuObject() {
- return $this->_instantiate(self::COMPONENT_MENU_CLASS);
+ return in_array($this->info['name'], $config->enableComponents, TRUE);
}
/**
@@ -352,7 +339,6 @@ abstract class CRM_Core_Component_Info {
*/
private function _instantiate($cl) {
$className = $this->namespace . '_' . $cl;
- require_once str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
return new $className();
}
diff --git a/civicrm/CRM/Core/Config.php b/civicrm/CRM/Core/Config.php
index aef4a308b8..6ca6e68ea4 100644
--- a/civicrm/CRM/Core/Config.php
+++ b/civicrm/CRM/Core/Config.php
@@ -278,6 +278,8 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
// clear all caches
self::clearDBCache();
Civi::cache('session')->clear();
+ Civi::cache('metadata')->clear();
+ CRM_Core_DAO_AllCoreTables::reinitializeCache();
CRM_Utils_System::flushCache();
if ($sessionReset) {
diff --git a/civicrm/CRM/Core/DAO.php b/civicrm/CRM/Core/DAO.php
index 5bb34367c7..8b903ec244 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -1971,11 +1971,12 @@ LIKE %1
*
* @param int $entityID
* @param int $newEntityID
+ * @param string $parentOperation
*/
- public function copyCustomFields($entityID, $newEntityID) {
+ public function copyCustomFields($entityID, $newEntityID, $parentOperation = NULL) {
$entity = CRM_Core_DAO_AllCoreTables::getBriefName(get_class($this));
$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(get_class($this));
- // Obtain custom values for old event
+ // Obtain custom values for the old entity.
$customParams = $htmlType = [];
$customValues = CRM_Core_BAO_CustomValueTable::getEntityValues($entityID, $entity);
@@ -2009,8 +2010,8 @@ LIKE %1
}
}
- // Save Custom Fields for new Event
- CRM_Core_BAO_CustomValueTable::postProcess($customParams, $tableName, $newEntityID, $entity);
+ // Save Custom Fields for new Entity.
+ CRM_Core_BAO_CustomValueTable::postProcess($customParams, $tableName, $newEntityID, $entity, $parentOperation ?? 'create');
}
// copy activity attachments ( if any )
diff --git a/civicrm/CRM/Core/DAO/Address.php b/civicrm/CRM/Core/DAO/Address.php
index 0ce4ef2710..83f8f7891f 100644
--- a/civicrm/CRM/Core/DAO/Address.php
+++ b/civicrm/CRM/Core/DAO/Address.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/Address.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bd0caca7da12cba4ed8161b892a77229)
+ * (GenCodeChecksum:40a96138e8081eaba0460889f49cc1cf)
*/
/**
@@ -619,6 +619,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
'table' => 'civicrm_county',
'keyColumn' => 'id',
'labelColumn' => 'name',
+ 'abbrColumn' => 'abbreviation',
],
'add' => '1.1',
],
@@ -643,6 +644,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
'table' => 'civicrm_state_province',
'keyColumn' => 'id',
'labelColumn' => 'name',
+ 'abbrColumn' => 'abbreviation',
],
'add' => '1.1',
],
diff --git a/civicrm/CRM/Core/DAO/AllCoreTables.php b/civicrm/CRM/Core/DAO/AllCoreTables.php
index 2db1a16acf..6a274847fc 100644
--- a/civicrm/CRM/Core/DAO/AllCoreTables.php
+++ b/civicrm/CRM/Core/DAO/AllCoreTables.php
@@ -366,11 +366,9 @@ class CRM_Core_DAO_AllCoreTables {
/**
* Reinitialise cache.
- *
- * @param bool $fresh
*/
- public static function reinitializeCache($fresh = FALSE) {
- self::init($fresh);
+ public static function reinitializeCache() {
+ self::init(TRUE);
}
/**
diff --git a/civicrm/CRM/Core/DAO/County.php b/civicrm/CRM/Core/DAO/County.php
index 943f2d724b..0ab0d03f0f 100644
--- a/civicrm/CRM/Core/DAO/County.php
+++ b/civicrm/CRM/Core/DAO/County.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/County.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6666108a662d719144f390bf4746268d)
+ * (GenCodeChecksum:f54f7ff28a6ecde09252698c389db154)
*/
/**
@@ -181,6 +181,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO {
'table' => 'civicrm_state_province',
'keyColumn' => 'id',
'labelColumn' => 'name',
+ 'abbrColumn' => 'abbreviation',
],
'add' => '1.1',
],
diff --git a/civicrm/CRM/Core/DAO/Email.php b/civicrm/CRM/Core/DAO/Email.php
index d72c3b3b85..53180904db 100644
--- a/civicrm/CRM/Core/DAO/Email.php
+++ b/civicrm/CRM/Core/DAO/Email.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/Email.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:84e4a7efb791b5e3ed3b7d7fc9e21a09)
+ * (GenCodeChecksum:7e30aa415b50a25add79b9553b5d7657)
*/
/**
@@ -320,6 +320,8 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
'bao' => 'CRM_Core_BAO_Email',
'localizable' => 0,
'html' => [
+ 'type' => 'Select Date',
+ 'formatType' => 'activityDateTime',
'label' => ts("Hold Date"),
],
'add' => '1.1',
@@ -335,6 +337,8 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
'bao' => 'CRM_Core_BAO_Email',
'localizable' => 0,
'html' => [
+ 'type' => 'Select Date',
+ 'formatType' => 'activityDateTime',
'label' => ts("Reset Date"),
],
'add' => '1.1',
diff --git a/civicrm/CRM/Core/EntityTokens.php b/civicrm/CRM/Core/EntityTokens.php
index bf677ad1f2..9a9497ebfa 100644
--- a/civicrm/CRM/Core/EntityTokens.php
+++ b/civicrm/CRM/Core/EntityTokens.php
@@ -12,6 +12,8 @@
use Civi\Token\AbstractTokenSubscriber;
use Civi\Token\TokenRow;
+use Civi\ActionSchedule\Event\MailingQueryEvent;
+use Civi\Token\TokenProcessor;
/**
* Class CRM_Core_EntityTokens
@@ -26,13 +28,44 @@ use Civi\Token\TokenRow;
class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
/**
- * This is required for the parent - it will be filled out.
- *
+ * @var array
+ */
+ protected $prefetch = [];
+
+ /**
* @inheritDoc
+ * @throws \CRM_Core_Exception
*/
public function evaluateToken(TokenRow $row, $entity, $field, $prefetch = NULL) {
+ $this->prefetch = (array) $prefetch;
+ $fieldValue = $this->getFieldValue($row, $field);
+
+ if ($this->isPseudoField($field)) {
+ $split = explode(':', $field);
+ return $row->tokens($entity, $field, $this->getPseudoValue($split[0], $split[1], $this->getFieldValue($row, $split[0])));
+ }
+ if ($this->isMoneyField($field)) {
+ return $row->format('text/plain')->tokens($entity, $field,
+ \CRM_Utils_Money::format($fieldValue, $this->getCurrency($row)));
+ }
+ if ($this->isDateField($field)) {
+ return $row->format('text/plain')->tokens($entity, $field, \CRM_Utils_Date::customFormat($fieldValue));
+ }
+ if ($this->isCustomField($field)) {
+ $row->customToken($entity, \CRM_Core_BAO_CustomField::getKeyID($field), $this->getFieldValue($row, 'id'));
+ }
+ else {
+ $row->format('text/plain')->tokens($entity, $field, (string) $fieldValue);
+ }
}
+ /**
+ * Metadata about the entity fields.
+ *
+ * @var array
+ */
+ protected $fieldMetadata = [];
+
/**
* Get the entity name for api v4 calls.
*
@@ -54,6 +87,17 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
return $this->getApiEntityName() . '__';
}
+ /**
+ * Get the name of the table this token class can extend.
+ *
+ * The default is based on the entity but some token classes,
+ * specifically the event class, latch on to other tables - ie
+ * the participant table.
+ */
+ public function getExtendableTableName(): string {
+ return CRM_Core_DAO_AllCoreTables::getTableForEntityName($this->getApiEntityName());
+ }
+
/**
* Get the relevant bao name.
*/
@@ -61,6 +105,15 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
return CRM_Core_DAO_AllCoreTables::getFullName($this->getApiEntityName());
}
+ /**
+ * Get an array of fields to be requested.
+ *
+ * @return string[]
+ */
+ public function getReturnFields(): array {
+ return array_keys($this->getBasicTokens());
+ }
+
/**
* Get all the tokens supported by this processor.
*
@@ -143,8 +196,9 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
$return = [];
foreach (array_keys($this->getBasicTokens()) as $fieldName) {
if ($this->isAddPseudoTokens($fieldName)) {
- $return[$fieldName . ':label'] = $this->fieldMetadata[$fieldName]['input_attrs']['label'];
- $return[$fieldName . ':name'] = ts('Machine name') . ': ' . $this->fieldMetadata[$fieldName]['input_attrs']['label'];
+ $fieldLabel = $this->fieldMetadata[$fieldName]['input_attrs']['label'] ?? $this->fieldMetadata[$fieldName]['label'];
+ $return[$fieldName . ':label'] = $fieldLabel;
+ $return[$fieldName . ':name'] = ts('Machine name') . ': ' . $fieldLabel;
}
}
return $return;
@@ -167,7 +221,16 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
// from the metadata as yet.
return FALSE;
}
- return (bool) $this->getFieldMetadata()[$fieldName]['options'];
+ if ($this->getFieldMetadata()[$fieldName]['type'] === 'Custom') {
+ // If we remove this early return then we get that extra nuanced goodness
+ // and support for the more portable v4 style field names
+ // on custom fields - where labels or names can be returned.
+ // At present the gap is that the metadata for the label is not accessed
+ // and tests failed on the enotice and we don't have a clear plan about
+ // v4 style custom tokens - but medium term this IF will probably go.
+ return FALSE;
+ }
+ return (bool) ($this->getFieldMetadata()[$fieldName]['options'] || !empty($this->getFieldMetadata()[$fieldName]['suffixes']));
}
/**
@@ -192,4 +255,157 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
return (string) $fieldValue;
}
+ /**
+ * @param \Civi\Token\TokenRow $row
+ * @param string $field
+ * @return string|int
+ */
+ protected function getFieldValue(TokenRow $row, string $field) {
+ $actionSearchResult = $row->context['actionSearchResult'];
+ $aliasedField = $this->getEntityAlias() . $field;
+ if (isset($actionSearchResult->{$aliasedField})) {
+ return $actionSearchResult->{$aliasedField};
+ }
+ $entityID = $row->context[$this->getEntityIDField()];
+ return $this->prefetch[$entityID][$field] ?? '';
+ }
+
+ /**
+ * Class constructor.
+ */
+ public function __construct() {
+ $tokens = $this->getAllTokens();
+ parent::__construct($this->getEntityName(), $tokens);
+ }
+
+ /**
+ * Check if the token processor is active.
+ *
+ * @param \Civi\Token\TokenProcessor $processor
+ *
+ * @return bool
+ */
+ public function checkActive(TokenProcessor $processor) {
+ return (!empty($processor->context['actionMapping'])
+ // This makes the 'schema context compulsory - which feels accidental
+ // since recent discu
+ && $processor->context['actionMapping']->getEntity()) || in_array($this->getEntityIDField(), $processor->context['schema']);
+ }
+
+ /**
+ * Alter action schedule query.
+ *
+ * @param \Civi\ActionSchedule\Event\MailingQueryEvent $e
+ */
+ public function alterActionScheduleQuery(MailingQueryEvent $e): void {
+ if ($e->mapping->getEntity() !== $this->getExtendableTableName()) {
+ return;
+ }
+ foreach ($this->getReturnFields() as $token) {
+ $e->query->select('e.' . $token . ' AS ' . $this->getEntityAlias() . $token);
+ }
+ }
+
+ /**
+ * Get tokens supporting the syntax we are migrating to.
+ *
+ * In general these are tokens that were not previously supported
+ * so we can add them in the preferred way or that we have
+ * undertaken some, as yet to be written, db update.
+ *
+ * See https://lab.civicrm.org/dev/core/-/issues/2650
+ *
+ * @return string[]
+ * @throws \API_Exception
+ */
+ public function getBasicTokens(): array {
+ $return = [];
+ foreach ($this->getExposedFields() as $fieldName) {
+ // Custom fields are still added v3 style - we want to keep v4 naming 'unpoluted'
+ // for now to allow us to consider how to handle names vs labels vs values
+ // and other raw vs not raw options.
+ if ($this->getFieldMetadata()[$fieldName]['type'] !== 'Custom') {
+ $return[$fieldName] = $this->getFieldMetadata()[$fieldName]['title'];
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Get entity fields that should be exposed as tokens.
+ *
+ * @return string[]
+ *
+ */
+ public function getExposedFields(): array {
+ $return = [];
+ foreach ($this->getFieldMetadata() as $field) {
+ if (!in_array($field['name'], $this->getSkippedFields(), TRUE)) {
+ $return[] = $field['name'];
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Get entity fields that should not be exposed as tokens.
+ *
+ * @return string[]
+ */
+ public function getSkippedFields(): array {
+ $fields = ['contact_id'];
+ if (!CRM_Campaign_BAO_Campaign::isCampaignEnable()) {
+ $fields[] = 'campaign_id';
+ }
+ return $fields;
+ }
+
+ /**
+ * @return string
+ */
+ protected function getEntityName(): string {
+ return CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($this->getApiEntityName());
+ }
+
+ public function getEntityIDField() {
+ return $this->getEntityName() . 'Id';
+ }
+
+ public function prefetch(\Civi\Token\Event\TokenValueEvent $e): ?array {
+ $entityIDs = $e->getTokenProcessor()->getContextValues($this->getEntityIDField());
+ if (empty($entityIDs)) {
+ return [];
+ }
+ $select = $this->getPrefetchFields($e);
+ $result = (array) civicrm_api4($this->getApiEntityName(), 'get', [
+ 'checkPermissions' => FALSE,
+ // Note custom fields are not yet added - I need to
+ // re-do the unit tests to support custom fields first.
+ 'select' => $select,
+ 'where' => [['id', 'IN', $entityIDs]],
+ ], 'id');
+ return $result;
+ }
+
+ public function getCurrencyFieldName() {
+ return [];
+ }
+
+ /**
+ * Get the currency to use for formatting money.
+ * @param $row
+ *
+ * @return string
+ */
+ public function getCurrency($row): string {
+ if (!empty($this->getCurrencyFieldName())) {
+ return $this->getFieldValue($row, $this->getCurrencyFieldName()[0]);
+ }
+ return CRM_Core_Config::singleton()->defaultCurrency;
+ }
+
+ public function getPrefetchFields(\Civi\Token\Event\TokenValueEvent $e): array {
+ return array_intersect($this->getActiveTokens($e), $this->getCurrencyFieldName(), array_keys($this->getAllTokens()));
+ }
+
}
diff --git a/civicrm/CRM/Core/Form.php b/civicrm/CRM/Core/Form.php
index 0f07bdd149..62372af16a 100644
--- a/civicrm/CRM/Core/Form.php
+++ b/civicrm/CRM/Core/Form.php
@@ -347,6 +347,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
'settingPath',
'autocomplete',
'validContact',
+ 'email',
];
foreach ($rules as $rule) {
@@ -2741,7 +2742,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
*
* @return mixed|null
*/
- protected function getSubmittedValue(string $fieldName) {
+ public function getSubmittedValue(string $fieldName) {
if (empty($this->exportedValues)) {
$this->exportedValues = $this->controller->exportValues($this->_name);
}
diff --git a/civicrm/CRM/Core/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Core/Form/Task/PDFLetterCommon.php
index 03dadff66e..836f0001ff 100644
--- a/civicrm/CRM/Core/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Core/Form/Task/PDFLetterCommon.php
@@ -36,10 +36,13 @@ class CRM_Core_Form_Task_PDFLetterCommon {
/**
* Build the form object.
*
+ * @deprecated
+ *
* @var CRM_Core_Form $form
* @throws \CRM_Core_Exception
*/
public static function buildQuickForm(&$form) {
+ CRM_Core_Error::deprecatedFunctionWarning('no supported alternative for non-core code');
// This form outputs a file so should never be submitted via ajax
$form->preventAjaxSubmit();
@@ -53,6 +56,10 @@ class CRM_Core_Form_Task_PDFLetterCommon {
FALSE
);
+ // Added for core#2121,
+ // To support sending a custom pdf filename before downloading.
+ $form->addElement('hidden', 'pdf_file_name');
+
$form->addSelect('format_id', [
'label' => ts('Select Format'),
'placeholder' => ts('Default'),
@@ -167,8 +174,11 @@ class CRM_Core_Form_Task_PDFLetterCommon {
/**
* Set default values.
+ *
+ * @deprecated
*/
public static function setDefaultValues() {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$defaultFormat = CRM_Core_BAO_PdfFormat::getDefaultValues();
$defaultFormat['format_id'] = $defaultFormat['id'];
return $defaultFormat;
@@ -336,10 +346,13 @@ class CRM_Core_Form_Task_PDFLetterCommon {
* @param array $formValues
* The values submitted through the form
*
+ * @deprecated
+ *
* @return array
* If formValues['is_unit_test'] is true, otherwise outputs document to browser
*/
public static function renderFromRows($rows, $msgPart, $formValues) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$html = [];
foreach ($rows as $row) {
$html[] = $row->render($msgPart);
@@ -357,8 +370,11 @@ class CRM_Core_Form_Task_PDFLetterCommon {
/**
* List the available tokens
* @return array of token name => label
+ *
+ * @deprecated
*/
public static function listTokens() {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$class = get_called_class();
if (method_exists($class, 'createTokenProcessor')) {
return $class::createTokenProcessor()->listTokens();
@@ -368,15 +384,25 @@ class CRM_Core_Form_Task_PDFLetterCommon {
/**
* Output the pdf or word document from the generated html.
*
+ * @deprecated
+ *
* @param array $formValues
* @param array $html
*/
protected static function outputFromHtml($formValues, array $html) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
+ // Set the filename for the PDF using the Activity Subject, if defined. Remove unwanted characters and limit the length to 200 characters.
+ if (!empty($formValues['subject'])) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($formValues['subject'], '_', 200);
+ }
+ else {
+ $fileName = 'CiviLetter';
+ }
if ($formValues['document_type'] === 'pdf') {
- CRM_Utils_PDF_Utils::html2pdf($html, 'CiviLetter.pdf', FALSE, $formValues);
+ CRM_Utils_PDF_Utils::html2pdf($html, $fileName . '.pdf', FALSE, $formValues);
}
else {
- CRM_Utils_PDF_Document::html2doc($html, 'CiviLetter.' . $formValues['document_type'], $formValues);
+ CRM_Utils_PDF_Document::html2doc($html, $fileName . '.' . $formValues['document_type'], $formValues);
}
}
diff --git a/civicrm/CRM/Core/Invoke.php b/civicrm/CRM/Core/Invoke.php
index 033632d071..12db074dc8 100644
--- a/civicrm/CRM/Core/Invoke.php
+++ b/civicrm/CRM/Core/Invoke.php
@@ -399,7 +399,7 @@ class CRM_Core_Invoke {
// For example - when uninstalling an extension. We already set "triggerRebuild" to true for these operations.
$config->userSystem->invalidateRouteCache();
}
- CRM_Core_DAO_AllCoreTables::reinitializeCache(TRUE);
+
CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
}
diff --git a/civicrm/CRM/Core/OptionGroup.php b/civicrm/CRM/Core/OptionGroup.php
index 1843cfeeb9..6215f8e690 100644
--- a/civicrm/CRM/Core/OptionGroup.php
+++ b/civicrm/CRM/Core/OptionGroup.php
@@ -107,10 +107,10 @@ class CRM_Core_OptionGroup {
) {
$cache = CRM_Utils_Cache::singleton();
if (in_array($name, self::$_domainIDGroups)) {
- $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy, CRM_Core_Config::domainID());
+ $cacheKey = self::createCacheKey($name, CRM_Core_I18n::getLocale(), $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy, CRM_Core_Config::domainID());
}
else {
- $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy);
+ $cacheKey = self::createCacheKey($name, CRM_Core_I18n::getLocale(), $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy);
}
if (!$fresh) {
@@ -181,7 +181,7 @@ WHERE v.option_group_id = g.id
* @param string $keyColumnName
*/
protected static function flushValues($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName = 'value') {
- $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName);
+ $cacheKey = self::createCacheKey($name, CRM_Core_I18n::getLocale(), $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName);
$cache = CRM_Utils_Cache::singleton();
$cache->delete($cacheKey);
unset(self::$_cache[$cacheKey]);
@@ -219,7 +219,7 @@ WHERE v.option_group_id = g.id
* @void
*/
public static function &valuesByID($id, $flip = FALSE, $grouping = FALSE, $localize = FALSE, $labelColumnName = 'label', $onlyActive = TRUE, $fresh = FALSE) {
- $cacheKey = self::createCacheKey($id, $flip, $grouping, $localize, $labelColumnName, $onlyActive);
+ $cacheKey = self::createCacheKey($id, CRM_Core_I18n::getLocale(), $flip, $grouping, $localize, $labelColumnName, $onlyActive);
$cache = CRM_Utils_Cache::singleton();
if (!$fresh) {
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
index 30886d1931..939bd86836 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -43,11 +43,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
try {
//we only get invoice num as a key player from payment gateway response.
//for ARB we get x_subscription_id and x_subscription_paynum
- $x_subscription_id = $this->retrieve('x_subscription_id', 'String');
- if (!$x_subscription_id) {
- // Presence of the id means it is approved.
- return TRUE;
- }
+ $x_subscription_id = $this->getRecurProcessorID();
$ids = $input = [];
$input['component'] = 'contribute';
@@ -62,7 +58,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
// Check if the contribution exists
// make sure contribution exists and is valid
$contribution = new CRM_Contribute_BAO_Contribution();
- $contribution->id = $contributionID = $ids['contribution'];
+ $contribution->id = $contributionID = $this->getContributionID();
if (!$contribution->find(TRUE)) {
throw new CRM_Core_Exception('Failure: Could not find contribution record for ' . (int) $contribution->id, NULL, ['context' => "Could not find contribution record: {$contribution->id} in IPN request: " . print_r($input, TRUE)]);
}
@@ -75,7 +71,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
throw new CRM_Core_Exception("Could not find contribution recur record: {$ids['ContributionRecur']} in IPN request: " . print_r($input, TRUE));
}
// do a subscription check
- if ($contributionRecur->processor_id != $input['subscription_id']) {
+ if ($contributionRecur->processor_id != $this->getRecurProcessorID()) {
throw new CRM_Core_Exception('Unrecognized subscription.');
}
@@ -171,7 +167,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
*/
public function getInput(&$input) {
$input['amount'] = $this->retrieve('x_amount', 'String');
- $input['subscription_id'] = $this->retrieve('x_subscription_id', 'Integer');
+ $input['subscription_id'] = $this->getRecurProcessorID();
$input['response_code'] = $this->retrieve('x_response_code', 'Integer');
$input['response_reason_code'] = $this->retrieve('x_response_reason_code', 'String', FALSE);
$input['response_reason_text'] = $this->retrieve('x_response_reason_text', 'String', FALSE);
@@ -214,8 +210,8 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
* @throws \CRM_Core_Exception
*/
public function getIDs(&$ids, $input) {
- $ids['contribution'] = (int) $this->retrieve('x_invoice_num', 'Integer');
- $contributionRecur = $this->getContributionRecurObject($input['subscription_id'], (int) $this->retrieve('x_cust_id', 'Integer', FALSE, 0), $ids['contribution']);
+ $ids['contribution'] = $this->getContributionID();
+ $contributionRecur = $this->getContributionRecurObject($this->getRecurProcessorID(), (int) $this->retrieve('x_cust_id', 'Integer', FALSE, 0), $this->getContributionID());
$ids['contributionRecur'] = (int) $contributionRecur->id;
}
@@ -329,4 +325,29 @@ INNER JOIN civicrm_contribution co ON co.contribution_recur_id = cr.id
]);
}
+ /**
+ * Get the processor_id for the recurring.
+ *
+ * This is the value stored in civicrm_contribution_recur.processor_id,
+ * sometimes called subscription_id.
+ *
+ * @return string
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function getRecurProcessorID(): string {
+ return $this->retrieve('x_subscription_id', 'String');
+ }
+
+ /**
+ * Get the contribution ID to be updated.
+ *
+ * @return int
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function getContributionID(): int {
+ return (int) $this->retrieve('x_invoice_num', 'Integer');
+ }
+
}
diff --git a/civicrm/CRM/Core/PseudoConstant.php b/civicrm/CRM/Core/PseudoConstant.php
index 9e84516231..494201eaa6 100644
--- a/civicrm/CRM/Core/PseudoConstant.php
+++ b/civicrm/CRM/Core/PseudoConstant.php
@@ -1513,8 +1513,8 @@ WHERE id = %1
}
// Use abbrColum if context is abbreviate
- if ($context === 'abbreviate' && (in_array('abbreviation', $availableFields) || !empty($pseudoconstant['abbrColumn']))) {
- $params['labelColumn'] = $pseudoconstant['abbrColumn'] ?? 'abbreviation';
+ if ($context === 'abbreviate' && !empty($pseudoconstant['abbrColumn'])) {
+ $params['labelColumn'] = $pseudoconstant['abbrColumn'];
}
// Condition param can be passed as an sql clause string or an array of clauses
diff --git a/civicrm/CRM/Core/SelectValues.php b/civicrm/CRM/Core/SelectValues.php
index 94e6da9cdc..ca20c9d271 100644
--- a/civicrm/CRM/Core/SelectValues.php
+++ b/civicrm/CRM/Core/SelectValues.php
@@ -568,14 +568,7 @@ class CRM_Core_SelectValues {
foreach ($processor->getAllTokens() as $token => $title) {
$tokens['{contribution.' . $token . '}'] = $title;
}
- return array_merge($tokens, [
- '{contribution.cancel_reason}' => ts('Contribution Cancel Reason'),
- '{contribution.amount_level}' => ts('Amount Level'),
- '{contribution.check_number}' => ts('Check Number'),
- '{contribution.campaign}' => ts('Contribution Campaign'),
- // @todo - we shouldn't need to include custom fields here -
- // remove, with test.
- ], CRM_Utils_Token::getCustomFieldTokens('Contribution', TRUE));
+ return $tokens;
}
/**
diff --git a/civicrm/CRM/Core/Transaction.php b/civicrm/CRM/Core/Transaction.php
index f2030606b6..f12c57964a 100644
--- a/civicrm/CRM/Core/Transaction.php
+++ b/civicrm/CRM/Core/Transaction.php
@@ -159,8 +159,8 @@ class CRM_Core_Transaction {
* After calling run(), the CRM_Core_Transaction object is "used up"; do not
* use it again.
*
- * @param string $callable
- * Should exception one parameter (CRM_Core_Transaction $tx).
+ * @param callable $callable
+ * Should expect one parameter (CRM_Core_Transaction).
* @return CRM_Core_Transaction
* @throws Exception
*/
diff --git a/civicrm/CRM/Custom/Form/Field.php b/civicrm/CRM/Custom/Form/Field.php
index 32a845ed7f..756701b042 100644
--- a/civicrm/CRM/Custom/Form/Field.php
+++ b/civicrm/CRM/Custom/Form/Field.php
@@ -952,15 +952,15 @@ AND option_group_id = %2";
/**
* Determine the serialize type based on form values.
* @param array $params The submitted form values.
- * @return int|string
- * The serialize type - CRM_Core_DAO::SERIALIZE_XXX or the string 'null'
+ * @return int
+ * The serialize type - CRM_Core_DAO::SERIALIZE_XXX or 0
*/
public function determineSerializeType($params) {
if ($params['html_type'] === 'Select' || $params['html_type'] === 'Autocomplete-Select') {
- return !empty($params['serialize']) ? CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND : 'null';
+ return !empty($params['serialize']) ? CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND : 0;
}
else {
- return $params['html_type'] == 'CheckBox' ? CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND : 'null';
+ return $params['html_type'] == 'CheckBox' ? CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND : 0;
}
}
diff --git a/civicrm/CRM/Dedupe/BAO/DedupeRule.php b/civicrm/CRM/Dedupe/BAO/DedupeRule.php
index 9d16d3331a..16683b5e5e 100644
--- a/civicrm/CRM/Dedupe/BAO/DedupeRule.php
+++ b/civicrm/CRM/Dedupe/BAO/DedupeRule.php
@@ -91,6 +91,7 @@ class CRM_Dedupe_BAO_DedupeRule extends CRM_Dedupe_DAO_DedupeRule {
case 'civicrm_im':
case 'civicrm_openid':
case 'civicrm_phone':
+ case 'civicrm_website':
$id = 'contact_id';
break;
diff --git a/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php b/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
index 5c95f9fabe..ce14df0c54 100644
--- a/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
+++ b/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
@@ -84,6 +84,7 @@ class CRM_Dedupe_BAO_DedupeRuleGroup extends CRM_Dedupe_DAO_DedupeRuleGroup {
'civicrm_note',
'civicrm_openid',
'civicrm_phone',
+ 'civicrm_website',
];
foreach (['Individual', 'Organization', 'Household'] as $ctype) {
diff --git a/civicrm/CRM/Event/BAO/Event.php b/civicrm/CRM/Event/BAO/Event.php
index 8db65e8a02..6baa7a793d 100644
--- a/civicrm/CRM/Event/BAO/Event.php
+++ b/civicrm/CRM/Event/BAO/Event.php
@@ -1242,7 +1242,7 @@ WHERE civicrm_event.is_active = 1
$values['event']
);
- if (Civi::settings()->get('invoicing') && Civi::settings()->get('invoice_is_email_pdf') && !empty($values['contributionId'])) {
+ if (Civi::settings()->get('invoice_is_email_pdf') && !empty($values['contributionId'])) {
$sendTemplateParams['isEmailPdf'] = TRUE;
$sendTemplateParams['contributionId'] = $values['contributionId'];
}
diff --git a/civicrm/CRM/Event/BAO/Participant.php b/civicrm/CRM/Event/BAO/Participant.php
index 90b9a2f6aa..5edcb9ea7a 100644
--- a/civicrm/CRM/Event/BAO/Participant.php
+++ b/civicrm/CRM/Event/BAO/Participant.php
@@ -242,7 +242,7 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant {
CRM_Core_BAO_Note::add($noteParams, $noteIDs);
}
elseif ($noteId && $hasNoteField) {
- CRM_Core_BAO_Note::del($noteId, FALSE);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $noteId]);
}
}
@@ -867,7 +867,7 @@ WHERE civicrm_participant.id = {$participantId}
$note = CRM_Core_BAO_Note::getNote($id, 'civicrm_participant');
$noteId = key($note);
if ($noteId) {
- CRM_Core_BAO_Note::del($noteId, FALSE);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $noteId]);
}
$participant->delete();
@@ -876,14 +876,6 @@ WHERE civicrm_participant.id = {$participantId}
CRM_Utils_Hook::post('delete', 'Participant', $participant->id, $participant);
- // delete the recently created Participant
- $participantRecent = [
- 'id' => $id,
- 'type' => 'Participant',
- ];
-
- CRM_Utils_Recent::del($participantRecent);
-
return $participant;
}
diff --git a/civicrm/CRM/Event/DAO/Event.php b/civicrm/CRM/Event/DAO/Event.php
index e1391f4ac6..0b340c956f 100644
--- a/civicrm/CRM/Event/DAO/Event.php
+++ b/civicrm/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Event/Event.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4b2cc938c8bb6e8bcba91513d109ff5f)
+ * (GenCodeChecksum:51b2702ee6856d74a9f38e9cf86da5bf)
*/
/**
@@ -1668,6 +1668,12 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'is_share' => [
diff --git a/civicrm/CRM/Event/DAO/Participant.php b/civicrm/CRM/Event/DAO/Participant.php
index 3e891d8ae1..74b25157d2 100644
--- a/civicrm/CRM/Event/DAO/Participant.php
+++ b/civicrm/CRM/Event/DAO/Participant.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Event/Participant.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0e7f61919241631110f216e80d72d845)
+ * (GenCodeChecksum:fcaf9990a79e1ea3bd799a6ff75db893)
*/
/**
@@ -526,6 +526,12 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'discount_amount' => [
diff --git a/civicrm/CRM/Event/Form/Participant.php b/civicrm/CRM/Event/Form/Participant.php
index 6430268729..204304aaf0 100644
--- a/civicrm/CRM/Event/Form/Participant.php
+++ b/civicrm/CRM/Event/Form/Participant.php
@@ -1546,7 +1546,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
);
$prefixValue = Civi::settings()->get('contribution_invoice_settings');
$invoicing = $prefixValue['invoicing'] ?? NULL;
- if (!empty($taxAmt) && (isset($invoicing) && isset($prefixValue['is_email_pdf']))) {
+ if (Civi::settings()->get('invoice_is_email_pdf')) {
$sendTemplateParams['isEmailPdf'] = TRUE;
$sendTemplateParams['contributionId'] = $contributionId;
}
diff --git a/civicrm/CRM/Event/Form/ParticipantView.php b/civicrm/CRM/Event/Form/ParticipantView.php
index 57e4af7ecd..db19ee9c6e 100644
--- a/civicrm/CRM/Event/Form/ParticipantView.php
+++ b/civicrm/CRM/Event/Form/ParticipantView.php
@@ -192,8 +192,6 @@ class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
$displayName = CRM_Contact_BAO_Contact::displayName($values[$participantID]['contact_id']);
$participantCount = [];
- $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
- $invoicing = $invoiceSettings['invoicing'] ?? NULL;
$totalTaxAmount = 0;
foreach ($lineItem as $k => $v) {
if (CRM_Utils_Array::value('participant_count', $lineItem[$k]) > 0) {
@@ -201,7 +199,7 @@ class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
}
$totalTaxAmount = $v['tax_amount'] + $totalTaxAmount;
}
- if ($invoicing) {
+ if (Civi::settings()->get('invoicing')) {
$this->assign('totalTaxAmount', $totalTaxAmount);
}
if ($participantCount) {
diff --git a/civicrm/CRM/Event/Form/Task/PDF.php b/civicrm/CRM/Event/Form/Task/PDF.php
index 38b3ae049e..9ce1baed9c 100644
--- a/civicrm/CRM/Event/Form/Task/PDF.php
+++ b/civicrm/CRM/Event/Form/Task/PDF.php
@@ -23,6 +23,8 @@
*/
class CRM_Event_Form_Task_PDF extends CRM_Event_Form_Task {
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* Are we operating in "single mode", i.e. printing letter to one
* specific participant?
@@ -44,7 +46,7 @@ class CRM_Event_Form_Task_PDF extends CRM_Event_Form_Task {
* Build all the data structures needed to build the form.
*/
public function preProcess() {
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
+ $this->preProcessPDF();
parent::preProcess();
// we have all the participant ids, so now we get the contact ids
@@ -53,13 +55,6 @@ class CRM_Event_Form_Task_PDF extends CRM_Event_Form_Task {
$this->assign('single', $this->_single);
}
- /**
- * Build the form object.
- */
- public function buildQuickForm() {
- CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
- }
-
/**
* Process the form after the input has been submitted and validated.
*/
@@ -67,15 +62,6 @@ class CRM_Event_Form_Task_PDF extends CRM_Event_Form_Task {
CRM_Contact_Form_Task_PDFLetterCommon::postProcess($this);
}
- /**
- * Set default values for the form.
- *
- * @return void
- */
- public function setDefaultValues() {
- return CRM_Contact_Form_Task_PDFLetterCommon::setDefaultValues();
- }
-
/**
* List available tokens for this form.
*
diff --git a/civicrm/CRM/Event/Page/EventInfo.php b/civicrm/CRM/Event/Page/EventInfo.php
index fe358a051c..5dcac3363f 100644
--- a/civicrm/CRM/Event/Page/EventInfo.php
+++ b/civicrm/CRM/Event/Page/EventInfo.php
@@ -130,7 +130,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
$invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
$taxTerm = Civi::settings()->get('tax_term');
$displayOpt = $invoiceSettings['tax_display_settings'] ?? NULL;
- $invoicing = $invoiceSettings['invoicing'] ?? NULL;
+
foreach ($fieldValues['options'] as $optionId => $optionVal) {
if (CRM_Utils_Array::value('visibility_id', $optionVal) != array_search('public', $visibility) &&
$adminFieldVisible == FALSE
@@ -139,7 +139,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
}
$values['feeBlock']['isDisplayAmount'][$fieldCnt] = $fieldValues['is_display_amounts'] ?? NULL;
- if ($invoicing && isset($optionVal['tax_amount'])) {
+ if (Civi::settings()->get('invoicing') && isset($optionVal['tax_amount'])) {
$values['feeBlock']['value'][$fieldCnt] = CRM_Price_BAO_PriceField::getTaxLabel($optionVal, 'amount', $displayOpt, $taxTerm);
$values['feeBlock']['tax_amount'][$fieldCnt] = $optionVal['tax_amount'];
}
diff --git a/civicrm/CRM/Financial/BAO/FinancialType.php b/civicrm/CRM/Financial/BAO/FinancialType.php
index 0444ba9603..0ddb52138f 100644
--- a/civicrm/CRM/Financial/BAO/FinancialType.php
+++ b/civicrm/CRM/Financial/BAO/FinancialType.php
@@ -191,51 +191,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType {
return $financialType;
}
- /**
- * Add permissions for financial types.
- *
- * @param array $permissions
- * @param array $descriptions
- *
- * @return bool
- */
- public static function permissionedFinancialTypes(&$permissions, $descriptions) {
- CRM_Core_Error::deprecatedFunctionWarning('not done via hook.');
- if (!self::isACLFinancialTypeStatus()) {
- return FALSE;
- }
- $financialTypes = CRM_Contribute_PseudoConstant::financialType();
- $actions = [
- 'add' => ts('add'),
- 'view' => ts('view'),
- 'edit' => ts('edit'),
- 'delete' => ts('delete'),
- ];
-
- foreach ($financialTypes as $id => $type) {
- foreach ($actions as $action => $action_ts) {
- if ($descriptions) {
- $permissions[$action . ' contributions of type ' . $type] = [
- ts("CiviCRM: %1 contributions of type %2", [1 => $action_ts, 2 => $type]),
- ts('%1 contributions of type %2', [1 => $action_ts, 2 => $type]),
- ];
- }
- else {
- $permissions[$action . ' contributions of type ' . $type] = ts("CiviCRM: %1 contributions of type %2", [1 => $action_ts, 2 => $type]);
- }
- }
- }
- if (!$descriptions) {
- $permissions['administer CiviCRM Financial Types'] = ts('CiviCRM: administer CiviCRM Financial Types');
- }
- else {
- $permissions['administer CiviCRM Financial Types'] = [
- ts('CiviCRM: administer CiviCRM Financial Types'),
- ts('Administer access to Financial Types'),
- ];
- }
- }
-
/**
* Wrapper aroung getAvailableFinancialTypes to get all including disabled FinancialTypes
* @param int|string $action
diff --git a/civicrm/CRM/Financial/Page/AJAX.php b/civicrm/CRM/Financial/Page/AJAX.php
index b14792abce..33e891cb2a 100644
--- a/civicrm/CRM/Financial/Page/AJAX.php
+++ b/civicrm/CRM/Financial/Page/AJAX.php
@@ -479,7 +479,11 @@ class CRM_Financial_Page_AJAX {
$updated = CRM_Batch_BAO_EntityBatch::create($params);
}
else {
- $updated = CRM_Batch_BAO_EntityBatch::del($params);
+ $delete = \Civi\Api4\EntityBatch::delete(FALSE);
+ foreach ($params as $field => $val) {
+ $delete->addWhere($field, '=', $val);
+ }
+ $updated = $delete->execute()->count();
}
}
}
diff --git a/civicrm/CRM/Grant/BAO/Grant.php b/civicrm/CRM/Grant/BAO/Grant.php
index bc33e04c80..c2e4dad3c0 100644
--- a/civicrm/CRM/Grant/BAO/Grant.php
+++ b/civicrm/CRM/Grant/BAO/Grant.php
@@ -259,13 +259,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
$grant->find();
- // delete the recently created Grant
- $grantRecent = [
- 'id' => $id,
- 'type' => 'Grant',
- ];
- CRM_Utils_Recent::del($grantRecent);
-
if ($grant->fetch()) {
$results = $grant->delete();
CRM_Utils_Hook::post('delete', 'Grant', $grant->id, $grant);
diff --git a/civicrm/CRM/Import/DataSource/CSV.php b/civicrm/CRM/Import/DataSource/CSV.php
index 45b2ee63b3..aaad75f717 100644
--- a/civicrm/CRM/Import/DataSource/CSV.php
+++ b/civicrm/CRM/Import/DataSource/CSV.php
@@ -214,6 +214,10 @@ class CRM_Import_DataSource_CSV extends CRM_Import_DataSource {
if (count($row) != $numColumns) {
continue;
}
+ // A blank line will be array(0 => NULL)
+ if ($row === [NULL]) {
+ continue;
+ }
if (!$first) {
$sql .= ', ';
diff --git a/civicrm/CRM/Logging/ReportDetail.php b/civicrm/CRM/Logging/ReportDetail.php
index bd0676e059..36404cf1d5 100644
--- a/civicrm/CRM/Logging/ReportDetail.php
+++ b/civicrm/CRM/Logging/ReportDetail.php
@@ -215,12 +215,25 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form {
$to = implode(', ', array_filter($tos));
}
+ $tableDAOClass = CRM_Core_DAO_AllCoreTables::getClassForTable($table);
+ if (!empty($tableDAOClass)) {
+ $tableDAOFields = (new $tableDAOClass())->fields();
+ // If this field is a foreign key, then we can later use the foreign
+ // class to translate the id into something more useful for display.
+ $fkClassName = $tableDAOFields[$field]['FKClassName'] ?? NULL;
+ }
if (isset($values[$field][$from])) {
$from = $values[$field][$from];
}
+ elseif (!empty($from) && !empty($fkClassName)) {
+ $from = $this->convertForeignKeyValuesToLabels($fkClassName, $field, $from);
+ }
if (isset($values[$field][$to])) {
$to = $values[$field][$to];
}
+ elseif (!empty($to) && !empty($fkClassName)) {
+ $to = $this->convertForeignKeyValuesToLabels($fkClassName, $field, $to);
+ }
if (isset($titles[$field])) {
$field = $titles[$field];
}
@@ -450,4 +463,26 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form {
}
}
+ /**
+ * Given a key value that we know is a foreign key to another table, return
+ * what the DAO thinks is the "label" for the foreign entity. For example
+ * if it's referencing a contact then return the contact name, or if it's an
+ * activity then return the activity subject.
+ * If it's the type of DAO that doesn't have such a thing, just echo back
+ * what we were given.
+ *
+ * @param string $fkClassName
+ * @param string $field
+ * @param int $keyval
+ * @return string
+ */
+ private function convertForeignKeyValuesToLabels(string $fkClassName, string $field, int $keyval): string {
+ if (property_exists($fkClassName, '_labelField')) {
+ $labelValue = CRM_Core_DAO::getFieldValue($fkClassName, $keyval, $fkClassName::$_labelField);
+ // Not sure if this should use ts - there's not a lot of context (`%1 (id: %2)`) - and also the similar field labels above don't use ts.
+ return "{$labelValue} (id: {$keyval})";
+ }
+ return (string) $keyval;
+ }
+
}
diff --git a/civicrm/CRM/Mailing/BAO/MailingJob.php b/civicrm/CRM/Mailing/BAO/MailingJob.php
index 020c65b7e1..46aa1fec5f 100644
--- a/civicrm/CRM/Mailing/BAO/MailingJob.php
+++ b/civicrm/CRM/Mailing/BAO/MailingJob.php
@@ -1117,20 +1117,11 @@ AND record_type_id = $targetRecordID
* Delete the mailing job.
*
* @param int $id
- * Mailing Job id.
- *
- * @return mixed
+ * @deprecated
+ * @return bool
*/
public static function del($id) {
- CRM_Utils_Hook::pre('delete', 'MailingJob', $id);
-
- $jobDAO = new CRM_Mailing_BAO_MailingJob();
- $jobDAO->id = $id;
- $result = $jobDAO->delete();
-
- CRM_Utils_Hook::post('delete', 'MailingJob', $jobDAO->id, $jobDAO);
-
- return $result;
+ return (bool) self::deleteRecord(['id' => $id]);
}
}
diff --git a/civicrm/CRM/Mailing/BAO/TrackableURL.php b/civicrm/CRM/Mailing/BAO/TrackableURL.php
index ea6d032db4..7026e718f7 100644
--- a/civicrm/CRM/Mailing/BAO/TrackableURL.php
+++ b/civicrm/CRM/Mailing/BAO/TrackableURL.php
@@ -54,10 +54,11 @@ class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL {
}
// hack for basic CRM-1014 and CRM-1151 and CRM-3492 compliance:
- // let's not replace possible image URLs and CiviMail ones
+ // let's not replace possible image URLs, CiviMail URLs or internal anchor URLs
if (preg_match('/\.(png|jpg|jpeg|gif|css)[\'"]?$/i', $url)
or substr_count($url, 'civicrm/extern/')
or substr_count($url, 'civicrm/mailing/')
+ or ($url[0] === '#')
) {
// let's not cache these, so they don't get &qid= appended to them
return $url;
diff --git a/civicrm/CRM/Mailing/DAO/Mailing.php b/civicrm/CRM/Mailing/DAO/Mailing.php
index 1ca7c178ab..3c77c46160 100644
--- a/civicrm/CRM/Mailing/DAO/Mailing.php
+++ b/civicrm/CRM/Mailing/DAO/Mailing.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Mailing/Mailing.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4c28acf96d01fa990a3af7f2d72344b5)
+ * (GenCodeChecksum:0889788ebb2ad430999bb9eda9524621)
*/
/**
@@ -1029,6 +1029,12 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
'dedupe_email' => [
diff --git a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
index ff7415fa4e..73f61f549c 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -132,7 +132,7 @@ WHERE email = %2
$relevant_mailing_id = $mailing_id;
// Special case for AB Tests:
- if (in_array($mailing_type, ['experiement', 'winner'])) {
+ if (in_array($mailing_type, ['experiment', 'winner'])) {
// The mailing belongs to an AB test.
// See if we can find an AB test where this is variant B.
$mailing_id_a = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_MailingAB', mailing_id, 'mailing_id_a', 'mailing_id_b');
diff --git a/civicrm/CRM/Member/BAO/Membership.php b/civicrm/CRM/Member/BAO/Membership.php
index 289d312c2d..2c4b04ca4f 100644
--- a/civicrm/CRM/Member/BAO/Membership.php
+++ b/civicrm/CRM/Member/BAO/Membership.php
@@ -301,7 +301,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
$excludeIsAdmin = TRUE;
}
- if (empty($params['is_override'])) {
+ if (empty($params['status_id']) && empty($params['is_override'])) {
$calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($params['start_date'], $params['end_date'], $params['join_date'],
'now', $excludeIsAdmin, $params['membership_type_id'] ?? NULL, $params
);
@@ -339,70 +339,80 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
}
$params['membership_id'] = $membership->id;
- // @todo further cleanup required to remove use of $ids['contribution'] from here
- if (isset($ids['membership'])) {
- $contributionID = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipPayment',
- $membership->id,
- 'contribution_id',
- 'membership_id'
- );
- // @todo this is a temporary step to removing $ids['contribution'] completely
- if (empty($params['contribution_id']) && !empty($contributionID)) {
- $params['contribution_id'] = $contributionID;
+ // For api v4 we skip all of this stuff. There is an expectation that v4 users either use
+ // the order api, or handle any financial / related processing themselves.
+ // Note that the processing below is fairly intertwined with core usage and in some places
+ // problematic or to be removed.
+ // Note the choice of 'version' as a parameter is to make it
+ // unavailable through apiv3.
+ // once we are rid of direct calls to the BAO::create from core
+ // we will deprecate this stuff into the v3 api.
+ if (($params['version'] ?? 0) !== 4) {
+ // @todo further cleanup required to remove use of $ids['contribution'] from here
+ if (isset($ids['membership'])) {
+ $contributionID = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipPayment',
+ $membership->id,
+ 'contribution_id',
+ 'membership_id'
+ );
+ // @todo this is a temporary step to removing $ids['contribution'] completely
+ if (empty($params['contribution_id']) && !empty($contributionID)) {
+ $params['contribution_id'] = $contributionID;
+ }
}
- }
- // This code ensures a line item is created but it is recommended you pass in 'skipLineItem' or 'line_item'
- if (empty($params['line_item']) && !empty($params['membership_type_id']) && empty($params['skipLineItem'])) {
- CRM_Price_BAO_LineItem::getLineItemArray($params, NULL, 'membership', $params['membership_type_id']);
- }
- $params['skipLineItem'] = TRUE;
-
- // Record contribution for this membership and create a MembershipPayment
- // @todo deprecate this.
- if (!empty($params['contribution_status_id'])) {
- $memInfo = array_merge($params, ['membership_id' => $membership->id]);
- $params['contribution'] = self::recordMembershipContribution($memInfo);
- }
-
- // If the membership has no associated contribution then we ensure
- // the line items are 'correct' here. This is a lazy legacy
- // hack whereby they are deleted and recreated
- if (empty($contributionID)) {
- if (!empty($params['lineItems'])) {
- $params['line_item'] = $params['lineItems'];
+ // This code ensures a line item is created but it is recommended you pass in 'skipLineItem' or 'line_item'
+ if (empty($params['line_item']) && !empty($params['membership_type_id']) && empty($params['skipLineItem'])) {
+ CRM_Price_BAO_LineItem::getLineItemArray($params, NULL, 'membership', $params['membership_type_id']);
}
- // do cleanup line items if membership edit the Membership type.
- if (!empty($ids['membership'])) {
- CRM_Price_BAO_LineItem::deleteLineItems($ids['membership'], 'civicrm_membership');
+ $params['skipLineItem'] = TRUE;
+
+ // Record contribution for this membership and create a MembershipPayment
+ // @todo deprecate this.
+ if (!empty($params['contribution_status_id'])) {
+ $memInfo = array_merge($params, ['membership_id' => $membership->id]);
+ $params['contribution'] = self::recordMembershipContribution($memInfo);
}
- // @todo - we should ONLY do the below if a contribution is created. Let's
- // get some deprecation notices in here & see where it's hit & work to eliminate.
- // This could happen if there is no contribution or we are in one of many
- // weird and wonderful flows. This is scary code. Keep adding tests.
- if (!empty($params['line_item']) && empty($params['contribution_id'])) {
- foreach ($params['line_item'] as $priceSetId => $lineItems) {
- foreach ($lineItems as $lineIndex => $lineItem) {
- $lineMembershipType = $lineItem['membership_type_id'] ?? NULL;
- if (!empty($params['contribution'])) {
- $params['line_item'][$priceSetId][$lineIndex]['contribution_id'] = $params['contribution']->id;
- }
- if ($lineMembershipType && $lineMembershipType == ($params['membership_type_id'] ?? NULL)) {
- $params['line_item'][$priceSetId][$lineIndex]['entity_id'] = $membership->id;
- $params['line_item'][$priceSetId][$lineIndex]['entity_table'] = 'civicrm_membership';
- }
- elseif (!$lineMembershipType && !empty($params['contribution'])) {
- $params['line_item'][$priceSetId][$lineIndex]['entity_id'] = $params['contribution']->id;
- $params['line_item'][$priceSetId][$lineIndex]['entity_table'] = 'civicrm_contribution';
+ // If the membership has no associated contribution then we ensure
+ // the line items are 'correct' here. This is a lazy legacy
+ // hack whereby they are deleted and recreated
+ if (empty($contributionID)) {
+ if (!empty($params['lineItems'])) {
+ $params['line_item'] = $params['lineItems'];
+ }
+ // do cleanup line items if membership edit the Membership type.
+ if (!empty($ids['membership'])) {
+ CRM_Price_BAO_LineItem::deleteLineItems($ids['membership'], 'civicrm_membership');
+ }
+ // @todo - we should ONLY do the below if a contribution is created. Let's
+ // get some deprecation notices in here & see where it's hit & work to eliminate.
+ // This could happen if there is no contribution or we are in one of many
+ // weird and wonderful flows. This is scary code. Keep adding tests.
+ if (!empty($params['line_item']) && empty($params['contribution_id'])) {
+
+ foreach ($params['line_item'] as $priceSetId => $lineItems) {
+ foreach ($lineItems as $lineIndex => $lineItem) {
+ $lineMembershipType = $lineItem['membership_type_id'] ?? NULL;
+ if (!empty($params['contribution'])) {
+ $params['line_item'][$priceSetId][$lineIndex]['contribution_id'] = $params['contribution']->id;
+ }
+ if ($lineMembershipType && $lineMembershipType == ($params['membership_type_id'] ?? NULL)) {
+ $params['line_item'][$priceSetId][$lineIndex]['entity_id'] = $membership->id;
+ $params['line_item'][$priceSetId][$lineIndex]['entity_table'] = 'civicrm_membership';
+ }
+ elseif (!$lineMembershipType && !empty($params['contribution'])) {
+ $params['line_item'][$priceSetId][$lineIndex]['entity_id'] = $params['contribution']->id;
+ $params['line_item'][$priceSetId][$lineIndex]['entity_table'] = 'civicrm_contribution';
+ }
}
}
+ CRM_Price_BAO_LineItem::processPriceSet(
+ $membership->id,
+ $params['line_item'],
+ $params['contribution'] ?? NULL
+ );
}
- CRM_Price_BAO_LineItem::processPriceSet(
- $membership->id,
- $params['line_item'],
- $params['contribution'] ?? NULL
- );
}
}
@@ -673,13 +683,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty
CRM_Utils_Hook::post('delete', 'Membership', $membership->id, $membership);
- // delete the recently created Membership
- $membershipRecent = [
- 'id' => $membershipId,
- 'type' => 'Membership',
- ];
- CRM_Utils_Recent::del($membershipRecent);
-
return $results;
}
diff --git a/civicrm/CRM/Member/BAO/MembershipBlock.php b/civicrm/CRM/Member/BAO/MembershipBlock.php
index 94a7cb5ba3..6c5dfdc931 100644
--- a/civicrm/CRM/Member/BAO/MembershipBlock.php
+++ b/civicrm/CRM/Member/BAO/MembershipBlock.php
@@ -37,18 +37,11 @@ class CRM_Member_BAO_MembershipBlock extends CRM_Member_DAO_MembershipBlock {
* Delete membership Blocks.
*
* @param int $id
- *
+ * @deprecated
* @return bool
*/
public static function del($id) {
- $dao = new CRM_Member_DAO_MembershipBlock();
- $dao->id = $id;
- $result = FALSE;
- if ($dao->find(TRUE)) {
- $dao->delete();
- $result = TRUE;
- }
- return $result;
+ return (bool) self::deleteRecord(['id' => $id]);
}
}
diff --git a/civicrm/CRM/Member/BAO/MembershipPayment.php b/civicrm/CRM/Member/BAO/MembershipPayment.php
index 32d9af030f..e19b1fdbf2 100644
--- a/civicrm/CRM/Member/BAO/MembershipPayment.php
+++ b/civicrm/CRM/Member/BAO/MembershipPayment.php
@@ -84,18 +84,11 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment
* Delete membership Payments.
*
* @param int $id
- *
+ * @deprecated
* @return bool
*/
public static function del($id) {
- $dao = new CRM_Member_DAO_MembershipPayment();
- $dao->id = $id;
- $result = FALSE;
- if ($dao->find(TRUE)) {
- $dao->delete();
- $result = TRUE;
- }
- return $result;
+ return (bool) self::deleteRecord(['id' => $id]);
}
}
diff --git a/civicrm/CRM/Member/DAO/Membership.php b/civicrm/CRM/Member/DAO/Membership.php
index c1d0ef01f3..51b16d4014 100644
--- a/civicrm/CRM/Member/DAO/Membership.php
+++ b/civicrm/CRM/Member/DAO/Membership.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Member/Membership.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e364568e0284363b3a9141823215c536)
+ * (GenCodeChecksum:fd3bcddc97a226b449f26e3280ef2ace)
*/
/**
@@ -526,6 +526,12 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
];
diff --git a/civicrm/CRM/Member/DAO/MembershipStatus.php b/civicrm/CRM/Member/DAO/MembershipStatus.php
index 85b8e054d8..cea61d91d1 100644
--- a/civicrm/CRM/Member/DAO/MembershipStatus.php
+++ b/civicrm/CRM/Member/DAO/MembershipStatus.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Member/MembershipStatus.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:62a534dbf9aed62f4d496939b44acf3d)
+ * (GenCodeChecksum:e60a982e078b6f3b7d14b16ea2139f14)
*/
/**
@@ -189,6 +189,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Membership Status'),
'description' => ts('Name for Membership Status'),
+ 'required' => TRUE,
'maxlength' => 128,
'size' => CRM_Utils_Type::HUGE,
'import' => TRUE,
diff --git a/civicrm/CRM/Member/DAO/MembershipType.php b/civicrm/CRM/Member/DAO/MembershipType.php
index 5bd91e8e80..50038a30a7 100644
--- a/civicrm/CRM/Member/DAO/MembershipType.php
+++ b/civicrm/CRM/Member/DAO/MembershipType.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Member/MembershipType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:89dc1a77c01ca0255a2dad8637f5e835)
+ * (GenCodeChecksum:9cb69957096aad15ee7d55a4efceb53e)
*/
/**
@@ -365,6 +365,7 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO {
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Membership Type Duration Unit'),
'description' => ts('Unit in which membership period is expressed.'),
+ 'required' => TRUE,
'maxlength' => 8,
'size' => CRM_Utils_Type::EIGHT,
'where' => 'civicrm_membership_type.duration_unit',
diff --git a/civicrm/CRM/Member/Form.php b/civicrm/CRM/Member/Form.php
index ea71c00f11..9ec7b8be7a 100644
--- a/civicrm/CRM/Member/Form.php
+++ b/civicrm/CRM/Member/Form.php
@@ -568,4 +568,27 @@ class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
return (int) $this->getSubmittedValue('payment_instrument_id') ?: $this->_paymentProcessor['object']->getPaymentInstrumentID();
}
+ /**
+ * Get the last 4 numbers of the card.
+ *
+ * @return int|null
+ */
+ protected function getPanTruncation(): ?int {
+ $card = $this->getSubmittedValue('credit_card_number');
+ return $card ? (int) substr($card, -4) : NULL;
+ }
+
+ /**
+ * Get the card_type_id.
+ *
+ * This value is the integer representing the option value for
+ * the credit card type (visa, mastercard). It is stored as part of the
+ * payment record in civicrm_financial_trxn.
+ *
+ * @return int|null
+ */
+ protected function getCardTypeID(): ?int {
+ return CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_FinancialTrxn', 'card_type_id', $this->getSubmittedValue('credit_card_type'));
+ }
+
}
diff --git a/civicrm/CRM/Member/Form/Membership.php b/civicrm/CRM/Member/Form/Membership.php
index e19cb2bb6a..7e9c28faeb 100644
--- a/civicrm/CRM/Member/Form/Membership.php
+++ b/civicrm/CRM/Member/Form/Membership.php
@@ -629,10 +629,9 @@ DESC limit 1");
// Retrieve the name and email of the contact - this will be the TO for receipt email
if ($this->_contactID) {
[$this->_memberDisplayName, $this->_memberEmail] = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactID);
-
- $this->assign('emailExists', $this->_memberEmail);
- $this->assign('displayName', $this->_memberDisplayName);
}
+ $this->assign('emailExists', $this->_memberEmail);
+ $this->assign('displayName', $this->_memberDisplayName);
if ($isUpdateToExistingRecurringMembership && CRM_Member_BAO_Membership::isCancelSubscriptionSupported($this->_id)) {
$this->assign('cancelAutoRenew',
@@ -993,7 +992,7 @@ DESC limit 1");
'toName' => $form->_contributorDisplayName,
'toEmail' => $form->_contributorEmail,
'PDFFilename' => ts('receipt') . '.pdf',
- 'isEmailPdf' => Civi::settings()->get('invoicing') && Civi::settings()->get('invoice_is_email_pdf'),
+ 'isEmailPdf' => Civi::settings()->get('invoice_is_email_pdf'),
'contributionId' => $formValues['contribution_id'],
'isTest' => (bool) ($form->_action & CRM_Core_Action::PREVIEW),
]
@@ -1103,10 +1102,6 @@ DESC limit 1");
if ($this->_mode) {
$params['total_amount'] = $this->order->getTotalAmount();
-
- //CRM-20264 : Store CC type and number (last 4 digit) during backoffice or online payment
- $params['card_type_id'] = $this->_params['card_type_id'] ?? NULL;
- $params['pan_truncation'] = $this->_params['pan_truncation'] ?? NULL;
$params['financial_type_id'] = $this->getFinancialTypeID();
//get the payment processor id as per mode. Try removing in favour of beginPostProcess.
@@ -1146,46 +1141,46 @@ DESC limit 1");
// CRM-7137 -for recurring membership,
// we do need contribution and recurring records.
$result = NULL;
- if ($this->isCreateRecurringContribution()) {
- $this->_params = $formValues;
- $contribution = civicrm_api3('Order', 'create',
- [
- 'contact_id' => $this->_contributorContactID,
- 'line_items' => $this->getLineItemForOrderApi(),
- 'is_test' => $this->isTest(),
- 'campaign_id' => $this->getSubmittedValue('campaign_id'),
- 'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
- 'payment_instrument_id' => $this->getPaymentInstrumentID(),
- 'financial_type_id' => $this->getFinancialTypeID(),
- 'receive_date' => $this->getReceiveDate(),
- 'tax_amount' => $this->order->getTotalTaxAmount(),
- 'total_amount' => $this->order->getTotalAmount(),
- 'invoice_id' => $this->getInvoiceID(),
- 'currency' => $this->getCurrency(),
- 'receipt_date' => $this->getSubmittedValue('send_receipt') ? date('YmdHis') : NULL,
- 'contribution_recur_id' => $this->getContributionRecurID(),
- 'skipCleanMoney' => TRUE,
- ]
- );
- $this->ids['Contribution'] = $contribution['id'];
- $this->setMembershipIDsFromOrder($contribution);
-
- //create new soft-credit record, CRM-13981
- if ($softParams) {
- $softParams['contribution_id'] = $contribution['id'];
- $softParams['currency'] = $this->getCurrency();
- $softParams['amount'] = $this->order->getTotalAmount();
- CRM_Contribute_BAO_ContributionSoft::add($softParams);
- }
-
- $paymentParams['contactID'] = $this->_contactID;
- $paymentParams['contributionID'] = $contribution['id'];
- $paymentParams['contributionRecurID'] = $this->getContributionRecurID();
- $paymentParams['is_recur'] = $this->isCreateRecurringContribution();
- $params['contribution_id'] = $paymentParams['contributionID'];
- $params['contribution_recur_id'] = $this->getContributionRecurID();
+ $this->_params = $formValues;
+ $contribution = civicrm_api3('Order', 'create',
+ [
+ 'contact_id' => $this->_contributorContactID,
+ 'line_items' => $this->getLineItemForOrderApi(),
+ 'is_test' => $this->isTest(),
+ 'campaign_id' => $this->getSubmittedValue('campaign_id'),
+ 'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
+ 'payment_instrument_id' => $this->getPaymentInstrumentID(),
+ 'financial_type_id' => $this->getFinancialTypeID(),
+ 'receive_date' => $this->getReceiveDate(),
+ 'tax_amount' => $this->order->getTotalTaxAmount(),
+ 'total_amount' => $this->order->getTotalAmount(),
+ 'invoice_id' => $this->getInvoiceID(),
+ 'currency' => $this->getCurrency(),
+ 'receipt_date' => $this->getSubmittedValue('send_receipt') ? date('YmdHis') : NULL,
+ 'contribution_recur_id' => $this->getContributionRecurID(),
+ 'skipCleanMoney' => TRUE,
+ ]
+ );
+ $this->ids['Contribution'] = $contribution['id'];
+ $this->setMembershipIDsFromOrder($contribution);
+
+ //create new soft-credit record, CRM-13981
+ if ($softParams) {
+ $softParams['contribution_id'] = $contribution['id'];
+ $softParams['currency'] = $this->getCurrency();
+ $softParams['amount'] = $this->order->getTotalAmount();
+ CRM_Contribute_BAO_ContributionSoft::add($softParams);
}
+
+ $paymentParams['contactID'] = $this->_contactID;
+ $paymentParams['contributionID'] = $contribution['id'];
+
+ $paymentParams['contributionRecurID'] = $this->getContributionRecurID();
+ $paymentParams['is_recur'] = $this->isCreateRecurringContribution();
+ $params['contribution_id'] = $paymentParams['contributionID'];
+ $params['contribution_recur_id'] = $this->getContributionRecurID();
+
$paymentStatus = NULL;
if ($this->order->getTotalAmount() > 0.0) {
@@ -1202,6 +1197,8 @@ DESC limit 1");
'trxn_id' => $result['trxn_id'],
'contribution_id' => $params['contribution_id'],
'is_send_contribution_notification' => FALSE,
+ 'card_type_id' => $this->getCardTypeID(),
+ 'pan_truncation' => $this->getPanTruncation(),
]);
}
}
@@ -1260,10 +1257,6 @@ DESC limit 1");
$count = 0;
foreach ($this->_memTypeSelected as $memType) {
$membershipParams = array_merge($membershipTypeValues[$memType], $params);
- //CRM-15366
- if (!empty($softParams) && !$this->isCreateRecurringContribution()) {
- $membershipParams['soft_credit'] = $softParams;
- }
if (isset($result['fee_amount'])) {
$membershipParams['fee_amount'] = $result['fee_amount'];
}
@@ -1274,19 +1267,11 @@ DESC limit 1");
// process -
// @see http://wiki.civicrm.org/confluence/pages/viewpage.action?pageId=261062657#Payments&AccountsRoadmap-Movetowardsalwaysusinga2-steppaymentprocess
$membershipParams['contribution_status_id'] = $result['payment_status_id'] ?? NULL;
- if ($this->isCreateRecurringContribution()) {
- // The earlier process created the line items (although we want to get rid of the earlier one in favour
- // of a single path!
- unset($membershipParams['lineItems']);
- }
+ // The earlier process created the line items (although we want to get rid of the earlier one in favour
+ // of a single path!
+ unset($membershipParams['lineItems']);
$membershipParams['payment_instrument_id'] = $this->getPaymentInstrumentID();
// @todo stop passing $ids (membership and userId only are set above)
- if (!$this->isCreateRecurringContribution()) {
- // For recurring we already created it 'the right way' (order api).
- // In time we will do that for all paths through this code but for now
- // we have not migrated the other paths.
- $this->setMembership((array) CRM_Member_BAO_Membership::create($membershipParams, $ids));
- }
$params['contribution'] = $membershipParams['contribution'] ?? NULL;
unset($params['lineItems']);
}
diff --git a/civicrm/CRM/Member/Form/Task/PDFLetter.php b/civicrm/CRM/Member/Form/Task/PDFLetter.php
index 3d6019a476..d6cb9df570 100644
--- a/civicrm/CRM/Member/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Member/Form/Task/PDFLetter.php
@@ -21,6 +21,8 @@
*/
class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
+ use CRM_Contact_Form_Task_PDFTrait;
+
/**
* All the existing templates in the system.
*
@@ -41,16 +43,7 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
$this->skipOnHold = $this->skipDeceased = FALSE;
parent::preProcess();
$this->setContactIDs();
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
- }
-
- /**
- * Set defaults.
- * (non-PHPdoc)
- * @see CRM_Core_Form::setDefaultValues()
- */
- public function setDefaultValues() {
- return CRM_Contact_Form_Task_PDFLetterCommon::setDefaultValues();
+ $this->preProcessPDF();
}
/**
@@ -58,11 +51,12 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
*
*
* @return void
+ * @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
//enable form element
$this->assign('suppressForm', FALSE);
- CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
+ $this->addPDFElementsToForm();
}
/**
@@ -76,11 +70,98 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
$this->setContactIDs();
$skipOnHold = $this->skipOnHold ?? FALSE;
$skipDeceased = $this->skipDeceased ?? TRUE;
- CRM_Member_Form_Task_PDFLetterCommon::postProcessMembers(
+ self::postProcessMembers(
$this, $this->_memberIds, $skipOnHold, $skipDeceased, $this->_contactIds
);
}
+ /**
+ * Process the form after the input has been submitted and validated.
+ * @todo this is horrible copy & paste code because there is so much risk of breakage
+ * in fixing the existing pdfLetter classes to be suitably generic
+ *
+ * @param CRM_Core_Form $form
+ * @param $membershipIDs
+ * @param $skipOnHold
+ * @param $skipDeceased
+ * @param $contactIDs
+ */
+ public static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
+ $formValues = $form->controller->exportValues($form->getName());
+ list($formValues, $categories, $html_message, $messageToken, $returnProperties) = CRM_Contact_Form_Task_PDFLetterCommon::processMessageTemplate($formValues);
+
+ $html
+ = self::generateHTML(
+ $membershipIDs,
+ $returnProperties,
+ $skipOnHold,
+ $skipDeceased,
+ $messageToken,
+ $html_message,
+ $categories
+ );
+ CRM_Contact_Form_Task_PDFLetterCommon::createActivities($form, $html_message, $contactIDs, $formValues['subject'], CRM_Utils_Array::value('campaign_id', $formValues));
+
+ // Set the filename for the PDF using the Activity Subject, if defined. Remove unwanted characters and limit the length to 200 characters.
+ if (!empty($form->getSubmittedValue('subject'))) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($form->getSubmittedValue('subject'), '_', 200) . '.pdf';
+ }
+ else {
+ $fileName = 'CiviLetter.pdf';
+ }
+
+ CRM_Utils_PDF_Utils::html2pdf($html, $fileName, FALSE, $formValues);
+
+ $form->postProcessHook();
+
+ CRM_Utils_System::civiExit();
+ }
+
+ /**
+ * Generate html for pdf letters.
+ *
+ * @param array $membershipIDs
+ * @param array $returnProperties
+ * @param bool $skipOnHold
+ * @param bool $skipDeceased
+ * @param array $messageToken
+ * @param $html_message
+ * @param $categories
+ *
+ * @return array
+ */
+ public static function generateHTML($membershipIDs, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $html_message, $categories) {
+ $memberships = CRM_Utils_Token::getMembershipTokenDetails($membershipIDs);
+ $html = [];
+
+ foreach ($membershipIDs as $membershipID) {
+ $membership = $memberships[$membershipID];
+ // get contact information
+ $contactId = $membership['contact_id'];
+ $params = ['contact_id' => $contactId];
+ //getTokenDetails is much like calling the api contact.get function - but - with some minor
+ // special handlings. It precedes the existence of the api
+ list($contacts) = CRM_Utils_Token::getTokenDetails(
+ $params,
+ $returnProperties,
+ $skipOnHold,
+ $skipDeceased,
+ NULL,
+ $messageToken,
+ 'CRM_Contribution_Form_Task_PDFLetterCommon'
+ );
+
+ $tokenHtml = CRM_Utils_Token::replaceContactTokens($html_message, $contacts[$contactId], TRUE, $messageToken);
+ $tokenHtml = CRM_Utils_Token::replaceEntityTokens('membership', $membership, $tokenHtml, $messageToken);
+ $tokenHtml = CRM_Utils_Token::replaceHookTokens($tokenHtml, $contacts[$contactId], $categories, TRUE);
+ $tokenHtml = CRM_Utils_Token::parseThroughSmarty($tokenHtml, $contacts[$contactId]);
+
+ $html[] = $tokenHtml;
+
+ }
+ return $html;
+ }
+
/**
* List available tokens for this form.
*
diff --git a/civicrm/CRM/Member/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Member/Form/Task/PDFLetterCommon.php
index 80c83e8f11..86191d616e 100644
--- a/civicrm/CRM/Member/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Member/Form/Task/PDFLetterCommon.php
@@ -3,6 +3,8 @@
/**
* This class provides the common functionality for creating PDF letter for
* members
+ *
+ * @deprecated
*/
class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLetterCommon {
@@ -11,6 +13,8 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
* @todo this is horrible copy & paste code because there is so much risk of breakage
* in fixing the existing pdfLetter classes to be suitably generic
*
+ * @deprecated
+ *
* @param CRM_Core_Form $form
* @param $membershipIDs
* @param $skipOnHold
@@ -18,8 +22,9 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
* @param $contactIDs
*/
public static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$formValues = $form->controller->exportValues($form->getName());
- list($formValues, $categories, $html_message, $messageToken, $returnProperties) = self::processMessageTemplate($formValues);
+ list($formValues, $categories, $html_message, $messageToken, $returnProperties) = CRM_Contact_Form_Task_PDFLetterCommon::processMessageTemplate($formValues);
$html
= self::generateHTML(
@@ -31,9 +36,17 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
$html_message,
$categories
);
- self::createActivities($form, $html_message, $contactIDs, $formValues['subject'], CRM_Utils_Array::value('campaign_id', $formValues));
+ CRM_Contact_Form_Task_PDFLetterCommon::createActivities($form, $html_message, $contactIDs, $formValues['subject'], CRM_Utils_Array::value('campaign_id', $formValues));
- CRM_Utils_PDF_Utils::html2pdf($html, "CiviLetter.pdf", FALSE, $formValues);
+ // Set the filename for the PDF using the Activity Subject, if defined. Remove unwanted characters and limit the length to 200 characters.
+ if (!empty($form->getSubmittedValue('subject'))) {
+ $fileName = CRM_Utils_File::makeFilenameWithUnicode($form->getSubmittedValue('subject'), '_', 200) . '.pdf';
+ }
+ else {
+ $fileName = 'CiviLetter.pdf';
+ }
+
+ CRM_Utils_PDF_Utils::html2pdf($html, $fileName, FALSE, $formValues);
$form->postProcessHook();
@@ -41,7 +54,7 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
}
/**
- * Generate htmlfor pdf letters.
+ * Generate html for pdf letters.
*
* @param array $membershipIDs
* @param array $returnProperties
@@ -51,9 +64,12 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
* @param $html_message
* @param $categories
*
+ * @deprecated
+ *
* @return array
*/
public static function generateHTML($membershipIDs, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $html_message, $categories) {
+ CRM_Core_Error::deprecatedFunctionWarning('no alternative');
$memberships = CRM_Utils_Token::getMembershipTokenDetails($membershipIDs);
$html = [];
diff --git a/civicrm/CRM/Note/Form/Note.php b/civicrm/CRM/Note/Form/Note.php
index 2104fd3245..c0ec7fe0d5 100644
--- a/civicrm/CRM/Note/Form/Note.php
+++ b/civicrm/CRM/Note/Form/Note.php
@@ -173,7 +173,9 @@ class CRM_Note_Form_Note extends CRM_Core_Form {
}
if ($this->_action & CRM_Core_Action::DELETE) {
- CRM_Core_BAO_Note::del($this->_id);
+ CRM_Core_BAO_Note::deleteRecord(['id' => $this->_id]);
+ $status = ts('Selected Note has been deleted successfully.');
+ CRM_Core_Session::setStatus($status, ts('Deleted'), 'success');
return;
}
diff --git a/civicrm/CRM/Pledge/BAO/Pledge.php b/civicrm/CRM/Pledge/BAO/Pledge.php
index 63078610fd..61f95340bc 100644
--- a/civicrm/CRM/Pledge/BAO/Pledge.php
+++ b/civicrm/CRM/Pledge/BAO/Pledge.php
@@ -314,13 +314,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge {
CRM_Utils_Hook::post('delete', 'Pledge', $dao->id, $dao);
- // delete the recently created Pledge
- $pledgeRecent = [
- 'id' => $id,
- 'type' => 'Pledge',
- ];
- CRM_Utils_Recent::del($pledgeRecent);
-
return $results;
}
diff --git a/civicrm/CRM/Pledge/BAO/PledgePayment.php b/civicrm/CRM/Pledge/BAO/PledgePayment.php
index 91930d465e..e48e2788a4 100644
--- a/civicrm/CRM/Pledge/BAO/PledgePayment.php
+++ b/civicrm/CRM/Pledge/BAO/PledgePayment.php
@@ -203,27 +203,11 @@ WHERE pledge_id = %1
* Delete pledge payment.
*
* @param int $id
- *
- * @return int
- * pledge payment id
+ * @deprecated
+ * @return bool
*/
public static function del($id) {
- $payment = new CRM_Pledge_DAO_PledgePayment();
- $payment->id = $id;
- if ($payment->find()) {
- $payment->fetch();
-
- CRM_Utils_Hook::pre('delete', 'PledgePayment', $id, $payment);
-
- $result = $payment->delete();
-
- CRM_Utils_Hook::post('delete', 'PledgePayment', $id, $payment);
-
- return $result;
- }
- else {
- return FALSE;
- }
+ return (bool) self::deleteRecord(['id' => $id]);
}
/**
diff --git a/civicrm/CRM/Pledge/DAO/Pledge.php b/civicrm/CRM/Pledge/DAO/Pledge.php
index ab4a7c6829..7a9a764e43 100644
--- a/civicrm/CRM/Pledge/DAO/Pledge.php
+++ b/civicrm/CRM/Pledge/DAO/Pledge.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Pledge/Pledge.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:49bcf54cf3de315f6e8f07519eb1b5f2)
+ * (GenCodeChecksum:bcc7d49479de858804a09bf49c1ebda9)
*/
/**
@@ -678,6 +678,12 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO {
'type' => 'EntityRef',
'label' => ts("Campaign"),
],
+ 'pseudoconstant' => [
+ 'table' => 'civicrm_campaign',
+ 'keyColumn' => 'id',
+ 'labelColumn' => 'title',
+ 'prefetch' => 'FALSE',
+ ],
'add' => '3.4',
],
];
diff --git a/civicrm/CRM/Price/BAO/LineItem.php b/civicrm/CRM/Price/BAO/LineItem.php
index 2591f632e8..c5c5120351 100644
--- a/civicrm/CRM/Price/BAO/LineItem.php
+++ b/civicrm/CRM/Price/BAO/LineItem.php
@@ -33,12 +33,6 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
*/
public static function create(&$params) {
$id = $params['id'] ?? NULL;
- if ($id) {
- CRM_Utils_Hook::pre('edit', 'LineItem', $id, $params);
- }
- else {
- CRM_Utils_Hook::pre('create', 'LineItem', $id, $params);
- }
// unset entity table and entity id in $params
// we never update the entity table and entity id during update mode
@@ -56,6 +50,13 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
$params['tax_amount'] = self::getTaxAmountForLineItem($params);
}
+ // Call the hooks after tax is set in case hooks wish to alter it.
+ if ($id) {
+ CRM_Utils_Hook::pre('edit', 'LineItem', $id, $params);
+ }
+ else {
+ CRM_Utils_Hook::pre('create', 'LineItem', $id, $params);
+ }
$lineItemBAO = new CRM_Price_BAO_LineItem();
$lineItemBAO->copyValues($params);
@@ -214,8 +215,6 @@ WHERE li.contribution_id = %1";
];
$getTaxDetails = FALSE;
- $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
- $invoicing = $invoiceSettings['invoicing'] ?? NULL;
$dao = CRM_Core_DAO::executeQuery("$selectClause $fromClause $whereClause $orderByClause", $params);
while ($dao->fetch()) {
@@ -257,7 +256,7 @@ WHERE li.contribution_id = %1";
$getTaxDetails = TRUE;
}
}
- if ($invoicing) {
+ if (Civi::settings()->get('invoicing')) {
// @todo - this is an inappropriate place to be doing form level assignments.
$taxTerm = Civi::settings()->get('tax_term');
$smarty = CRM_Core_Smarty::singleton();
diff --git a/civicrm/CRM/Price/BAO/PriceFieldValue.php b/civicrm/CRM/Price/BAO/PriceFieldValue.php
index e33b1ed83b..5df67efec8 100644
--- a/civicrm/CRM/Price/BAO/PriceFieldValue.php
+++ b/civicrm/CRM/Price/BAO/PriceFieldValue.php
@@ -217,19 +217,12 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue {
* Delete the value.
*
* @param int $id
- * Id.
*
+ * @deprecated
* @return bool
- *
*/
public static function del($id) {
- if (!$id) {
- return FALSE;
- }
-
- $fieldValueDAO = new CRM_Price_DAO_PriceFieldValue();
- $fieldValueDAO->id = $id;
- return $fieldValueDAO->delete();
+ return (bool) self::deleteRecord(['id' => $id]);
}
/**
diff --git a/civicrm/CRM/Price/Page/Field.php b/civicrm/CRM/Price/Page/Field.php
index d59d9a0eae..71cec4233d 100644
--- a/civicrm/CRM/Price/Page/Field.php
+++ b/civicrm/CRM/Price/Page/Field.php
@@ -108,9 +108,7 @@ class CRM_Price_Page_Field extends CRM_Core_Page {
$priceFieldBAO->find();
// display taxTerm for priceFields
- $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
$taxTerm = Civi::settings()->get('tax_term');
- $invoicing = $invoiceSettings['invoicing'] ?? NULL;
$getTaxDetails = FALSE;
$taxRate = CRM_Core_PseudoConstant::getTaxRates();
CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes);
@@ -126,7 +124,7 @@ class CRM_Price_Page_Field extends CRM_Core_Page {
CRM_Price_BAO_PriceFieldValue::retrieve($params, $optionValues);
$priceField[$priceFieldBAO->id]['price'] = $optionValues['amount'] ?? NULL;
$financialTypeId = $optionValues['financial_type_id'];
- if ($invoicing && isset($taxRate[$financialTypeId])) {
+ if (Civi::settings()->get('invoicing') && isset($taxRate[$financialTypeId])) {
$priceField[$priceFieldBAO->id]['tax_rate'] = $taxRate[$financialTypeId];
$getTaxDetails = TRUE;
}
diff --git a/civicrm/CRM/Profile/Page/Dynamic.php b/civicrm/CRM/Profile/Page/Dynamic.php
index 7ce7eeef62..2e05630f61 100644
--- a/civicrm/CRM/Profile/Page/Dynamic.php
+++ b/civicrm/CRM/Profile/Page/Dynamic.php
@@ -446,7 +446,7 @@ class CRM_Profile_Page_Dynamic extends CRM_Core_Page {
if (!$email) {
return '';
}
- $emailID = Email::get()->setOrderBy(['is_primary' => 'DESC'])->setWhere([['contact_id', '=', $this->_id], ['email', '=', $email], ['on_hold', '=', FALSE], ['contact.is_deceased', '=', FALSE], ['contact.is_deleted', '=', FALSE], ['contact.do_not_email', '=', FALSE]])->execute()->first()['id'];
+ $emailID = Email::get()->setOrderBy(['is_primary' => 'DESC'])->setWhere([['contact_id', '=', $this->_id], ['email', '=', $email], ['on_hold', '=', FALSE], ['contact_id.is_deceased', '=', FALSE], ['contact_id.is_deleted', '=', FALSE], ['contact_id.do_not_email', '=', FALSE]])->execute()->first()['id'];
if (!$emailID) {
return $email;
}
diff --git a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 87486b1174..91f10d1bad 100644
--- a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -307,7 +307,12 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic {
$customValue = &$val;
if (!empty($dateFields) && array_key_exists($fieldId, $dateFields)) {
// formatted date capture value capture
- $dateFieldsVals[$fieldId][$recId] = CRM_Core_BAO_CustomField::displayValue($customValue, $fieldId);
+ if ($this->_pageViewType == 'profileDataView') {
+ $dateFieldsVals[$fieldId][$recId] = CRM_Utils_Date::processDate($result[$recId][$fieldId], NULL, FALSE, 'YmdHis');
+ }
+ else {
+ $dateFieldsVals[$fieldId][$recId] = CRM_Core_BAO_CustomField::displayValue($customValue, $fieldId);
+ }
//set date and time format
switch ($timeFormat) {
diff --git a/civicrm/CRM/Queue/Service.php b/civicrm/CRM/Queue/Service.php
index 0ef34cab90..119c76efe1 100644
--- a/civicrm/CRM/Queue/Service.php
+++ b/civicrm/CRM/Queue/Service.php
@@ -84,7 +84,7 @@ class CRM_Queue_Service {
* @return CRM_Queue_Queue
*/
public function create($queueSpec) {
- if (@is_object($this->queues[$queueSpec['name']]) && empty($queueSpec['reset'])) {
+ if (is_object($this->queues[$queueSpec['name']] ?? NULL) && empty($queueSpec['reset'])) {
return $this->queues[$queueSpec['name']];
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Summary.php b/civicrm/CRM/Report/Form/Contribute/Summary.php
index 27d08eb05a..82ae379f50 100644
--- a/civicrm/CRM/Report/Form/Contribute/Summary.php
+++ b/civicrm/CRM/Report/Form/Contribute/Summary.php
@@ -142,6 +142,11 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
'non_deductible_amount' => [
'title' => ts('Non-deductible Amount'),
],
+ 'contribution_recur_id' => [
+ 'title' => ts('Contribution Recurring'),
+ 'dbAlias' => '!ISNULL(contribution_civireport.contribution_recur_id)',
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ ],
],
'grouping' => 'contri-fields',
'filters' => [
@@ -180,6 +185,17 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
'options' => CRM_Contribute_PseudoConstant::contributionPage(),
'type' => CRM_Utils_Type::T_INT,
],
+ 'contribution_recur_id' => [
+ 'title' => ts('Contribution Recurring'),
+ 'operatorType' => CRM_Report_Form::OP_SELECT,
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ 'options' => [
+ '' => ts('Any'),
+ TRUE => ts('Yes'),
+ FALSE => ts('No'),
+ ],
+ 'dbAlias' => '!ISNULL(contribution_civireport.contribution_recur_id)',
+ ],
'total_amount' => [
'title' => ts('Contribution Amount'),
],
@@ -225,6 +241,11 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
'options' => CRM_Contribute_PseudoConstant::contributionPage(),
'type' => CRM_Utils_Type::T_INT,
],
+ 'contribution_recur_id' => [
+ 'title' => ts('Contribution Recurring'),
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ 'dbAlias' => '!ISNULL(contribution_civireport.contribution_recur_id)',
+ ],
],
],
'civicrm_financial_trxn' => [
diff --git a/civicrm/CRM/SMS/Form/Upload.php b/civicrm/CRM/SMS/Form/Upload.php
index c39cdb03fa..64078f123c 100644
--- a/civicrm/CRM/SMS/Form/Upload.php
+++ b/civicrm/CRM/SMS/Form/Upload.php
@@ -338,7 +338,10 @@ class CRM_SMS_Form_Upload extends CRM_Core_Form {
$dummy_mail = new CRM_Mailing_BAO_Mailing();
$mess = "body_text";
$dummy_mail->$mess = $str;
- $str = CRM_Core_BAO_MessageTemplate::renderMessageTemplate(['text' => $str, 'html' => '', 'subject' => ''], TRUE, CRM_Core_Session::getLoggedInContactID(), [])['text'];
+ $str = CRM_Core_TokenSmarty::render(['text' => $str], [
+ 'smarty' => FALSE,
+ 'contactId' => CRM_Core_Session::getLoggedInContactID(),
+ ])['text'];
$tokens = $dummy_mail->getTokens();
$str = CRM_Utils_Token::replaceSubscribeInviteTokens($str);
diff --git a/civicrm/CRM/Upgrade/Incremental/Base.php b/civicrm/CRM/Upgrade/Incremental/Base.php
index 940fb3b0d1..8e2e8641f7 100644
--- a/civicrm/CRM/Upgrade/Incremental/Base.php
+++ b/civicrm/CRM/Upgrade/Incremental/Base.php
@@ -220,6 +220,26 @@ class CRM_Upgrade_Incremental_Base {
return TRUE;
}
+ /**
+ * Add the specified option group, gracefully if it already exists.
+ *
+ * @param CRM_Queue_TaskContext $ctx
+ * @param array $params
+ * @param array $options
+ *
+ * @return bool
+ */
+ public static function addOptionGroup(CRM_Queue_TaskContext $ctx, $params, $options): bool {
+ $defaults = ['is_active' => 1];
+ $optionDefaults = ['is_active' => 1];
+ $optionDefaults['option_group_id'] = \CRM_Core_BAO_OptionGroup::ensureOptionGroupExists(array_merge($defaults, $params));
+
+ foreach ($options as $option) {
+ \CRM_Core_BAO_OptionValue::ensureOptionValueExists(array_merge($optionDefaults, $option));
+ }
+ return TRUE;
+ }
+
/**
* Do any relevant message template updates.
*
diff --git a/civicrm/CRM/Upgrade/Incremental/General.php b/civicrm/CRM/Upgrade/Incremental/General.php
index 115e47a7d0..9023a670c8 100644
--- a/civicrm/CRM/Upgrade/Incremental/General.php
+++ b/civicrm/CRM/Upgrade/Incremental/General.php
@@ -122,8 +122,8 @@ class CRM_Upgrade_Incremental_General {
}
$ftAclSetting = Civi::settings()->get('acl_financial_type');
- $financialAclExtension = civicrm_api3('extension', 'get', ['key' => 'biz.jmaconsulting.financialaclreport']);
- if ($ftAclSetting && (($financialAclExtension['count'] == 1 && $financialAclExtension['status'] != 'Installed') || $financialAclExtension['count'] !== 1)) {
+ $financialAclExtension = civicrm_api3('extension', 'get', ['key' => 'biz.jmaconsulting.financialaclreport', 'sequential' => 1]);
+ if ($ftAclSetting && (($financialAclExtension['count'] == 1 && $financialAclExtension['values'][0]['status'] != 'Installed') || $financialAclExtension['count'] !== 1)) {
$preUpgradeMessage .= '<br />' . ts('CiviCRM will in the future require the extension %1 for CiviCRM Reports to work correctly with the Financial Type ACLs. The extension can be downloaded <a href="%2">here</a>', [
1 => 'biz.jmaconsulting.financialaclreport',
2 => 'https://github.com/JMAConsulting/biz.jmaconsulting.financialaclreport',
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveFortyTwo.php b/civicrm/CRM/Upgrade/Incremental/php/FiveFortyTwo.php
new file mode 100644
index 0000000000..265aa328ee
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveFortyTwo.php
@@ -0,0 +1,87 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Upgrade logic for FiveFortyTwo */
+class CRM_Upgrade_Incremental_php_FiveFortyTwo extends CRM_Upgrade_Incremental_Base {
+
+ /**
+ * Compute any messages which should be displayed beforeupgrade.
+ *
+ * Note: This function is called iteratively for each incremental upgrade step.
+ * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()').
+ *
+ * @param string $preUpgradeMessage
+ * @param string $rev
+ * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
+ * @param null $currentVer
+ */
+ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
+ // Example: Generate a pre-upgrade message.
+ // if ($rev == '5.12.34') {
+ // $preUpgradeMessage .= '<p>' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '</p>';
+ // }
+ }
+
+ /**
+ * Compute any messages which should be displayed after upgrade.
+ *
+ * Note: This function is called iteratively for each incremental upgrade step.
+ * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()').
+ *
+ * @param string $postUpgradeMessage
+ * alterable.
+ * @param string $rev
+ * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
+ */
+ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
+ // Example: Generate a post-upgrade message.
+ // if ($rev == '5.12.34') {
+ // $postUpgradeMessage .= '<br /><br />' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'.");
+ // }
+ }
+
+ /*
+ * Important! All upgrade functions MUST add a 'runSql' task.
+ * Uncomment and use the following template for a new upgrade version
+ * (change the x in the function name):
+ */
+
+ /**
+ * Upgrade function.
+ *
+ * @param string $rev
+ */
+ public function upgrade_5_42_alpha1(string $rev): void {
+ $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+ $contributeComponentID = CRM_Core_DAO::singleValueQuery('SELECT id from civicrm_component WHERE name = "CiviContribute"');
+ $this->addTask(
+ 'Add option group for entity batch table (if you are using gift-aid you will need an extension update)',
+ 'addOptionGroup',
+ [
+ 'name' => 'entity_batch_extends',
+ 'title' => ts('Entity Batch Extends'),
+ 'is_reserved' => 1,
+ 'is_active' => 1,
+ 'is_locked' => 1,
+ ],
+ [
+ [
+ 'name' => 'civicrm_financial_trxn',
+ 'value' => 'civicrm_financial_trxn',
+ 'label' => ts('Financial Transactions'),
+ 'component_id' => $contributeComponentID,
+ ],
+ ]
+ );
+ }
+
+}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.42.alpha1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.42.alpha1.mysql.tpl
new file mode 100644
index 0000000000..e72fd128fd
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.42.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.42.alpha1 during upgrade *}
diff --git a/civicrm/CRM/Utils/Address/USPS.php b/civicrm/CRM/Utils/Address/USPS.php
index 721b2e70e0..fc53a7a70f 100644
--- a/civicrm/CRM/Utils/Address/USPS.php
+++ b/civicrm/CRM/Utils/Address/USPS.php
@@ -74,6 +74,7 @@ class CRM_Utils_Address_USPS {
'API' => 'Verify',
'XML' => $XMLQuery,
],
+ 'timeout' => \Civi::settings()->get('http_timeout'),
]);
$session = CRM_Core_Session::singleton();
diff --git a/civicrm/CRM/Utils/AutoClean.php b/civicrm/CRM/Utils/AutoClean.php
index 1be38b0ece..514283f434 100644
--- a/civicrm/CRM/Utils/AutoClean.php
+++ b/civicrm/CRM/Utils/AutoClean.php
@@ -48,6 +48,26 @@ class CRM_Utils_AutoClean {
return $ac;
}
+ /**
+ * Temporarily set the active locale. Cleanup locale when the autoclean handle disappears.
+ *
+ * @param string|null $newLocale
+ * Ex: 'fr_CA'
+ * @return \CRM_Utils_AutoClean|null
+ */
+ public static function swapLocale(?string $newLocale) {
+ $oldLocale = $GLOBALS['tsLocale'] ?? NULL;
+ if ($oldLocale === $newLocale) {
+ return NULL;
+ }
+
+ $i18n = \CRM_Core_I18n::singleton();
+ $i18n->setLocale($newLocale);
+ return static::with(function() use ($i18n, $oldLocale) {
+ $i18n->setLocale($oldLocale);
+ });
+ }
+
/**
* Temporarily swap values using callback functions, and cleanup
* when the current context shuts down.
diff --git a/civicrm/CRM/Utils/File.php b/civicrm/CRM/Utils/File.php
index d50ee48d77..4fd3706bfa 100644
--- a/civicrm/CRM/Utils/File.php
+++ b/civicrm/CRM/Utils/File.php
@@ -415,14 +415,11 @@ class CRM_Utils_File {
* whether the file can be include()d or require()d
*/
public static function isIncludable($name) {
- $x = @fopen($name, 'r', TRUE);
- if ($x) {
- fclose($x);
- return TRUE;
- }
- else {
+ $full_filepath = stream_resolve_include_path($name);
+ if ($full_filepath === FALSE) {
return FALSE;
}
+ return is_readable($full_filepath);
}
/**
@@ -462,6 +459,27 @@ class CRM_Utils_File {
}
}
+ /**
+ * CRM_Utils_String::munge() doesn't handle unicode and needs to be able
+ * to generate valid database tablenames so will sometimes generate a
+ * random string. Here what we want is a human-sensible filename that might
+ * contain unicode.
+ * Note that this does filter out emojis and such, but keeps characters that
+ * are considered alphanumeric in non-english languages.
+ *
+ * @param string $input
+ * @param string $replacementString Character or string to replace invalid characters with. Can be the empty string.
+ * @param int $cutoffLength Length to truncate the result after replacements.
+ * @return string
+ */
+ public static function makeFilenameWithUnicode(string $input, string $replacementString = '_', int $cutoffLength = 63): string {
+ $filename = preg_replace('/\W/u', $replacementString, $input);
+ if ($cutoffLength) {
+ return mb_substr($filename, 0, $cutoffLength);
+ }
+ return $filename;
+ }
+
/**
* Copies a file
*
diff --git a/civicrm/CRM/Utils/Geocode/Google.php b/civicrm/CRM/Utils/Geocode/Google.php
index 6ab1397fea..ad670f6c94 100644
--- a/civicrm/CRM/Utils/Geocode/Google.php
+++ b/civicrm/CRM/Utils/Geocode/Google.php
@@ -106,7 +106,7 @@ class CRM_Utils_Geocode_Google {
$query = 'https://' . self::$_server . self::$_uri . $add;
$client = new GuzzleHttp\Client();
- $request = $client->request('GET', $query);
+ $request = $client->request('GET', $query, ['timeout' => \Civi::settings()->get('http_timeout')]);
$string = $request->getBody();
libxml_use_internal_errors(TRUE);
diff --git a/civicrm/CRM/Utils/Mail.php b/civicrm/CRM/Utils/Mail.php
index 9a21b4b9de..e8eca02c72 100644
--- a/civicrm/CRM/Utils/Mail.php
+++ b/civicrm/CRM/Utils/Mail.php
@@ -39,7 +39,7 @@ class CRM_Utils_Mail {
}
elseif ($mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) {
if ($mailingInfo['smtpServer'] == '' || !$mailingInfo['smtpServer']) {
- CRM_Core_Error::debug_log_message(ts('There is no valid smtp server setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the SMTP Server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
+ Civi::log()->error(ts('There is no valid smtp server setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the SMTP Server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
throw new CRM_Core_Exception(ts('There is no valid smtp server setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the SMTP Server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
}
@@ -83,7 +83,7 @@ class CRM_Utils_Mail {
if ($mailingInfo['sendmail_path'] == '' ||
!$mailingInfo['sendmail_path']
) {
- CRM_Core_Error::debug_log_message(ts('There is no valid sendmail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the sendmail server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
+ Civi::log()->error(ts('There is no valid sendmail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the sendmail server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
throw new CRM_Core_Exception(ts('There is no valid sendmail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the sendmail server.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
}
$params['sendmail_path'] = $mailingInfo['sendmail_path'];
@@ -98,11 +98,11 @@ class CRM_Utils_Mail {
$mailer = self::_createMailer('mock', $mailingInfo);
}
elseif ($mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED) {
- CRM_Core_Error::debug_log_message(ts('Outbound mail has been disabled. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
+ Civi::log()->info(ts('Outbound mail has been disabled. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
CRM_Core_Error::statusBounce(ts('Outbound mail has been disabled. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
}
else {
- CRM_Core_Error::debug_log_message(ts('There is no valid SMTP server Setting Or SendMail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
+ Civi::log()->error(ts('There is no valid SMTP server Setting Or SendMail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
CRM_Core_Error::debug_var('mailing_info', $mailingInfo);
CRM_Core_Error::statusBounce(ts('There is no valid SMTP server Setting Or sendMail path setting. Click <a href=\'%1\'>Administer >> System Setting >> Outbound Email</a> to set the OutBound Email.', [1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')]));
}
@@ -305,14 +305,16 @@ class CRM_Utils_Mail {
$result = $mailer->send($to, $headers, $message);
}
catch (Exception $e) {
- CRM_Core_Session::setStatus($e->getMessage(), ts('Mailing Error'), 'error');
+ \Civi::log()->error('Mailing error: ' . $e->getMessage());
+ CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
return FALSE;
}
if (is_a($result, 'PEAR_Error')) {
$message = self::errorMessage($mailer, $result);
// append error message in case multiple calls are being made to
// this method in the course of sending a batch of messages.
- CRM_Core_Session::setStatus($message, ts('Mailing Error'), 'error');
+ \Civi::log()->error('Mailing error: ' . $message);
+ CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
return FALSE;
}
// CRM-10699
diff --git a/civicrm/CRM/Utils/Recent.php b/civicrm/CRM/Utils/Recent.php
index 59818c0b01..d4fcf923ec 100644
--- a/civicrm/CRM/Utils/Recent.php
+++ b/civicrm/CRM/Utils/Recent.php
@@ -90,22 +90,13 @@ class CRM_Utils_Recent {
$contactName,
$others = []
) {
- self::initialize();
-
+ // Abort if this entity type is not supported
if (!self::isProviderEnabled($type)) {
return;
}
- $session = CRM_Core_Session::singleton();
-
- // make sure item is not already present in list
- for ($i = 0; $i < count(self::$_recent); $i++) {
- if (self::$_recent[$i]['type'] === $type && self::$_recent[$i]['id'] == $id) {
- // delete item from array
- array_splice(self::$_recent, $i, 1);
- break;
- }
- }
+ // Ensure item is not already present in list
+ self::removeItems(['id' => $id, 'type' => $type]);
if (!is_array($others)) {
$others = [];
@@ -127,37 +118,56 @@ class CRM_Utils_Recent {
]
);
- if (count(self::$_recent) > self::$_maxItems) {
+ // Keep the list trimmed to max length
+ while (count(self::$_recent) > self::$_maxItems) {
array_pop(self::$_recent);
}
CRM_Utils_Hook::recent(self::$_recent);
+ $session = CRM_Core_Session::singleton();
$session->set(self::STORE_NAME, self::$_recent);
}
/**
- * Delete an item from the recent stack.
- *
- * @param array $recentItem
- * Array of the recent Item to be removed.
+ * Callback for hook_civicrm_post().
+ * @param \Civi\Core\Event\PostEvent $event
*/
- public static function del($recentItem) {
- self::initialize();
- $tempRecent = self::$_recent;
+ public static function on_hook_civicrm_post(\Civi\Core\Event\PostEvent $event) {
+ if ($event->action === 'delete' && $event->id && CRM_Core_Session::getLoggedInContactID()) {
+ // Is this an entity that might be in the recent items list?
+ $providersPermitted = Civi::settings()->get('recentItemsProviders') ?: array_keys(self::getProviders());
+ if (in_array($event->entity, $providersPermitted)) {
+ self::del(['id' => $event->id, 'type' => $event->entity]);
+ }
+ }
+ }
- self::$_recent = [];
+ /**
+ * Remove items from the array that match given props
+ * @param array $props
+ */
+ private static function removeItems(array $props) {
+ self::initialize();
- // make sure item is not already present in list
- for ($i = 0; $i < count($tempRecent); $i++) {
- if (!($tempRecent[$i]['id'] == $recentItem['id'] &&
- $tempRecent[$i]['type'] == $recentItem['type']
- )
- ) {
- self::$_recent[] = $tempRecent[$i];
+ self::$_recent = array_filter(self::$_recent, function($item) use ($props) {
+ foreach ($props as $key => $val) {
+ if (isset($item[$key]) && $item[$key] != $val) {
+ return TRUE;
+ }
}
- }
+ return FALSE;
+ });
+ }
+ /**
+ * Delete item(s) from the recently-viewed list.
+ *
+ * @param array $removeItem
+ * Item to be removed.
+ */
+ public static function del($removeItem) {
+ self::removeItems($removeItem);
CRM_Utils_Hook::recent(self::$_recent);
$session = CRM_Core_Session::singleton();
$session->set(self::STORE_NAME, self::$_recent);
@@ -167,27 +177,11 @@ class CRM_Utils_Recent {
* Delete an item from the recent stack.
*
* @param string $id
- * Contact id that had to be removed.
+ * @deprecated
*/
public static function delContact($id) {
- self::initialize();
-
- $tempRecent = self::$_recent;
-
- self::$_recent = [];
-
- // rebuild recent.
- for ($i = 0; $i < count($tempRecent); $i++) {
- // don't include deleted contact in recent.
- if (CRM_Utils_Array::value('contact_id', $tempRecent[$i]) == $id) {
- continue;
- }
- self::$_recent[] = $tempRecent[$i];
- }
-
- CRM_Utils_Hook::recent(self::$_recent);
- $session = CRM_Core_Session::singleton();
- $session->set(self::STORE_NAME, self::$_recent);
+ CRM_Core_Error::deprecatedFunctionWarning('del');
+ self::del(['contact_id' => $id]);
}
/**
diff --git a/civicrm/CRM/Utils/Rule.php b/civicrm/CRM/Utils/Rule.php
index 9c5707925c..862e4603f7 100644
--- a/civicrm/CRM/Utils/Rule.php
+++ b/civicrm/CRM/Utils/Rule.php
@@ -639,12 +639,46 @@ class CRM_Utils_Rule {
*
* @return bool
*/
- public static function email($value) {
+ public static function email($value): bool {
+ if (function_exists('idn_to_ascii')) {
+ $parts = explode('@', $value);
+ foreach ($parts as &$part) {
+ // if the function returns FALSE then let filter_var have at it.
+ $part = self::idnToAsci($part) ?: $part;
+ if ($part === 'localhost') {
+ // if we are in a dev environment add .com to trick it into accepting localhost.
+ // this is a bit best-effort - ie we don't really care that it's in a bigger if.
+ $part .= '.com';
+ }
+ }
+ $value = implode('@', $parts);
+ }
return (bool) filter_var($value, FILTER_VALIDATE_EMAIL);
}
/**
- * @param $list
+ * Convert domain string to ascii.
+ *
+ * See https://lab.civicrm.org/dev/core/-/issues/2769
+ * and also discussion over in guzzle land
+ * https://github.com/guzzle/guzzle/pull/2454
+ *
+ * @param string $string
+ *
+ * @return string|false
+ */
+ private static function idnToAsci(string $string) {
+ if (!\extension_loaded('intl')) {
+ return $string;
+ }
+ if (defined('INTL_IDNA_VARIANT_UTS46')) {
+ return idn_to_ascii($string, 0, INTL_IDNA_VARIANT_UTS46);
+ }
+ return idn_to_ascii($string);
+ }
+
+ /**
+ * @param string $list
*
* @return bool
*/
diff --git a/civicrm/CRM/Utils/System.php b/civicrm/CRM/Utils/System.php
index 0b6dbb8768..b445a04e09 100644
--- a/civicrm/CRM/Utils/System.php
+++ b/civicrm/CRM/Utils/System.php
@@ -1865,32 +1865,6 @@ class CRM_Utils_System {
return $sid;
}
- /**
- * @deprecated
- * Determine whether this system is deployed using version control.
- *
- * Normally sites would tune their php error settings to prevent deprecation
- * notices appearing on a live site. However, on some systems the user
- * does not have control over this setting. Sites with version-controlled
- * deployments are unlikely to be in a situation where they cannot alter their
- * php error level reporting so we can trust that the are able to set them
- * to suppress deprecation / php error level warnings if appropriate but
- * in order to phase in deprecation warnings we originally chose not to
- * show them on sites who might not be able to set their error_level in
- * a way that is appropriate to their site.
- *
- * @return bool
- */
- public static function isDevelopment() {
- CRM_Core_Error::deprecatedWarning('isDevelopment() is deprecated. Set your php error_reporting or MySQL settings appropriately instead.');
- static $cache = NULL;
- if ($cache === NULL) {
- global $civicrm_root;
- $cache = file_exists("{$civicrm_root}/.svn") || file_exists("{$civicrm_root}/.git");
- }
- return $cache;
- }
-
/**
* Is in upgrade mode.
*
diff --git a/civicrm/CRM/Utils/Token.php b/civicrm/CRM/Utils/Token.php
index 67f3137c8a..f2aec1d44e 100644
--- a/civicrm/CRM/Utils/Token.php
+++ b/civicrm/CRM/Utils/Token.php
@@ -182,16 +182,16 @@ class CRM_Utils_Token {
}
/**
- * Get< the regex for token replacement
+ * Get the regex for token replacement
*
* @param string $token_type
* A string indicating the the type of token to be used in the expression.
*
* @return string
- * regular expression sutiable for using in preg_replace
+ * regular expression suitable for using in preg_replace
*/
- private static function tokenRegex($token_type) {
- return '/(?<!\{|\\\\)\{' . $token_type . '\.([\w]+:?\w*(\-[\w\s]+)?)\}(?!\})/';
+ private static function tokenRegex(string $token_type) {
+ return '/(?<!\{|\\\\)\{' . $token_type . '\.([\w]+(:|\.)?\w*(\-[\w\s]+)?)\}(?!\})/';
}
/**
@@ -1102,7 +1102,7 @@ class CRM_Utils_Token {
public static function getTokens($string) {
$matches = [];
$tokens = [];
- preg_match_all('/(?<!\{|\\\\)\{(\w+\.\w+:?\w*)\}(?!\})/',
+ preg_match_all('/(?<!\{|\\\\)\{(\w+\.\w+(:|.)?\w*)\}(?!\})/',
$string,
$matches,
PREG_PATTERN_ORDER
@@ -1110,12 +1110,15 @@ class CRM_Utils_Token {
if ($matches[1]) {
foreach ($matches[1] as $token) {
- [$type, $name] = preg_split('/\./', $token, 2);
+ $parts = explode('.', $token, 3);
+ $type = $parts[0];
+ $name = $parts[1];
+ $suffix = !empty($parts[2]) ? ('.' . $parts[2]) : '';
if ($name && $type) {
if (!isset($tokens[$type])) {
$tokens[$type] = [];
}
- $tokens[$type][] = $name;
+ $tokens[$type][] = $name . $suffix;
}
}
}
@@ -1630,10 +1633,13 @@ class CRM_Utils_Token {
* @return string
* @throws \CiviCRM_API3_Exception
*/
- public static function replaceCaseTokens($caseId, $str, $knownTokens = [], $escapeSmarty = FALSE) {
- if (!$knownTokens || empty($knownTokens['case'])) {
+ public static function replaceCaseTokens($caseId, $str, $knownTokens = NULL, $escapeSmarty = FALSE): string {
+ if (strpos($str, '{case.') === FALSE) {
return $str;
}
+ if (!$knownTokens) {
+ $knownTokens = self::getTokens($str);
+ }
$case = civicrm_api3('case', 'getsingle', ['id' => $caseId]);
return self::replaceEntityTokens('case', $case, $str, $knownTokens, $escapeSmarty);
}
diff --git a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
index 3aaa1a89c6..a4b92bd3ef 100644
--- a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
+++ b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
@@ -174,9 +174,6 @@ class DynamicFKAuthorization implements EventSubscriberInterface {
}
if (isset($apiRequest['params']['entity_table'])) {
- if (!\CRM_Core_DAO_AllCoreTables::isCoreTable($apiRequest['params']['entity_table'])) {
- throw new \API_Exception("Unrecognized target entity table {$apiRequest['params']['entity_table']}");
- }
$this->authorizeDelegate(
$apiRequest['action'],
$apiRequest['params']['entity_table'],
diff --git a/civicrm/Civi/ActionSchedule/Event/MailingQueryEvent.php b/civicrm/Civi/ActionSchedule/Event/MailingQueryEvent.php
index 8739514169..bd6324c429 100644
--- a/civicrm/Civi/ActionSchedule/Event/MailingQueryEvent.php
+++ b/civicrm/Civi/ActionSchedule/Event/MailingQueryEvent.php
@@ -28,6 +28,18 @@ use Symfony\Component\EventDispatcher\Event;
* ->select('foo.bar_value AS bar');
* ```
*
+ * Modifications may be used to do the following:
+ *
+ * - Joining to business tables - to help target filter-criteria/temporal criteria on other entites.
+ * (Ex: Join to the `civicrm_participant` table and filter on participant status or registration date.)
+ * - Joining business tables - to select/return additional columns. Feed the data downstream for mail-merge/token-handling. As in:
+ * - (Recommended) Return the IDs of business-records. Use the prefix `tokenContext_*`.
+ * Ex query: `$event->query->select('foo.id AS tokenContext_fooId')
+ * Ex output: `$tokenRow->context['fooId']`
+ * - (Deprecated) Return detailed data of business-records. Ex:
+ * Ex query: `$event->query->select('foo.title as foo_title, foo.status_id as foo_status_id')`
+ * Ex output: `$tokenRow->context['actionSearchResult']->foo_title`
+ *
* There are several parameters pre-set for use in queries:
* - 'casActionScheduleId'
* - 'casEntityJoinExpr' - eg 'e.id = reminder.entity_id'
diff --git a/civicrm/Civi/Api4/Action/Entity/Get.php b/civicrm/Civi/Api4/Action/Entity/Get.php
index 06e262c34b..024ffadba2 100644
--- a/civicrm/Civi/Api4/Action/Entity/Get.php
+++ b/civicrm/Civi/Api4/Action/Entity/Get.php
@@ -57,7 +57,7 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
// Fetch custom entities unless we've already fetched everything requested
if (!$namesRequested || array_diff($namesRequested, array_keys($entities))) {
- $this->addCustomEntities($entities);
+ $entities = array_merge($entities, $this->getCustomEntities());
}
ksort($entities);
@@ -81,59 +81,69 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
* @return \Civi\Api4\Generic\AbstractEntity[]
*/
private function getAllApiClasses() {
- $classNames = [];
- $locations = array_merge([\Civi::paths()->getPath('[civicrm.root]/Civi.php')],
- array_column(\CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(), 'filePath')
- );
- foreach ($locations as $location) {
- $dir = \CRM_Utils_File::addTrailingSlash(dirname($location)) . 'Civi/Api4';
- if (is_dir($dir)) {
- foreach (glob("$dir/*.php") as $file) {
- $className = 'Civi\Api4\\' . basename($file, '.php');
- if (is_a($className, 'Civi\Api4\Generic\AbstractEntity', TRUE)) {
- $classNames[] = $className;
+ $cache = \Civi::cache('metadata');
+ $classNames = $cache->get('api4.entities.classNames', []);
+ if (!$classNames) {
+ $locations = array_merge([\Civi::paths()->getPath('[civicrm.root]/Civi.php')],
+ array_column(\CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(), 'filePath')
+ );
+ foreach ($locations as $location) {
+ $dir = \CRM_Utils_File::addTrailingSlash(dirname($location)) . 'Civi/Api4';
+ if (is_dir($dir)) {
+ foreach (glob("$dir/*.php") as $file) {
+ $className = 'Civi\Api4\\' . basename($file, '.php');
+ if (is_a($className, 'Civi\Api4\Generic\AbstractEntity', TRUE)) {
+ $classNames[] = $className;
+ }
}
}
}
+ $cache->set('api4.entities.classNames', $classNames);
}
return $classNames;
}
/**
- * Add custom-field pseudo-entities
+ * Get custom-field pseudo-entities
*
- * @param $entities
- * @throws \API_Exception
+ * @return array[]
*/
- private function addCustomEntities(&$entities) {
- $customEntities = CustomGroup::get()
- ->addWhere('is_multiple', '=', 1)
- ->addWhere('is_active', '=', 1)
- ->setSelect(['name', 'title', 'help_pre', 'help_post', 'extends', 'icon'])
- ->setCheckPermissions(FALSE)
- ->execute();
- $baseInfo = CustomValue::getInfo();
- foreach ($customEntities as $customEntity) {
- $fieldName = 'Custom_' . $customEntity['name'];
- $baseEntity = CoreUtil::getApiClass(CustomGroupJoinable::getEntityFromExtends($customEntity['extends']));
- $entities[$fieldName] = [
- 'name' => $fieldName,
- 'title' => $customEntity['title'],
- 'title_plural' => $customEntity['title'],
- 'description' => ts('Custom group for %1', [1 => $baseEntity::getInfo()['title_plural']]),
- 'paths' => [
- 'view' => "civicrm/contact/view/cd?reset=1&gid={$customEntity['id']}&recId=[id]&multiRecordDisplay=single",
- ],
- 'icon' => $customEntity['icon'] ?: NULL,
- ] + $baseInfo;
- if (!empty($customEntity['help_pre'])) {
- $entities[$fieldName]['comment'] = $this->plainTextify($customEntity['help_pre']);
- }
- if (!empty($customEntity['help_post'])) {
- $pre = empty($entities[$fieldName]['comment']) ? '' : $entities[$fieldName]['comment'] . "\n\n";
- $entities[$fieldName]['comment'] = $pre . $this->plainTextify($customEntity['help_post']);
+ private function getCustomEntities() {
+ $cache = \Civi::cache('metadata');
+ $entities = $cache->get('api4.entities.custom');
+ if (!isset($entities)) {
+ $entities = [];
+ $customEntities = CustomGroup::get()
+ ->addWhere('is_multiple', '=', 1)
+ ->addWhere('is_active', '=', 1)
+ ->setSelect(['name', 'title', 'help_pre', 'help_post', 'extends', 'icon'])
+ ->setCheckPermissions(FALSE)
+ ->execute();
+ $baseInfo = CustomValue::getInfo();
+ foreach ($customEntities as $customEntity) {
+ $fieldName = 'Custom_' . $customEntity['name'];
+ $baseEntity = CoreUtil::getApiClass(CustomGroupJoinable::getEntityFromExtends($customEntity['extends']));
+ $entities[$fieldName] = [
+ 'name' => $fieldName,
+ 'title' => $customEntity['title'],
+ 'title_plural' => $customEntity['title'],
+ 'description' => ts('Custom group for %1', [1 => $baseEntity::getInfo()['title_plural']]),
+ 'paths' => [
+ 'view' => "civicrm/contact/view/cd?reset=1&gid={$customEntity['id']}&recId=[id]&multiRecordDisplay=single",
+ ],
+ 'icon' => $customEntity['icon'] ?: NULL,
+ ] + $baseInfo;
+ if (!empty($customEntity['help_pre'])) {
+ $entities[$fieldName]['comment'] = $this->plainTextify($customEntity['help_pre']);
+ }
+ if (!empty($customEntity['help_post'])) {
+ $pre = empty($entities[$fieldName]['comment']) ? '' : $entities[$fieldName]['comment'] . "\n\n";
+ $entities[$fieldName]['comment'] = $pre . $this->plainTextify($customEntity['help_post']);
+ }
}
+ $cache->set('api4.entities.custom', $entities);
}
+ return $entities;
}
/**
diff --git a/civicrm/Civi/Api4/Generic/AbstractSaveAction.php b/civicrm/Civi/Api4/Generic/AbstractSaveAction.php
index c815645abb..3892e4f1b2 100644
--- a/civicrm/Civi/Api4/Generic/AbstractSaveAction.php
+++ b/civicrm/Civi/Api4/Generic/AbstractSaveAction.php
@@ -74,7 +74,7 @@ abstract class AbstractSaveAction extends AbstractAction {
* @throws \Civi\API\Exception\UnauthorizedException
*/
protected function validateValues() {
- $idField = $this->getIdField();
+ $idField = CoreUtil::getIdFieldName($this->getEntityName());
// FIXME: There should be a protocol to report a full list of errors... Perhaps a subclass of API_Exception?
$unmatched = [];
foreach ($this->records as $record) {
diff --git a/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php b/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
index c64be64977..7bb18411ef 100644
--- a/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
+++ b/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
@@ -135,6 +135,9 @@ class BasicGetFieldsAction extends BasicGetAction {
if (array_key_exists('label', $fieldDefaults)) {
$field['label'] = $field['label'] ?? $field['title'] ?? $field['name'];
}
+ if (!empty($field['options']) && is_array($field['options']) && empty($field['suffixes']) && array_key_exists('suffixes', $field)) {
+ $this->setFieldSuffixes($field);
+ }
if (isset($defaults['options'])) {
$field['options'] = $this->formatOptionList($field['options']);
}
@@ -183,6 +186,22 @@ class BasicGetFieldsAction extends BasicGetAction {
return $formatted;
}
+ /**
+ * Set supported field suffixes based on available option keys
+ * @param array $field
+ */
+ private function setFieldSuffixes(array &$field) {
+ // These suffixes are always supported if a field has options
+ $field['suffixes'] = ['name', 'label'];
+ $firstOption = reset($field['options']);
+ // If first option is an array, merge in those keys as available suffixes
+ if (is_array($firstOption)) {
+ // Remove 'id' because there is no practical reason to use it as a field suffix
+ $otherKeys = array_diff(array_keys($firstOption), ['id', 'name', 'label']);
+ $field['suffixes'] = array_merge($field['suffixes'], $otherKeys);
+ }
+ }
+
/**
* @return string
*/
@@ -275,6 +294,13 @@ class BasicGetFieldsAction extends BasicGetAction {
'data_type' => 'Array',
'default_value' => FALSE,
],
+ [
+ 'name' => 'suffixes',
+ 'data_type' => 'Array',
+ 'default_value' => NULL,
+ 'options' => ['name', 'label', 'description', 'abbr', 'color', 'icon'],
+ 'description' => 'Available option transformations, e.g. :name, :label',
+ ],
[
'name' => 'operators',
'data_type' => 'Array',
diff --git a/civicrm/Civi/Api4/Generic/BasicSaveAction.php b/civicrm/Civi/Api4/Generic/BasicSaveAction.php
index f0e175e5fa..b886b50e3e 100644
--- a/civicrm/Civi/Api4/Generic/BasicSaveAction.php
+++ b/civicrm/Civi/Api4/Generic/BasicSaveAction.php
@@ -13,6 +13,7 @@
namespace Civi\Api4\Generic;
use Civi\API\Exception\NotImplementedException;
+use Civi\Api4\Utils\CoreUtil;
/**
* @inheritDoc
@@ -51,6 +52,7 @@ class BasicSaveAction extends AbstractSaveAction {
* @param \Civi\Api4\Generic\Result $result
*/
public function _run(Result $result) {
+ $idField = CoreUtil::getIdFieldName($this->getEntityName());
foreach ($this->records as &$record) {
$record += $this->defaults;
$this->formatWriteValues($record);
@@ -64,7 +66,7 @@ class BasicSaveAction extends AbstractSaveAction {
$get = \Civi\API\Request::create($this->getEntityName(), 'get', ['version' => 4]);
$get
->setCheckPermissions($this->getCheckPermissions())
- ->addWhere($this->getIdField(), 'IN', (array) $result->column($this->getIdField()));
+ ->addWhere($idField, 'IN', (array) $result->column($idField));
$result->exchangeArray((array) $get->execute());
}
}
diff --git a/civicrm/Civi/Api4/Membership.php b/civicrm/Civi/Api4/Membership.php
new file mode 100644
index 0000000000..3906edd802
--- /dev/null
+++ b/civicrm/Civi/Api4/Membership.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Membership entity.
+ *
+ * @searchable primary
+ * @since 5.42
+ * @package Civi\Api4
+ */
+class Membership extends Generic\DAOEntity {
+ use Generic\Traits\OptionList;
+
+}
diff --git a/civicrm/Civi/Api4/MembershipBlock.php b/civicrm/Civi/Api4/MembershipBlock.php
new file mode 100644
index 0000000000..880cbe5159
--- /dev/null
+++ b/civicrm/Civi/Api4/MembershipBlock.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * MembershipBlock entity.
+ *
+ * @searchable secondary
+ * @since 5.42
+ * @package Civi\Api4
+ */
+class MembershipBlock extends Generic\DAOEntity {
+ use Generic\Traits\OptionList;
+
+}
diff --git a/civicrm/Civi/Api4/MembershipStatus.php b/civicrm/Civi/Api4/MembershipStatus.php
new file mode 100644
index 0000000000..e94c6c237e
--- /dev/null
+++ b/civicrm/Civi/Api4/MembershipStatus.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * MembershipStatus entity.
+ *
+ * @searchable secondary
+ * @since 5.42
+ * @package Civi\Api4
+ */
+class MembershipStatus extends Generic\DAOEntity {
+ use Generic\Traits\OptionList;
+
+}
diff --git a/civicrm/Civi/Api4/Query/Api4SelectQuery.php b/civicrm/Civi/Api4/Query/Api4SelectQuery.php
index 6e8cb701e4..119abe49a9 100644
--- a/civicrm/Civi/Api4/Query/Api4SelectQuery.php
+++ b/civicrm/Civi/Api4/Query/Api4SelectQuery.php
@@ -46,6 +46,18 @@ class Api4SelectQuery {
*/
protected $joins = [];
+ /**
+ * Used to keep track of implicit join table aliases
+ * @var array
+ */
+ protected $joinTree = [];
+
+ /**
+ * Used to create a unique table alias for each implicit join
+ * @var int
+ */
+ protected $autoJoinSuffix = 0;
+
/**
* @var array[]
*/
@@ -233,7 +245,7 @@ class Api4SelectQuery {
// If the joined_entity.id isn't in the fieldspec already, autoJoinFK will attempt to add the entity.
$fkField = substr($wildField, 0, strrpos($wildField, '.'));
$fkEntity = $this->getField($fkField)['fk_entity'] ?? NULL;
- $id = $fkEntity ? CoreUtil::getInfoItem($fkEntity, 'primary_key')[0] : 'id';
+ $id = $fkEntity ? CoreUtil::getIdFieldName($fkEntity) : 'id';
$this->autoJoinFK($fkField . ".$id");
$matches = $this->selectMatchingFields($wildField);
array_splice($select, $pos, 1, $matches);
@@ -598,7 +610,7 @@ class Api4SelectQuery {
// Prevent (most) redundant acl sub clauses if they have already been applied to the main entity.
// FIXME: Currently this only works 1 level deep, but tracking through multiple joins would increase complexity
// and just doing it for the first join takes care of most acl clause deduping.
- if (count($stack) === 1 && in_array($stack[0], $this->aclFields, TRUE)) {
+ if (count($stack) === 1 && in_array(reset($stack), $this->aclFields, TRUE)) {
return [];
}
$clauses = $baoName::getSelectWhereClause($tableAlias);
@@ -680,7 +692,10 @@ class Api4SelectQuery {
continue;
}
// Ensure alias is a safe string, and supply default if not given
- $alias = $alias ? \CRM_Utils_String::munge($alias, '_', 256) : strtolower($entity);
+ $alias = $alias ?: strtolower($entity);
+ if ($alias === self::MAIN_TABLE_ALIAS || !preg_match('/^[-\w]{1,256}$/', $alias)) {
+ throw new \API_Exception('Illegal join alias: "' . $alias . '"');
+ }
// First item in the array is a boolean indicating if the join is required (aka INNER or LEFT).
// The rest are join conditions.
$side = array_shift($join);
@@ -970,49 +985,97 @@ class Api4SelectQuery {
* Joins a path and adds all fields in the joined entity to apiFieldSpec
*
* @param $key
- * @throws \API_Exception
- * @throws \Exception
*/
protected function autoJoinFK($key) {
if (isset($this->apiFieldSpec[$key])) {
return;
}
-
- $pathArray = explode('.', $key);
-
/** @var \Civi\Api4\Service\Schema\Joiner $joiner */
$joiner = \Civi::container()->get('joiner');
+
+ $pathArray = explode('.', $key);
// The last item in the path is the field name. We don't care about that; we'll add all fields from the joined entity.
array_pop($pathArray);
+ $baseTableAlias = $this::MAIN_TABLE_ALIAS;
+
+ // If the first item is the name of an explicit join, use it as the base & shift it off the path
+ $explicitJoin = $this->getExplicitJoin($pathArray[0]);
+ if ($explicitJoin) {
+ $baseTableAlias = array_shift($pathArray);
+ }
+
+ // Ensure joinTree array contains base table
+ $this->joinTree[$baseTableAlias]['#table_alias'] = $baseTableAlias;
+ $this->joinTree[$baseTableAlias]['#path'] = $explicitJoin ? $baseTableAlias . '.' : '';
+ // During iteration this variable will refer to the current position in the tree
+ $joinTreeNode =& $this->joinTree[$baseTableAlias];
+
try {
- $joinPath = $joiner->autoJoin($this, $pathArray);
+ $joinPath = $joiner->getPath($explicitJoin['table'] ?? $this->getFrom(), $pathArray);
}
catch (\API_Exception $e) {
+ // Because the select clause silently ignores unknown fields, this function shouldn't throw exceptions
return;
}
- $lastLink = array_pop($joinPath);
- $previousLink = array_pop($joinPath);
- // Custom field names are already prefixed
- $isCustom = $lastLink instanceof CustomGroupJoinable;
- if ($isCustom) {
- array_pop($pathArray);
- }
- $prefix = $pathArray ? implode('.', $pathArray) . '.' : '';
- // Cache field info for retrieval by $this->getField()
- foreach ($lastLink->getEntityFields() as $fieldObject) {
- $fieldArray = $fieldObject->toArray();
- // Set sql name of field, using column name for real joins
- if (!$lastLink->getSerialize()) {
- $fieldArray['sql_name'] = '`' . $lastLink->getAlias() . '`.`' . $fieldArray['column_name'] . '`';
- }
- // For virtual joins on serialized fields, the callback function will need the sql name of the serialized field
- // @see self::renderSerializedJoin()
- else {
- $fieldArray['sql_name'] = '`' . $previousLink->getAlias() . '`.`' . $lastLink->getBaseColumn() . '`';
+ foreach ($joinPath as $joinName => $link) {
+ if (!isset($joinTreeNode[$joinName])) {
+ $target = $link->getTargetTable();
+ $tableAlias = $link->getAlias() . '_' . ++$this->autoJoinSuffix;
+ $isCustom = $link instanceof CustomGroupJoinable;
+
+ $joinTreeNode[$joinName] = [
+ '#table_alias' => $tableAlias,
+ '#path' => $joinTreeNode['#path'] . $joinName . '.',
+ ];
+ $joinEntity = CoreUtil::getApiNameFromTableName($target);
+
+ if ($joinEntity && !$this->checkEntityAccess($joinEntity)) {
+ return;
+ }
+ if ($this->getCheckPermissions() && $isCustom) {
+ // Check access to custom group
+ $groupId = \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $link->getTargetTable(), 'id', 'table_name');
+ if (!\CRM_Core_BAO_CustomGroup::checkGroupAccess($groupId, \CRM_Core_Permission::VIEW)) {
+ return;
+ }
+ }
+ if ($link->isDeprecated()) {
+ $deprecatedAlias = $link->getAlias();
+ \CRM_Core_Error::deprecatedWarning("Deprecated join alias '$deprecatedAlias' used in APIv4 get. Should be changed to '{$deprecatedAlias}_id'");
+ }
+ $virtualField = $link->getSerialize();
+
+ // Cache field info for retrieval by $this->getField()
+ foreach ($link->getEntityFields() as $fieldObject) {
+ $fieldArray = $fieldObject->toArray();
+ // Set sql name of field, using column name for real joins
+ if (!$virtualField) {
+ $fieldArray['sql_name'] = '`' . $tableAlias . '`.`' . $fieldArray['column_name'] . '`';
+ }
+ // For virtual joins on serialized fields, the callback function will need the sql name of the serialized field
+ // @see self::renderSerializedJoin()
+ else {
+ $fieldArray['sql_name'] = '`' . $joinTreeNode['#table_alias'] . '`.`' . $link->getBaseColumn() . '`';
+ }
+ // Custom fields will already have the group name prefixed
+ $fieldName = $isCustom ? explode('.', $fieldArray['name'])[1] : $fieldArray['name'];
+ $this->addSpecField($joinTreeNode[$joinName]['#path'] . $fieldName, $fieldArray);
+ }
+
+ // Serialized joins are rendered by this::renderSerializedJoin. Don't add their tables.
+ if (!$virtualField) {
+ $bao = $joinEntity ? CoreUtil::getBAOFromApiName($joinEntity) : NULL;
+ $conditions = $link->getConditionsForJoin($joinTreeNode['#table_alias'], $tableAlias);
+ if ($bao) {
+ $conditions = array_merge($conditions, $this->getAclClause($tableAlias, $bao, $joinPath));
+ }
+ $this->join('LEFT', $target, $tableAlias, $conditions);
+ }
+
}
- $this->addSpecField($prefix . $fieldArray['name'], $fieldArray);
+ $joinTreeNode =& $joinTreeNode[$joinName];
}
}
@@ -1038,7 +1101,7 @@ class Api4SelectQuery {
*/
public static function renderSerializedJoin(array $field): string {
$sep = \CRM_Core_DAO::VALUE_SEPARATOR;
- $id = CoreUtil::getInfoItem($field['entity'], 'primary_key')[0];
+ $id = CoreUtil::getIdFieldName($field['entity']);
$searchFn = "FIND_IN_SET(`{$field['table_name']}`.`$id`, REPLACE({$field['sql_name']}, '$sep', ','))";
return "(
SELECT GROUP_CONCAT(
diff --git a/civicrm/Civi/Api4/Query/SqlExpression.php b/civicrm/Civi/Api4/Query/SqlExpression.php
index 5f80321b67..8e3d43254d 100644
--- a/civicrm/Civi/Api4/Query/SqlExpression.php
+++ b/civicrm/Civi/Api4/Query/SqlExpression.php
@@ -45,6 +45,13 @@ abstract class SqlExpression {
*/
public $supportsExpansion = FALSE;
+ /**
+ * Data type output by this expression
+ *
+ * @var string
+ */
+ protected static $dataType;
+
/**
* SqlFunction constructor.
* @param string $expr
@@ -166,4 +173,11 @@ abstract class SqlExpression {
return substr($className, strrpos($className, '\\') + 1);
}
+ /**
+ * @return string|NULL
+ */
+ public static function getDataType():? string {
+ return static::$dataType;
+ }
+
}
diff --git a/civicrm/Civi/Api4/Query/SqlFunction.php b/civicrm/Civi/Api4/Query/SqlFunction.php
index c7ee3ad713..457186c2e8 100644
--- a/civicrm/Civi/Api4/Query/SqlFunction.php
+++ b/civicrm/Civi/Api4/Query/SqlFunction.php
@@ -30,13 +30,6 @@ abstract class SqlFunction extends SqlExpression {
*/
protected static $category;
- /**
- * Data type output by this function
- *
- * @var string
- */
- protected static $dataType;
-
const CATEGORY_AGGREGATE = 'aggregate',
CATEGORY_COMPARISON = 'comparison',
CATEGORY_DATE = 'date',
@@ -288,13 +281,6 @@ abstract class SqlFunction extends SqlExpression {
return static::$category;
}
- /**
- * @return string|NULL
- */
- public static function getDataType():? string {
- return static::$dataType;
- }
-
/**
* @return string
*/
diff --git a/civicrm/Civi/Api4/Query/SqlFunctionLOWER.php b/civicrm/Civi/Api4/Query/SqlFunctionLOWER.php
index 47763c2bc4..d1a77b6b5f 100644
--- a/civicrm/Civi/Api4/Query/SqlFunctionLOWER.php
+++ b/civicrm/Civi/Api4/Query/SqlFunctionLOWER.php
@@ -16,6 +16,8 @@ namespace Civi\Api4\Query;
*/
class SqlFunctionLOWER extends SqlFunction {
+ protected static $dataType = 'String';
+
protected static $category = self::CATEGORY_STRING;
protected static function params(): array {
diff --git a/civicrm/Civi/Api4/Query/SqlFunctionRAND.php b/civicrm/Civi/Api4/Query/SqlFunctionRAND.php
new file mode 100644
index 0000000000..1cb0cfeeb9
--- /dev/null
+++ b/civicrm/Civi/Api4/Query/SqlFunctionRAND.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Query;
+
+/**
+ * Sql function
+ */
+class SqlFunctionRAND extends SqlFunction {
+
+ protected static $category = self::CATEGORY_MATH;
+
+ protected static function params(): array {
+ return [];
+ }
+
+ /**
+ * @return string
+ */
+ public static function getTitle(): string {
+ return ts('Random Number');
+ }
+
+}
diff --git a/civicrm/Civi/Api4/Query/SqlFunctionUPPER.php b/civicrm/Civi/Api4/Query/SqlFunctionUPPER.php
index cc21cd1aaa..57e3ae3243 100644
--- a/civicrm/Civi/Api4/Query/SqlFunctionUPPER.php
+++ b/civicrm/Civi/Api4/Query/SqlFunctionUPPER.php
@@ -16,6 +16,8 @@ namespace Civi\Api4\Query;
*/
class SqlFunctionUPPER extends SqlFunction {
+ protected static $dataType = 'String';
+
protected static $category = self::CATEGORY_STRING;
protected static function params(): array {
diff --git a/civicrm/Civi/Api4/Query/SqlNumber.php b/civicrm/Civi/Api4/Query/SqlNumber.php
index 064121bfa9..c3331bd953 100644
--- a/civicrm/Civi/Api4/Query/SqlNumber.php
+++ b/civicrm/Civi/Api4/Query/SqlNumber.php
@@ -16,6 +16,8 @@ namespace Civi\Api4\Query;
*/
class SqlNumber extends SqlExpression {
+ protected static $dataType = 'Float';
+
protected function initialize() {
\CRM_Utils_Type::validate($this->expr, 'Float');
}
diff --git a/civicrm/Civi/Api4/Query/SqlString.php b/civicrm/Civi/Api4/Query/SqlString.php
index 8ea9c00137..ae2208d6f3 100644
--- a/civicrm/Civi/Api4/Query/SqlString.php
+++ b/civicrm/Civi/Api4/Query/SqlString.php
@@ -16,6 +16,8 @@ namespace Civi\Api4\Query;
*/
class SqlString extends SqlExpression {
+ protected static $dataType = 'String';
+
protected function initialize() {
// Remove surrounding quotes
$str = substr($this->expr, 1, -1);
diff --git a/civicrm/Civi/Api4/SavedSearch.php b/civicrm/Civi/Api4/SavedSearch.php
index 281de18020..74dd21cef1 100644
--- a/civicrm/Civi/Api4/SavedSearch.php
+++ b/civicrm/Civi/Api4/SavedSearch.php
@@ -16,10 +16,16 @@ namespace Civi\Api4;
* Stores search parameters for populating smart groups with live results.
*
* @see https://docs.civicrm.org/user/en/latest/organising-your-data/smart-groups/
- * @searchable none
+ * @searchable secondary
* @since 5.24
* @package Civi\Api4
*/
class SavedSearch extends Generic\DAOEntity {
+ public static function permissions() {
+ $permissions = parent::permissions();
+ $permissions['get'] = ['access CiviCRM'];
+ return $permissions;
+ }
+
}
diff --git a/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php b/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
index 52738aac81..2681466d86 100644
--- a/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
+++ b/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
@@ -97,17 +97,17 @@ class Joinable {
/**
* Gets conditions required when joining to a base table
*
- * @param string|null $baseTableAlias
- * Name of the base table, if aliased.
+ * @param string $baseTableAlias
+ * @param string $tableAlias
*
* @return array
*/
- public function getConditionsForJoin($baseTableAlias = NULL) {
+ public function getConditionsForJoin(string $baseTableAlias, string $tableAlias) {
$baseCondition = sprintf(
'%s.%s = %s.%s',
- $baseTableAlias ?: $this->baseTable,
+ $baseTableAlias,
$this->baseColumn,
- $this->getAlias(),
+ $tableAlias,
$this->targetColumn
);
diff --git a/civicrm/Civi/Api4/Service/Schema/Joiner.php b/civicrm/Civi/Api4/Service/Schema/Joiner.php
index d64cac920a..169466dfd5 100644
--- a/civicrm/Civi/Api4/Service/Schema/Joiner.php
+++ b/civicrm/Civi/Api4/Service/Schema/Joiner.php
@@ -12,11 +12,6 @@
namespace Civi\Api4\Service\Schema;
-use Civi\API\Exception\UnauthorizedException;
-use Civi\Api4\Query\Api4SelectQuery;
-use Civi\Api4\Service\Schema\Joinable\CustomGroupJoinable;
-use Civi\Api4\Utils\CoreUtil;
-
class Joiner {
/**
* @var SchemaMap
@@ -36,93 +31,28 @@ class Joiner {
}
/**
- * @param \Civi\Api4\Query\Api4SelectQuery $query
- * The query object to do the joins on
- * @param array $joinPath
- * A list of aliases, e.g. [contact, phone]
- * @param string $side
- * Can be LEFT or INNER
+ * Get the path used to create an implicit join
*
- * @throws \Exception
- * @return \Civi\Api4\Service\Schema\Joinable\Joinable[]
- * The path used to make the join
- */
- public function autoJoin(Api4SelectQuery $query, array $joinPath, $side = 'LEFT') {
- $explicitJoin = $query->getExplicitJoin($joinPath[0]);
-
- // If the first item is the name of an explicit join, use it as the base & shift it off the path
- if ($explicitJoin) {
- $from = $explicitJoin['table'];
- $baseTableAlias = array_shift($joinPath);
- }
- // Otherwise use the api entity as the base
- else {
- $from = $query->getFrom();
- $baseTableAlias = $query::MAIN_TABLE_ALIAS;
- }
-
- $fullPath = $this->getPath($from, $joinPath);
-
- foreach ($fullPath as $link) {
- $target = $link->getTargetTable();
- $alias = $link->getAlias();
- $joinEntity = CoreUtil::getApiNameFromTableName($target);
-
- if ($joinEntity && !$query->checkEntityAccess($joinEntity)) {
- throw new UnauthorizedException('Cannot join to ' . $joinEntity);
- }
- if ($query->getCheckPermissions() && is_a($link, CustomGroupJoinable::class)) {
- // Check access to custom group
- $groupId = \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $link->getTargetTable(), 'id', 'table_name');
- if (!\CRM_Core_BAO_CustomGroup::checkGroupAccess($groupId, \CRM_Core_Permission::VIEW)) {
- throw new UnauthorizedException('Cannot join to ' . $link->getAlias());
- }
- }
- if ($link->isDeprecated()) {
- \CRM_Core_Error::deprecatedWarning("Deprecated join alias '$alias' used in APIv4 get. Should be changed to '{$alias}_id'");
- }
- // Serialized joins are rendered by Api4SelectQuery::renderSerializedJoin
- if ($link->getSerialize()) {
- // Virtual join, don't actually add this table
- break;
- }
-
- $bao = $joinEntity ? CoreUtil::getBAOFromApiName($joinEntity) : NULL;
- $conditions = $link->getConditionsForJoin($baseTableAlias);
- if ($bao) {
- $conditions = array_merge($conditions, $query->getAclClause($alias, $bao, $joinPath));
- }
-
- $query->join($side, $target, $alias, $conditions);
-
- $baseTableAlias = $link->getAlias();
- }
-
- return $fullPath;
- }
-
- /**
* @param string $baseTable
* @param array $joinPath
*
* @return \Civi\Api4\Service\Schema\Joinable\Joinable[]
* @throws \API_Exception
*/
- protected function getPath(string $baseTable, array $joinPath) {
+ public function getPath(string $baseTable, array $joinPath) {
$cacheKey = sprintf('%s.%s', $baseTable, implode('.', $joinPath));
if (!isset($this->cache[$cacheKey])) {
$fullPath = [];
- foreach ($joinPath as $key => $targetAlias) {
- $links = $this->schemaMap->getPath($baseTable, $targetAlias);
+ foreach ($joinPath as $targetAlias) {
+ $link = $this->schemaMap->getLink($baseTable, $targetAlias);
- if (empty($links)) {
+ if (!$link) {
throw new \API_Exception(sprintf('Cannot join %s to %s', $baseTable, $targetAlias));
}
else {
- $fullPath = array_merge($fullPath, $links);
- $lastLink = end($links);
- $baseTable = $lastLink->getTargetTable();
+ $fullPath[$targetAlias] = $link;
+ $baseTable = $link->getTargetTable();
}
}
diff --git a/civicrm/Civi/Api4/Service/Schema/SchemaMap.php b/civicrm/Civi/Api4/Service/Schema/SchemaMap.php
index ff360f12bd..c6c01d6c7b 100644
--- a/civicrm/Civi/Api4/Service/Schema/SchemaMap.php
+++ b/civicrm/Civi/Api4/Service/Schema/SchemaMap.php
@@ -14,8 +14,6 @@ namespace Civi\Api4\Service\Schema;
class SchemaMap {
- const MAX_JOIN_DEPTH = 3;
-
/**
* @var Table[]
*/
@@ -25,20 +23,23 @@ class SchemaMap {
* @param $baseTableName
* @param $targetTableAlias
*
- * @return \Civi\Api4\Service\Schema\Joinable\Joinable[]
- * Array of links to the target table, empty if no path found
+ * @return \Civi\Api4\Service\Schema\Joinable\Joinable|NULL
+ * Link to the target table
+ * @throws \API_Exception
*/
- public function getPath($baseTableName, $targetTableAlias) {
+ public function getLink($baseTableName, $targetTableAlias): ?Joinable\Joinable {
$table = $this->getTableByName($baseTableName);
- $path = [];
if (!$table) {
- return $path;
+ throw new \API_Exception("Table $baseTableName not found");
}
- $this->findPaths($table, $targetTableAlias, $path);
-
- return $path;
+ foreach ($table->getTableLinks() as $link) {
+ if ($link->getAlias() === $targetTableAlias) {
+ return $link;
+ }
+ }
+ return NULL;
}
/**
@@ -87,22 +88,4 @@ class SchemaMap {
}
}
- /**
- * Traverse the schema looking for a path
- *
- * @param Table $table
- * The current table to base fromm
- * @param string $target
- * The target joinable table alias
- * @param \Civi\Api4\Service\Schema\Joinable\Joinable[] $path
- * (By-reference) The possible paths to the target table
- */
- private function findPaths(Table $table, $target, &$path) {
- foreach ($table->getTableLinks() as $link) {
- if ($link->getAlias() === $target) {
- $path[] = $link;
- }
- }
- }
-
}
diff --git a/civicrm/Civi/Api4/Service/Spec/FieldSpec.php b/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
index f8f5424886..e1da6ce9c1 100644
--- a/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
+++ b/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
@@ -12,32 +12,28 @@
namespace Civi\Api4\Service\Spec;
-use Civi\Schema\Traits\ArrayFormatTrait;
-use Civi\Schema\Traits\BasicSpecTrait;
-use Civi\Schema\Traits\DataTypeSpecTrait;
-use Civi\Schema\Traits\GuiSpecTrait;
-use Civi\Schema\Traits\OptionsSpecTrait;
-use Civi\Schema\Traits\SqlSpecTrait;
-
+/**
+ * Contains APIv4 field metadata
+ */
class FieldSpec {
// BasicSpecTrait: name, title, description
- use BasicSpecTrait;
+ use \Civi\Schema\Traits\BasicSpecTrait;
// DataTypeSpecTrait: dataType, serialize, fkEntity
- use DataTypeSpecTrait;
+ use \Civi\Schema\Traits\DataTypeSpecTrait;
// OptionsSpecTrait: options, optionsCallback
- use OptionsSpecTrait;
+ use \Civi\Schema\Traits\OptionsSpecTrait;
// GuiSpecTrait: label, inputType, inputAttrs, helpPre, helpPost
- use GuiSpecTrait;
+ use \Civi\Schema\Traits\GuiSpecTrait;
// SqlSpecTrait tableName, columnName, operators, sqlFilters
- use SqlSpecTrait;
+ use \Civi\Schema\Traits\SqlSpecTrait;
// ArrayFormatTrait: toArray():array, loadArray($array)
- use ArrayFormatTrait;
+ use \Civi\Schema\Traits\ArrayFormatTrait;
/**
* @var mixed
diff --git a/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php b/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
index 72acc37a85..e6ff17de27 100644
--- a/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
+++ b/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
@@ -30,6 +30,7 @@ class ContactGetSpecProvider implements Generic\SpecProviderInterface {
->setType('Filter')
->setOperators(['IN', 'NOT IN'])
->addSqlFilter([__CLASS__, 'getContactGroupSql'])
+ ->setSuffixes(['id', 'name', 'label'])
->setOptionsCallback([__CLASS__, 'getGroupList']);
$spec->addFieldSpec($field);
}
diff --git a/civicrm/Civi/Api4/Service/Spec/Provider/EntityBatchCreationSpecProvider.php b/civicrm/Civi/Api4/Service/Spec/Provider/EntityBatchCreationSpecProvider.php
new file mode 100644
index 0000000000..c5f5b43bf9
--- /dev/null
+++ b/civicrm/Civi/Api4/Service/Spec/Provider/EntityBatchCreationSpecProvider.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Spec\Provider;
+
+use Civi\Api4\Service\Spec\RequestSpec;
+
+class EntityBatchCreationSpecProvider implements Generic\SpecProviderInterface {
+
+ /**
+ * @param \Civi\Api4\Service\Spec\RequestSpec $spec
+ */
+ public function modifySpec(RequestSpec $spec) {
+ $spec->getFieldByName('entity_table')->setDefaultValue('civicrm_financial_trxn');
+ }
+
+ /**
+ * @param string $entity
+ * @param string $action
+ *
+ * @return bool
+ */
+ public function applies($entity, $action) {
+ return $entity === 'EntityBatch' && $action === 'create';
+ }
+
+}
diff --git a/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php b/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
index dbe6efab67..be1aad01e7 100644
--- a/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
+++ b/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
@@ -33,6 +33,7 @@ class EntityTagFilterSpecProvider implements Generic\SpecProviderInterface {
->setType('Filter')
->setOperators(['IN', 'NOT IN'])
->addSqlFilter([__CLASS__, 'getTagFilterSql'])
+ ->setSuffixes(['id', 'name', 'label', 'description', 'color'])
->setOptionsCallback([__CLASS__, 'getTagList']);
$spec->addFieldSpec($field);
}
diff --git a/civicrm/Civi/Api4/Service/Spec/Provider/MembershipCreationSpecProvider.php b/civicrm/Civi/Api4/Service/Spec/Provider/MembershipCreationSpecProvider.php
new file mode 100644
index 0000000000..a9094b190d
--- /dev/null
+++ b/civicrm/Civi/Api4/Service/Spec/Provider/MembershipCreationSpecProvider.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Spec\Provider;
+
+use Civi\Api4\Service\Spec\FieldSpec;
+use Civi\Api4\Service\Spec\RequestSpec;
+
+class MembershipCreationSpecProvider implements Generic\SpecProviderInterface {
+
+ /**
+ * @param \Civi\Api4\Service\Spec\RequestSpec $spec
+ */
+ public function modifySpec(RequestSpec $spec): void {
+ $spec->getFieldByName('status_id')->setRequired(FALSE);
+ // This is a bit of dark-magic - the membership BAO code is particularly
+ // nasty. It has a lot of logic in it that does not belong there in
+ // terms of our current expectations. Removing it is difficult
+ // so the plan is that new api v4 membership.create users will either
+ // use the Order api flow when financial code should kick in. Otherwise
+ // the crud flow will bypass all the financial processing in membership.create.
+ // The use of the 'version' parameter to drive this is to be sure that
+ // we know the bypass will not affect the v3 api to the extent
+ // it cannot be reached by the v3 api at all (in time we can move some
+ // of the code we are deprecating into the v3 api, to die of natural deprecation).
+ $spec->addFieldSpec(new FieldSpec('version', 'Membership', 'Integer'));
+ $spec->getFieldByName('version')->setDefaultValue(4)->setRequired(TRUE);
+ }
+
+ /**
+ * When does this apply.
+ *
+ * @param string $entity
+ * @param string $action
+ *
+ * @return bool
+ */
+ public function applies($entity, $action): bool {
+ return $entity === 'Membership' && $action === 'create';
+ }
+
+}
diff --git a/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php b/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
index 6eae4b396d..413c1f3670 100644
--- a/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
+++ b/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
@@ -43,6 +43,11 @@ class SpecFormatter {
$field->setHelpPost($data['help_post'] ?? NULL);
if (self::customFieldHasOptions($data)) {
$field->setOptionsCallback([__CLASS__, 'getOptions']);
+ if (!empty($data['option_group_id'])) {
+ // Option groups support other stuff like description, icon & color,
+ // but at time of this writing, custom fields do not.
+ $field->setSuffixes(['id', 'name', 'label']);
+ }
}
$field->setReadonly($data['is_view']);
}
@@ -55,7 +60,19 @@ class SpecFormatter {
$field->setTitle($data['title'] ?? NULL);
$field->setLabel($data['html']['label'] ?? NULL);
if (!empty($data['pseudoconstant'])) {
- $field->setOptionsCallback([__CLASS__, 'getOptions']);
+ // Do not load options if 'prefetch' is explicitly FALSE
+ if (!isset($data['pseudoconstant']['prefetch']) || $data['pseudoconstant']['prefetch'] === FALSE) {
+ $field->setOptionsCallback([__CLASS__, 'getOptions']);
+ }
+ // These suffixes are always supported if a field has options
+ $suffixes = ['name', 'label'];
+ // Add other columns specified in schema (e.g. 'abbrColumn')
+ foreach (['description', 'abbr', 'icon', 'color'] as $suffix) {
+ if (isset($data['pseudoconstant'][$suffix . 'Column'])) {
+ $suffixes[] = $suffix;
+ }
+ }
+ $field->setSuffixes($suffixes);
}
$field->setReadonly(!empty($data['readonly']));
}
diff --git a/civicrm/Civi/Api4/Utils/CoreUtil.php b/civicrm/Civi/Api4/Utils/CoreUtil.php
index 7d27b9ea24..efb11f48e3 100644
--- a/civicrm/Civi/Api4/Utils/CoreUtil.php
+++ b/civicrm/Civi/Api4/Utils/CoreUtil.php
@@ -60,7 +60,17 @@ class CoreUtil {
* @return mixed
*/
public static function getInfoItem(string $entityName, string $keyToReturn) {
- return self::getApiClass($entityName)::getInfo()[$keyToReturn] ?? NULL;
+ $className = self::getApiClass($entityName);
+ return $className ? $className::getInfo()[$keyToReturn] ?? NULL : NULL;
+ }
+
+ /**
+ * Get name of unique identifier, typically "id"
+ * @param string $entityName
+ * @return string
+ */
+ public static function getIdFieldName(string $entityName): string {
+ return self::getInfoItem($entityName, 'primary_key')[0] ?? 'id';
}
/**
diff --git a/civicrm/Civi/Api4/Utils/ReflectionUtils.php b/civicrm/Civi/Api4/Utils/ReflectionUtils.php
index c48f921d0c..a5d59803f1 100644
--- a/civicrm/Civi/Api4/Utils/ReflectionUtils.php
+++ b/civicrm/Civi/Api4/Utils/ReflectionUtils.php
@@ -157,4 +157,49 @@ class ReflectionUtils {
return $traits;
}
+ /**
+ * Get a list of standard properties which can be written+read by outside callers.
+ *
+ * @param string $class
+ */
+ public static function findStandardProperties($class): iterable {
+ try {
+ /** @var \ReflectionClass $clazz */
+ $clazz = new \ReflectionClass($class);
+
+ yield from [];
+ foreach ($clazz->getProperties(\ReflectionProperty::IS_PROTECTED | \ReflectionProperty::IS_PUBLIC) as $property) {
+ if (!$property->isStatic() && $property->getName()[0] !== '_') {
+ yield $property;
+ }
+ }
+ }
+ catch (\ReflectionException $e) {
+ throw new \RuntimeException(sprintf("Cannot inspect class %s.", $class));
+ }
+ }
+
+ /**
+ * Find any methods in this class which match the given prefix.
+ *
+ * @param string $class
+ * @param string $prefix
+ */
+ public static function findMethodHelpers($class, string $prefix): iterable {
+ try {
+ /** @var \ReflectionClass $clazz */
+ $clazz = new \ReflectionClass($class);
+
+ yield from [];
+ foreach ($clazz->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
+ if (\CRM_Utils_String::startsWith($m->getName(), $prefix)) {
+ yield $m;
+ }
+ }
+ }
+ catch (\ReflectionException $e) {
+ throw new \RuntimeException(sprintf("Cannot inspect class %s.", $class));
+ }
+ }
+
}
diff --git a/civicrm/Civi/Core/Container.php b/civicrm/Civi/Core/Container.php
index 72e69c4762..c680216844 100644
--- a/civicrm/Civi/Core/Container.php
+++ b/civicrm/Civi/Core/Container.php
@@ -406,6 +406,8 @@ class Container {
$dispatcher->addListener('hook_civicrm_coreResourceList', ['\CRM_Utils_System', 'appendCoreResources']);
$dispatcher->addListener('hook_civicrm_getAssetUrl', ['\CRM_Utils_System', 'alterAssetUrl']);
$dispatcher->addListener('hook_civicrm_alterExternUrl', ['\CRM_Utils_System', 'migrateExternUrl'], 1000);
+ // Not a BAO class so it can't implement hookInterface
+ $dispatcher->addListener('hook_civicrm_post', ['CRM_Utils_Recent', 'on_hook_civicrm_post']);
$dispatcher->addListener('hook_civicrm_permissionList', ['CRM_Core_Permission_List', 'findConstPermissions'], 975);
$dispatcher->addListener('hook_civicrm_permissionList', ['CRM_Core_Permission_List', 'findCiviPermissions'], 950);
$dispatcher->addListener('hook_civicrm_permissionList', ['CRM_Core_Permission_List', 'findCmsPermissions'], 925);
diff --git a/civicrm/Civi/Core/Event/EventScanner.php b/civicrm/Civi/Core/Event/EventScanner.php
index 912e313168..9b6c93daa5 100644
--- a/civicrm/Civi/Core/Event/EventScanner.php
+++ b/civicrm/Civi/Core/Event/EventScanner.php
@@ -53,7 +53,7 @@ class EventScanner {
* @param string|null $self
* If the target $class is focused on a specific entity/form/etc, use the `$self` parameter to specify it.
* This will activate support for `self_{$event}` methods.
- * Ex: if '$self' is 'Contact', then 'function self_hook_civicrm_pre()' maps to 'hook_civicrm_pre::Contact'.
+ * Ex: if '$self' is 'Contact', then 'function self_hook_civicrm_pre()' maps to 'on_hook_civicrm_pre::Contact'.
* @return array
* List of events/listeners. Format is compatible with 'getSubscribedEvents()'.
* Ex: ['some.event' => [['firstFunc'], ['secondFunc']]
diff --git a/civicrm/Civi/Schema/Traits/MagicGetterSetterTrait.php b/civicrm/Civi/Schema/Traits/MagicGetterSetterTrait.php
index cc5e0e325a..12f1ba6e3f 100644
--- a/civicrm/Civi/Schema/Traits/MagicGetterSetterTrait.php
+++ b/civicrm/Civi/Schema/Traits/MagicGetterSetterTrait.php
@@ -11,6 +11,8 @@
namespace Civi\Schema\Traits;
+use Civi\Api4\Utils\ReflectionUtils;
+
/**
* Automatically define getter/setter methods for public and protected fields.
*
@@ -52,6 +54,9 @@ trait MagicGetterSetterTrait {
return $this->$prop;
case 'set':
+ if (count($arguments) < 1) {
+ throw new \CRM_Core_Exception(sprintf('Missing required parameter for method %s::%s()', static::CLASS, $method));
+ }
$this->$prop = $arguments[0];
return $this;
}
@@ -68,29 +73,18 @@ trait MagicGetterSetterTrait {
* Array(string $propertyName => bool $true).
*/
protected static function getMagicProperties(): array {
- // Thread-local cache of class metadata. This is strictly readonly and immutable, and it should ideally be reused across varied test-functions.
- static $cache = [];
-
- if (!isset($cache[static::CLASS])) {
- try {
- $clazz = new \ReflectionClass(static::CLASS);
- }
- catch (\ReflectionException $e) {
- // This shouldn't happen. Cast to RuntimeException so that we don't have a million `@throws` statements.
- throw new \RuntimeException(sprintf("Class %s cannot reflect upon itself.", static::CLASS));
- }
-
- $fields = [];
- foreach ($clazz->getProperties(\ReflectionProperty::IS_PROTECTED | \ReflectionProperty::IS_PUBLIC) as $property) {
- $name = $property->getName();
- if (!$property->isStatic() && $name[0] !== '_') {
- $fields[$name] = TRUE;
- }
+ // Thread-local cache of class metadata. Class metadata is immutable at runtime, so this is strictly write-once. It should ideally be reused across varied test-functions.
+ static $caches = [];
+ $CLASS = static::CLASS;
+ $cache =& $caches[$CLASS];
+ if ($cache === NULL) {
+ $cache = [];
+ foreach (ReflectionUtils::findStandardProperties(static::CLASS) as $property) {
+ /** @var \ReflectionProperty $property */
+ $cache[$property->getName()] = TRUE;
}
- unset($clazz);
- $cache[static::CLASS] = $fields;
}
- return $cache[static::CLASS];
+ return $cache;
}
}
diff --git a/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php b/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
index 13a2fa525f..aebe2694bf 100644
--- a/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
+++ b/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
@@ -25,6 +25,11 @@ trait OptionsSpecTrait {
*/
public $options;
+ /**
+ * @var array|null
+ */
+ public $suffixes;
+
/**
* @var callable
*/
@@ -59,6 +64,16 @@ trait OptionsSpecTrait {
return $this;
}
+ /**
+ * @param array $suffixes
+ *
+ * @return $this
+ */
+ public function setSuffixes($suffixes) {
+ $this->suffixes = $suffixes;
+ return $this;
+ }
+
/**
* @param callable $callback
*
diff --git a/civicrm/Civi/Test/ContactTestTrait.php b/civicrm/Civi/Test/ContactTestTrait.php
index 93e9264320..1aced05b67 100644
--- a/civicrm/Civi/Test/ContactTestTrait.php
+++ b/civicrm/Civi/Test/ContactTestTrait.php
@@ -77,7 +77,8 @@ trait ContactTestTrait {
*/
public function individualCreate(array $params = [], $seq = 0, $random = FALSE): int {
$params = array_merge($this->sampleContact('Individual', $seq, $random), $params);
- return $this->_contactCreate($params);
+ $this->ids['Contact']['individual_' . $seq] = $this->_contactCreate($params);
+ return $this->ids['Contact']['individual_' . $seq];
}
/**
diff --git a/civicrm/Civi/Token/TokenCompatSubscriber.php b/civicrm/Civi/Token/TokenCompatSubscriber.php
index d957c3cb9d..9d745c1489 100644
--- a/civicrm/Civi/Token/TokenCompatSubscriber.php
+++ b/civicrm/Civi/Token/TokenCompatSubscriber.php
@@ -25,11 +25,37 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
*/
public static function getSubscribedEvents() {
return [
- 'civi.token.eval' => 'onEvaluate',
+ 'civi.token.eval' => [
+ ['setupSmartyAliases', 1000],
+ ['onEvaluate'],
+ ],
'civi.token.render' => 'onRender',
];
}
+ /**
+ * Interpret the variable `$context['smartyTokenAlias']` (e.g. `mySmartyField' => `tkn_entity.tkn_field`).
+ *
+ * We need to ensure that any tokens like `{tkn_entity.tkn_field}` are hydrated, so
+ * we pretend that they are in use.
+ *
+ * @param \Civi\Token\Event\TokenValueEvent $e
+ */
+ public function setupSmartyAliases(TokenValueEvent $e) {
+ $aliasedTokens = [];
+ foreach ($e->getRows() as $row) {
+ $aliasedTokens = array_unique(array_merge($aliasedTokens,
+ array_values($row->context['smartyTokenAlias'] ?? [])));
+ }
+
+ $fakeMessage = implode('', array_map(function ($f) {
+ return '{' . $f . '}';
+ }, $aliasedTokens));
+
+ $proc = $e->getTokenProcessor();
+ $proc->addMessage('TokenCompatSubscriber.aliases', $fakeMessage, 'text/plain');
+ }
+
/**
* Load token data.
*
@@ -51,6 +77,10 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
if (empty($row->context['contactId'])) {
continue;
}
+
+ unset($swapLocale);
+ $swapLocale = empty($row->context['locale']) ? NULL : \CRM_Utils_AutoClean::swapLocale($row->context['locale']);
+
/** @var int $contactId */
$contactId = $row->context['contactId'];
if (empty($row->context['contact'])) {
@@ -126,8 +156,19 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
}
if ($useSmarty) {
- $smarty = \CRM_Core_Smarty::singleton();
- $e->string = $smarty->fetch("string:" . $e->string);
+ $smartyVars = [];
+ foreach ($e->context['smartyTokenAlias'] ?? [] as $smartyName => $tokenName) {
+ // Note: $e->row->tokens resolves event-based tokens (eg CRM_*_Tokens). But if the target token relies on the
+ // above bits (replaceGreetingTokens=>replaceContactTokens=>replaceHookTokens) then this lookup isn't sufficient.
+ $smartyVars[$smartyName] = \CRM_Utils_Array::pathGet($e->row->tokens, explode('.', $tokenName));
+ }
+ \CRM_Core_Smarty::singleton()->pushScope($smartyVars);
+ try {
+ $e->string = \CRM_Utils_String::parseOneOffStringThroughSmarty($e->string);
+ }
+ finally {
+ \CRM_Core_Smarty::singleton()->popScope();
+ }
}
}
diff --git a/civicrm/Civi/Token/TokenProcessor.php b/civicrm/Civi/Token/TokenProcessor.php
index e8ee1b8f73..61438d2092 100644
--- a/civicrm/Civi/Token/TokenProcessor.php
+++ b/civicrm/Civi/Token/TokenProcessor.php
@@ -49,12 +49,15 @@ class TokenProcessor {
*
* - controller: string, the class which is managing the mail-merge.
* - smarty: bool, whether to enable smarty support.
+ * - smartyTokenAlias: array, Define Smarty variables that are populated
+ * based on token-content. Ex: ['theInvoiceId' => 'contribution.invoice_id']
* - contactId: int, the main person/org discussed in the message.
* - contact: array, the main person/org discussed in the message.
* (Optional for performance tweaking; if omitted, will load
* automatically from contactId.)
* - actionSchedule: DAO, the rule which triggered the mailing
* [for CRM_Core_BAO_ActionScheduler].
+ * - locale: string, the name of a locale (eg 'fr_CA') to use for {ts} strings in the view.
* - schema: array, a list of fields that will be provided for each row.
* This is automatically populated with any general context
* keys, but you may need to add extra keys for token-row data.
@@ -255,7 +258,7 @@ class TokenProcessor {
* Each row is presented with a fluent, OOP facade.
*/
public function getRows() {
- return new TokenRowIterator($this, new \ArrayIterator($this->rowContexts));
+ return new TokenRowIterator($this, new \ArrayIterator($this->rowContexts ?: []));
}
/**
@@ -351,6 +354,8 @@ class TokenProcessor {
$row = $this->getRow($row);
}
+ $swapLocale = empty($row->context['locale']) ? NULL : \CRM_Utils_AutoClean::swapLocale($row->context['locale']);
+
$message = $this->getMessage($name);
$row->fill($message['format']);
$useSmarty = !empty($row->context['smarty']);
diff --git a/civicrm/Civi/WorkflowMessage/Exception/WorkflowMessageException.php b/civicrm/Civi/WorkflowMessage/Exception/WorkflowMessageException.php
new file mode 100644
index 0000000000..f0e3f71c54
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/Exception/WorkflowMessageException.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\WorkflowMessage\Exception;
+
+/**
+ * An error encountered while evaluating a workflow-message-template.
+ */
+class WorkflowMessageException extends \CRM_Core_Exception {
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/FieldSpec.php b/civicrm/Civi/WorkflowMessage/FieldSpec.php
new file mode 100644
index 0000000000..7e7b4ffe13
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/FieldSpec.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage;
+
+use Civi\Schema\Traits\ArrayFormatTrait;
+use Civi\Schema\Traits\BasicSpecTrait;
+use Civi\Schema\Traits\PhpDataTypeSpecTrait;
+use Civi\Schema\Traits\OptionsSpecTrait;
+
+class FieldSpec {
+
+ // BasicSpecTrait: name, title, description
+ use BasicSpecTrait;
+
+ // PhpDataTypeSpecTrait: type, dataType, serialize, fkEntity
+ use PhpDataTypeSpecTrait;
+
+ // OptionsSpecTrait: options, optionsCallback
+ use OptionsSpecTrait;
+
+ // ArrayFormatTrait: toArray():array, loadArray($array)
+ use ArrayFormatTrait;
+
+ /**
+ * @var bool|null
+ */
+ public $required;
+
+ /**
+ * Allow this property to be used in alternative scopes, such as Smarty and TokenProcessor.
+ *
+ * @var array|null
+ * Ex: ['Smarty' => 'smarty_name']
+ */
+ public $scope;
+
+ /**
+ * @return bool
+ */
+ public function isRequired(): ?bool {
+ return $this->required;
+ }
+
+ /**
+ * @param bool|null $required
+ * @return $this
+ */
+ public function setRequired(?bool $required) {
+ $this->required = $required;
+ return $this;
+ }
+
+ /**
+ * @return array|NULL
+ */
+ public function getScope(): ?array {
+ return $this->scope;
+ }
+
+ /**
+ * Enable export/import in alternative scopes.
+ *
+ * @param string|array|NULL $scope
+ * Ex: 'tplParams'
+ * Ex: 'tplParams as foo_bar'
+ * Ex: 'tplParams as contact_id, TokenProcessor as contactId'
+ * Ex: ['tplParams' => 'foo_bar']
+ * @return $this
+ */
+ public function setScope($scope) {
+ if (is_array($scope)) {
+ $this->scope = $scope;
+ }
+ else {
+ $parts = explode(',', $scope);
+ $this->scope = [];
+ foreach ($parts as $part) {
+ if (preg_match('/^\s*(\S+) as (\S+)\s*$/', $part, $m)) {
+ $this->scope[trim($m[1])] = trim($m[2]);
+ }
+ else {
+ $this->scope[trim($part)] = $this->getName();
+ }
+ }
+ }
+ return $this;
+ }
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/GenericWorkflowMessage.php b/civicrm/Civi/WorkflowMessage/GenericWorkflowMessage.php
new file mode 100644
index 0000000000..862c3a8d42
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/GenericWorkflowMessage.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage;
+
+use Civi\Schema\Traits\MagicGetterSetterTrait;
+use Civi\WorkflowMessage\Traits\AddressingTrait;
+use Civi\WorkflowMessage\Traits\FinalHelperTrait;
+use Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait;
+
+/**
+ * Generic base-class for describing the inputs for a workflow email template.
+ *
+ * @method $this setContactId(int|null $contactId)
+ * @method int|null getContactId()
+ * @method $this setContact(array|null $contact)
+ * @method array|null getContact()
+ */
+class GenericWorkflowMessage implements WorkflowMessageInterface {
+
+ // Implement getFields(), import(), export(), validate() - All methods based on inspecting class properties (`ReflectionClass`).
+ // Define stub methods exportExtraTokenContext(), exportExtraTplParams(), etc.
+ use ReflectiveWorkflowTrait;
+
+ // Implement __call() - Public and protected properties are automatically given a default getter/setter. These may be overridden/customized.
+ use MagicGetterSetterTrait;
+
+ // Implement assertValid(), renderTemplate(), sendTemplate() - Sugary stub methods that delegate to real APIs.
+ use FinalHelperTrait;
+
+ // Implement setTo(), setReplyTo(), etc
+ use AddressingTrait;
+
+ /**
+ * WorkflowMessage constructor.
+ *
+ * @param array $imports
+ * List of values to import.
+ * Ex: ['tplParams' => [...tplValues...], 'tokenContext' => [...tokenData...]]
+ * Ex: ['modelProps' => [...classProperties...]]
+ */
+ public function __construct(array $imports = []) {
+ WorkflowMessage::importAll($this, $imports);
+ }
+
+ /**
+ * The contact receiving this message.
+ *
+ * @var int|null
+ * @scope tokenContext
+ * @fkEntity Contact
+ */
+ protected $contactId;
+
+ /**
+ * @var array|null
+ * @scope tokenContext
+ */
+ protected $contact;
+
+ /**
+ * Must provide either 'int $contactId' or 'array $contact'
+ *
+ * @param array $errors
+ * @see ReflectiveWorkflowTrait::validate()
+ */
+ protected function validateExtra_contact(array &$errors) {
+ if (empty($this->contactId) && empty($this->contact['id'])) {
+ $errors[] = [
+ 'severity' => 'error',
+ 'fields' => ['contactId', 'contact'],
+ 'name' => 'missingContact',
+ 'message' => ts('Message template requires one of these fields (%1)', ['contactId, contact']),
+ ];
+ }
+ if (!empty($this->contactId) && !empty($this->contact)) {
+ $errors[] = [
+ 'severity' => 'warning',
+ 'fields' => ['contactId', 'contact'],
+ 'name' => 'missingContact',
+ 'message' => ts('Passing both (%1) may lead to ambiguous behavior.', ['contactId, contact']),
+ ];
+ }
+ }
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/Traits/AddressingTrait.php b/civicrm/Civi/WorkflowMessage/Traits/AddressingTrait.php
new file mode 100644
index 0000000000..ac60155bd5
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/Traits/AddressingTrait.php
@@ -0,0 +1,336 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage\Traits;
+
+const ADDRESS_STORAGE_FMT = 'rfc822';
+const ADDRESS_EXPORT_FMT = 'rfc822';
+
+/**
+ * Define the $to, $from, $replyTo, $cc, and $bcc fields to a WorkflowMessage class.
+ *
+ * Email addresses may be get or set in any of these formats:
+ *
+ * - rfc822 (string): RFC822-style, e.g. 'Full Name <user@example.com>'
+ * - record (array): Pair of name+email, e.g. ['name' => 'Full Name', 'email' => 'user@example.com']
+ * - records: (array) List of records, keyed sequentially.
+ */
+trait AddressingTrait {
+
+ /**
+ * The primary email recipient (single address).
+ *
+ * @var string|null
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ *
+ * The "To:" address is mapped to the "envelope" scope. The existing
+ * envelope format treats this as a pair of fields [toName,toEmail].
+ * Consequently, we only support one "To:" address, and it uses a
+ * special import/export method.
+ */
+ protected $to;
+
+ /**
+ * The email sender (single address).
+ *
+ * @var string|null
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * @scope envelope
+ */
+ protected $from;
+
+ /**
+ * The email sender's Reply-To (single address).
+ *
+ * @var string|null
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * @scope envelope
+ */
+ protected $replyTo;
+
+ /**
+ * Additional recipients (multiple addresses).
+ *
+ * @var string|null
+ * Ex: '"Foo Bar" <foo.bar@example.com>, "Whiz Bang" <whiz.bang@example.com>'
+ * Ex: [['name' => 'Foo Bar', 'email' => 'foo.bar@example.com'], ['name' => 'Whiz Bang', 'email' => 'whiz.bang@example.com']]
+ * @scope envelope
+ */
+ protected $cc;
+
+ /**
+ * Additional recipients (multiple addresses).
+ *
+ * @var string|null
+ * Ex: '"Foo Bar" <foo.bar@example.com>, "Whiz Bang" <whiz.bang@example.com>'
+ * Ex: [['name' => 'Foo Bar', 'email' => 'foo.bar@example.com'], ['name' => 'Whiz Bang', 'email' => 'whiz.bang@example.com']]
+ * @scope envelope
+ */
+ protected $bcc;
+
+ /**
+ * Get the list of "To:" addresses.
+ *
+ * Note: This returns only
+ *
+ * @param string $format
+ * Ex: 'rfc822', 'records', 'record'
+ * @return array|string
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => 'Foo Bar', 'email' => 'foo.bar@example.com']
+ */
+ public function getTo($format = ADDRESS_EXPORT_FMT) {
+ return $this->formatAddress($format, $this->to);
+ }
+
+ /**
+ * Get the "From:" address.
+ *
+ * @param string $format
+ * Ex: 'rfc822', 'records', 'record'
+ * @return array|string
+ * The "From" address. If none set, this will be empty ([]).
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => 'Foo Bar', 'email' => 'foo.bar@example.com']
+ */
+ public function getFrom($format = ADDRESS_EXPORT_FMT) {
+ return $this->formatAddress($format, $this->from);
+ }
+
+ /**
+ * Get the "Reply-To:" address.
+ *
+ * @param string $format
+ * Ex: 'rfc822', 'records', 'record'
+ * @return array|string
+ * The "From" address. If none set, this will be empty ([]).
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => 'Foo Bar', 'email' => 'foo.bar@example.com']
+ */
+ public function getReplyTo($format = ADDRESS_EXPORT_FMT) {
+ return $this->formatAddress($format, $this->replyTo);
+ }
+
+ /**
+ * Get the list of "Cc:" addresses.
+ *
+ * @param string $format
+ * Ex: 'rfc822', 'records', 'record'
+ * @return array|string
+ * List of addresses.
+ * Ex: 'First <first@example.com>, second@example.com'
+ * Ex: [['name' => 'First', 'email' => 'first@example.com'], ['email' => 'second@example.com']]
+ */
+ public function getCc($format = ADDRESS_EXPORT_FMT) {
+ return $this->formatAddress($format, $this->cc);
+ }
+
+ /**
+ * Get the list of "Bcc:" addresses.
+ *
+ * @param string $format
+ * Ex: 'rfc822', 'records', 'record'
+ * @return array|string
+ * List of addresses.
+ * Ex: 'First <first@example.com>, second@example.com'
+ * Ex: [['name' => 'First', 'email' => 'first@example.com'], ['email' => 'second@example.com']]
+ */
+ public function getBcc($format = ADDRESS_EXPORT_FMT) {
+ return $this->formatAddress($format, $this->bcc);
+ }
+
+ /**
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * @return $this
+ */
+ public function setFrom($address) {
+ $this->from = $this->formatAddress(ADDRESS_STORAGE_FMT, $address);
+ return $this;
+ }
+
+ /**
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * @return $this
+ */
+ public function setTo($address) {
+ $this->to = $this->formatAddress(ADDRESS_STORAGE_FMT, $address);
+ return $this;
+ }
+
+ /**
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * @return $this
+ */
+ public function setReplyTo($address) {
+ $this->replyTo = $this->formatAddress(ADDRESS_STORAGE_FMT, $address);
+ return $this;
+ }
+
+ /**
+ * Set the "CC:" list.
+ *
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * Ex: [['email' => 'first@example.com'], ['email' => 'second@example.com']]
+ * @return $this
+ */
+ public function setCc($address) {
+ $this->cc = $this->formatAddress(ADDRESS_STORAGE_FMT, $address);
+ return $this;
+ }
+
+ /**
+ * Set the "BCC:" list.
+ *
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * Ex: [['email' => 'first@example.com'], ['email' => 'second@example.com']]
+ * @return $this
+ */
+ public function setBcc($address) {
+ $this->bcc = $this->formatAddress(ADDRESS_STORAGE_FMT, $address);
+ return $this;
+ }
+
+ /**
+ * Add another "CC:" address.
+ *
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * Ex: [['email' => 'first@example.com'], ['email' => 'second@example.com']]
+ * @return $this
+ */
+ public function addCc($address) {
+ return $this->setCc(array_merge(
+ $this->getCc('records'),
+ $this->formatAddress('records', $address)
+ ));
+ }
+
+ /**
+ * Add another "BCC:" address.
+ *
+ * @param string|array $address
+ * Ex: '"Foo Bar" <foo.bar@example.com>'
+ * Ex: ['name' => "Foo Bar", "email" => "foo.bar@example.com"]
+ * Ex: [['email' => 'first@example.com'], ['email' => 'second@example.com']]
+ * @return $this
+ */
+ public function addBcc($address) {
+ return $this->setBcc(array_merge(
+ $this->getBcc('records'),
+ $this->formatAddress('records', $address)
+ ));
+ }
+
+ /**
+ * Plugin to `WorkflowMessageInterface::import()` and handle toEmail/toName.
+ *
+ * @param array $values
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::import
+ */
+ protected function importExtraEnvelope_toAddress(array &$values): void {
+ if (array_key_exists('toEmail', $values) || array_key_exists('toName', $values)) {
+ $this->setTo(['name' => $values['toName'] ?? NULL, 'email' => $values['toEmail'] ?? NULL]);
+ unset($values['toName']);
+ unset($values['toEmail']);
+ }
+ }
+
+ /**
+ * Plugin to `WorkflowMessageInterface::export()` and handle toEmail/toName.
+ *
+ * @param array $values
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::export
+ */
+ protected function exportExtraEnvelope_toAddress(array &$values): void {
+ $addr = $this->getTo('record');
+ $values['toName'] = $addr['name'] ?? NULL;
+ $values['toEmail'] = $addr['email'] ?? NULL;
+ }
+
+ /**
+ * Convert an address to the desired format.
+ *
+ * @param string $newFormat
+ * Ex: 'rfc822', 'records', 'record'
+ * @param array|string $mixed
+ * @return array|string|null
+ */
+ private function formatAddress($newFormat, $mixed) {
+ if ($mixed === NULL) {
+ return NULL;
+ }
+
+ $oldFormat = is_string($mixed) ? 'rfc822' : (array_key_exists('email', $mixed) ? 'record' : 'records');
+ if ($oldFormat === $newFormat) {
+ return $mixed;
+ }
+
+ $recordToObj = function (?array $record) {
+ return new \ezcMailAddress($record['email'], $record['name'] ?? '');
+ };
+ $objToRecord = function (?\ezcMailAddress $addr) {
+ return is_null($addr) ? NULL : ['email' => $addr->email, 'name' => $addr->name];
+ };
+
+ // Convert $mixed to intermediate format (ezcMailAddress[] $objects) and then to final format.
+
+ /** @var \ezcMailAddress[] $objects */
+
+ switch ($oldFormat) {
+ case 'rfc822':
+ $objects = \ezcMailTools::parseEmailAddresses($mixed);
+ break;
+
+ case 'record':
+ $objects = [$recordToObj($mixed)];
+ break;
+
+ case 'records':
+ $objects = array_map($recordToObj, $mixed);
+ break;
+
+ default:
+ throw new \RuntimeException("Unrecognized source format: $oldFormat");
+ }
+
+ switch ($newFormat) {
+ case 'rfc822':
+ // We use `implode(map(composeEmailAddress))` instead of `composeEmailAddresses` because the latter has header-line-wrapping.
+ return implode(', ', array_map(['ezcMailTools', 'composeEmailAddress'], $objects));
+
+ case 'record':
+ if (count($objects) > 1) {
+ throw new \RuntimeException("Cannot convert email addresses to record format. Too many addresses.");
+ }
+ return $objToRecord($objects[0] ?? NULL);
+
+ case 'records':
+ return array_map($objToRecord, $objects);
+
+ default:
+ throw new \RuntimeException("Unrecognized output format: $newFormat");
+ }
+ }
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/Traits/FinalHelperTrait.php b/civicrm/Civi/WorkflowMessage/Traits/FinalHelperTrait.php
new file mode 100644
index 0000000000..09ab889048
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/Traits/FinalHelperTrait.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage\Traits;
+
+/**
+ * Define a series of high-level, non-extensible helpers for WorkflowMessages,
+ * such as `renderTemplate()` or `sendTemplate()`.
+ *
+ * These helpers are convenient because it should be common to take a WorkflowMessage
+ * instance and pass it to a template. However, WorkflowMessage is the data-model
+ * for content of a message -- templating is outside the purview of WorkflowMessage.
+ * Consequently, there should not be any substantial templating logic here. Instead,
+ * these helpers MUST ONLY delegate out to a canonical renderer.
+ */
+trait FinalHelperTrait {
+
+ /**
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::export()
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::export()
+ */
+ abstract public function export(string $format = NULL): ?array;
+
+ /**
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::validate()
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::validate()
+ */
+ abstract public function validate(): array;
+
+ /**
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::assertValid()
+ */
+ final public function assertValid($strict = FALSE) {
+ $validations = $this->validate();
+ if (!$strict) {
+ $validations = array_filter($validations, function ($validation) {
+ return $validation['severity'] === 'error';
+ });
+ }
+ if (!empty($validations)) {
+ throw new \CRM_Core_Exception(sprintf("Found %d validation error(s) in %s.", count($validations), get_class($this)));
+ }
+ return $this;
+ }
+
+ /**
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::renderTemplate()
+ */
+ final public function renderTemplate(array $params = []): array {
+ $params['model'] = $this;
+ return \CRM_Core_BAO_MessageTemplate::renderTemplate($params);
+ }
+
+ /**
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::sendTemplate()
+ */
+ final public function sendTemplate(array $params = []): array {
+ return \CRM_Core_BAO_MessageTemplate::sendTemplate($params + ['model' => $this]);
+ }
+
+ ///**
+ // * Get the list of available tokens.
+ // *
+ // * @return array
+ // * Ex: ['contact.first_name' => ['entity' => 'contact', 'field' => 'first_name', 'label' => ts('Last Name')]]
+ // * Array(string $dottedName => array('entity'=>string, 'field'=>string, 'label'=>string)).
+ // */
+ //final public function getTokens(): array {
+ // $tp = new TokenProcessor(\Civi::dispatcher(), [
+ // 'controller' => static::CLASS,
+ // ]);
+ // $tp->addRow($this->export('tokenContext'));
+ // return $tp->getTokens();
+ //}
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/Traits/ReflectiveWorkflowTrait.php b/civicrm/Civi/WorkflowMessage/Traits/ReflectiveWorkflowTrait.php
new file mode 100644
index 0000000000..a19958eb8f
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/Traits/ReflectiveWorkflowTrait.php
@@ -0,0 +1,306 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage\Traits;
+
+use Civi\Api4\Utils\ReflectionUtils;
+
+/**
+ * The ReflectiveWorkflowTrait makes it easier to define
+ * workflow-messages using conventional PHP class-modeling. Thus:
+ *
+ * - As general rule, you define all inputs+outputs as PHP properties.
+ * - All key WorkflowMessage methods (getFields, import, export, validate)
+ * are based reflection (inspecting types/annotations of the PHP properties).
+ * - Most common tasks can be done with annotations on the properties such
+ * as `@var` and `@scope`.
+ * - If you need special behaviors (e.g. outputting derived data to the
+ * Smarty context automatically), then you may override certain methods
+ * (e.g. exportExtra*(), importExtra*()).
+ *
+ * Here are few important annotations:
+ *
+ * - `@var` - Specify the PHP type for the data. (Use '|' to list multiple permitted types.)
+ * Ex: `@var string|bool`
+ * - `@scope` - Share data with another subsystem, such as the token-processor (`tokenContext`)
+ * or Smarty (`tplParams`).
+ * (By default, the property will have the same name in the other context, but)
+ * Ex: `@scope tplParams`
+ * Ex: `@scope tplParams as contact_id, tokenContext as contactId`
+ */
+trait ReflectiveWorkflowTrait {
+
+ /**
+ * The extras are an open-ended list of fields that will be passed-through to
+ * tpl, tokenContext, etc. This is the storage of last-resort for imported
+ * values that cannot be stored by other means.
+ *
+ * @var array
+ * Ex: ['tplParams' => ['assigned_value' => 'A', 'other_value' => 'B']]
+ */
+ protected $_extras = [];
+
+ /**
+ * @inheritDoc
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::getFields()
+ */
+ public function getFields(): array {
+ // Thread-local cache of class metadata. Class metadata is immutable at runtime, so this is strictly write-once. It should ideally be reused across varied test-functions.
+ static $caches = [];
+ $cache =& $caches[static::CLASS];
+ if ($cache === NULL) {
+ $cache = [];
+ foreach (ReflectionUtils::findStandardProperties(static::CLASS) as $property) {
+ /** @var \ReflectionProperty $property */
+ $parsed = ReflectionUtils::getCodeDocs($property, 'Property');
+ $field = new \Civi\WorkflowMessage\FieldSpec();
+ $field->setName($property->getName())->loadArray($parsed);
+ $cache[$field->getName()] = $field;
+ }
+ }
+ return $cache;
+ }
+
+ protected function getFieldsByFormat($format): ?array {
+ switch ($format) {
+ case 'modelProps':
+ return $this->getFields();
+
+ case 'envelope':
+ case 'tplParams':
+ case 'tokenContext':
+ $matches = [];
+ foreach ($this->getFields() as $field) {
+ /** @var \Civi\WorkflowMessage\FieldSpec $field */
+ if (isset($field->getScope()[$format])) {
+ $key = $field->getScope()[$format];
+ $matches[$key] = $field;
+ }
+ }
+ return $matches;
+
+ default:
+ return NULL;
+ }
+ }
+
+ /**
+ * @inheritDoc
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::export()
+ */
+ public function export(string $format = NULL): ?array {
+ switch ($format) {
+ case 'modelProps':
+ case 'envelope':
+ case 'tokenContext':
+ case 'tplParams':
+ $values = $this->_extras[$format] ?? [];
+ $fieldsByFormat = $this->getFieldsByFormat($format);
+ foreach ($fieldsByFormat as $key => $field) {
+ /** @var \Civi\WorkflowMessage\FieldSpec $field */
+ $getter = 'get' . ucfirst($field->getName());
+ \CRM_Utils_Array::pathSet($values, explode('.', $key), $this->$getter());
+ }
+
+ $methods = ReflectionUtils::findMethodHelpers(static::CLASS, 'exportExtra' . ucfirst($format));
+ foreach ($methods as $method) {
+ $this->{$method->getName()}(...[&$values]);
+ }
+ return $values;
+
+ default:
+ return NULL;
+ }
+ }
+
+ /**
+ * @inheritDoc
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::import()
+ */
+ public function import(string $format, array $values) {
+ $MISSING = new \stdClass();
+
+ switch ($format) {
+ case 'modelProps':
+ case 'envelope':
+ case 'tokenContext':
+ case 'tplParams':
+ $fields = $this->getFieldsByFormat($format);
+ foreach ($fields as $key => $field) {
+ /** @var \Civi\WorkflowMessage\FieldSpec $field */
+ $path = explode('.', $key);
+ $value = \CRM_Utils_Array::pathGet($values, $path, $MISSING);
+ if ($value !== $MISSING) {
+ $setter = 'set' . ucfirst($field->getName());
+ $this->$setter($value);
+ \CRM_Utils_Array::pathUnset($values, $path, TRUE);
+ }
+ }
+
+ $methods = ReflectionUtils::findMethodHelpers(static::CLASS, 'importExtra' . ucfirst($format));
+ foreach ($methods as $method) {
+ $this->{$method->getName()}($values);
+ }
+
+ if ($format !== 'modelProps' && !empty($values)) {
+ $this->_extras[$format] = array_merge($this->_extras[$format] ?? [], $values);
+ $values = [];
+ }
+ break;
+
+ }
+
+ return $this;
+ }
+
+ /**
+ * Determine if the data for this workflow message is complete/well-formed.
+ *
+ * @return array
+ * A list of errors and warnings. Each record defines
+ * - severity: string, 'error' or 'warning'
+ * - fields: string[], list of fields implicated in the error
+ * - name: string, symbolic name of the error/warning
+ * - message: string, printable message describing the problem
+ * @see \Civi\WorkflowMessage\WorkflowMessageInterface::validate()
+ */
+ public function validate(): array {
+ $props = $this->export('modelProps');
+ $fields = $this->getFields();
+
+ $errors = [];
+ foreach ($fields as $fieldName => $fieldSpec) {
+ /** @var \Civi\WorkflowMessage\FieldSpec $fieldSpec */
+ $fieldValue = $props[$fieldName] ?? NULL;
+ if (!$fieldSpec->isRequired() && $fieldValue === NULL) {
+ continue;
+ }
+ if (!\CRM_Utils_Type::validatePhpType($fieldValue, $fieldSpec->getType(), FALSE)) {
+ $errors[] = [
+ 'severity' => 'error',
+ 'fields' => [$fieldName],
+ 'name' => 'wrong_type',
+ 'message' => ts('Field should have type %1.', [1 => implode('|', $fieldSpec->getType())]),
+ ];
+ }
+ if ($fieldSpec->isRequired() && ($fieldValue === NULL || $fieldValue === '')) {
+ $errors[] = [
+ 'severity' => 'error',
+ 'fields' => [$fieldName],
+ 'name' => 'required',
+ 'message' => ts('Missing required field %1.', [1 => $fieldName]),
+ ];
+ }
+ }
+
+ $methods = ReflectionUtils::findMethodHelpers(static::CLASS, 'validateExtra');
+ foreach ($methods as $method) {
+ $this->{$method->getName()}($errors);
+ }
+
+ return $errors;
+ }
+
+ // All of the methods below are empty placeholders. They may be overridden to customize behavior.
+
+ /**
+ * Get a list of key-value pairs to include the array-coded version of the class.
+ *
+ * @param array $export
+ * Modifiable list of export-values.
+ */
+ protected function exportExtraModelProps(array &$export): void {
+ }
+
+ /**
+ * Get a list of key-value pairs to add to the token-context.
+ *
+ * @param array $export
+ * Modifiable list of export-values.
+ */
+ protected function exportExtraTokenContext(array &$export): void {
+ $export['controller'] = static::CLASS;
+ }
+
+ /**
+ * Get a list of key-value pairs to include the Smarty template context.
+ *
+ * Values returned here will override any defaults.
+ *
+ * @param array $export
+ * Modifiable list of export-values.
+ */
+ protected function exportExtraTplParams(array &$export): void {
+ }
+
+ /**
+ * Get a list of key-value pairs to include the Smarty template context.
+ *
+ * @param array $export
+ * Modifiable list of export-values.
+ */
+ protected function exportExtraEnvelope(array &$export): void {
+ if ($wfName = \CRM_Utils_Constant::value(static::CLASS . '::WORKFLOW')) {
+ $export['valueName'] = $wfName;
+ }
+ if ($wfGroup = \CRM_Utils_Constant::value(static::CLASS . '::GROUP')) {
+ $export['groupName'] = $wfGroup;
+ }
+ }
+
+ /**
+ * Given an import-array (in the class-format), pull out any interesting values.
+ *
+ * @param array $values
+ * List of import-values. Optionally, unset values that you have handled or blocked.
+ */
+ protected function importExtraModelProps(array &$values): void {
+ }
+
+ /**
+ * Given an import-array (in the token-context-format), pull out any interesting values.
+ *
+ * @param array $values
+ * List of import-values. Optionally, unset values that you have handled or blocked.
+ */
+ protected function importExtraTokenContext(array &$values): void {
+ }
+
+ /**
+ * Given an import-array (in the tpl-format), pull out any interesting values.
+ *
+ * @param array $values
+ * List of import-values. Optionally, unset values that you have handled or blocked.
+ */
+ protected function importExtraTplParams(array &$values): void {
+ }
+
+ /**
+ * Given an import-array (in the envelope-format), pull out any interesting values.
+ *
+ * @param array $values
+ * List of import-values. Optionally, unset values that you have handled or blocked.
+ */
+ protected function importExtraEnvelope(array &$values): void {
+ if ($wfName = \CRM_Utils_Constant::value(static::CLASS . '::WORKFLOW')) {
+ if (isset($values['valueName']) && $wfName === $values['valueName']) {
+ unset($values['valueName']);
+ }
+ }
+ if ($wfGroup = \CRM_Utils_Constant::value(static::CLASS . '::GROUP')) {
+ if (isset($values['groupName']) && $wfGroup === $values['groupName']) {
+ unset($values['groupName']);
+ }
+ }
+ }
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/WorkflowMessage.php b/civicrm/Civi/WorkflowMessage/WorkflowMessage.php
new file mode 100644
index 0000000000..3647286ef5
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/WorkflowMessage.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage;
+
+use Civi\WorkflowMessage\Exception\WorkflowMessageException;
+
+/**
+ * A WorkflowMessage describes the inputs to an automated email messages.
+ *
+ * These classes may be instantiated by either class-name or workflow-name.
+ *
+ * Ex: $msgWf = new \CRM_Foo_WorkflowMessage_MyAlert(['tplParams' => [...tplValues...]]);
+ * Ex: $msgWf = new \CRM_Foo_WorkflowMessage_MyAlert(['modelProps' => [...classProperties...]]);
+ * Ex: $msgWf = WorkflowMessage::create('my_alert_name', ['tplParams' => [...tplValues...]]);
+ * Ex: $msgWf = WorkflowMessage::create('my_alert_name', ['modelProps' => [...classProperties...]]);
+ *
+ * Instantiating by class-name will provide better hinting and inspection.
+ * However, some workflows may not have specific classes at the time of writing.
+ * Instantiating by workflow-name will work regardless of whether there is a specific class.
+ */
+class WorkflowMessage {
+
+ /**
+ * Create a new instance of the workflow-message context.
+ *
+ * @param string $wfName
+ * Name of the workflow.
+ * Ex: 'case_activity'
+ * @param array $imports
+ * List of data to use when populating the message.
+ *
+ * The parameters may be given in a mix of formats. This mix reflects two modes of operation:
+ *
+ * - (Informal/Generic) Traditionally, workflow-messages did not have formal parameters. Instead,
+ * they relied on a mix of un(der)documented/unverifiable inputs -- supplied as a mix of Smarty
+ * assignments, token-data, and sendTemplate() params.
+ * - (Formal) More recently, workflow-messages could be defined with a PHP class that lists the
+ * inputs explicitly.
+ *
+ * You may supply inputs using these keys:
+ *
+ * - `tplParams` (array): Smarty data. These values go to `$smarty->assign()`.
+ * - `tokenContext` (array): Token-processing data. These values go to `$tokenProcessor->context`.
+ * - `envelope` (array): Email delivery data. These values go to `sendTemplate(...)`
+ * - `modelProps` (array): Formal parameters defined by a class.
+ *
+ * Informal workflow-messages ONLY support 'tplParams', 'tokenContext', and/or 'envelope'.
+ * Formal workflow-messages accept any format.
+ *
+ * @return \Civi\WorkflowMessage\WorkflowMessageInterface
+ * If there is a workflow-message class, then it will return an instance of that class.
+ * Otherwise, it will return an instance of `GenericWorkflowMessage`.
+ * @throws \Civi\WorkflowMessage\Exception\WorkflowMessageException
+ */
+ public static function create(string $wfName, array $imports = []) {
+ $classMap = static::getWorkflowNameClassMap();
+ $class = $classMap[$wfName] ?? 'Civi\WorkflowMessage\GenericWorkflowMessage';
+ $imports['envelope']['valueName'] = $wfName;
+ $model = new $class();
+ static::importAll($model, $imports);
+ return $model;
+ }
+
+ /**
+ * Import a batch of params, updating the $model.
+ *
+ * @param \Civi\WorkflowMessage\WorkflowMessageInterface $model
+ * @param array $params
+ * List of parameters, per MessageTemplate::sendTemplate().
+ * Ex: Initialize using adhoc data:
+ * ['tplParams' => [...], 'tokenContext' => [...]]
+ * Ex: Initialize using properties of the class-model
+ * ['modelProps' => [...]]
+ * @return \Civi\WorkflowMessage\WorkflowMessageInterface
+ * The updated model.
+ * @throws \Civi\WorkflowMessage\Exception\WorkflowMessageException
+ */
+ public static function importAll(WorkflowMessageInterface $model, array $params) {
+ // The $params format is defined to match the traditional format of CRM_Core_BAO_MessageTemplate::sendTemplate().
+ // At the top level, it is an "envelope", but it also has keys for other sections.
+ if (isset($params['model'])) {
+ if ($params['model'] !== $model) {
+ throw new WorkflowMessageException(sprintf("%s: Cannot apply mismatched model", get_class($model)));
+ }
+ unset($params['model']);
+ }
+
+ \CRM_Utils_Array::pathMove($params, ['contactId'], ['tokenContext', 'contactId']);
+
+ // Core#644 - handle Email ID passed as "From".
+ if (isset($params['from'])) {
+ $params['from'] = \CRM_Utils_Mail::formatFromAddress($params['from']);
+ }
+
+ if (isset($params['tplParams'])) {
+ $model->import('tplParams', $params['tplParams']);
+ unset($params['tplParams']);
+ }
+ if (isset($params['tokenContext'])) {
+ $model->import('tokenContext', $params['tokenContext']);
+ unset($params['tokenContext']);
+ }
+ if (isset($params['modelProps'])) {
+ $model->import('modelProps', $params['modelProps']);
+ unset($params['modelProps']);
+ }
+ if (isset($params['envelope'])) {
+ $model->import('envelope', $params['envelope']);
+ unset($params['envelope']);
+ }
+ $model->import('envelope', $params);
+ return $model;
+ }
+
+ /**
+ * @param \Civi\WorkflowMessage\WorkflowMessageInterface $model
+ * @return array
+ * List of parameters, per MessageTemplate::sendTemplate().
+ * Ex: ['tplParams' => [...], 'tokenContext' => [...]]
+ */
+ public static function exportAll(WorkflowMessageInterface $model): array {
+ // The format is defined to match the traditional format of CRM_Core_BAO_MessageTemplate::sendTemplate().
+ // At the top level, it is an "envelope", but it also has keys for other sections.
+ $values = $model->export('envelope');
+ $values['tplParams'] = $model->export('tplParams');
+ $values['tokenContext'] = $model->export('tokenContext');
+ if (isset($values['tokenContext']['contactId'])) {
+ $values['contactId'] = $values['tokenContext']['contactId'];
+ }
+ return $values;
+ }
+
+ /**
+ * @return array
+ * Array(string $workflowName => string $className).
+ * Ex: ["case_activity" => "CRM_Case_WorkflowMessage_CaseActivity"]
+ * @internal
+ */
+ public static function getWorkflowNameClassMap() {
+ $cache = \Civi::cache('long');
+ $cacheKey = 'WorkflowMessage-' . __FUNCTION__;
+ $map = $cache->get($cacheKey);
+ if ($map === NULL) {
+ $map = [];
+ $map['generic'] = GenericWorkflowMessage::class;
+ $baseDirs = explode(PATH_SEPARATOR, get_include_path());
+ foreach ($baseDirs as $baseDir) {
+ $baseDir = \CRM_Utils_File::addTrailingSlash($baseDir);
+ $glob = (array) glob($baseDir . 'CRM/*/WorkflowMessage/*.php');
+ $glob = preg_grep('/\.ex\.php$/', $glob, PREG_GREP_INVERT);
+ foreach ($glob as $file) {
+ $class = strtr(preg_replace('/\.php$/', '', \CRM_Utils_File::relativize($file, $baseDir)), ['/' => '_', '\\' => '_']);
+ if (class_exists($class) && (new \ReflectionClass($class))->implementsInterface(WorkflowMessageInterface::class)) {
+ $map[$class::WORKFLOW] = $class;
+ }
+ }
+ }
+ $cache->set($cacheKey, $map);
+ }
+ return $map;
+ }
+
+}
diff --git a/civicrm/Civi/WorkflowMessage/WorkflowMessageInterface.php b/civicrm/Civi/WorkflowMessage/WorkflowMessageInterface.php
new file mode 100644
index 0000000000..c3d4438ce8
--- /dev/null
+++ b/civicrm/Civi/WorkflowMessage/WorkflowMessageInterface.php
@@ -0,0 +1,114 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved. |
+ | |
+ | This work is published under the GNU AGPLv3 license with some |
+ | permitted exceptions and without any warranty. For full license |
+ | and copyright information, see https://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\WorkflowMessage;
+
+interface WorkflowMessageInterface {
+
+ /**
+ * @return \Civi\WorkflowMessage\FieldSpec[]
+ * A list of field-specs that are used in the given format, keyed by their name in that format.
+ * If the implementation does not understand a specific format, return NULL.
+ */
+ public function getFields(): array;
+
+ /**
+ * @param string $format
+ * Ex: 'tplParams', 'tokenContext', 'modelProps', 'envelope'
+ * @return array|null
+ * A list of field-values that are used in the given format, keyed by their name in that format.
+ * If the implementation does not understand a specific format, return NULL.
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::export()
+ */
+ public function export(string $format = NULL): ?array;
+
+ /**
+ * Import values from some scope.
+ *
+ * Ex: $message->import('tplParams', ['sm_art_stuff' => 123]);
+ *
+ * @param string $format
+ * Ex: 'tplParams', 'tokenContext', 'modelProps', 'envelope'
+ * @param array $values
+ *
+ * @return $this
+ * @see \Civi\WorkflowMessage\Traits\ReflectiveWorkflowTrait::import()
+ */
+ public function import(string $format, array $values);
+
+ /**
+ * Determine if the data for this workflow message is complete/well-formed.
+ *
+ * @return array
+ * A list of errors and warnings. Each record defines
+ * - severity: string, 'error' or 'warning'
+ * - fields: string[], list of fields implicated in the error
+ * - name: string, symbolic name of the error/warning
+ * - message: string, printable message describing the problem
+ */
+ public function validate(): array;
+
+ // These additional methods are sugar-coating - they're part of the interface to
+ // make it easier to work with, but implementers should not differentiate themselves
+ // using this methods. Instead, use FinalHelperTrait as a thin implementation.
+
+ /**
+ * Assert that the current message data is valid/sufficient.
+ *
+ * TIP: Do not implement directly. Use FinalHelperTrait.
+ *
+ * @param bool $strict
+ * If TRUE, then warnings will raise exceptions.
+ * If FALSE, then only errors will raise exceptions.
+ * @return $this
+ * @throws \CRM_Core_Exception
+ */
+ public function assertValid($strict = FALSE);
+
+ /**
+ * Render a message template.
+ *
+ * TIP: Do not implement directly. Use FinalHelperTrait.
+ *
+ * @param array $params
+ * Options for loading the message template.
+ * If none given, the default for this workflow will be loaded.
+ * Ex: ['messageTemplate' => ['msg_subject' => 'Hello {contact.first_name}']]
+ * Ex: ['messageTemplateID' => 123]
+ * @return array
+ * Rendered message, consistent of 'subject', 'text', 'html'
+ * Ex: ['subject' => 'Hello Bob', 'text' => 'It\'s been so long since we sent you an automated notification!']
+ * @see \CRM_Core_BAO_MessageTemplate::renderTemplate()
+ */
+ public function renderTemplate(array $params = []): array;
+
+ /**
+ * Send an email using a message template.
+ *
+ * TIP: Do not implement directly. Use FinalHelperTrait.
+ *
+ * @param array $params
+ * List of extra parameters to pass to `sendTemplate()`. Ex:
+ * - from
+ * - toName
+ * - toEmail
+ * - cc
+ * - bcc
+ * - replyTo
+ * - isTest
+ *
+ * @return array
+ * Array of four parameters: a boolean whether the email was sent, and the subject, text and HTML templates
+ * @see \CRM_Core_BAO_MessageTemplate::sendTemplate()
+ */
+ public function sendTemplate(array $params = []): array;
+
+}
diff --git a/civicrm/ang/angularFileUpload.ang.php b/civicrm/ang/angularFileUpload.ang.php
index 66a35f3dc4..1d36fba5f2 100644
--- a/civicrm/ang/angularFileUpload.ang.php
+++ b/civicrm/ang/angularFileUpload.ang.php
@@ -2,5 +2,5 @@
// This file declares an Angular module which can be autoloaded
return [
'ext' => 'civicrm',
- 'js' => ['bower_components/angular-file-upload/angular-file-upload.min.js'],
+ 'js' => ['bower_components/angular-file-upload/dist/angular-file-upload.min.js'],
];
diff --git a/civicrm/api/v3/Note.php b/civicrm/api/v3/Note.php
index a361620c94..e1866d1196 100644
--- a/civicrm/api/v3/Note.php
+++ b/civicrm/api/v3/Note.php
@@ -57,8 +57,8 @@ function _civicrm_api3_note_create_spec(&$params) {
* @return array
*/
function civicrm_api3_note_delete($params) {
- $result = new CRM_Core_BAO_Note();
- return $result->del($params['id']) ? civicrm_api3_create_success() : civicrm_api3_create_error('Error while deleting Note');
+ $result = CRM_Core_BAO_Note::deleteRecord($params);
+ return $result ? civicrm_api3_create_success() : civicrm_api3_create_error('Error while deleting Note');
}
/**
diff --git a/civicrm/api/v3/Order.php b/civicrm/api/v3/Order.php
index 364ff23dc3..0bef6bef79 100644
--- a/civicrm/api/v3/Order.php
+++ b/civicrm/api/v3/Order.php
@@ -16,6 +16,8 @@
* @package CiviCRM_APIv3
*/
+use Civi\Api4\Membership;
+
/**
* Retrieve a set of Order.
*
@@ -139,14 +141,19 @@ function civicrm_api3_order_create(array $params): array {
}
if ($entityParams['entity'] === 'membership') {
- $entityParams['status_id'] = 'Pending';
+ if (empty($entityParams['id'])) {
+ $entityParams['status_id:name'] = 'Pending';
+ }
if (!empty($params['contribution_recur_id'])) {
$entityParams['contribution_recur_id'] = $params['contribution_recur_id'];
}
- $entityParams['skipLineItem'] = TRUE;
- $entityResult = civicrm_api3('Membership', 'create', $entityParams);
+ // At this stage we need to get this passed through.
+ $entityParams['version'] = 4;
+ _order_create_wrangle_membership_params($entityParams);
+
+ $membershipID = Membership::save($params['check_permissions'] ?? FALSE)->setRecords([$entityParams])->execute()->first()['id'];
foreach ($entityParams['line_references'] as $lineIndex) {
- $order->setLineItemValue('entity_id', $entityResult['id'], $lineIndex);
+ $order->setLineItemValue('entity_id', $membershipID, $lineIndex);
}
}
}
@@ -284,3 +291,29 @@ function _civicrm_api3_order_delete_spec(array &$params) {
];
$params['id']['api.aliases'] = ['contribution_id'];
}
+
+/**
+ * Handle possibility of v3 style params.
+ *
+ * We used to call v3 Membership.create. Now we call v4.
+ * This converts membership input parameters.
+ *
+ * @param array $membershipParams
+ *
+ * @throws \API_Exception
+ */
+function _order_create_wrangle_membership_params(array &$membershipParams) {
+ $fields = Membership::getFields(FALSE)->execute()->indexBy('name');
+ foreach ($fields as $fieldName => $field) {
+ $customFieldName = 'custom_' . ($field['custom_field_id'] ?? NULL);
+ if ($field['type'] === ['Custom'] && isset($membershipParams[$customFieldName])) {
+ $membershipParams[$field['custom_group'] . '.' . $field['custom_field']] = $membershipParams[$customFieldName];
+ unset($membershipParams[$customFieldName]);
+ }
+
+ if (!empty($membershipParams[$fieldName]) && $field['data_type'] === 'Integer' && !is_numeric($membershipParams[$fieldName])) {
+ $membershipParams[$field['name'] . ':name'] = $membershipParams[$fieldName];
+ unset($membershipParams[$field['name']]);
+ }
+ }
+}
diff --git a/civicrm/bower_components/angular-file-upload/.babelrc b/civicrm/bower_components/angular-file-upload/.babelrc
new file mode 100644
index 0000000000..a292bffd66
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/.babelrc
@@ -0,0 +1,13 @@
+{
+ "presets": [
+ "es2015"
+ ],
+ "plugins": [
+ [
+ "transform-es2015-classes",
+ {
+ "loose": true
+ }
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/.composer-downloads/angular-file-upload-e60440287b4df1cbc04045e77a8c05f5.json b/civicrm/bower_components/angular-file-upload/.composer-downloads/angular-file-upload-e60440287b4df1cbc04045e77a8c05f5.json
index 8b2c667187..482c6de853 100644
--- a/civicrm/bower_components/angular-file-upload/.composer-downloads/angular-file-upload-e60440287b4df1cbc04045e77a8c05f5.json
+++ b/civicrm/bower_components/angular-file-upload/.composer-downloads/angular-file-upload-e60440287b4df1cbc04045e77a8c05f5.json
@@ -1,8 +1,9 @@
{
"name": "civicrm/civicrm-core:angular-file-upload",
- "url": "https://github.com/nervgh/angular-file-upload/archive/v1.1.6.zip",
- "checksum": "5270549e05fc3223f21c401c6ebd738f7ac1eff372ff78a4dd31aff974586951",
+ "url": "https://github.com/nervgh/angular-file-upload/archive/2.6.1.zip",
+ "checksum": "364095cfe5f7e305458c6a712f79e06a899677d7f99381f870f525704c8bd564",
"ignore": [
- "examples"
+ "examples",
+ "src"
]
}
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/CONTRIBUTING.md b/civicrm/bower_components/angular-file-upload/CONTRIBUTING.md
new file mode 100644
index 0000000000..51d451fa3a
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/CONTRIBUTING.md
@@ -0,0 +1,80 @@
+# Contributing to Angular-File-Upload
+
+:+1::tada: Welcome in angular-file-upload community :tada::+1:
+
+The following is a set of guidelines for contributing to Angular-File-Upload.
+These are just guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+Note : this guide is inspired by https://github.com/atom/atom/blob/master/CONTRIBUTING.md
+
+#### Table Of Contents
+
+[How Can I Contribute?](#how-can-i-contribute)
+ * [Reporting Bugs](#reporting-bugs)
+ * [Suggesting Enhancements](#suggesting-enhancements)
+ * [Pull Requests](#pull-requests)
+
+[Additional Notes](#additional-notes)
+ * [Issue and Pull Request Labels](#issue-and-pull-request-labels)
+ * [Contributors Communication](#contributors-communication)
+
+## How Can I Contribute?
+
+### Reporting Bugs
+
+This section guides you through submitting a bug report for Angular-File-Upload. Following these guidelines helps maintainers and the community understand your report :pencil:, reproduce the behavior :computer: :computer:, and find related reports :mag_right:.
+
+Fill out [the required template](ISSUE_TEMPLATE.md), the information it asks for helps us resolve issues faster.
+* Before Submitting A Bug Report : **Perform a [quick search](https://github.com/nervgh/angular-file-upload/issues)** to see if the problem has already been reported. If it has, add a comment to the existing issue instead of opening a new one.
+* When you are creating a bug report, please include as many details as possible, explain the problem and include additional details to help maintainers reproduce the problem:
+
+ * **Use a clear and descriptive title** for the issue to identify the problem.
+ * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you are using Angulare-File-Upload. When listing steps, **don't just say what you did, but explain how you did it**. For example, if you upload a file, explain if you did it by clicking on a button or if you have started the upload programmatically?
+ * **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
+ * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
+ * **Explain which behavior you expected to see instead and why.**
+ * **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. If you use the keyboard while following the steps. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
+ * **If you're reporting that Angular-File-Upload crashed**, include a crash report with a stack trace from the browser stack. On macOS, the crash report will be available and put it in a [gist](https://gist.github.com/) and provide link to that gist.
+
+ Provide more context by answering these questions:
+
+ * **Did the problem start happening recently** (e.g. after updating to a new version of Angular-File-Upload) or was this always a problem?
+ * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
+ * **Does the problem happen for all files or only some?** Does the problem happen only when working with local or remote files (e.g. on network drives), with files of a specific type (e.g. only JavaScript or Python files), with large files or files with very long lines, or with files in a specific encoding? Is there anything else special about the files you are using?
+
+Include details about your configuration and environment:
+
+ * **Which browser are you using?** ?
+ * **What's the name and version of the OS you're using**?
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for Angular-File-Upload, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion :pencil: and find related suggestions :mag_right:.
+* Before Submitting An Enhancement : **Perform a [quick search](https://github.com/nervgh/angular-file-upload/issues)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+
+ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/). Provide the following information:
+
+ * **Use a clear and descriptive title** for the issue to identify the suggestion.
+ * **Provide a step-by-step description of the suggested enhancement** in as many details as possible.
+ * **Provide specific examples to demonstrate the steps**. Include copy/pasteable snippets which you use in those examples, as [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
+ * **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
+ * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Angular-File-Upload which the suggestion is related to. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
+ * **Explain why this enhancement would be useful** to most Angular-File-Upload users.
+ * **List some other uploader libs or usages where this enhancement exists.**
+
+### Pull Requests
+
+* Follow [standardJS](https://github.com/feross/standard) styleguides.
+* Include thoughtfully-worded, [protractor](http://www.protractortest.org/#/) tests
+* Document new code based using [jsdoc](http://usejsdoc.org/)
+
+## Additional Notes
+
+###Â Issue and Pull Request Labels
+
+Feel free to grade issues and PRs by tags if it helps you work.
+You can create any labels what you need and you can manage project using these labels.
+
+###Â Contributors Communication
+
+To participate to discussion, please ask access to [nervgh](https://github.com/nervgh) to the telegram group of contributors.
diff --git a/civicrm/bower_components/angular-file-upload/Gruntfile.coffee b/civicrm/bower_components/angular-file-upload/Gruntfile.coffee
deleted file mode 100644
index a3a34ed0cf..0000000000
--- a/civicrm/bower_components/angular-file-upload/Gruntfile.coffee
+++ /dev/null
@@ -1,58 +0,0 @@
-path = require 'path'
-
-# Build configurations.
-module.exports = (grunt) ->
- grunt.initConfig
-
- # Metadata
- pkg: grunt.file.readJSON('package.json'),
-
- banner: '/*\n' +
- ' <%= pkg.name %> v<%= pkg.version %>\n' +
- ' <%= pkg.homepage %>\n' +
- '*/\n'
-
- # Deletes built file and temp directories.
- clean:
- working:
- src: [
- 'angular-file-upload.*'
- ]
-
- uglify:
-
- # concat js files before minification
- js:
- src: ['angular-file-upload.js']
- dest: 'angular-file-upload.min.js'
- options:
- banner: '<%= banner %>'
- sourceMap: (fileName) ->
- fileName.replace /\.js$/, '.map'
- concat:
-
- # concat js files before minification
- js:
- options:
- banner: '<%= banner %>'
- stripBanners: true
- src: [
- 'src/intro.js',
- 'src/module.js',
- 'src/outro.js'
- ]
- dest: 'angular-file-upload.js'
-
- # Register grunt tasks supplied by grunt-contrib-*.
- # Referenced in package.json.
- # https://github.com/gruntjs/grunt-contrib
- grunt.loadNpmTasks 'grunt-contrib-clean'
- grunt.loadNpmTasks 'grunt-contrib-copy'
- grunt.loadNpmTasks 'grunt-contrib-uglify'
- grunt.loadNpmTasks 'grunt-contrib-concat'
-
- grunt.registerTask 'default', [
- 'clean'
- 'concat'
- 'uglify'
- ]
diff --git a/civicrm/bower_components/angular-file-upload/README.md b/civicrm/bower_components/angular-file-upload/README.md
index 01bb08af6e..0caa71ea52 100644
--- a/civicrm/bower_components/angular-file-upload/README.md
+++ b/civicrm/bower_components/angular-file-upload/README.md
@@ -1,5 +1,7 @@
# Angular File Upload
++ compatible with AngularJS v1.x
+
---
## About
@@ -8,7 +10,29 @@
When files are selected or dropped into the component, one or more filters are applied. Files which pass all filters are added to the queue. When file is added to the queue, for him is created instance of `{FileItem}` and uploader options are copied into this object. After, items in the queue (FileItems) are ready for uploading.
-You could find this module in bower like [_angular file upload_](http://bower.io/search/?q=angular%20file%20upload).
+## Package managers
+
+### NPM [](https://www.npmjs.com/package/angular-file-upload)
+```
+npm install angular-file-upload
+```
+You could find this module in npm like [_angular file upload_](https://www.npmjs.com/package/angular-file-upload).
+
+### Yarn [](https://www.npmjs.com/package/angular-file-upload)
+```
+yarn add --exact angular-file-upload
+```
+You could find this module in yarn like [_angular file upload_](https://yarnpkg.com/en/package/angular-file-upload).
+
+### Module Dependency
+
+Add `'angularFileUpload'` to your module declaration:
+
+```
+var app = angular.module('my-app', [
+ 'angularFileUpload'
+]);
+```
## Demos
1. [Simple example](http://nervgh.github.io/pages/angular-file-upload/examples/simple)
@@ -22,3 +46,34 @@ You could find this module in bower like [_angular file upload_](http://bower.io
3. [FAQ](https://github.com/nervgh/angular-file-upload/wiki/FAQ)
4. [Migrate from 0.x.x to 1.x.x](https://github.com/nervgh/angular-file-upload/wiki/Migrate-from-0.x.x-to-1.x.x)
5. [RubyGem](https://github.com/marthyn/angularjs-file-upload-rails)
+
+## Browser compatibility
+This module uses the _feature detection_ pattern for adaptation its behaviour: [fd1](https://github.com/nervgh/angular-file-upload/blob/v2.3.1/src/services/FileUploader.js#L728),
+[fd2](https://github.com/nervgh/angular-file-upload/blob/v2.3.1/examples/image-preview/directives.js#L21).
+
+You could check out features of target browsers using http://caniuse.com/. For example, the [File API](http://caniuse.com/#feat=fileapi) feature.
+
+| Feature/Browser | IE 8-9 | IE10+ | Firefox 28+ | Chrome 38+ | Safari 6+ |
+|----------|:---:|:---:|:---:|:---:|:---:|
+| `<input type="file"/>` | + | + | + | + | + |
+| `<input type="file" multiple/>` | - | + | + | + | + |
+| Drag-n-drop | - | + | + | + | + |
+| Iframe transport (only for old browsers) | + | + | + | + | + |
+| XHR transport (multipart,binary) | - | + | + | + | + |
+| An image preview via Canvas (not built-in) | - | + | + | + | + |
+| AJAX headers | - | + | + | + | + |
+
+
+## How to ask a question
+
+### A right way to ask a question
+If you have a question, please, follow next steps:
+- Try to find an answer to your question using [search](https://github.com/nervgh/angular-file-upload/issues?utf8=%E2%9C%93&q=)
+- If you have not found an answer, create [new issue](https://github.com/nervgh/angular-file-upload/issues/new) on issue-tracker
+
+### Why email a question is a bad way?
+When you emal me a question:
+- You lose an opportunity to get an answer from other team members or users (devs)
+- It requires from me to answer on same questions again and again
+- It is not a rational way. For example, if everybody who use code of this project will have emailed me a question then I will be receiving ~700 emails each day =)
+- It is a very slow way. I have not time for it.
diff --git a/civicrm/bower_components/angular-file-upload/WebpackConfig.js b/civicrm/bower_components/angular-file-upload/WebpackConfig.js
new file mode 100644
index 0000000000..08ebe6c592
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/WebpackConfig.js
@@ -0,0 +1,72 @@
+'use strict';
+
+// http://webpack.github.io/docs/
+let webpack = require('webpack');
+
+
+class WebpackConfig {
+ /**
+ * @param {Object} descriptor
+ * @param {String} descriptor.name
+ * @param {String} descriptor.version
+ * @param {String} descriptor.homepage
+ * @param {Object} path
+ * @param {String} path.src
+ * @param {String} path.dist
+ */
+ constructor(descriptor, path) {
+ this.name = descriptor.name;
+ this.version = descriptor.version;
+ this.homepage = descriptor.homepage;
+ this.path = path;
+ }
+ /**
+ * @returns {Object}
+ */
+ get() {
+ let entry = {};
+ entry[this.name] = this.path.src;
+ entry[this.name + '.min'] = this.path.src;
+
+ return {
+ entry,
+ module: {
+ loaders: [
+ // https://github.com/babel/babel-loader
+ {
+ test: /\.js$/,
+ loader: 'babel'
+ },
+ // https://github.com/webpack/json-loader
+ {test: /\.json$/, loader: 'json'},
+ // https://github.com/webpack/html-loader
+ {test: /\.html$/, loader: 'raw'}
+ ]
+ },
+ devtool: 'source-map',
+ output: {
+ libraryTarget: 'umd',
+ library: this.name,
+ filename: '[name].js'
+ },
+ plugins: [
+ new webpack.optimize.UglifyJsPlugin({
+ // Minify only [name].min.js file
+ // http://stackoverflow.com/a/34018909
+ include: /\.min\.js$/
+ }),
+ new webpack.BannerPlugin(
+ `/*\n` +
+ ` ${this.name} v${this.version}\n` +
+ ` ${this.homepage}\n` +
+ `*/\n`
+ , {
+ entryOnly: true,
+ raw: true
+ })
+ ]
+ };
+ }
+}
+
+module.exports = WebpackConfig;
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/angular-file-upload.js b/civicrm/bower_components/angular-file-upload/angular-file-upload.js
deleted file mode 100644
index 0842b74c1f..0000000000
--- a/civicrm/bower_components/angular-file-upload/angular-file-upload.js
+++ /dev/null
@@ -1,1341 +0,0 @@
-/*
- angular-file-upload v1.1.6
- https://github.com/nervgh/angular-file-upload
-*/
-(function(angular, factory) {
- if (typeof define === 'function' && define.amd) {
- define('angular-file-upload', ['angular'], function(angular) {
- return factory(angular);
- });
- } else {
- return factory(angular);
- }
-}(typeof angular === 'undefined' ? null : angular, function(angular) {
-
-var module = angular.module('angularFileUpload', []);
-
-'use strict';
-
-/**
- * Classes
- *
- * FileUploader
- * FileUploader.FileLikeObject
- * FileUploader.FileItem
- * FileUploader.FileDirective
- * FileUploader.FileSelect
- * FileUploader.FileDrop
- * FileUploader.FileOver
- */
-
-module
-
-
- .value('fileUploaderOptions', {
- url: '/',
- alias: 'file',
- headers: {},
- queue: [],
- progress: 0,
- autoUpload: false,
- removeAfterUpload: false,
- method: 'POST',
- filters: [],
- formData: [],
- queueLimit: Number.MAX_VALUE,
- withCredentials: false
- })
-
-
- .factory('FileUploader', ['fileUploaderOptions', '$rootScope', '$http', '$window', '$compile',
- function(fileUploaderOptions, $rootScope, $http, $window, $compile) {
- /**
- * Creates an instance of FileUploader
- * @param {Object} [options]
- * @constructor
- */
- function FileUploader(options) {
- var settings = angular.copy(fileUploaderOptions);
- angular.extend(this, settings, options, {
- isUploading: false,
- _nextIndex: 0,
- _failFilterIndex: -1,
- _directives: {select: [], drop: [], over: []}
- });
-
- // add default filters
- this.filters.unshift({name: 'queueLimit', fn: this._queueLimitFilter});
- this.filters.unshift({name: 'folder', fn: this._folderFilter});
- }
- /**********************
- * PUBLIC
- **********************/
- /**
- * Checks a support the html5 uploader
- * @returns {Boolean}
- * @readonly
- */
- FileUploader.prototype.isHTML5 = !!($window.File && $window.FormData);
- /**
- * Adds items to the queue
- * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files
- * @param {Object} [options]
- * @param {Array<Function>|String} filters
- */
- FileUploader.prototype.addToQueue = function(files, options, filters) {
- var list = this.isArrayLikeObject(files) ? files: [files];
- var arrayOfFilters = this._getFilters(filters);
- var count = this.queue.length;
- var addedFileItems = [];
-
- angular.forEach(list, function(some /*{File|HTMLInputElement|Object}*/) {
- var temp = new FileUploader.FileLikeObject(some);
-
- if (this._isValidFile(temp, arrayOfFilters, options)) {
- var fileItem = new FileUploader.FileItem(this, some, options);
- addedFileItems.push(fileItem);
- this.queue.push(fileItem);
- this._onAfterAddingFile(fileItem);
- } else {
- var filter = arrayOfFilters[this._failFilterIndex];
- this._onWhenAddingFileFailed(temp, filter, options);
- }
- }, this);
-
- if(this.queue.length !== count) {
- this._onAfterAddingAll(addedFileItems);
- this.progress = this._getTotalProgress();
- }
-
- this._render();
- if (this.autoUpload) this.uploadAll();
- };
- /**
- * Remove items from the queue. Remove last: index = -1
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.removeFromQueue = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- if (item.isUploading) item.cancel();
- this.queue.splice(index, 1);
- item._destroy();
- this.progress = this._getTotalProgress();
- };
- /**
- * Clears the queue
- */
- FileUploader.prototype.clearQueue = function() {
- while(this.queue.length) {
- this.queue[0].remove();
- }
- this.progress = 0;
- };
- /**
- * Uploads a item from the queue
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.uploadItem = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';
-
- item._prepareToUploading();
- if(this.isUploading) return;
-
- this.isUploading = true;
- this[transport](item);
- };
- /**
- * Cancels uploading of item from the queue
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.cancelItem = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- var prop = this.isHTML5 ? '_xhr' : '_form';
- if (item && item.isUploading) item[prop].abort();
- };
- /**
- * Uploads all not uploaded items of queue
- */
- FileUploader.prototype.uploadAll = function() {
- var items = this.getNotUploadedItems().filter(function(item) {
- return !item.isUploading;
- });
- if (!items.length) return;
-
- angular.forEach(items, function(item) {
- item._prepareToUploading();
- });
- items[0].upload();
- };
- /**
- * Cancels all uploads
- */
- FileUploader.prototype.cancelAll = function() {
- var items = this.getNotUploadedItems();
- angular.forEach(items, function(item) {
- item.cancel();
- });
- };
- /**
- * Returns "true" if value an instance of File
- * @param {*} value
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype.isFile = function(value) {
- var fn = $window.File;
- return (fn && value instanceof fn);
- };
- /**
- * Returns "true" if value an instance of FileLikeObject
- * @param {*} value
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype.isFileLikeObject = function(value) {
- return value instanceof FileUploader.FileLikeObject;
- };
- /**
- * Returns "true" if value is array like object
- * @param {*} value
- * @returns {Boolean}
- */
- FileUploader.prototype.isArrayLikeObject = function(value) {
- return (angular.isObject(value) && 'length' in value);
- };
- /**
- * Returns a index of item from the queue
- * @param {Item|Number} value
- * @returns {Number}
- */
- FileUploader.prototype.getIndexOfItem = function(value) {
- return angular.isNumber(value) ? value : this.queue.indexOf(value);
- };
- /**
- * Returns not uploaded items
- * @returns {Array}
- */
- FileUploader.prototype.getNotUploadedItems = function() {
- return this.queue.filter(function(item) {
- return !item.isUploaded;
- });
- };
- /**
- * Returns items ready for upload
- * @returns {Array}
- */
- FileUploader.prototype.getReadyItems = function() {
- return this.queue
- .filter(function(item) {
- return (item.isReady && !item.isUploading);
- })
- .sort(function(item1, item2) {
- return item1.index - item2.index;
- });
- };
- /**
- * Destroys instance of FileUploader
- */
- FileUploader.prototype.destroy = function() {
- angular.forEach(this._directives, function(key) {
- angular.forEach(this._directives[key], function(object) {
- object.destroy();
- }, this);
- }, this);
- };
- /**
- * Callback
- * @param {Array} fileItems
- */
- FileUploader.prototype.onAfterAddingAll = function(fileItems) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- */
- FileUploader.prototype.onAfterAddingFile = function(fileItem) {};
- /**
- * Callback
- * @param {File|Object} item
- * @param {Object} filter
- * @param {Object} options
- * @private
- */
- FileUploader.prototype.onWhenAddingFileFailed = function(item, filter, options) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- */
- FileUploader.prototype.onBeforeUploadItem = function(fileItem) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- * @param {Number} progress
- */
- FileUploader.prototype.onProgressItem = function(fileItem, progress) {};
- /**
- * Callback
- * @param {Number} progress
- */
- FileUploader.prototype.onProgressAll = function(progress) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onSuccessItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onErrorItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onCancelItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onCompleteItem = function(item, response, status, headers) {};
- /**
- * Callback
- */
- FileUploader.prototype.onCompleteAll = function() {};
- /**********************
- * PRIVATE
- **********************/
- /**
- * Returns the total progress
- * @param {Number} [value]
- * @returns {Number}
- * @private
- */
- FileUploader.prototype._getTotalProgress = function(value) {
- if(this.removeAfterUpload) return value || 0;
-
- var notUploaded = this.getNotUploadedItems().length;
- var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;
- var ratio = 100 / this.queue.length;
- var current = (value || 0) * ratio / 100;
-
- return Math.round(uploaded * ratio + current);
- };
- /**
- * Returns array of filters
- * @param {Array<Function>|String} filters
- * @returns {Array<Function>}
- * @private
- */
- FileUploader.prototype._getFilters = function(filters) {
- if (angular.isUndefined(filters)) return this.filters;
- if (angular.isArray(filters)) return filters;
- var names = filters.match(/[^\s,]+/g);
- return this.filters.filter(function(filter) {
- return names.indexOf(filter.name) !== -1;
- }, this);
- };
- /**
- * Updates html
- * @private
- */
- FileUploader.prototype._render = function() {
- if (!$rootScope.$$phase) $rootScope.$apply();
- };
- /**
- * Returns "true" if item is a file (not folder)
- * @param {File|FileLikeObject} item
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._folderFilter = function(item) {
- return !!(item.size || item.type);
- };
- /**
- * Returns "true" if the limit has not been reached
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._queueLimitFilter = function() {
- return this.queue.length < this.queueLimit;
- };
- /**
- * Returns "true" if file pass all filters
- * @param {File|Object} file
- * @param {Array<Function>} filters
- * @param {Object} options
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._isValidFile = function(file, filters, options) {
- this._failFilterIndex = -1;
- return !filters.length ? true : filters.every(function(filter) {
- this._failFilterIndex++;
- return filter.fn.call(this, file, options);
- }, this);
- };
- /**
- * Checks whether upload successful
- * @param {Number} status
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._isSuccessCode = function(status) {
- return (status >= 200 && status < 300) || status === 304;
- };
- /**
- * Transforms the server response
- * @param {*} response
- * @param {Object} headers
- * @returns {*}
- * @private
- */
- FileUploader.prototype._transformResponse = function(response, headers) {
- var headersGetter = this._headersGetter(headers);
- angular.forEach($http.defaults.transformResponse, function(transformFn) {
- response = transformFn(response, headersGetter);
- });
- return response;
- };
- /**
- * Parsed response headers
- * @param headers
- * @returns {Object}
- * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js
- * @private
- */
- FileUploader.prototype._parseHeaders = function(headers) {
- var parsed = {}, key, val, i;
-
- if (!headers) return parsed;
-
- angular.forEach(headers.split('\n'), function(line) {
- i = line.indexOf(':');
- key = line.slice(0, i).trim().toLowerCase();
- val = line.slice(i + 1).trim();
-
- if (key) {
- parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
- }
- });
-
- return parsed;
- };
- /**
- * Returns function that returns headers
- * @param {Object} parsedHeaders
- * @returns {Function}
- * @private
- */
- FileUploader.prototype._headersGetter = function(parsedHeaders) {
- return function(name) {
- if (name) {
- return parsedHeaders[name.toLowerCase()] || null;
- }
- return parsedHeaders;
- };
- };
- /**
- * The XMLHttpRequest transport
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._xhrTransport = function(item) {
- var xhr = item._xhr = new XMLHttpRequest();
- var form = new FormData();
- var that = this;
-
- that._onBeforeUploadItem(item);
-
- angular.forEach(item.formData, function(obj) {
- angular.forEach(obj, function(value, key) {
- form.append(key, value);
- });
- });
-
- if ( typeof(item._file.size) != 'number' ) {
- throw new TypeError('The file specified is no longer valid');
- }
-
- form.append(item.alias, item._file, item.file.name);
-
- xhr.upload.onprogress = function(event) {
- var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
- that._onProgressItem(item, progress);
- };
-
- xhr.onload = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- var gist = that._isSuccessCode(xhr.status) ? 'Success' : 'Error';
- var method = '_on' + gist + 'Item';
- that[method](item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.onerror = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- that._onErrorItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.onabort = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- that._onCancelItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.open(item.method, item.url, true);
-
- xhr.withCredentials = item.withCredentials;
-
- angular.forEach(item.headers, function(value, name) {
- xhr.setRequestHeader(name, value);
- });
-
- xhr.send(form);
- this._render();
- };
- /**
- * The IFrame transport
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._iframeTransport = function(item) {
- var form = angular.element('<form style="display: none;" />');
- var iframe = angular.element('<iframe name="iframeTransport' + Date.now() + '">');
- var input = item._input;
- var that = this;
-
- if (item._form) item._form.replaceWith(input); // remove old form
- item._form = form; // save link to new form
-
- that._onBeforeUploadItem(item);
-
- input.prop('name', item.alias);
-
- angular.forEach(item.formData, function(obj) {
- angular.forEach(obj, function(value, key) {
- var element = angular.element('<input type="hidden" name="' + key + '" />');
- element.val(value);
- form.append(element);
- });
- });
-
- form.prop({
- action: item.url,
- method: 'POST',
- target: iframe.prop('name'),
- enctype: 'multipart/form-data',
- encoding: 'multipart/form-data' // old IE
- });
-
- iframe.bind('load', function() {
- try {
- // Fix for legacy IE browsers that loads internal error page
- // when failed WS response received. In consequence iframe
- // content access denied error is thrown becouse trying to
- // access cross domain page. When such thing occurs notifying
- // with empty response object. See more info at:
- // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object
- // Note that if non standard 4xx or 5xx error code returned
- // from WS then response content can be accessed without error
- // but 'XHR' status becomes 200. In order to avoid confusion
- // returning response via same 'success' event handler.
-
- // fixed angular.contents() for iframes
- var html = iframe[0].contentDocument.body.innerHTML;
- } catch (e) {}
-
- var xhr = {response: html, status: 200, dummy: true};
- var headers = {};
- var response = that._transformResponse(xhr.response, headers);
-
- that._onSuccessItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- });
-
- form.abort = function() {
- var xhr = {status: 0, dummy: true};
- var headers = {};
- var response;
-
- iframe.unbind('load').prop('src', 'javascript:false;');
- form.replaceWith(input);
-
- that._onCancelItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- input.after(form);
- form.append(input).append(iframe);
-
- form[0].submit();
- this._render();
- };
- /**
- * Inner callback
- * @param {File|Object} item
- * @param {Object} filter
- * @param {Object} options
- * @private
- */
- FileUploader.prototype._onWhenAddingFileFailed = function(item, filter, options) {
- this.onWhenAddingFileFailed(item, filter, options);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- */
- FileUploader.prototype._onAfterAddingFile = function(item) {
- this.onAfterAddingFile(item);
- };
- /**
- * Inner callback
- * @param {Array<FileItem>} items
- */
- FileUploader.prototype._onAfterAddingAll = function(items) {
- this.onAfterAddingAll(items);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._onBeforeUploadItem = function(item) {
- item._onBeforeUpload();
- this.onBeforeUploadItem(item);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {Number} progress
- * @private
- */
- FileUploader.prototype._onProgressItem = function(item, progress) {
- var total = this._getTotalProgress(progress);
- this.progress = total;
- item._onProgress(progress);
- this.onProgressItem(item, progress);
- this.onProgressAll(total);
- this._render();
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onSuccessItem = function(item, response, status, headers) {
- item._onSuccess(response, status, headers);
- this.onSuccessItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onErrorItem = function(item, response, status, headers) {
- item._onError(response, status, headers);
- this.onErrorItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onCancelItem = function(item, response, status, headers) {
- item._onCancel(response, status, headers);
- this.onCancelItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onCompleteItem = function(item, response, status, headers) {
- item._onComplete(response, status, headers);
- this.onCompleteItem(item, response, status, headers);
-
- var nextItem = this.getReadyItems()[0];
- this.isUploading = false;
-
- if(angular.isDefined(nextItem)) {
- nextItem.upload();
- return;
- }
-
- this.onCompleteAll();
- this.progress = this._getTotalProgress();
- this._render();
- };
- /**********************
- * STATIC
- **********************/
- /**
- * @borrows FileUploader.prototype.isFile
- */
- FileUploader.isFile = FileUploader.prototype.isFile;
- /**
- * @borrows FileUploader.prototype.isFileLikeObject
- */
- FileUploader.isFileLikeObject = FileUploader.prototype.isFileLikeObject;
- /**
- * @borrows FileUploader.prototype.isArrayLikeObject
- */
- FileUploader.isArrayLikeObject = FileUploader.prototype.isArrayLikeObject;
- /**
- * @borrows FileUploader.prototype.isHTML5
- */
- FileUploader.isHTML5 = FileUploader.prototype.isHTML5;
- /**
- * Inherits a target (Class_1) by a source (Class_2)
- * @param {Function} target
- * @param {Function} source
- */
- FileUploader.inherit = function(target, source) {
- target.prototype = Object.create(source.prototype);
- target.prototype.constructor = target;
- target.super_ = source;
- };
- FileUploader.FileLikeObject = FileLikeObject;
- FileUploader.FileItem = FileItem;
- FileUploader.FileDirective = FileDirective;
- FileUploader.FileSelect = FileSelect;
- FileUploader.FileDrop = FileDrop;
- FileUploader.FileOver = FileOver;
-
- // ---------------------------
-
- /**
- * Creates an instance of FileLikeObject
- * @param {File|HTMLInputElement|Object} fileOrInput
- * @constructor
- */
- function FileLikeObject(fileOrInput) {
- var isInput = angular.isElement(fileOrInput);
- var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
- var postfix = angular.isString(fakePathOrObject) ? 'FakePath' : 'Object';
- var method = '_createFrom' + postfix;
- this[method](fakePathOrObject);
- }
-
- /**
- * Creates file like object from fake path string
- * @param {String} path
- * @private
- */
- FileLikeObject.prototype._createFromFakePath = function(path) {
- this.lastModifiedDate = null;
- this.size = null;
- this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
- this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
- };
- /**
- * Creates file like object from object
- * @param {File|FileLikeObject} object
- * @private
- */
- FileLikeObject.prototype._createFromObject = function(object) {
- this.lastModifiedDate = angular.copy(object.lastModifiedDate);
- this.size = object.size;
- this.type = object.type;
- this.name = object.name;
- };
-
- // ---------------------------
-
- /**
- * Creates an instance of FileItem
- * @param {FileUploader} uploader
- * @param {File|HTMLInputElement|Object} some
- * @param {Object} options
- * @constructor
- */
- function FileItem(uploader, some, options) {
- var isInput = angular.isElement(some);
- var input = isInput ? angular.element(some) : null;
- var file = !isInput ? some : null;
-
- angular.extend(this, {
- url: uploader.url,
- alias: uploader.alias,
- headers: angular.copy(uploader.headers),
- formData: angular.copy(uploader.formData),
- removeAfterUpload: uploader.removeAfterUpload,
- withCredentials: uploader.withCredentials,
- method: uploader.method
- }, options, {
- uploader: uploader,
- file: new FileUploader.FileLikeObject(some),
- isReady: false,
- isUploading: false,
- isUploaded: false,
- isSuccess: false,
- isCancel: false,
- isError: false,
- progress: 0,
- index: null,
- _file: file,
- _input: input
- });
-
- if (input) this._replaceNode(input);
- }
- /**********************
- * PUBLIC
- **********************/
- /**
- * Uploads a FileItem
- */
- FileItem.prototype.upload = function() {
- try {
- this.uploader.uploadItem(this);
- } catch (e) {
- this.uploader._onCompleteItem( this, '', 0, [] );
- this.uploader._onErrorItem( this, '', 0, [] );
- }
- };
- /**
- * Cancels uploading of FileItem
- */
- FileItem.prototype.cancel = function() {
- this.uploader.cancelItem(this);
- };
- /**
- * Removes a FileItem
- */
- FileItem.prototype.remove = function() {
- this.uploader.removeFromQueue(this);
- };
- /**
- * Callback
- * @private
- */
- FileItem.prototype.onBeforeUpload = function() {};
- /**
- * Callback
- * @param {Number} progress
- * @private
- */
- FileItem.prototype.onProgress = function(progress) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onSuccess = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onError = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onCancel = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onComplete = function(response, status, headers) {};
- /**********************
- * PRIVATE
- **********************/
- /**
- * Inner callback
- */
- FileItem.prototype._onBeforeUpload = function() {
- this.isReady = true;
- this.isUploading = true;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = false;
- this.progress = 0;
- this.onBeforeUpload();
- };
- /**
- * Inner callback
- * @param {Number} progress
- * @private
- */
- FileItem.prototype._onProgress = function(progress) {
- this.progress = progress;
- this.onProgress(progress);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onSuccess = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = true;
- this.isCancel = false;
- this.isError = false;
- this.progress = 100;
- this.index = null;
- this.onSuccess(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onError = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = true;
- this.progress = 0;
- this.index = null;
- this.onError(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onCancel = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = true;
- this.isError = false;
- this.progress = 0;
- this.index = null;
- this.onCancel(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onComplete = function(response, status, headers) {
- this.onComplete(response, status, headers);
- if (this.removeAfterUpload) this.remove();
- };
- /**
- * Destroys a FileItem
- */
- FileItem.prototype._destroy = function() {
- if (this._input) this._input.remove();
- if (this._form) this._form.remove();
- delete this._form;
- delete this._input;
- };
- /**
- * Prepares to uploading
- * @private
- */
- FileItem.prototype._prepareToUploading = function() {
- this.index = this.index || ++this.uploader._nextIndex;
- this.isReady = true;
- };
- /**
- * Replaces input element on his clone
- * @param {JQLite|jQuery} input
- * @private
- */
- FileItem.prototype._replaceNode = function(input) {
- var clone = $compile(input.clone())(input.scope());
- clone.prop('value', null); // FF fix
- input.css('display', 'none');
- input.after(clone); // remove jquery dependency
- };
-
- // ---------------------------
-
- /**
- * Creates instance of {FileDirective} object
- * @param {Object} options
- * @param {Object} options.uploader
- * @param {HTMLElement} options.element
- * @param {Object} options.events
- * @param {String} options.prop
- * @constructor
- */
- function FileDirective(options) {
- angular.extend(this, options);
- this.uploader._directives[this.prop].push(this);
- this._saveLinks();
- this.bind();
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileDirective.prototype.events = {};
- /**
- * Binds events handles
- */
- FileDirective.prototype.bind = function() {
- for(var key in this.events) {
- var prop = this.events[key];
- this.element.bind(key, this[prop]);
- }
- };
- /**
- * Unbinds events handles
- */
- FileDirective.prototype.unbind = function() {
- for(var key in this.events) {
- this.element.unbind(key, this.events[key]);
- }
- };
- /**
- * Destroys directive
- */
- FileDirective.prototype.destroy = function() {
- var index = this.uploader._directives[this.prop].indexOf(this);
- this.uploader._directives[this.prop].splice(index, 1);
- this.unbind();
- // this.element = null;
- };
- /**
- * Saves links to functions
- * @private
- */
- FileDirective.prototype._saveLinks = function() {
- for(var key in this.events) {
- var prop = this.events[key];
- this[prop] = this[prop].bind(this);
- }
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileSelect, FileDirective);
-
- /**
- * Creates instance of {FileSelect} object
- * @param {Object} options
- * @constructor
- */
- function FileSelect(options) {
- FileSelect.super_.apply(this, arguments);
-
- if(!this.uploader.isHTML5) {
- this.element.removeAttr('multiple');
- }
- this.element.prop('value', null); // FF fix
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileSelect.prototype.events = {
- $destroy: 'destroy',
- change: 'onChange'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileSelect.prototype.prop = 'select';
- /**
- * Returns options
- * @return {Object|undefined}
- */
- FileSelect.prototype.getOptions = function() {};
- /**
- * Returns filters
- * @return {Array<Function>|String|undefined}
- */
- FileSelect.prototype.getFilters = function() {};
- /**
- * If returns "true" then HTMLInputElement will be cleared
- * @returns {Boolean}
- */
- FileSelect.prototype.isEmptyAfterSelection = function() {
- return !!this.element.attr('multiple');
- };
- /**
- * Event handler
- */
- FileSelect.prototype.onChange = function() {
- var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];
- var options = this.getOptions();
- var filters = this.getFilters();
-
- if (!this.uploader.isHTML5) this.destroy();
- this.uploader.addToQueue(files, options, filters);
- if (this.isEmptyAfterSelection()) this.element.prop('value', null);
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileDrop, FileDirective);
-
- /**
- * Creates instance of {FileDrop} object
- * @param {Object} options
- * @constructor
- */
- function FileDrop(options) {
- FileDrop.super_.apply(this, arguments);
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileDrop.prototype.events = {
- $destroy: 'destroy',
- drop: 'onDrop',
- dragover: 'onDragOver',
- dragleave: 'onDragLeave'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileDrop.prototype.prop = 'drop';
- /**
- * Returns options
- * @return {Object|undefined}
- */
- FileDrop.prototype.getOptions = function() {};
- /**
- * Returns filters
- * @return {Array<Function>|String|undefined}
- */
- FileDrop.prototype.getFilters = function() {};
- /**
- * Event handler
- */
- FileDrop.prototype.onDrop = function(event) {
- var transfer = this._getTransfer(event);
- if (!transfer) return;
- var options = this.getOptions();
- var filters = this.getFilters();
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._removeOverClass, this);
- this.uploader.addToQueue(transfer.files, options, filters);
- };
- /**
- * Event handler
- */
- FileDrop.prototype.onDragOver = function(event) {
- var transfer = this._getTransfer(event);
- if(!this._haveFiles(transfer.types)) return;
- transfer.dropEffect = 'copy';
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._addOverClass, this);
- };
- /**
- * Event handler
- */
- FileDrop.prototype.onDragLeave = function(event) {
- if (event.currentTarget !== this.element[0]) return;
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._removeOverClass, this);
- };
- /**
- * Helper
- */
- FileDrop.prototype._getTransfer = function(event) {
- return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
- };
- /**
- * Helper
- */
- FileDrop.prototype._preventAndStop = function(event) {
- event.preventDefault();
- event.stopPropagation();
- };
- /**
- * Returns "true" if types contains files
- * @param {Object} types
- */
- FileDrop.prototype._haveFiles = function(types) {
- if (!types) return false;
- if (types.indexOf) {
- return types.indexOf('Files') !== -1;
- } else if(types.contains) {
- return types.contains('Files');
- } else {
- return false;
- }
- };
- /**
- * Callback
- */
- FileDrop.prototype._addOverClass = function(item) {
- item.addOverClass();
- };
- /**
- * Callback
- */
- FileDrop.prototype._removeOverClass = function(item) {
- item.removeOverClass();
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileOver, FileDirective);
-
- /**
- * Creates instance of {FileDrop} object
- * @param {Object} options
- * @constructor
- */
- function FileOver(options) {
- FileOver.super_.apply(this, arguments);
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileOver.prototype.events = {
- $destroy: 'destroy'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileOver.prototype.prop = 'over';
- /**
- * Over class
- * @type {string}
- */
- FileOver.prototype.overClass = 'nv-file-over';
- /**
- * Adds over class
- */
- FileOver.prototype.addOverClass = function() {
- this.element.addClass(this.getOverClass());
- };
- /**
- * Removes over class
- */
- FileOver.prototype.removeOverClass = function() {
- this.element.removeClass(this.getOverClass());
- };
- /**
- * Returns over class
- * @returns {String}
- */
- FileOver.prototype.getOverClass = function() {
- return this.overClass;
- };
-
- return FileUploader;
- }])
-
-
- .directive('nvFileSelect', ['$parse', 'FileUploader', function($parse, FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- var object = new FileUploader.FileSelect({
- uploader: uploader,
- element: element
- });
-
- object.getOptions = $parse(attributes.options).bind(object, scope);
- object.getFilters = function() {return attributes.filters;};
- }
- };
- }])
-
-
- .directive('nvFileDrop', ['$parse', 'FileUploader', function($parse, FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- if (!uploader.isHTML5) return;
-
- var object = new FileUploader.FileDrop({
- uploader: uploader,
- element: element
- });
-
- object.getOptions = $parse(attributes.options).bind(object, scope);
- object.getFilters = function() {return attributes.filters;};
- }
- };
- }])
-
-
- .directive('nvFileOver', ['FileUploader', function(FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- var object = new FileUploader.FileOver({
- uploader: uploader,
- element: element
- });
-
- object.getOverClass = function() {
- return attributes.overClass || this.overClass;
- };
- }
- };
- }])
-
- return module;
-}));
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/angular-file-upload.min.js b/civicrm/bower_components/angular-file-upload/angular-file-upload.min.js
deleted file mode 100644
index b81e0d0225..0000000000
--- a/civicrm/bower_components/angular-file-upload/angular-file-upload.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- angular-file-upload v1.1.6
- https://github.com/nervgh/angular-file-upload
-*/
-
-!function(a,b){return"function"==typeof define&&define.amd?void define("angular-file-upload",["angular"],function(a){return b(a)}):b(a)}("undefined"==typeof angular?null:angular,function(a){var b=a.module("angularFileUpload",[]);return b.value("fileUploaderOptions",{url:"/",alias:"file",headers:{},queue:[],progress:0,autoUpload:!1,removeAfterUpload:!1,method:"POST",filters:[],formData:[],queueLimit:Number.MAX_VALUE,withCredentials:!1}).factory("FileUploader",["fileUploaderOptions","$rootScope","$http","$window","$compile",function(b,c,d,e,f){function g(c){var d=a.copy(b);a.extend(this,d,c,{isUploading:!1,_nextIndex:0,_failFilterIndex:-1,_directives:{select:[],drop:[],over:[]}}),this.filters.unshift({name:"queueLimit",fn:this._queueLimitFilter}),this.filters.unshift({name:"folder",fn:this._folderFilter})}function h(b){var c=a.isElement(b),d=c?b.value:b,e=a.isString(d)?"FakePath":"Object",f="_createFrom"+e;this[f](d)}function i(b,c,d){var e=a.isElement(c),f=e?a.element(c):null,h=e?null:c;a.extend(this,{url:b.url,alias:b.alias,headers:a.copy(b.headers),formData:a.copy(b.formData),removeAfterUpload:b.removeAfterUpload,withCredentials:b.withCredentials,method:b.method},d,{uploader:b,file:new g.FileLikeObject(c),isReady:!1,isUploading:!1,isUploaded:!1,isSuccess:!1,isCancel:!1,isError:!1,progress:0,index:null,_file:h,_input:f}),f&&this._replaceNode(f)}function j(b){a.extend(this,b),this.uploader._directives[this.prop].push(this),this._saveLinks(),this.bind()}function k(a){k.super_.apply(this,arguments),this.uploader.isHTML5||this.element.removeAttr("multiple"),this.element.prop("value",null)}function l(a){l.super_.apply(this,arguments)}function m(a){m.super_.apply(this,arguments)}return g.prototype.isHTML5=!(!e.File||!e.FormData),g.prototype.addToQueue=function(b,c,d){var e=this.isArrayLikeObject(b)?b:[b],f=this._getFilters(d),h=this.queue.length,i=[];a.forEach(e,function(a){var b=new g.FileLikeObject(a);if(this._isValidFile(b,f,c)){var d=new g.FileItem(this,a,c);i.push(d),this.queue.push(d),this._onAfterAddingFile(d)}else{var e=f[this._failFilterIndex];this._onWhenAddingFileFailed(b,e,c)}},this),this.queue.length!==h&&(this._onAfterAddingAll(i),this.progress=this._getTotalProgress()),this._render(),this.autoUpload&&this.uploadAll()},g.prototype.removeFromQueue=function(a){var b=this.getIndexOfItem(a),c=this.queue[b];c.isUploading&&c.cancel(),this.queue.splice(b,1),c._destroy(),this.progress=this._getTotalProgress()},g.prototype.clearQueue=function(){for(;this.queue.length;)this.queue[0].remove();this.progress=0},g.prototype.uploadItem=function(a){var b=this.getIndexOfItem(a),c=this.queue[b],d=this.isHTML5?"_xhrTransport":"_iframeTransport";c._prepareToUploading(),this.isUploading||(this.isUploading=!0,this[d](c))},g.prototype.cancelItem=function(a){var b=this.getIndexOfItem(a),c=this.queue[b],d=this.isHTML5?"_xhr":"_form";c&&c.isUploading&&c[d].abort()},g.prototype.uploadAll=function(){var b=this.getNotUploadedItems().filter(function(a){return!a.isUploading});b.length&&(a.forEach(b,function(a){a._prepareToUploading()}),b[0].upload())},g.prototype.cancelAll=function(){var b=this.getNotUploadedItems();a.forEach(b,function(a){a.cancel()})},g.prototype.isFile=function(a){var b=e.File;return b&&a instanceof b},g.prototype.isFileLikeObject=function(a){return a instanceof g.FileLikeObject},g.prototype.isArrayLikeObject=function(b){return a.isObject(b)&&"length"in b},g.prototype.getIndexOfItem=function(b){return a.isNumber(b)?b:this.queue.indexOf(b)},g.prototype.getNotUploadedItems=function(){return this.queue.filter(function(a){return!a.isUploaded})},g.prototype.getReadyItems=function(){return this.queue.filter(function(a){return a.isReady&&!a.isUploading}).sort(function(a,b){return a.index-b.index})},g.prototype.destroy=function(){a.forEach(this._directives,function(b){a.forEach(this._directives[b],function(a){a.destroy()},this)},this)},g.prototype.onAfterAddingAll=function(a){},g.prototype.onAfterAddingFile=function(a){},g.prototype.onWhenAddingFileFailed=function(a,b,c){},g.prototype.onBeforeUploadItem=function(a){},g.prototype.onProgressItem=function(a,b){},g.prototype.onProgressAll=function(a){},g.prototype.onSuccessItem=function(a,b,c,d){},g.prototype.onErrorItem=function(a,b,c,d){},g.prototype.onCancelItem=function(a,b,c,d){},g.prototype.onCompleteItem=function(a,b,c,d){},g.prototype.onCompleteAll=function(){},g.prototype._getTotalProgress=function(a){if(this.removeAfterUpload)return a||0;var b=this.getNotUploadedItems().length,c=b?this.queue.length-b:this.queue.length,d=100/this.queue.length,e=(a||0)*d/100;return Math.round(c*d+e)},g.prototype._getFilters=function(b){if(a.isUndefined(b))return this.filters;if(a.isArray(b))return b;var c=b.match(/[^\s,]+/g);return this.filters.filter(function(a){return-1!==c.indexOf(a.name)},this)},g.prototype._render=function(){c.$$phase||c.$apply()},g.prototype._folderFilter=function(a){return!(!a.size&&!a.type)},g.prototype._queueLimitFilter=function(){return this.queue.length<this.queueLimit},g.prototype._isValidFile=function(a,b,c){return this._failFilterIndex=-1,b.length?b.every(function(b){return this._failFilterIndex++,b.fn.call(this,a,c)},this):!0},g.prototype._isSuccessCode=function(a){return a>=200&&300>a||304===a},g.prototype._transformResponse=function(b,c){var e=this._headersGetter(c);return a.forEach(d.defaults.transformResponse,function(a){b=a(b,e)}),b},g.prototype._parseHeaders=function(b){var c,d,e,f={};return b?(a.forEach(b.split("\n"),function(a){e=a.indexOf(":"),c=a.slice(0,e).trim().toLowerCase(),d=a.slice(e+1).trim(),c&&(f[c]=f[c]?f[c]+", "+d:d)}),f):f},g.prototype._headersGetter=function(a){return function(b){return b?a[b.toLowerCase()]||null:a}},g.prototype._xhrTransport=function(b){var c=b._xhr=new XMLHttpRequest,d=new FormData,e=this;if(e._onBeforeUploadItem(b),a.forEach(b.formData,function(b){a.forEach(b,function(a,b){d.append(b,a)})}),"number"!=typeof b._file.size)throw new TypeError("The file specified is no longer valid");d.append(b.alias,b._file,b.file.name),c.upload.onprogress=function(a){var c=Math.round(a.lengthComputable?100*a.loaded/a.total:0);e._onProgressItem(b,c)},c.onload=function(){var a=e._parseHeaders(c.getAllResponseHeaders()),d=e._transformResponse(c.response,a),f=e._isSuccessCode(c.status)?"Success":"Error",g="_on"+f+"Item";e[g](b,d,c.status,a),e._onCompleteItem(b,d,c.status,a)},c.onerror=function(){var a=e._parseHeaders(c.getAllResponseHeaders()),d=e._transformResponse(c.response,a);e._onErrorItem(b,d,c.status,a),e._onCompleteItem(b,d,c.status,a)},c.onabort=function(){var a=e._parseHeaders(c.getAllResponseHeaders()),d=e._transformResponse(c.response,a);e._onCancelItem(b,d,c.status,a),e._onCompleteItem(b,d,c.status,a)},c.open(b.method,b.url,!0),c.withCredentials=b.withCredentials,a.forEach(b.headers,function(a,b){c.setRequestHeader(b,a)}),c.send(d),this._render()},g.prototype._iframeTransport=function(b){var c=a.element('<form style="display: none;" />'),d=a.element('<iframe name="iframeTransport'+Date.now()+'">'),e=b._input,f=this;b._form&&b._form.replaceWith(e),b._form=c,f._onBeforeUploadItem(b),e.prop("name",b.alias),a.forEach(b.formData,function(b){a.forEach(b,function(b,d){var e=a.element('<input type="hidden" name="'+d+'" />');e.val(b),c.append(e)})}),c.prop({action:b.url,method:"POST",target:d.prop("name"),enctype:"multipart/form-data",encoding:"multipart/form-data"}),d.bind("load",function(){try{var a=d[0].contentDocument.body.innerHTML}catch(c){}var e={response:a,status:200,dummy:!0},g={},h=f._transformResponse(e.response,g);f._onSuccessItem(b,h,e.status,g),f._onCompleteItem(b,h,e.status,g)}),c.abort=function(){var a,g={status:0,dummy:!0},h={};d.unbind("load").prop("src","javascript:false;"),c.replaceWith(e),f._onCancelItem(b,a,g.status,h),f._onCompleteItem(b,a,g.status,h)},e.after(c),c.append(e).append(d),c[0].submit(),this._render()},g.prototype._onWhenAddingFileFailed=function(a,b,c){this.onWhenAddingFileFailed(a,b,c)},g.prototype._onAfterAddingFile=function(a){this.onAfterAddingFile(a)},g.prototype._onAfterAddingAll=function(a){this.onAfterAddingAll(a)},g.prototype._onBeforeUploadItem=function(a){a._onBeforeUpload(),this.onBeforeUploadItem(a)},g.prototype._onProgressItem=function(a,b){var c=this._getTotalProgress(b);this.progress=c,a._onProgress(b),this.onProgressItem(a,b),this.onProgressAll(c),this._render()},g.prototype._onSuccessItem=function(a,b,c,d){a._onSuccess(b,c,d),this.onSuccessItem(a,b,c,d)},g.prototype._onErrorItem=function(a,b,c,d){a._onError(b,c,d),this.onErrorItem(a,b,c,d)},g.prototype._onCancelItem=function(a,b,c,d){a._onCancel(b,c,d),this.onCancelItem(a,b,c,d)},g.prototype._onCompleteItem=function(b,c,d,e){b._onComplete(c,d,e),this.onCompleteItem(b,c,d,e);var f=this.getReadyItems()[0];return this.isUploading=!1,a.isDefined(f)?void f.upload():(this.onCompleteAll(),this.progress=this._getTotalProgress(),void this._render())},g.isFile=g.prototype.isFile,g.isFileLikeObject=g.prototype.isFileLikeObject,g.isArrayLikeObject=g.prototype.isArrayLikeObject,g.isHTML5=g.prototype.isHTML5,g.inherit=function(a,b){a.prototype=Object.create(b.prototype),a.prototype.constructor=a,a.super_=b},g.FileLikeObject=h,g.FileItem=i,g.FileDirective=j,g.FileSelect=k,g.FileDrop=l,g.FileOver=m,h.prototype._createFromFakePath=function(a){this.lastModifiedDate=null,this.size=null,this.type="like/"+a.slice(a.lastIndexOf(".")+1).toLowerCase(),this.name=a.slice(a.lastIndexOf("/")+a.lastIndexOf("\\")+2)},h.prototype._createFromObject=function(b){this.lastModifiedDate=a.copy(b.lastModifiedDate),this.size=b.size,this.type=b.type,this.name=b.name},i.prototype.upload=function(){try{this.uploader.uploadItem(this)}catch(a){this.uploader._onCompleteItem(this,"",0,[]),this.uploader._onErrorItem(this,"",0,[])}},i.prototype.cancel=function(){this.uploader.cancelItem(this)},i.prototype.remove=function(){this.uploader.removeFromQueue(this)},i.prototype.onBeforeUpload=function(){},i.prototype.onProgress=function(a){},i.prototype.onSuccess=function(a,b,c){},i.prototype.onError=function(a,b,c){},i.prototype.onCancel=function(a,b,c){},i.prototype.onComplete=function(a,b,c){},i.prototype._onBeforeUpload=function(){this.isReady=!0,this.isUploading=!0,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!1,this.isError=!1,this.progress=0,this.onBeforeUpload()},i.prototype._onProgress=function(a){this.progress=a,this.onProgress(a)},i.prototype._onSuccess=function(a,b,c){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!0,this.isCancel=!1,this.isError=!1,this.progress=100,this.index=null,this.onSuccess(a,b,c)},i.prototype._onError=function(a,b,c){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!1,this.isCancel=!1,this.isError=!0,this.progress=0,this.index=null,this.onError(a,b,c)},i.prototype._onCancel=function(a,b,c){this.isReady=!1,this.isUploading=!1,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!0,this.isError=!1,this.progress=0,this.index=null,this.onCancel(a,b,c)},i.prototype._onComplete=function(a,b,c){this.onComplete(a,b,c),this.removeAfterUpload&&this.remove()},i.prototype._destroy=function(){this._input&&this._input.remove(),this._form&&this._form.remove(),delete this._form,delete this._input},i.prototype._prepareToUploading=function(){this.index=this.index||++this.uploader._nextIndex,this.isReady=!0},i.prototype._replaceNode=function(a){var b=f(a.clone())(a.scope());b.prop("value",null),a.css("display","none"),a.after(b)},j.prototype.events={},j.prototype.bind=function(){for(var a in this.events){var b=this.events[a];this.element.bind(a,this[b])}},j.prototype.unbind=function(){for(var a in this.events)this.element.unbind(a,this.events[a])},j.prototype.destroy=function(){var a=this.uploader._directives[this.prop].indexOf(this);this.uploader._directives[this.prop].splice(a,1),this.unbind()},j.prototype._saveLinks=function(){for(var a in this.events){var b=this.events[a];this[b]=this[b].bind(this)}},g.inherit(k,j),k.prototype.events={$destroy:"destroy",change:"onChange"},k.prototype.prop="select",k.prototype.getOptions=function(){},k.prototype.getFilters=function(){},k.prototype.isEmptyAfterSelection=function(){return!!this.element.attr("multiple")},k.prototype.onChange=function(){var a=this.uploader.isHTML5?this.element[0].files:this.element[0],b=this.getOptions(),c=this.getFilters();this.uploader.isHTML5||this.destroy(),this.uploader.addToQueue(a,b,c),this.isEmptyAfterSelection()&&this.element.prop("value",null)},g.inherit(l,j),l.prototype.events={$destroy:"destroy",drop:"onDrop",dragover:"onDragOver",dragleave:"onDragLeave"},l.prototype.prop="drop",l.prototype.getOptions=function(){},l.prototype.getFilters=function(){},l.prototype.onDrop=function(b){var c=this._getTransfer(b);if(c){var d=this.getOptions(),e=this.getFilters();this._preventAndStop(b),a.forEach(this.uploader._directives.over,this._removeOverClass,this),this.uploader.addToQueue(c.files,d,e)}},l.prototype.onDragOver=function(b){var c=this._getTransfer(b);this._haveFiles(c.types)&&(c.dropEffect="copy",this._preventAndStop(b),a.forEach(this.uploader._directives.over,this._addOverClass,this))},l.prototype.onDragLeave=function(b){b.currentTarget===this.element[0]&&(this._preventAndStop(b),a.forEach(this.uploader._directives.over,this._removeOverClass,this))},l.prototype._getTransfer=function(a){return a.dataTransfer?a.dataTransfer:a.originalEvent.dataTransfer},l.prototype._preventAndStop=function(a){a.preventDefault(),a.stopPropagation()},l.prototype._haveFiles=function(a){return a?a.indexOf?-1!==a.indexOf("Files"):a.contains?a.contains("Files"):!1:!1},l.prototype._addOverClass=function(a){a.addOverClass()},l.prototype._removeOverClass=function(a){a.removeOverClass()},g.inherit(m,j),m.prototype.events={$destroy:"destroy"},m.prototype.prop="over",m.prototype.overClass="nv-file-over",m.prototype.addOverClass=function(){this.element.addClass(this.getOverClass())},m.prototype.removeOverClass=function(){this.element.removeClass(this.getOverClass())},m.prototype.getOverClass=function(){return this.overClass},g}]).directive("nvFileSelect",["$parse","FileUploader",function(a,b){return{link:function(c,d,e){var f=c.$eval(e.uploader);if(!(f instanceof b))throw new TypeError('"Uploader" must be an instance of FileUploader');var g=new b.FileSelect({uploader:f,element:d});g.getOptions=a(e.options).bind(g,c),g.getFilters=function(){return e.filters}}}}]).directive("nvFileDrop",["$parse","FileUploader",function(a,b){return{link:function(c,d,e){var f=c.$eval(e.uploader);if(!(f instanceof b))throw new TypeError('"Uploader" must be an instance of FileUploader');if(f.isHTML5){var g=new b.FileDrop({uploader:f,element:d});g.getOptions=a(e.options).bind(g,c),g.getFilters=function(){return e.filters}}}}}]).directive("nvFileOver",["FileUploader",function(a){return{link:function(b,c,d){var e=b.$eval(d.uploader);if(!(e instanceof a))throw new TypeError('"Uploader" must be an instance of FileUploader');var f=new a.FileOver({uploader:e,element:c});f.getOverClass=function(){return d.overClass||this.overClass}}}}]),b});
-//# sourceMappingURL=angular-file-upload.min.map
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/angular-file-upload.min.map b/civicrm/bower_components/angular-file-upload/angular-file-upload.min.map
deleted file mode 100644
index 779746a7fa..0000000000
--- a/civicrm/bower_components/angular-file-upload/angular-file-upload.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"angular-file-upload.min.js","sources":["angular-file-upload.js"],"names":["angular","factory","define","amd","module","value","url","alias","headers","queue","progress","autoUpload","removeAfterUpload","method","filters","formData","queueLimit","Number","MAX_VALUE","withCredentials","fileUploaderOptions","$rootScope","$http","$window","$compile","FileUploader","options","settings","copy","extend","this","isUploading","_nextIndex","_failFilterIndex","_directives","select","drop","over","unshift","name","fn","_queueLimitFilter","_folderFilter","FileLikeObject","fileOrInput","isInput","isElement","fakePathOrObject","postfix","isString","FileItem","uploader","some","input","element","file","isReady","isUploaded","isSuccess","isCancel","isError","index","_file","_input","_replaceNode","FileDirective","prop","push","_saveLinks","bind","FileSelect","super_","apply","arguments","isHTML5","removeAttr","FileDrop","FileOver","prototype","File","FormData","addToQueue","files","list","isArrayLikeObject","arrayOfFilters","_getFilters","count","length","addedFileItems","forEach","temp","_isValidFile","fileItem","_onAfterAddingFile","filter","_onWhenAddingFileFailed","_onAfterAddingAll","_getTotalProgress","_render","uploadAll","removeFromQueue","getIndexOfItem","item","cancel","splice","_destroy","clearQueue","remove","uploadItem","transport","_prepareToUploading","cancelItem","abort","items","getNotUploadedItems","upload","cancelAll","isFile","isFileLikeObject","isObject","isNumber","indexOf","getReadyItems","sort","item1","item2","destroy","key","object","onAfterAddingAll","fileItems","onAfterAddingFile","onWhenAddingFileFailed","onBeforeUploadItem","onProgressItem","onProgressAll","onSuccessItem","response","status","onErrorItem","onCancelItem","onCompleteItem","onCompleteAll","notUploaded","uploaded","ratio","current","Math","round","isUndefined","isArray","names","match","$$phase","$apply","size","type","every","call","_isSuccessCode","_transformResponse","headersGetter","_headersGetter","defaults","transformResponse","transformFn","_parseHeaders","val","i","parsed","split","line","slice","trim","toLowerCase","parsedHeaders","_xhrTransport","xhr","_xhr","XMLHttpRequest","form","that","_onBeforeUploadItem","obj","append","TypeError","onprogress","event","lengthComputable","loaded","total","_onProgressItem","onload","getAllResponseHeaders","gist","_onCompleteItem","onerror","_onErrorItem","onabort","_onCancelItem","open","setRequestHeader","send","_iframeTransport","iframe","Date","now","_form","replaceWith","action","target","enctype","encoding","html","contentDocument","body","innerHTML","e","dummy","_onSuccessItem","unbind","after","submit","_onBeforeUpload","_onProgress","_onSuccess","_onError","_onCancel","_onComplete","nextItem","isDefined","inherit","source","Object","create","constructor","_createFromFakePath","path","lastModifiedDate","lastIndexOf","_createFromObject","onBeforeUpload","onProgress","onSuccess","onError","onCancel","onComplete","clone","scope","css","events","$destroy","change","getOptions","getFilters","isEmptyAfterSelection","attr","onChange","dragover","dragleave","onDrop","transfer","_getTransfer","_preventAndStop","_removeOverClass","onDragOver","_haveFiles","types","dropEffect","_addOverClass","onDragLeave","currentTarget","dataTransfer","originalEvent","preventDefault","stopPropagation","contains","addOverClass","removeOverClass","overClass","addClass","getOverClass","removeClass","directive","$parse","link","attributes","$eval"],"mappings":"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"}
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/bower.json b/civicrm/bower_components/angular-file-upload/bower.json
index 574084749d..fd2e3f0d34 100644
--- a/civicrm/bower_components/angular-file-upload/bower.json
+++ b/civicrm/bower_components/angular-file-upload/bower.json
@@ -1,10 +1,10 @@
{
"name": "angular-file-upload",
- "main": "angular-file-upload.min.js",
+ "main": "dist/angular-file-upload.min.js",
"homepage": "https://github.com/nervgh/angular-file-upload",
"ignore": ["examples"],
"dependencies": {
- "angular": "~1.2.11"
+ "angular": "^1.1.5"
},
"devDependencies": {
"es5-shim": ">=3.4.0"
diff --git a/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js
new file mode 100644
index 0000000000..5234f1bb20
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js
@@ -0,0 +1,2161 @@
+/*
+ angular-file-upload v2.6.1
+ https://github.com/nervgh/angular-file-upload
+*/
+
+(function webpackUniversalModuleDefinition(root, factory) {
+ if(typeof exports === 'object' && typeof module === 'object')
+ module.exports = factory();
+ else if(typeof define === 'function' && define.amd)
+ define([], factory);
+ else if(typeof exports === 'object')
+ exports["angular-file-upload"] = factory();
+ else
+ root["angular-file-upload"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ // The module cache
+/******/ var installedModules = {};
+/******/
+/******/ // The require function
+/******/ function __webpack_require__(moduleId) {
+/******/
+/******/ // Check if module is in cache
+/******/ if(installedModules[moduleId])
+/******/ return installedModules[moduleId].exports;
+/******/
+/******/ // Create a new module (and put it into the cache)
+/******/ var module = installedModules[moduleId] = {
+/******/ exports: {},
+/******/ id: moduleId,
+/******/ loaded: false
+/******/ };
+/******/
+/******/ // Execute the module function
+/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ // Flag the module as loaded
+/******/ module.loaded = true;
+/******/
+/******/ // Return the exports of the module
+/******/ return module.exports;
+/******/ }
+/******/
+/******/
+/******/ // expose the modules object (__webpack_modules__)
+/******/ __webpack_require__.m = modules;
+/******/
+/******/ // expose the module cache
+/******/ __webpack_require__.c = installedModules;
+/******/
+/******/ // __webpack_public_path__
+/******/ __webpack_require__.p = "";
+/******/
+/******/ // Load entry module and return exports
+/******/ return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ var _options = __webpack_require__(2);
+
+ var _options2 = _interopRequireDefault(_options);
+
+ var _FileUploader = __webpack_require__(3);
+
+ var _FileUploader2 = _interopRequireDefault(_FileUploader);
+
+ var _FileLikeObject = __webpack_require__(4);
+
+ var _FileLikeObject2 = _interopRequireDefault(_FileLikeObject);
+
+ var _FileItem = __webpack_require__(5);
+
+ var _FileItem2 = _interopRequireDefault(_FileItem);
+
+ var _FileDirective = __webpack_require__(6);
+
+ var _FileDirective2 = _interopRequireDefault(_FileDirective);
+
+ var _FileSelect = __webpack_require__(7);
+
+ var _FileSelect2 = _interopRequireDefault(_FileSelect);
+
+ var _Pipeline = __webpack_require__(8);
+
+ var _Pipeline2 = _interopRequireDefault(_Pipeline);
+
+ var _FileDrop = __webpack_require__(9);
+
+ var _FileDrop2 = _interopRequireDefault(_FileDrop);
+
+ var _FileOver = __webpack_require__(10);
+
+ var _FileOver2 = _interopRequireDefault(_FileOver);
+
+ var _FileSelect3 = __webpack_require__(11);
+
+ var _FileSelect4 = _interopRequireDefault(_FileSelect3);
+
+ var _FileDrop3 = __webpack_require__(12);
+
+ var _FileDrop4 = _interopRequireDefault(_FileDrop3);
+
+ var _FileOver3 = __webpack_require__(13);
+
+ var _FileOver4 = _interopRequireDefault(_FileOver3);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ angular.module(_config2.default.name, []).value('fileUploaderOptions', _options2.default).factory('FileUploader', _FileUploader2.default).factory('FileLikeObject', _FileLikeObject2.default).factory('FileItem', _FileItem2.default).factory('FileDirective', _FileDirective2.default).factory('FileSelect', _FileSelect2.default).factory('FileDrop', _FileDrop2.default).factory('FileOver', _FileOver2.default).factory('Pipeline', _Pipeline2.default).directive('nvFileSelect', _FileSelect4.default).directive('nvFileDrop', _FileDrop4.default).directive('nvFileOver', _FileOver4.default).run(['FileUploader', 'FileLikeObject', 'FileItem', 'FileDirective', 'FileSelect', 'FileDrop', 'FileOver', 'Pipeline', function (FileUploader, FileLikeObject, FileItem, FileDirective, FileSelect, FileDrop, FileOver, Pipeline) {
+ // only for compatibility
+ FileUploader.FileLikeObject = FileLikeObject;
+ FileUploader.FileItem = FileItem;
+ FileUploader.FileDirective = FileDirective;
+ FileUploader.FileSelect = FileSelect;
+ FileUploader.FileDrop = FileDrop;
+ FileUploader.FileOver = FileOver;
+ FileUploader.Pipeline = Pipeline;
+ }]);
+
+/***/ }),
+/* 1 */
+/***/ (function(module, exports) {
+
+ module.exports = {"name":"angularFileUpload"}
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = {
+ url: '/',
+ alias: 'file',
+ headers: {},
+ queue: [],
+ progress: 0,
+ autoUpload: false,
+ removeAfterUpload: false,
+ method: 'POST',
+ filters: [],
+ formData: [],
+ queueLimit: Number.MAX_VALUE,
+ withCredentials: false,
+ disableMultipart: false
+ };
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+
+ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ var _angular = angular,
+ bind = _angular.bind,
+ copy = _angular.copy,
+ extend = _angular.extend,
+ forEach = _angular.forEach,
+ isObject = _angular.isObject,
+ isNumber = _angular.isNumber,
+ isDefined = _angular.isDefined,
+ isArray = _angular.isArray,
+ isUndefined = _angular.isUndefined,
+ element = _angular.element;
+ function __identity(fileUploaderOptions, $rootScope, $http, $window, $timeout, FileLikeObject, FileItem, Pipeline) {
+ var File = $window.File,
+ FormData = $window.FormData;
+
+ var FileUploader = function () {
+ /**********************
+ * PUBLIC
+ **********************/
+ /**
+ * Creates an instance of FileUploader
+ * @param {Object} [options]
+ * @constructor
+ */
+ function FileUploader(options) {
+ _classCallCheck(this, FileUploader);
+
+ var settings = copy(fileUploaderOptions);
+
+ extend(this, settings, options, {
+ isUploading: false,
+ _nextIndex: 0,
+ _directives: { select: [], drop: [], over: [] }
+ });
+
+ // add default filters
+ this.filters.unshift({ name: 'queueLimit', fn: this._queueLimitFilter });
+ this.filters.unshift({ name: 'folder', fn: this._folderFilter });
+ }
+ /**
+ * Adds items to the queue
+ * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files
+ * @param {Object} [options]
+ * @param {Array<Function>|String} filters
+ */
+
+
+ FileUploader.prototype.addToQueue = function addToQueue(files, options, filters) {
+ var _this = this;
+
+ var incomingQueue = this.isArrayLikeObject(files) ? Array.prototype.slice.call(files) : [files];
+ var arrayOfFilters = this._getFilters(filters);
+ var count = this.queue.length;
+ var addedFileItems = [];
+
+ var next = function next() {
+ var something = incomingQueue.shift();
+
+ if (isUndefined(something)) {
+ return done();
+ }
+
+ var fileLikeObject = _this.isFile(something) ? something : new FileLikeObject(something);
+ var pipes = _this._convertFiltersToPipes(arrayOfFilters);
+ var pipeline = new Pipeline(pipes);
+ var onThrown = function onThrown(err) {
+ var originalFilter = err.pipe.originalFilter;
+
+ var _err$args = _slicedToArray(err.args, 2),
+ fileLikeObject = _err$args[0],
+ options = _err$args[1];
+
+ _this._onWhenAddingFileFailed(fileLikeObject, originalFilter, options);
+ next();
+ };
+ var onSuccessful = function onSuccessful(fileLikeObject, options) {
+ var fileItem = new FileItem(_this, fileLikeObject, options);
+ addedFileItems.push(fileItem);
+ _this.queue.push(fileItem);
+ _this._onAfterAddingFile(fileItem);
+ next();
+ };
+ pipeline.onThrown = onThrown;
+ pipeline.onSuccessful = onSuccessful;
+ pipeline.exec(fileLikeObject, options);
+ };
+
+ var done = function done() {
+ if (_this.queue.length !== count) {
+ _this._onAfterAddingAll(addedFileItems);
+ _this.progress = _this._getTotalProgress();
+ }
+
+ _this._render();
+ if (_this.autoUpload) _this.uploadAll();
+ };
+
+ next();
+ };
+ /**
+ * Remove items from the queue. Remove last: index = -1
+ * @param {FileItem|Number} value
+ */
+
+
+ FileUploader.prototype.removeFromQueue = function removeFromQueue(value) {
+ var index = this.getIndexOfItem(value);
+ var item = this.queue[index];
+ if (item.isUploading) item.cancel();
+ this.queue.splice(index, 1);
+ item._destroy();
+ this.progress = this._getTotalProgress();
+ };
+ /**
+ * Clears the queue
+ */
+
+
+ FileUploader.prototype.clearQueue = function clearQueue() {
+ while (this.queue.length) {
+ this.queue[0].remove();
+ }
+ this.progress = 0;
+ };
+ /**
+ * Uploads a item from the queue
+ * @param {FileItem|Number} value
+ */
+
+
+ FileUploader.prototype.uploadItem = function uploadItem(value) {
+ var index = this.getIndexOfItem(value);
+ var item = this.queue[index];
+ var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';
+
+ item._prepareToUploading();
+ if (this.isUploading) return;
+
+ this._onBeforeUploadItem(item);
+ if (item.isCancel) return;
+
+ item.isUploading = true;
+ this.isUploading = true;
+ this[transport](item);
+ this._render();
+ };
+ /**
+ * Cancels uploading of item from the queue
+ * @param {FileItem|Number} value
+ */
+
+
+ FileUploader.prototype.cancelItem = function cancelItem(value) {
+ var _this2 = this;
+
+ var index = this.getIndexOfItem(value);
+ var item = this.queue[index];
+ var prop = this.isHTML5 ? '_xhr' : '_form';
+ if (!item) return;
+ item.isCancel = true;
+ if (item.isUploading) {
+ // It will call this._onCancelItem() & this._onCompleteItem() asynchronously
+ item[prop].abort();
+ } else {
+ var dummy = [undefined, 0, {}];
+ var onNextTick = function onNextTick() {
+ _this2._onCancelItem.apply(_this2, [item].concat(dummy));
+ _this2._onCompleteItem.apply(_this2, [item].concat(dummy));
+ };
+ $timeout(onNextTick); // Trigger callbacks asynchronously (setImmediate emulation)
+ }
+ };
+ /**
+ * Uploads all not uploaded items of queue
+ */
+
+
+ FileUploader.prototype.uploadAll = function uploadAll() {
+ var items = this.getNotUploadedItems().filter(function (item) {
+ return !item.isUploading;
+ });
+ if (!items.length) return;
+
+ forEach(items, function (item) {
+ return item._prepareToUploading();
+ });
+ items[0].upload();
+ };
+ /**
+ * Cancels all uploads
+ */
+
+
+ FileUploader.prototype.cancelAll = function cancelAll() {
+ var items = this.getNotUploadedItems();
+ forEach(items, function (item) {
+ return item.cancel();
+ });
+ };
+ /**
+ * Returns "true" if value an instance of File
+ * @param {*} value
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.prototype.isFile = function isFile(value) {
+ return this.constructor.isFile(value);
+ };
+ /**
+ * Returns "true" if value an instance of FileLikeObject
+ * @param {*} value
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.prototype.isFileLikeObject = function isFileLikeObject(value) {
+ return this.constructor.isFileLikeObject(value);
+ };
+ /**
+ * Returns "true" if value is array like object
+ * @param {*} value
+ * @returns {Boolean}
+ */
+
+
+ FileUploader.prototype.isArrayLikeObject = function isArrayLikeObject(value) {
+ return this.constructor.isArrayLikeObject(value);
+ };
+ /**
+ * Returns a index of item from the queue
+ * @param {Item|Number} value
+ * @returns {Number}
+ */
+
+
+ FileUploader.prototype.getIndexOfItem = function getIndexOfItem(value) {
+ return isNumber(value) ? value : this.queue.indexOf(value);
+ };
+ /**
+ * Returns not uploaded items
+ * @returns {Array}
+ */
+
+
+ FileUploader.prototype.getNotUploadedItems = function getNotUploadedItems() {
+ return this.queue.filter(function (item) {
+ return !item.isUploaded;
+ });
+ };
+ /**
+ * Returns items ready for upload
+ * @returns {Array}
+ */
+
+
+ FileUploader.prototype.getReadyItems = function getReadyItems() {
+ return this.queue.filter(function (item) {
+ return item.isReady && !item.isUploading;
+ }).sort(function (item1, item2) {
+ return item1.index - item2.index;
+ });
+ };
+ /**
+ * Destroys instance of FileUploader
+ */
+
+
+ FileUploader.prototype.destroy = function destroy() {
+ var _this3 = this;
+
+ forEach(this._directives, function (key) {
+ forEach(_this3._directives[key], function (object) {
+ object.destroy();
+ });
+ });
+ };
+ /**
+ * Callback
+ * @param {Array} fileItems
+ */
+
+
+ FileUploader.prototype.onAfterAddingAll = function onAfterAddingAll(fileItems) {};
+ /**
+ * Callback
+ * @param {FileItem} fileItem
+ */
+
+
+ FileUploader.prototype.onAfterAddingFile = function onAfterAddingFile(fileItem) {};
+ /**
+ * Callback
+ * @param {File|Object} item
+ * @param {Object} filter
+ * @param {Object} options
+ */
+
+
+ FileUploader.prototype.onWhenAddingFileFailed = function onWhenAddingFileFailed(item, filter, options) {};
+ /**
+ * Callback
+ * @param {FileItem} fileItem
+ */
+
+
+ FileUploader.prototype.onBeforeUploadItem = function onBeforeUploadItem(fileItem) {};
+ /**
+ * Callback
+ * @param {FileItem} fileItem
+ * @param {Number} progress
+ */
+
+
+ FileUploader.prototype.onProgressItem = function onProgressItem(fileItem, progress) {};
+ /**
+ * Callback
+ * @param {Number} progress
+ */
+
+
+ FileUploader.prototype.onProgressAll = function onProgressAll(progress) {};
+ /**
+ * Callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileUploader.prototype.onSuccessItem = function onSuccessItem(item, response, status, headers) {};
+ /**
+ * Callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileUploader.prototype.onErrorItem = function onErrorItem(item, response, status, headers) {};
+ /**
+ * Callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileUploader.prototype.onCancelItem = function onCancelItem(item, response, status, headers) {};
+ /**
+ * Callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileUploader.prototype.onCompleteItem = function onCompleteItem(item, response, status, headers) {};
+ /**
+ * Callback
+ * @param {FileItem} item
+ */
+
+
+ FileUploader.prototype.onTimeoutItem = function onTimeoutItem(item) {};
+ /**
+ * Callback
+ */
+
+
+ FileUploader.prototype.onCompleteAll = function onCompleteAll() {};
+ /**********************
+ * PRIVATE
+ **********************/
+ /**
+ * Returns the total progress
+ * @param {Number} [value]
+ * @returns {Number}
+ * @private
+ */
+
+
+ FileUploader.prototype._getTotalProgress = function _getTotalProgress(value) {
+ if (this.removeAfterUpload) return value || 0;
+
+ var notUploaded = this.getNotUploadedItems().length;
+ var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;
+ var ratio = 100 / this.queue.length;
+ var current = (value || 0) * ratio / 100;
+
+ return Math.round(uploaded * ratio + current);
+ };
+ /**
+ * Returns array of filters
+ * @param {Array<Function>|String} filters
+ * @returns {Array<Function>}
+ * @private
+ */
+
+
+ FileUploader.prototype._getFilters = function _getFilters(filters) {
+ if (!filters) return this.filters;
+ if (isArray(filters)) return filters;
+ var names = filters.match(/[^\s,]+/g);
+ return this.filters.filter(function (filter) {
+ return names.indexOf(filter.name) !== -1;
+ });
+ };
+ /**
+ * @param {Array<Function>} filters
+ * @returns {Array<Function>}
+ * @private
+ */
+
+
+ FileUploader.prototype._convertFiltersToPipes = function _convertFiltersToPipes(filters) {
+ var _this4 = this;
+
+ return filters.map(function (filter) {
+ var fn = bind(_this4, filter.fn);
+ fn.isAsync = filter.fn.length === 3;
+ fn.originalFilter = filter;
+ return fn;
+ });
+ };
+ /**
+ * Updates html
+ * @private
+ */
+
+
+ FileUploader.prototype._render = function _render() {
+ if (!$rootScope.$$phase) $rootScope.$apply();
+ };
+ /**
+ * Returns "true" if item is a file (not folder)
+ * @param {File|FileLikeObject} item
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.prototype._folderFilter = function _folderFilter(item) {
+ return !!(item.size || item.type);
+ };
+ /**
+ * Returns "true" if the limit has not been reached
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.prototype._queueLimitFilter = function _queueLimitFilter() {
+ return this.queue.length < this.queueLimit;
+ };
+ /**
+ * Checks whether upload successful
+ * @param {Number} status
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.prototype._isSuccessCode = function _isSuccessCode(status) {
+ return status >= 200 && status < 300 || status === 304;
+ };
+ /**
+ * Transforms the server response
+ * @param {*} response
+ * @param {Object} headers
+ * @returns {*}
+ * @private
+ */
+
+
+ FileUploader.prototype._transformResponse = function _transformResponse(response, headers) {
+ var headersGetter = this._headersGetter(headers);
+ forEach($http.defaults.transformResponse, function (transformFn) {
+ response = transformFn(response, headersGetter);
+ });
+ return response;
+ };
+ /**
+ * Parsed response headers
+ * @param headers
+ * @returns {Object}
+ * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js
+ * @private
+ */
+
+
+ FileUploader.prototype._parseHeaders = function _parseHeaders(headers) {
+ var parsed = {},
+ key,
+ val,
+ i;
+
+ if (!headers) return parsed;
+
+ forEach(headers.split('\n'), function (line) {
+ i = line.indexOf(':');
+ key = line.slice(0, i).trim().toLowerCase();
+ val = line.slice(i + 1).trim();
+
+ if (key) {
+ parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+ }
+ });
+
+ return parsed;
+ };
+ /**
+ * Returns function that returns headers
+ * @param {Object} parsedHeaders
+ * @returns {Function}
+ * @private
+ */
+
+
+ FileUploader.prototype._headersGetter = function _headersGetter(parsedHeaders) {
+ return function (name) {
+ if (name) {
+ return parsedHeaders[name.toLowerCase()] || null;
+ }
+ return parsedHeaders;
+ };
+ };
+ /**
+ * The XMLHttpRequest transport
+ * @param {FileItem} item
+ * @private
+ */
+
+
+ FileUploader.prototype._xhrTransport = function _xhrTransport(item) {
+ var _this5 = this;
+
+ var xhr = item._xhr = new XMLHttpRequest();
+ var sendable;
+
+ if (!item.disableMultipart) {
+ sendable = new FormData();
+ forEach(item.formData, function (obj) {
+ forEach(obj, function (value, key) {
+ sendable.append(key, value);
+ });
+ });
+
+ sendable.append(item.alias, item._file, item.file.name);
+ } else {
+ sendable = item._file;
+ }
+
+ if (typeof item._file.size != 'number') {
+ throw new TypeError('The file specified is no longer valid');
+ }
+
+ xhr.upload.onprogress = function (event) {
+ var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
+ _this5._onProgressItem(item, progress);
+ };
+
+ xhr.onload = function () {
+ var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());
+ var response = _this5._transformResponse(xhr.response, headers);
+ var gist = _this5._isSuccessCode(xhr.status) ? 'Success' : 'Error';
+ var method = '_on' + gist + 'Item';
+ _this5[method](item, response, xhr.status, headers);
+ _this5._onCompleteItem(item, response, xhr.status, headers);
+ };
+
+ xhr.onerror = function () {
+ var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());
+ var response = _this5._transformResponse(xhr.response, headers);
+ _this5._onErrorItem(item, response, xhr.status, headers);
+ _this5._onCompleteItem(item, response, xhr.status, headers);
+ };
+
+ xhr.onabort = function () {
+ var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());
+ var response = _this5._transformResponse(xhr.response, headers);
+ _this5._onCancelItem(item, response, xhr.status, headers);
+ _this5._onCompleteItem(item, response, xhr.status, headers);
+ };
+
+ xhr.ontimeout = function (e) {
+ var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());
+ var response = "Request Timeout.";
+ _this5._onTimeoutItem(item);
+ _this5._onCompleteItem(item, response, 408, headers);
+ };
+
+ xhr.open(item.method, item.url, true);
+
+ xhr.timeout = item.timeout || 0;
+ xhr.withCredentials = item.withCredentials;
+
+ forEach(item.headers, function (value, name) {
+ xhr.setRequestHeader(name, value);
+ });
+
+ xhr.send(sendable);
+ };
+ /**
+ * The IFrame transport
+ * @param {FileItem} item
+ * @private
+ */
+
+
+ FileUploader.prototype._iframeTransport = function _iframeTransport(item) {
+ var _this6 = this;
+
+ var form = element('<form style="display: none;" />');
+ var iframe = element('<iframe name="iframeTransport' + Date.now() + '">');
+ var input = item._input;
+
+ var timeout = 0;
+ var timer = null;
+ var isTimedOut = false;
+
+ if (item._form) item._form.replaceWith(input); // remove old form
+ item._form = form; // save link to new form
+
+ input.prop('name', item.alias);
+
+ forEach(item.formData, function (obj) {
+ forEach(obj, function (value, key) {
+ var element_ = element('<input type="hidden" name="' + key + '" />');
+ element_.val(value);
+ form.append(element_);
+ });
+ });
+
+ form.prop({
+ action: item.url,
+ method: 'POST',
+ target: iframe.prop('name'),
+ enctype: 'multipart/form-data',
+ encoding: 'multipart/form-data' // old IE
+ });
+
+ iframe.bind('load', function () {
+ var html = '';
+ var status = 200;
+
+ try {
+ // Fix for legacy IE browsers that loads internal error page
+ // when failed WS response received. In consequence iframe
+ // content access denied error is thrown becouse trying to
+ // access cross domain page. When such thing occurs notifying
+ // with empty response object. See more info at:
+ // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object
+ // Note that if non standard 4xx or 5xx error code returned
+ // from WS then response content can be accessed without error
+ // but 'XHR' status becomes 200. In order to avoid confusion
+ // returning response via same 'success' event handler.
+
+ // fixed angular.contents() for iframes
+ html = iframe[0].contentDocument.body.innerHTML;
+ } catch (e) {
+ // in case we run into the access-is-denied error or we have another error on the server side
+ // (intentional 500,40... errors), we at least say 'something went wrong' -> 500
+ status = 500;
+ }
+
+ if (timer) {
+ clearTimeout(timer);
+ }
+ timer = null;
+
+ if (isTimedOut) {
+ return false; //throw 'Request Timeout'
+ }
+
+ var xhr = { response: html, status: status, dummy: true };
+ var headers = {};
+ var response = _this6._transformResponse(xhr.response, headers);
+
+ _this6._onSuccessItem(item, response, xhr.status, headers);
+ _this6._onCompleteItem(item, response, xhr.status, headers);
+ });
+
+ form.abort = function () {
+ var xhr = { status: 0, dummy: true };
+ var headers = {};
+ var response;
+
+ iframe.unbind('load').prop('src', 'javascript:false;');
+ form.replaceWith(input);
+
+ _this6._onCancelItem(item, response, xhr.status, headers);
+ _this6._onCompleteItem(item, response, xhr.status, headers);
+ };
+
+ input.after(form);
+ form.append(input).append(iframe);
+
+ timeout = item.timeout || 0;
+ timer = null;
+
+ if (timeout) {
+ timer = setTimeout(function () {
+ isTimedOut = true;
+
+ item.isCancel = true;
+ if (item.isUploading) {
+ iframe.unbind('load').prop('src', 'javascript:false;');
+ form.replaceWith(input);
+ }
+
+ var headers = {};
+ var response = "Request Timeout.";
+ _this6._onTimeoutItem(item);
+ _this6._onCompleteItem(item, response, 408, headers);
+ }, timeout);
+ }
+
+ form[0].submit();
+ };
+ /**
+ * Inner callback
+ * @param {File|Object} item
+ * @param {Object} filter
+ * @param {Object} options
+ * @private
+ */
+
+
+ FileUploader.prototype._onWhenAddingFileFailed = function _onWhenAddingFileFailed(item, filter, options) {
+ this.onWhenAddingFileFailed(item, filter, options);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ */
+
+
+ FileUploader.prototype._onAfterAddingFile = function _onAfterAddingFile(item) {
+ this.onAfterAddingFile(item);
+ };
+ /**
+ * Inner callback
+ * @param {Array<FileItem>} items
+ */
+
+
+ FileUploader.prototype._onAfterAddingAll = function _onAfterAddingAll(items) {
+ this.onAfterAddingAll(items);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @private
+ */
+
+
+ FileUploader.prototype._onBeforeUploadItem = function _onBeforeUploadItem(item) {
+ item._onBeforeUpload();
+ this.onBeforeUploadItem(item);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @param {Number} progress
+ * @private
+ */
+
+
+ FileUploader.prototype._onProgressItem = function _onProgressItem(item, progress) {
+ var total = this._getTotalProgress(progress);
+ this.progress = total;
+ item._onProgress(progress);
+ this.onProgressItem(item, progress);
+ this.onProgressAll(total);
+ this._render();
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileUploader.prototype._onSuccessItem = function _onSuccessItem(item, response, status, headers) {
+ item._onSuccess(response, status, headers);
+ this.onSuccessItem(item, response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileUploader.prototype._onErrorItem = function _onErrorItem(item, response, status, headers) {
+ item._onError(response, status, headers);
+ this.onErrorItem(item, response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileUploader.prototype._onCancelItem = function _onCancelItem(item, response, status, headers) {
+ item._onCancel(response, status, headers);
+ this.onCancelItem(item, response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileUploader.prototype._onCompleteItem = function _onCompleteItem(item, response, status, headers) {
+ item._onComplete(response, status, headers);
+ this.onCompleteItem(item, response, status, headers);
+
+ var nextItem = this.getReadyItems()[0];
+ this.isUploading = false;
+
+ if (isDefined(nextItem)) {
+ nextItem.upload();
+ return;
+ }
+
+ this.onCompleteAll();
+ this.progress = this._getTotalProgress();
+ this._render();
+ };
+ /**
+ * Inner callback
+ * @param {FileItem} item
+ * @private
+ */
+
+
+ FileUploader.prototype._onTimeoutItem = function _onTimeoutItem(item) {
+ item._onTimeout();
+ this.onTimeoutItem(item);
+ };
+ /**********************
+ * STATIC
+ **********************/
+ /**
+ * Returns "true" if value an instance of File
+ * @param {*} value
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.isFile = function isFile(value) {
+ return File && value instanceof File;
+ };
+ /**
+ * Returns "true" if value an instance of FileLikeObject
+ * @param {*} value
+ * @returns {Boolean}
+ * @private
+ */
+
+
+ FileUploader.isFileLikeObject = function isFileLikeObject(value) {
+ return value instanceof FileLikeObject;
+ };
+ /**
+ * Returns "true" if value is array like object
+ * @param {*} value
+ * @returns {Boolean}
+ */
+
+
+ FileUploader.isArrayLikeObject = function isArrayLikeObject(value) {
+ return isObject(value) && 'length' in value;
+ };
+ /**
+ * Inherits a target (Class_1) by a source (Class_2)
+ * @param {Function} target
+ * @param {Function} source
+ */
+
+
+ FileUploader.inherit = function inherit(target, source) {
+ target.prototype = Object.create(source.prototype);
+ target.prototype.constructor = target;
+ target.super_ = source;
+ };
+
+ return FileUploader;
+ }();
+
+ /**********************
+ * PUBLIC
+ **********************/
+ /**
+ * Checks a support the html5 uploader
+ * @returns {Boolean}
+ * @readonly
+ */
+
+
+ FileUploader.prototype.isHTML5 = !!(File && FormData);
+ /**********************
+ * STATIC
+ **********************/
+ /**
+ * @borrows FileUploader.prototype.isHTML5
+ */
+ FileUploader.isHTML5 = FileUploader.prototype.isHTML5;
+
+ return FileUploader;
+ }
+
+ __identity.$inject = ['fileUploaderOptions', '$rootScope', '$http', '$window', '$timeout', 'FileLikeObject', 'FileItem', 'Pipeline'];
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ var _angular = angular,
+ copy = _angular.copy,
+ isElement = _angular.isElement,
+ isString = _angular.isString;
+ function __identity() {
+
+ return function () {
+ /**
+ * Creates an instance of FileLikeObject
+ * @param {File|HTMLInputElement|Object} fileOrInput
+ * @constructor
+ */
+ function FileLikeObject(fileOrInput) {
+ _classCallCheck(this, FileLikeObject);
+
+ var isInput = isElement(fileOrInput);
+ var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
+ var postfix = isString(fakePathOrObject) ? 'FakePath' : 'Object';
+ var method = '_createFrom' + postfix;
+ this[method](fakePathOrObject, fileOrInput);
+ }
+ /**
+ * Creates file like object from fake path string
+ * @param {String} path
+ * @private
+ */
+
+
+ FileLikeObject.prototype._createFromFakePath = function _createFromFakePath(path, input) {
+ this.lastModifiedDate = null;
+ this.size = null;
+ this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
+ this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
+ this.input = input;
+ };
+ /**
+ * Creates file like object from object
+ * @param {File|FileLikeObject} object
+ * @private
+ */
+
+
+ FileLikeObject.prototype._createFromObject = function _createFromObject(object) {
+ this.lastModifiedDate = copy(object.lastModifiedDate);
+ this.size = object.size;
+ this.type = object.type;
+ this.name = object.name;
+ this.input = object.input;
+ };
+
+ return FileLikeObject;
+ }();
+ }
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ var _angular = angular,
+ copy = _angular.copy,
+ extend = _angular.extend,
+ element = _angular.element,
+ isElement = _angular.isElement;
+ function __identity($compile, FileLikeObject) {
+
+ return function () {
+ /**
+ * Creates an instance of FileItem
+ * @param {FileUploader} uploader
+ * @param {File|HTMLInputElement|Object} some
+ * @param {Object} options
+ * @constructor
+ */
+ function FileItem(uploader, some, options) {
+ _classCallCheck(this, FileItem);
+
+ var isInput = !!some.input;
+ var input = isInput ? element(some.input) : null;
+ var file = !isInput ? some : null;
+
+ extend(this, {
+ url: uploader.url,
+ alias: uploader.alias,
+ headers: copy(uploader.headers),
+ formData: copy(uploader.formData),
+ removeAfterUpload: uploader.removeAfterUpload,
+ withCredentials: uploader.withCredentials,
+ disableMultipart: uploader.disableMultipart,
+ method: uploader.method,
+ timeout: uploader.timeout
+ }, options, {
+ uploader: uploader,
+ file: new FileLikeObject(some),
+ isReady: false,
+ isUploading: false,
+ isUploaded: false,
+ isSuccess: false,
+ isCancel: false,
+ isError: false,
+ progress: 0,
+ index: null,
+ _file: file,
+ _input: input
+ });
+
+ if (input) this._replaceNode(input);
+ }
+ /**********************
+ * PUBLIC
+ **********************/
+ /**
+ * Uploads a FileItem
+ */
+
+
+ FileItem.prototype.upload = function upload() {
+ try {
+ this.uploader.uploadItem(this);
+ } catch (e) {
+ var message = e.name + ':' + e.message;
+ this.uploader._onCompleteItem(this, message, e.code, []);
+ this.uploader._onErrorItem(this, message, e.code, []);
+ }
+ };
+ /**
+ * Cancels uploading of FileItem
+ */
+
+
+ FileItem.prototype.cancel = function cancel() {
+ this.uploader.cancelItem(this);
+ };
+ /**
+ * Removes a FileItem
+ */
+
+
+ FileItem.prototype.remove = function remove() {
+ this.uploader.removeFromQueue(this);
+ };
+ /**
+ * Callback
+ * @private
+ */
+
+
+ FileItem.prototype.onBeforeUpload = function onBeforeUpload() {};
+ /**
+ * Callback
+ * @param {Number} progress
+ * @private
+ */
+
+
+ FileItem.prototype.onProgress = function onProgress(progress) {};
+ /**
+ * Callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileItem.prototype.onSuccess = function onSuccess(response, status, headers) {};
+ /**
+ * Callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileItem.prototype.onError = function onError(response, status, headers) {};
+ /**
+ * Callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileItem.prototype.onCancel = function onCancel(response, status, headers) {};
+ /**
+ * Callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ */
+
+
+ FileItem.prototype.onComplete = function onComplete(response, status, headers) {};
+ /**
+ * Callback
+ */
+
+
+ FileItem.prototype.onTimeout = function onTimeout() {};
+ /**********************
+ * PRIVATE
+ **********************/
+ /**
+ * Inner callback
+ */
+
+
+ FileItem.prototype._onBeforeUpload = function _onBeforeUpload() {
+ this.isReady = true;
+ this.isUploading = false;
+ this.isUploaded = false;
+ this.isSuccess = false;
+ this.isCancel = false;
+ this.isError = false;
+ this.progress = 0;
+ this.onBeforeUpload();
+ };
+ /**
+ * Inner callback
+ * @param {Number} progress
+ * @private
+ */
+
+
+ FileItem.prototype._onProgress = function _onProgress(progress) {
+ this.progress = progress;
+ this.onProgress(progress);
+ };
+ /**
+ * Inner callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileItem.prototype._onSuccess = function _onSuccess(response, status, headers) {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = true;
+ this.isSuccess = true;
+ this.isCancel = false;
+ this.isError = false;
+ this.progress = 100;
+ this.index = null;
+ this.onSuccess(response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileItem.prototype._onError = function _onError(response, status, headers) {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = true;
+ this.isSuccess = false;
+ this.isCancel = false;
+ this.isError = true;
+ this.progress = 0;
+ this.index = null;
+ this.onError(response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileItem.prototype._onCancel = function _onCancel(response, status, headers) {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = false;
+ this.isSuccess = false;
+ this.isCancel = true;
+ this.isError = false;
+ this.progress = 0;
+ this.index = null;
+ this.onCancel(response, status, headers);
+ };
+ /**
+ * Inner callback
+ * @param {*} response
+ * @param {Number} status
+ * @param {Object} headers
+ * @private
+ */
+
+
+ FileItem.prototype._onComplete = function _onComplete(response, status, headers) {
+ this.onComplete(response, status, headers);
+ if (this.removeAfterUpload) this.remove();
+ };
+ /**
+ * Inner callback
+ * @private
+ */
+
+
+ FileItem.prototype._onTimeout = function _onTimeout() {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = false;
+ this.isSuccess = false;
+ this.isCancel = false;
+ this.isError = true;
+ this.progress = 0;
+ this.index = null;
+ this.onTimeout();
+ };
+ /**
+ * Destroys a FileItem
+ */
+
+
+ FileItem.prototype._destroy = function _destroy() {
+ if (this._input) this._input.remove();
+ if (this._form) this._form.remove();
+ delete this._form;
+ delete this._input;
+ };
+ /**
+ * Prepares to uploading
+ * @private
+ */
+
+
+ FileItem.prototype._prepareToUploading = function _prepareToUploading() {
+ this.index = this.index || ++this.uploader._nextIndex;
+ this.isReady = true;
+ };
+ /**
+ * Replaces input element on his clone
+ * @param {JQLite|jQuery} input
+ * @private
+ */
+
+
+ FileItem.prototype._replaceNode = function _replaceNode(input) {
+ var clone = $compile(input.clone())(input.scope());
+ clone.prop('value', null); // FF fix
+ input.css('display', 'none');
+ input.after(clone); // remove jquery dependency
+ };
+
+ return FileItem;
+ }();
+ }
+
+ __identity.$inject = ['$compile', 'FileLikeObject'];
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ var _angular = angular,
+ extend = _angular.extend;
+ function __identity() {
+ var FileDirective = function () {
+ /**
+ * Creates instance of {FileDirective} object
+ * @param {Object} options
+ * @param {Object} options.uploader
+ * @param {HTMLElement} options.element
+ * @param {Object} options.events
+ * @param {String} options.prop
+ * @constructor
+ */
+ function FileDirective(options) {
+ _classCallCheck(this, FileDirective);
+
+ extend(this, options);
+ this.uploader._directives[this.prop].push(this);
+ this._saveLinks();
+ this.bind();
+ }
+ /**
+ * Binds events handles
+ */
+
+
+ FileDirective.prototype.bind = function bind() {
+ for (var key in this.events) {
+ var prop = this.events[key];
+ this.element.bind(key, this[prop]);
+ }
+ };
+ /**
+ * Unbinds events handles
+ */
+
+
+ FileDirective.prototype.unbind = function unbind() {
+ for (var key in this.events) {
+ this.element.unbind(key, this.events[key]);
+ }
+ };
+ /**
+ * Destroys directive
+ */
+
+
+ FileDirective.prototype.destroy = function destroy() {
+ var index = this.uploader._directives[this.prop].indexOf(this);
+ this.uploader._directives[this.prop].splice(index, 1);
+ this.unbind();
+ // this.element = null;
+ };
+ /**
+ * Saves links to functions
+ * @private
+ */
+
+
+ FileDirective.prototype._saveLinks = function _saveLinks() {
+ for (var key in this.events) {
+ var prop = this.events[key];
+ this[prop] = this[prop].bind(this);
+ }
+ };
+
+ return FileDirective;
+ }();
+
+ /**
+ * Map of events
+ * @type {Object}
+ */
+
+
+ FileDirective.prototype.events = {};
+
+ return FileDirective;
+ }
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+ var _angular = angular,
+ extend = _angular.extend;
+ function __identity($compile, FileDirective) {
+
+ return function (_FileDirective) {
+ _inherits(FileSelect, _FileDirective);
+
+ /**
+ * Creates instance of {FileSelect} object
+ * @param {Object} options
+ * @constructor
+ */
+ function FileSelect(options) {
+ _classCallCheck(this, FileSelect);
+
+ var extendedOptions = extend(options, {
+ // Map of events
+ events: {
+ $destroy: 'destroy',
+ change: 'onChange'
+ },
+ // Name of property inside uploader._directive object
+ prop: 'select'
+ });
+
+ var _this = _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));
+
+ if (!_this.uploader.isHTML5) {
+ _this.element.removeAttr('multiple');
+ }
+ _this.element.prop('value', null); // FF fix
+ return _this;
+ }
+ /**
+ * Returns options
+ * @return {Object|undefined}
+ */
+
+
+ FileSelect.prototype.getOptions = function getOptions() {};
+ /**
+ * Returns filters
+ * @return {Array<Function>|String|undefined}
+ */
+
+
+ FileSelect.prototype.getFilters = function getFilters() {};
+ /**
+ * If returns "true" then HTMLInputElement will be cleared
+ * @returns {Boolean}
+ */
+
+
+ FileSelect.prototype.isEmptyAfterSelection = function isEmptyAfterSelection() {
+ return !!this.element.attr('multiple');
+ };
+ /**
+ * Event handler
+ */
+
+
+ FileSelect.prototype.onChange = function onChange() {
+ var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];
+ var options = this.getOptions();
+ var filters = this.getFilters();
+
+ if (!this.uploader.isHTML5) this.destroy();
+ this.uploader.addToQueue(files, options, filters);
+ if (this.isEmptyAfterSelection()) {
+ this.element.prop('value', null);
+ this.element.replaceWith($compile(this.element.clone())(this.scope)); // IE fix
+ }
+ };
+
+ return FileSelect;
+ }(FileDirective);
+ }
+
+ __identity.$inject = ['$compile', 'FileDirective'];
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ var _angular = angular,
+ bind = _angular.bind,
+ isUndefined = _angular.isUndefined;
+ function __identity($q) {
+
+ return function () {
+ /**
+ * @param {Array<Function>} pipes
+ */
+ function Pipeline() {
+ var pipes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+ _classCallCheck(this, Pipeline);
+
+ this.pipes = pipes;
+ }
+
+ Pipeline.prototype.next = function next(args) {
+ var pipe = this.pipes.shift();
+ if (isUndefined(pipe)) {
+ this.onSuccessful.apply(this, _toConsumableArray(args));
+ return;
+ }
+ var err = new Error('The filter has not passed');
+ err.pipe = pipe;
+ err.args = args;
+ if (pipe.isAsync) {
+ var deferred = $q.defer();
+ var onFulfilled = bind(this, this.next, args);
+ var onRejected = bind(this, this.onThrown, err);
+ deferred.promise.then(onFulfilled, onRejected);
+ pipe.apply(undefined, _toConsumableArray(args).concat([deferred]));
+ } else {
+ var isDone = Boolean(pipe.apply(undefined, _toConsumableArray(args)));
+ if (isDone) {
+ this.next(args);
+ } else {
+ this.onThrown(err);
+ }
+ }
+ };
+
+ Pipeline.prototype.exec = function exec() {
+ for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+ args[_key] = arguments[_key];
+ }
+
+ this.next(args);
+ };
+
+ Pipeline.prototype.onThrown = function onThrown(err) {};
+
+ Pipeline.prototype.onSuccessful = function onSuccessful() {};
+
+ return Pipeline;
+ }();
+ }
+
+ __identity.$inject = ['$q'];
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+ var _angular = angular,
+ extend = _angular.extend,
+ forEach = _angular.forEach;
+ function __identity(FileDirective) {
+
+ return function (_FileDirective) {
+ _inherits(FileDrop, _FileDirective);
+
+ /**
+ * Creates instance of {FileDrop} object
+ * @param {Object} options
+ * @constructor
+ */
+ function FileDrop(options) {
+ _classCallCheck(this, FileDrop);
+
+ var extendedOptions = extend(options, {
+ // Map of events
+ events: {
+ $destroy: 'destroy',
+ drop: 'onDrop',
+ dragover: 'onDragOver',
+ dragleave: 'onDragLeave'
+ },
+ // Name of property inside uploader._directive object
+ prop: 'drop'
+ });
+
+ return _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));
+ }
+ /**
+ * Returns options
+ * @return {Object|undefined}
+ */
+
+
+ FileDrop.prototype.getOptions = function getOptions() {};
+ /**
+ * Returns filters
+ * @return {Array<Function>|String|undefined}
+ */
+
+
+ FileDrop.prototype.getFilters = function getFilters() {};
+ /**
+ * Event handler
+ */
+
+
+ FileDrop.prototype.onDrop = function onDrop(event) {
+ var transfer = this._getTransfer(event);
+ if (!transfer) return;
+ var options = this.getOptions();
+ var filters = this.getFilters();
+ this._preventAndStop(event);
+ forEach(this.uploader._directives.over, this._removeOverClass, this);
+ this.uploader.addToQueue(transfer.files, options, filters);
+ };
+ /**
+ * Event handler
+ */
+
+
+ FileDrop.prototype.onDragOver = function onDragOver(event) {
+ var transfer = this._getTransfer(event);
+ if (!this._haveFiles(transfer.types)) return;
+ transfer.dropEffect = 'copy';
+ this._preventAndStop(event);
+ forEach(this.uploader._directives.over, this._addOverClass, this);
+ };
+ /**
+ * Event handler
+ */
+
+
+ FileDrop.prototype.onDragLeave = function onDragLeave(event) {
+ if (event.currentTarget === this.element[0]) return;
+ this._preventAndStop(event);
+ forEach(this.uploader._directives.over, this._removeOverClass, this);
+ };
+ /**
+ * Helper
+ */
+
+
+ FileDrop.prototype._getTransfer = function _getTransfer(event) {
+ return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
+ };
+ /**
+ * Helper
+ */
+
+
+ FileDrop.prototype._preventAndStop = function _preventAndStop(event) {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+ /**
+ * Returns "true" if types contains files
+ * @param {Object} types
+ */
+
+
+ FileDrop.prototype._haveFiles = function _haveFiles(types) {
+ if (!types) return false;
+ if (types.indexOf) {
+ return types.indexOf('Files') !== -1;
+ } else if (types.contains) {
+ return types.contains('Files');
+ } else {
+ return false;
+ }
+ };
+ /**
+ * Callback
+ */
+
+
+ FileDrop.prototype._addOverClass = function _addOverClass(item) {
+ item.addOverClass();
+ };
+ /**
+ * Callback
+ */
+
+
+ FileDrop.prototype._removeOverClass = function _removeOverClass(item) {
+ item.removeOverClass();
+ };
+
+ return FileDrop;
+ }(FileDirective);
+ }
+
+ __identity.$inject = ['FileDirective'];
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+ function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+ var _angular = angular,
+ extend = _angular.extend;
+ function __identity(FileDirective) {
+
+ return function (_FileDirective) {
+ _inherits(FileOver, _FileDirective);
+
+ /**
+ * Creates instance of {FileDrop} object
+ * @param {Object} options
+ * @constructor
+ */
+ function FileOver(options) {
+ _classCallCheck(this, FileOver);
+
+ var extendedOptions = extend(options, {
+ // Map of events
+ events: {
+ $destroy: 'destroy'
+ },
+ // Name of property inside uploader._directive object
+ prop: 'over',
+ // Over class
+ overClass: 'nv-file-over'
+ });
+
+ return _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));
+ }
+ /**
+ * Adds over class
+ */
+
+
+ FileOver.prototype.addOverClass = function addOverClass() {
+ this.element.addClass(this.getOverClass());
+ };
+ /**
+ * Removes over class
+ */
+
+
+ FileOver.prototype.removeOverClass = function removeOverClass() {
+ this.element.removeClass(this.getOverClass());
+ };
+ /**
+ * Returns over class
+ * @returns {String}
+ */
+
+
+ FileOver.prototype.getOverClass = function getOverClass() {
+ return this.overClass;
+ };
+
+ return FileOver;
+ }(FileDirective);
+ }
+
+ __identity.$inject = ['FileDirective'];
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function __identity($parse, FileUploader, FileSelect) {
+
+ return {
+ link: function link(scope, element, attributes) {
+ var uploader = scope.$eval(attributes.uploader);
+
+ if (!(uploader instanceof FileUploader)) {
+ throw new TypeError('"Uploader" must be an instance of FileUploader');
+ }
+
+ var object = new FileSelect({
+ uploader: uploader,
+ element: element,
+ scope: scope
+ });
+
+ object.getOptions = $parse(attributes.options).bind(object, scope);
+ object.getFilters = function () {
+ return attributes.filters;
+ };
+ }
+ };
+ }
+
+ __identity.$inject = ['$parse', 'FileUploader', 'FileSelect'];
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function __identity($parse, FileUploader, FileDrop) {
+
+ return {
+ link: function link(scope, element, attributes) {
+ var uploader = scope.$eval(attributes.uploader);
+
+ if (!(uploader instanceof FileUploader)) {
+ throw new TypeError('"Uploader" must be an instance of FileUploader');
+ }
+
+ if (!uploader.isHTML5) return;
+
+ var object = new FileDrop({
+ uploader: uploader,
+ element: element
+ });
+
+ object.getOptions = $parse(attributes.options).bind(object, scope);
+ object.getFilters = function () {
+ return attributes.filters;
+ };
+ }
+ };
+ }
+
+ __identity.$inject = ['$parse', 'FileUploader', 'FileDrop'];
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+ 'use strict';
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true
+ });
+ exports.default = __identity;
+
+ var _config = __webpack_require__(1);
+
+ var _config2 = _interopRequireDefault(_config);
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ function __identity(FileUploader, FileOver) {
+
+ return {
+ link: function link(scope, element, attributes) {
+ var uploader = scope.$eval(attributes.uploader);
+
+ if (!(uploader instanceof FileUploader)) {
+ throw new TypeError('"Uploader" must be an instance of FileUploader');
+ }
+
+ var object = new FileOver({
+ uploader: uploader,
+ element: element
+ });
+
+ object.getOverClass = function () {
+ return attributes.overClass || object.overClass;
+ };
+ }
+ };
+ }
+
+ __identity.$inject = ['FileUploader', 'FileOver'];
+
+/***/ })
+/******/ ])
+});
+;
+//# sourceMappingURL=angular-file-upload.js.map
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js.map b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js.map
new file mode 100644
index 0000000000..5035b469c1
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/universalModuleDefinition","webpack:///webpack/bootstrap 8e3763ddc3eea8ac4eff","webpack:///./src/index.js","webpack:///./src/config.json","webpack:///./src/values/options.js","webpack:///./src/services/FileUploader.js","webpack:///./src/services/FileLikeObject.js","webpack:///./src/services/FileItem.js","webpack:///./src/services/FileDirective.js","webpack:///./src/services/FileSelect.js","webpack:///./src/services/Pipeline.js","webpack:///./src/services/FileDrop.js","webpack:///./src/services/FileOver.js","webpack:///./src/directives/FileSelect.js","webpack:///./src/directives/FileDrop.js","webpack:///./src/directives/FileOver.js"],"names":["angular","module","CONFIG","name","value","options","factory","serviceFileUploader","serviceFileLikeObject","serviceFileItem","serviceFileDirective","serviceFileSelect","serviceFileDrop","serviceFileOver","servicePipeline","directive","directiveFileSelect","directiveFileDrop","directiveFileOver","run","FileUploader","FileLikeObject","FileItem","FileDirective","FileSelect","FileDrop","FileOver","Pipeline","url","alias","headers","queue","progress","autoUpload","removeAfterUpload","method","filters","formData","queueLimit","Number","MAX_VALUE","withCredentials","disableMultipart","__identity","bind","copy","extend","forEach","isObject","isNumber","isDefined","isArray","isUndefined","element","fileUploaderOptions","$rootScope","$http","$window","$timeout","File","FormData","settings","isUploading","_nextIndex","_directives","select","drop","over","unshift","fn","_queueLimitFilter","_folderFilter","addToQueue","files","incomingQueue","isArrayLikeObject","Array","prototype","slice","call","arrayOfFilters","_getFilters","count","length","addedFileItems","next","something","shift","done","fileLikeObject","isFile","pipes","_convertFiltersToPipes","pipeline","onThrown","err","originalFilter","pipe","args","_onWhenAddingFileFailed","onSuccessful","fileItem","push","_onAfterAddingFile","exec","_onAfterAddingAll","_getTotalProgress","_render","uploadAll","removeFromQueue","index","getIndexOfItem","item","cancel","splice","_destroy","clearQueue","remove","uploadItem","transport","isHTML5","_prepareToUploading","_onBeforeUploadItem","isCancel","cancelItem","prop","abort","dummy","undefined","onNextTick","_onCancelItem","_onCompleteItem","items","getNotUploadedItems","filter","upload","cancelAll","constructor","isFileLikeObject","indexOf","isUploaded","getReadyItems","isReady","sort","item1","item2","destroy","key","object","onAfterAddingAll","fileItems","onAfterAddingFile","onWhenAddingFileFailed","onBeforeUploadItem","onProgressItem","onProgressAll","onSuccessItem","response","status","onErrorItem","onCancelItem","onCompleteItem","onTimeoutItem","onCompleteAll","notUploaded","uploaded","ratio","current","Math","round","names","match","map","isAsync","$$phase","$apply","size","type","_isSuccessCode","_transformResponse","headersGetter","_headersGetter","defaults","transformResponse","transformFn","_parseHeaders","parsed","val","i","split","line","trim","toLowerCase","parsedHeaders","_xhrTransport","xhr","_xhr","XMLHttpRequest","sendable","obj","append","_file","file","TypeError","onprogress","event","lengthComputable","loaded","total","_onProgressItem","onload","getAllResponseHeaders","gist","onerror","_onErrorItem","onabort","ontimeout","e","_onTimeoutItem","open","timeout","setRequestHeader","send","_iframeTransport","form","iframe","Date","now","input","_input","timer","isTimedOut","_form","replaceWith","element_","action","target","enctype","encoding","html","contentDocument","body","innerHTML","clearTimeout","_onSuccessItem","unbind","after","setTimeout","submit","_onBeforeUpload","_onProgress","_onSuccess","_onError","_onCancel","_onComplete","nextItem","_onTimeout","inherit","source","Object","create","super_","$inject","isElement","isString","fileOrInput","isInput","fakePathOrObject","postfix","_createFromFakePath","path","lastModifiedDate","lastIndexOf","_createFromObject","$compile","uploader","some","isSuccess","isError","_replaceNode","message","code","onBeforeUpload","onProgress","onSuccess","onError","onCancel","onComplete","onTimeout","clone","scope","css","_saveLinks","events","extendedOptions","$destroy","change","removeAttr","getOptions","getFilters","isEmptyAfterSelection","attr","onChange","$q","Error","deferred","defer","onFulfilled","onRejected","promise","then","isDone","Boolean","dragover","dragleave","onDrop","transfer","_getTransfer","_preventAndStop","_removeOverClass","onDragOver","_haveFiles","types","dropEffect","_addOverClass","onDragLeave","currentTarget","dataTransfer","originalEvent","preventDefault","stopPropagation","contains","addOverClass","removeOverClass","overClass","addClass","getOverClass","removeClass","$parse","link","attributes","$eval"],"mappings":"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","file":"angular-file-upload.js","sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"angular-file-upload\"] = factory();\n\telse\n\t\troot[\"angular-file-upload\"] = factory();\n})(this, function() {\nreturn \n\n\n// WEBPACK FOOTER //\n// webpack/universalModuleDefinition"," \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\texports: {},\n \t\t\tid: moduleId,\n \t\t\tloaded: false\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.loaded = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(0);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 8e3763ddc3eea8ac4eff","'use strict';\r\n\r\n\r\nimport CONFIG from './config.json';\r\n\r\n\r\nimport options from './values/options'\r\n\r\n\r\nimport serviceFileUploader from './services/FileUploader';\r\nimport serviceFileLikeObject from './services/FileLikeObject';\r\nimport serviceFileItem from './services/FileItem';\r\nimport serviceFileDirective from './services/FileDirective';\r\nimport serviceFileSelect from './services/FileSelect';\r\nimport servicePipeline from './services/Pipeline';\r\nimport serviceFileDrop from './services/FileDrop';\r\nimport serviceFileOver from './services/FileOver';\r\n\r\n\r\nimport directiveFileSelect from './directives/FileSelect';\r\nimport directiveFileDrop from './directives/FileDrop';\r\nimport directiveFileOver from './directives/FileOver';\r\n\r\n\r\nangular\r\n .module(CONFIG.name, [])\r\n .value('fileUploaderOptions', options)\r\n .factory('FileUploader', serviceFileUploader)\r\n .factory('FileLikeObject', serviceFileLikeObject)\r\n .factory('FileItem', serviceFileItem)\r\n .factory('FileDirective', serviceFileDirective)\r\n .factory('FileSelect', serviceFileSelect)\r\n .factory('FileDrop', serviceFileDrop)\r\n .factory('FileOver', serviceFileOver)\r\n .factory('Pipeline', servicePipeline)\r\n .directive('nvFileSelect', directiveFileSelect)\r\n .directive('nvFileDrop', directiveFileDrop)\r\n .directive('nvFileOver', directiveFileOver)\r\n .run([\r\n 'FileUploader',\r\n 'FileLikeObject',\r\n 'FileItem',\r\n 'FileDirective',\r\n 'FileSelect',\r\n 'FileDrop',\r\n 'FileOver',\r\n 'Pipeline',\r\n function(FileUploader, FileLikeObject, FileItem, FileDirective, FileSelect, FileDrop, FileOver, Pipeline) {\r\n // only for compatibility\r\n FileUploader.FileLikeObject = FileLikeObject;\r\n FileUploader.FileItem = FileItem;\r\n FileUploader.FileDirective = FileDirective;\r\n FileUploader.FileSelect = FileSelect;\r\n FileUploader.FileDrop = FileDrop;\r\n FileUploader.FileOver = FileOver;\r\n FileUploader.Pipeline = Pipeline;\r\n }\r\n ]);\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js","module.exports = {\"name\":\"angularFileUpload\"}\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./src/config.json\n// module id = 1\n// module chunks = 0 1","'use strict';\r\n\r\n\r\nexport default {\r\n url: '/',\r\n alias: 'file',\r\n headers: {},\r\n queue: [],\r\n progress: 0,\r\n autoUpload: false,\r\n removeAfterUpload: false,\r\n method: 'POST',\r\n filters: [],\r\n formData: [],\r\n queueLimit: Number.MAX_VALUE,\r\n withCredentials: false,\r\n disableMultipart: false\r\n};\n\n\n// WEBPACK FOOTER //\n// ./src/values/options.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n bind,\r\n copy,\r\n extend,\r\n forEach,\r\n isObject,\r\n isNumber,\r\n isDefined,\r\n isArray,\r\n isUndefined,\r\n element\r\n } = angular;\r\n\r\n\r\nexport default function __identity(fileUploaderOptions, $rootScope, $http, $window, $timeout, FileLikeObject, FileItem, Pipeline) {\r\n \r\n \r\n let {\r\n File,\r\n FormData\r\n } = $window;\r\n \r\n \r\n class FileUploader {\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Creates an instance of FileUploader\r\n * @param {Object} [options]\r\n * @constructor\r\n */\r\n constructor(options) {\r\n var settings = copy(fileUploaderOptions);\r\n \r\n extend(this, settings, options, {\r\n isUploading: false,\r\n _nextIndex: 0,\r\n _directives: {select: [], drop: [], over: []}\r\n });\r\n\r\n // add default filters\r\n this.filters.unshift({name: 'queueLimit', fn: this._queueLimitFilter});\r\n this.filters.unshift({name: 'folder', fn: this._folderFilter});\r\n }\r\n /**\r\n * Adds items to the queue\r\n * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files\r\n * @param {Object} [options]\r\n * @param {Array<Function>|String} filters\r\n */\r\n addToQueue(files, options, filters) {\r\n let incomingQueue = this.isArrayLikeObject(files) ? Array.prototype.slice.call(files): [files];\r\n var arrayOfFilters = this._getFilters(filters);\r\n var count = this.queue.length;\r\n var addedFileItems = [];\r\n\r\n let next = () => {\r\n let something = incomingQueue.shift();\r\n \r\n if (isUndefined(something)) {\r\n return done();\r\n }\r\n \r\n let fileLikeObject = this.isFile(something) ? something : new FileLikeObject(something);\r\n let pipes = this._convertFiltersToPipes(arrayOfFilters);\r\n let pipeline = new Pipeline(pipes);\r\n let onThrown = (err) => {\r\n let {originalFilter} = err.pipe;\r\n let [fileLikeObject, options] = err.args;\r\n this._onWhenAddingFileFailed(fileLikeObject, originalFilter, options);\r\n next();\r\n };\r\n let onSuccessful = (fileLikeObject, options) => {\r\n let fileItem = new FileItem(this, fileLikeObject, options);\r\n addedFileItems.push(fileItem);\r\n this.queue.push(fileItem);\r\n this._onAfterAddingFile(fileItem);\r\n next();\r\n };\r\n pipeline.onThrown = onThrown;\r\n pipeline.onSuccessful = onSuccessful;\r\n pipeline.exec(fileLikeObject, options);\r\n };\r\n \r\n let done = () => {\r\n if(this.queue.length !== count) {\r\n this._onAfterAddingAll(addedFileItems);\r\n this.progress = this._getTotalProgress();\r\n }\r\n\r\n this._render();\r\n if (this.autoUpload) this.uploadAll();\r\n };\r\n \r\n next();\r\n }\r\n /**\r\n * Remove items from the queue. Remove last: index = -1\r\n * @param {FileItem|Number} value\r\n */\r\n removeFromQueue(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n if(item.isUploading) item.cancel();\r\n this.queue.splice(index, 1);\r\n item._destroy();\r\n this.progress = this._getTotalProgress();\r\n }\r\n /**\r\n * Clears the queue\r\n */\r\n clearQueue() {\r\n while(this.queue.length) {\r\n this.queue[0].remove();\r\n }\r\n this.progress = 0;\r\n }\r\n /**\r\n * Uploads a item from the queue\r\n * @param {FileItem|Number} value\r\n */\r\n uploadItem(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';\r\n\r\n item._prepareToUploading();\r\n if(this.isUploading) return;\r\n\r\n this._onBeforeUploadItem(item);\r\n if (item.isCancel) return;\r\n\r\n item.isUploading = true;\r\n this.isUploading = true;\r\n this[transport](item);\r\n this._render();\r\n }\r\n /**\r\n * Cancels uploading of item from the queue\r\n * @param {FileItem|Number} value\r\n */\r\n cancelItem(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n var prop = this.isHTML5 ? '_xhr' : '_form';\r\n if (!item) return;\r\n item.isCancel = true;\r\n if(item.isUploading) {\r\n // It will call this._onCancelItem() & this._onCompleteItem() asynchronously\r\n item[prop].abort();\r\n } else {\r\n let dummy = [undefined, 0, {}];\r\n let onNextTick = () => {\r\n this._onCancelItem(item, ...dummy);\r\n this._onCompleteItem(item, ...dummy);\r\n };\r\n $timeout(onNextTick); // Trigger callbacks asynchronously (setImmediate emulation)\r\n }\r\n }\r\n /**\r\n * Uploads all not uploaded items of queue\r\n */\r\n uploadAll() {\r\n var items = this.getNotUploadedItems().filter(item => !item.isUploading);\r\n if(!items.length) return;\r\n\r\n forEach(items, item => item._prepareToUploading());\r\n items[0].upload();\r\n }\r\n /**\r\n * Cancels all uploads\r\n */\r\n cancelAll() {\r\n var items = this.getNotUploadedItems();\r\n forEach(items, item => item.cancel());\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of File\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n isFile(value) {\r\n return this.constructor.isFile(value);\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of FileLikeObject\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n isFileLikeObject(value) {\r\n return this.constructor.isFileLikeObject(value);\r\n }\r\n /**\r\n * Returns \"true\" if value is array like object\r\n * @param {*} value\r\n * @returns {Boolean}\r\n */\r\n isArrayLikeObject(value) {\r\n return this.constructor.isArrayLikeObject(value);\r\n }\r\n /**\r\n * Returns a index of item from the queue\r\n * @param {Item|Number} value\r\n * @returns {Number}\r\n */\r\n getIndexOfItem(value) {\r\n return isNumber(value) ? value : this.queue.indexOf(value);\r\n }\r\n /**\r\n * Returns not uploaded items\r\n * @returns {Array}\r\n */\r\n getNotUploadedItems() {\r\n return this.queue.filter(item => !item.isUploaded);\r\n }\r\n /**\r\n * Returns items ready for upload\r\n * @returns {Array}\r\n */\r\n getReadyItems() {\r\n return this.queue\r\n .filter(item => (item.isReady && !item.isUploading))\r\n .sort((item1, item2) => item1.index - item2.index);\r\n }\r\n /**\r\n * Destroys instance of FileUploader\r\n */\r\n destroy() {\r\n forEach(this._directives, (key) => {\r\n forEach(this._directives[key], (object) => {\r\n object.destroy();\r\n });\r\n });\r\n }\r\n /**\r\n * Callback\r\n * @param {Array} fileItems\r\n */\r\n onAfterAddingAll(fileItems) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n */\r\n onAfterAddingFile(fileItem) {\r\n }\r\n /**\r\n * Callback\r\n * @param {File|Object} item\r\n * @param {Object} filter\r\n * @param {Object} options\r\n */\r\n onWhenAddingFileFailed(item, filter, options) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n */\r\n onBeforeUploadItem(fileItem) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n * @param {Number} progress\r\n */\r\n onProgressItem(fileItem, progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {Number} progress\r\n */\r\n onProgressAll(progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onSuccessItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onErrorItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCancelItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCompleteItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n */\r\n onTimeoutItem(item) {\r\n }\r\n /**\r\n * Callback\r\n */\r\n onCompleteAll() {\r\n }\r\n /**********************\r\n * PRIVATE\r\n **********************/\r\n /**\r\n * Returns the total progress\r\n * @param {Number} [value]\r\n * @returns {Number}\r\n * @private\r\n */\r\n _getTotalProgress(value) {\r\n if(this.removeAfterUpload) return value || 0;\r\n\r\n var notUploaded = this.getNotUploadedItems().length;\r\n var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;\r\n var ratio = 100 / this.queue.length;\r\n var current = (value || 0) * ratio / 100;\r\n\r\n return Math.round(uploaded * ratio + current);\r\n }\r\n /**\r\n * Returns array of filters\r\n * @param {Array<Function>|String} filters\r\n * @returns {Array<Function>}\r\n * @private\r\n */\r\n _getFilters(filters) {\r\n if(!filters) return this.filters;\r\n if(isArray(filters)) return filters;\r\n var names = filters.match(/[^\\s,]+/g);\r\n return this.filters\r\n .filter(filter => names.indexOf(filter.name) !== -1);\r\n }\r\n /**\r\n * @param {Array<Function>} filters\r\n * @returns {Array<Function>}\r\n * @private\r\n */\r\n _convertFiltersToPipes(filters) {\r\n return filters\r\n .map(filter => {\r\n let fn = bind(this, filter.fn);\r\n fn.isAsync = filter.fn.length === 3;\r\n fn.originalFilter = filter;\r\n return fn;\r\n });\r\n }\r\n /**\r\n * Updates html\r\n * @private\r\n */\r\n _render() {\r\n if(!$rootScope.$$phase) $rootScope.$apply();\r\n }\r\n /**\r\n * Returns \"true\" if item is a file (not folder)\r\n * @param {File|FileLikeObject} item\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _folderFilter(item) {\r\n return !!(item.size || item.type);\r\n }\r\n /**\r\n * Returns \"true\" if the limit has not been reached\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _queueLimitFilter() {\r\n return this.queue.length < this.queueLimit;\r\n }\r\n /**\r\n * Checks whether upload successful\r\n * @param {Number} status\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _isSuccessCode(status) {\r\n return (status >= 200 && status < 300) || status === 304;\r\n }\r\n /**\r\n * Transforms the server response\r\n * @param {*} response\r\n * @param {Object} headers\r\n * @returns {*}\r\n * @private\r\n */\r\n _transformResponse(response, headers) {\r\n var headersGetter = this._headersGetter(headers);\r\n forEach($http.defaults.transformResponse, (transformFn) => {\r\n response = transformFn(response, headersGetter);\r\n });\r\n return response;\r\n }\r\n /**\r\n * Parsed response headers\r\n * @param headers\r\n * @returns {Object}\r\n * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js\r\n * @private\r\n */\r\n _parseHeaders(headers) {\r\n var parsed = {}, key, val, i;\r\n\r\n if(!headers) return parsed;\r\n\r\n forEach(headers.split('\\n'), (line) => {\r\n i = line.indexOf(':');\r\n key = line.slice(0, i).trim().toLowerCase();\r\n val = line.slice(i + 1).trim();\r\n\r\n if(key) {\r\n parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;\r\n }\r\n });\r\n\r\n return parsed;\r\n }\r\n /**\r\n * Returns function that returns headers\r\n * @param {Object} parsedHeaders\r\n * @returns {Function}\r\n * @private\r\n */\r\n _headersGetter(parsedHeaders) {\r\n return (name) => {\r\n if(name) {\r\n return parsedHeaders[name.toLowerCase()] || null;\r\n }\r\n return parsedHeaders;\r\n };\r\n }\r\n /**\r\n * The XMLHttpRequest transport\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _xhrTransport(item) {\r\n var xhr = item._xhr = new XMLHttpRequest();\r\n var sendable;\r\n\r\n if (!item.disableMultipart) {\r\n sendable = new FormData();\r\n forEach(item.formData, (obj) => {\r\n forEach(obj, (value, key) => {\r\n sendable.append(key, value);\r\n });\r\n });\r\n\r\n sendable.append(item.alias, item._file, item.file.name);\r\n }\r\n else {\r\n sendable = item._file;\r\n }\r\n\r\n if(typeof(item._file.size) != 'number') {\r\n throw new TypeError('The file specified is no longer valid');\r\n }\r\n\r\n xhr.upload.onprogress = (event) => {\r\n var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);\r\n this._onProgressItem(item, progress);\r\n };\r\n\r\n xhr.onload = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n var gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error';\r\n var method = '_on' + gist + 'Item';\r\n this[method](item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n xhr.onerror = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n this._onErrorItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n xhr.onabort = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n this._onCancelItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n }; \r\n\r\n xhr.ontimeout = (e) => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = \"Request Timeout.\";\r\n this._onTimeoutItem(item);\r\n this._onCompleteItem(item, response, 408, headers);\r\n };\r\n\r\n xhr.open(item.method, item.url, true);\r\n\r\n xhr.timeout = item.timeout || 0;\r\n xhr.withCredentials = item.withCredentials;\r\n\r\n forEach(item.headers, (value, name) => {\r\n xhr.setRequestHeader(name, value);\r\n });\r\n\r\n xhr.send(sendable);\r\n }\r\n /**\r\n * The IFrame transport\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _iframeTransport(item) {\r\n var form = element('<form style=\"display: none;\" />');\r\n var iframe = element('<iframe name=\"iframeTransport' + Date.now() + '\">');\r\n var input = item._input;\r\n\r\n var timeout = 0;\r\n var timer = null;\r\n var isTimedOut = false;\r\n\r\n if(item._form) item._form.replaceWith(input); // remove old form\r\n item._form = form; // save link to new form\r\n\r\n input.prop('name', item.alias);\r\n\r\n forEach(item.formData, (obj) => {\r\n forEach(obj, (value, key) => {\r\n var element_ = element('<input type=\"hidden\" name=\"' + key + '\" />');\r\n element_.val(value);\r\n form.append(element_);\r\n });\r\n });\r\n\r\n form.prop({\r\n action: item.url,\r\n method: 'POST',\r\n target: iframe.prop('name'),\r\n enctype: 'multipart/form-data',\r\n encoding: 'multipart/form-data' // old IE\r\n });\r\n\r\n iframe.bind('load', () => {\r\n var html = '';\r\n var status = 200;\r\n\r\n try {\r\n // Fix for legacy IE browsers that loads internal error page\r\n // when failed WS response received. In consequence iframe\r\n // content access denied error is thrown becouse trying to\r\n // access cross domain page. When such thing occurs notifying\r\n // with empty response object. See more info at:\r\n // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object\r\n // Note that if non standard 4xx or 5xx error code returned\r\n // from WS then response content can be accessed without error\r\n // but 'XHR' status becomes 200. In order to avoid confusion\r\n // returning response via same 'success' event handler.\r\n\r\n // fixed angular.contents() for iframes\r\n html = iframe[0].contentDocument.body.innerHTML;\r\n } catch(e) {\r\n // in case we run into the access-is-denied error or we have another error on the server side\r\n // (intentional 500,40... errors), we at least say 'something went wrong' -> 500\r\n status = 500;\r\n }\r\n\r\n if (timer) {\r\n clearTimeout(timer);\r\n }\r\n timer = null;\r\n\r\n if (isTimedOut) {\r\n return false; //throw 'Request Timeout'\r\n }\r\n\r\n var xhr = {response: html, status: status, dummy: true};\r\n var headers = {};\r\n var response = this._transformResponse(xhr.response, headers);\r\n\r\n this._onSuccessItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n });\r\n\r\n form.abort = () => {\r\n var xhr = {status: 0, dummy: true};\r\n var headers = {};\r\n var response;\r\n\r\n iframe.unbind('load').prop('src', 'javascript:false;');\r\n form.replaceWith(input);\r\n\r\n this._onCancelItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n input.after(form);\r\n form.append(input).append(iframe);\r\n\r\n timeout = item.timeout || 0;\r\n timer = null;\r\n\r\n if (timeout) {\r\n timer = setTimeout(() => {\r\n isTimedOut = true;\r\n\r\n item.isCancel = true;\r\n if (item.isUploading) {\r\n iframe.unbind('load').prop('src', 'javascript:false;');\r\n form.replaceWith(input);\r\n }\r\n\r\n var headers = {};\r\n var response = \"Request Timeout.\";\r\n this._onTimeoutItem(item);\r\n this._onCompleteItem(item, response, 408, headers);\r\n }, timeout);\r\n }\r\n\r\n form[0].submit();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {File|Object} item\r\n * @param {Object} filter\r\n * @param {Object} options\r\n * @private\r\n */\r\n _onWhenAddingFileFailed(item, filter, options) {\r\n this.onWhenAddingFileFailed(item, filter, options);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n */\r\n _onAfterAddingFile(item) {\r\n this.onAfterAddingFile(item);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {Array<FileItem>} items\r\n */\r\n _onAfterAddingAll(items) {\r\n this.onAfterAddingAll(items);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _onBeforeUploadItem(item) {\r\n item._onBeforeUpload();\r\n this.onBeforeUploadItem(item);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {Number} progress\r\n * @private\r\n */\r\n _onProgressItem(item, progress) {\r\n var total = this._getTotalProgress(progress);\r\n this.progress = total;\r\n item._onProgress(progress);\r\n this.onProgressItem(item, progress);\r\n this.onProgressAll(total);\r\n this._render();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onSuccessItem(item, response, status, headers) {\r\n item._onSuccess(response, status, headers);\r\n this.onSuccessItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onErrorItem(item, response, status, headers) {\r\n item._onError(response, status, headers);\r\n this.onErrorItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCancelItem(item, response, status, headers) {\r\n item._onCancel(response, status, headers);\r\n this.onCancelItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCompleteItem(item, response, status, headers) {\r\n item._onComplete(response, status, headers);\r\n this.onCompleteItem(item, response, status, headers);\r\n\r\n var nextItem = this.getReadyItems()[0];\r\n this.isUploading = false;\r\n\r\n if(isDefined(nextItem)) {\r\n nextItem.upload();\r\n return;\r\n }\r\n\r\n this.onCompleteAll();\r\n this.progress = this._getTotalProgress();\r\n this._render();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _onTimeoutItem(item) {\r\n item._onTimeout();\r\n this.onTimeoutItem(item);\r\n }\r\n /**********************\r\n * STATIC\r\n **********************/\r\n /**\r\n * Returns \"true\" if value an instance of File\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n static isFile(value) {\r\n return (File && value instanceof File);\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of FileLikeObject\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n static isFileLikeObject(value) {\r\n return value instanceof FileLikeObject;\r\n }\r\n /**\r\n * Returns \"true\" if value is array like object\r\n * @param {*} value\r\n * @returns {Boolean}\r\n */\r\n static isArrayLikeObject(value) {\r\n return (isObject(value) && 'length' in value);\r\n }\r\n /**\r\n * Inherits a target (Class_1) by a source (Class_2)\r\n * @param {Function} target\r\n * @param {Function} source\r\n */\r\n static inherit(target, source) {\r\n target.prototype = Object.create(source.prototype);\r\n target.prototype.constructor = target;\r\n target.super_ = source;\r\n }\r\n }\r\n\r\n\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Checks a support the html5 uploader\r\n * @returns {Boolean}\r\n * @readonly\r\n */\r\n FileUploader.prototype.isHTML5 = !!(File && FormData);\r\n /**********************\r\n * STATIC\r\n **********************/\r\n /**\r\n * @borrows FileUploader.prototype.isHTML5\r\n */\r\n FileUploader.isHTML5 = FileUploader.prototype.isHTML5;\r\n\r\n \r\n return FileUploader;\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'fileUploaderOptions', \r\n '$rootScope', \r\n '$http', \r\n '$window',\r\n '$timeout',\r\n 'FileLikeObject',\r\n 'FileItem',\r\n 'Pipeline'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileUploader.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n copy,\r\n isElement,\r\n isString\r\n } = angular;\r\n\r\n\r\nexport default function __identity() {\r\n \r\n \r\n return class FileLikeObject {\r\n /**\r\n * Creates an instance of FileLikeObject\r\n * @param {File|HTMLInputElement|Object} fileOrInput\r\n * @constructor\r\n */\r\n constructor(fileOrInput) {\r\n var isInput = isElement(fileOrInput);\r\n var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;\r\n var postfix = isString(fakePathOrObject) ? 'FakePath' : 'Object';\r\n var method = '_createFrom' + postfix;\r\n this[method](fakePathOrObject, fileOrInput);\r\n }\r\n /**\r\n * Creates file like object from fake path string\r\n * @param {String} path\r\n * @private\r\n */\r\n _createFromFakePath(path, input) {\r\n this.lastModifiedDate = null;\r\n this.size = null;\r\n this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();\r\n this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\\\') + 2);\r\n this.input = input;\r\n }\r\n /**\r\n * Creates file like object from object\r\n * @param {File|FileLikeObject} object\r\n * @private\r\n */\r\n _createFromObject(object) {\r\n this.lastModifiedDate = copy(object.lastModifiedDate);\r\n this.size = object.size;\r\n this.type = object.type;\r\n this.name = object.name;\r\n this.input = object.input;\r\n }\r\n }\r\n}\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileLikeObject.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n copy,\r\n extend,\r\n element,\r\n isElement\r\n } = angular;\r\n\r\n\r\nexport default function __identity($compile, FileLikeObject) {\r\n \r\n \r\n return class FileItem {\r\n /**\r\n * Creates an instance of FileItem\r\n * @param {FileUploader} uploader\r\n * @param {File|HTMLInputElement|Object} some\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(uploader, some, options) {\r\n var isInput = !!some.input;\r\n var input = isInput ? element(some.input) : null;\r\n var file = !isInput ? some : null;\r\n\r\n extend(this, {\r\n url: uploader.url,\r\n alias: uploader.alias,\r\n headers: copy(uploader.headers),\r\n formData: copy(uploader.formData),\r\n removeAfterUpload: uploader.removeAfterUpload,\r\n withCredentials: uploader.withCredentials,\r\n disableMultipart: uploader.disableMultipart,\r\n method: uploader.method,\r\n timeout: uploader.timeout\r\n }, options, {\r\n uploader: uploader,\r\n file: new FileLikeObject(some),\r\n isReady: false,\r\n isUploading: false,\r\n isUploaded: false,\r\n isSuccess: false,\r\n isCancel: false,\r\n isError: false,\r\n progress: 0,\r\n index: null,\r\n _file: file,\r\n _input: input\r\n });\r\n\r\n if (input) this._replaceNode(input);\r\n }\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Uploads a FileItem\r\n */\r\n upload() {\r\n try {\r\n this.uploader.uploadItem(this);\r\n } catch(e) {\r\n var message = e.name + ':' + e.message;\r\n this.uploader._onCompleteItem(this, message, e.code, []);\r\n this.uploader._onErrorItem(this, message, e.code, []);\r\n }\r\n }\r\n /**\r\n * Cancels uploading of FileItem\r\n */\r\n cancel() {\r\n this.uploader.cancelItem(this);\r\n }\r\n /**\r\n * Removes a FileItem\r\n */\r\n remove() {\r\n this.uploader.removeFromQueue(this);\r\n }\r\n /**\r\n * Callback\r\n * @private\r\n */\r\n onBeforeUpload() {\r\n }\r\n /**\r\n * Callback\r\n * @param {Number} progress\r\n * @private\r\n */\r\n onProgress(progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onSuccess(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onError(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCancel(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onComplete(response, status, headers) {\r\n }\r\n /**\r\n * Callback \r\n */\r\n onTimeout() {\r\n }\r\n /**********************\r\n * PRIVATE\r\n **********************/\r\n /**\r\n * Inner callback\r\n */\r\n _onBeforeUpload() {\r\n this.isReady = true;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = false;\r\n this.progress = 0;\r\n this.onBeforeUpload();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {Number} progress\r\n * @private\r\n */\r\n _onProgress(progress) {\r\n this.progress = progress;\r\n this.onProgress(progress);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onSuccess(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = true;\r\n this.isSuccess = true;\r\n this.isCancel = false;\r\n this.isError = false;\r\n this.progress = 100;\r\n this.index = null;\r\n this.onSuccess(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onError(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = true;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = true;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onError(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCancel(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = true;\r\n this.isError = false;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onCancel(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onComplete(response, status, headers) {\r\n this.onComplete(response, status, headers);\r\n if(this.removeAfterUpload) this.remove();\r\n }\r\n /**\r\n * Inner callback \r\n * @private\r\n */\r\n _onTimeout() {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = true;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onTimeout();\r\n }\r\n /**\r\n * Destroys a FileItem\r\n */\r\n _destroy() {\r\n if(this._input) this._input.remove();\r\n if(this._form) this._form.remove();\r\n delete this._form;\r\n delete this._input;\r\n }\r\n /**\r\n * Prepares to uploading\r\n * @private\r\n */\r\n _prepareToUploading() {\r\n this.index = this.index || ++this.uploader._nextIndex;\r\n this.isReady = true;\r\n }\r\n /**\r\n * Replaces input element on his clone\r\n * @param {JQLite|jQuery} input\r\n * @private\r\n */\r\n _replaceNode(input) {\r\n var clone = $compile(input.clone())(input.scope());\r\n clone.prop('value', null); // FF fix\r\n input.css('display', 'none');\r\n input.after(clone); // remove jquery dependency\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$compile',\r\n 'FileLikeObject'\r\n];\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileItem.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity() {\r\n\r\n\r\n class FileDirective {\r\n /**\r\n * Creates instance of {FileDirective} object\r\n * @param {Object} options\r\n * @param {Object} options.uploader\r\n * @param {HTMLElement} options.element\r\n * @param {Object} options.events\r\n * @param {String} options.prop\r\n * @constructor\r\n */\r\n constructor(options) {\r\n extend(this, options);\r\n this.uploader._directives[this.prop].push(this);\r\n this._saveLinks();\r\n this.bind();\r\n }\r\n /**\r\n * Binds events handles\r\n */\r\n bind() {\r\n for(var key in this.events) {\r\n var prop = this.events[key];\r\n this.element.bind(key, this[prop]);\r\n }\r\n }\r\n /**\r\n * Unbinds events handles\r\n */\r\n unbind() {\r\n for(var key in this.events) {\r\n this.element.unbind(key, this.events[key]);\r\n }\r\n }\r\n /**\r\n * Destroys directive\r\n */\r\n destroy() {\r\n var index = this.uploader._directives[this.prop].indexOf(this);\r\n this.uploader._directives[this.prop].splice(index, 1);\r\n this.unbind();\r\n // this.element = null;\r\n }\r\n /**\r\n * Saves links to functions\r\n * @private\r\n */\r\n _saveLinks() {\r\n for(var key in this.events) {\r\n var prop = this.events[key];\r\n this[prop] = this[prop].bind(this);\r\n }\r\n }\r\n }\r\n\r\n\r\n /**\r\n * Map of events\r\n * @type {Object}\r\n */\r\n FileDirective.prototype.events = {};\r\n\r\n\r\n return FileDirective;\r\n}\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileDirective.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity($compile, FileDirective) {\r\n \r\n \r\n return class FileSelect extends FileDirective {\r\n /**\r\n * Creates instance of {FileSelect} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy',\r\n change: 'onChange'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'select'\r\n });\r\n \r\n super(extendedOptions);\r\n \r\n if(!this.uploader.isHTML5) {\r\n this.element.removeAttr('multiple');\r\n }\r\n this.element.prop('value', null); // FF fix\r\n }\r\n /**\r\n * Returns options\r\n * @return {Object|undefined}\r\n */\r\n getOptions() {\r\n }\r\n /**\r\n * Returns filters\r\n * @return {Array<Function>|String|undefined}\r\n */\r\n getFilters() {\r\n }\r\n /**\r\n * If returns \"true\" then HTMLInputElement will be cleared\r\n * @returns {Boolean}\r\n */\r\n isEmptyAfterSelection() {\r\n return !!this.element.attr('multiple');\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onChange() {\r\n var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];\r\n var options = this.getOptions();\r\n var filters = this.getFilters();\r\n\r\n if(!this.uploader.isHTML5) this.destroy();\r\n this.uploader.addToQueue(files, options, filters);\r\n if(this.isEmptyAfterSelection()) {\r\n this.element.prop('value', null);\r\n this.element.replaceWith($compile(this.element.clone())(this.scope)); // IE fix\r\n }\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$compile',\r\n 'FileDirective'\r\n];\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileSelect.js","'use strict';\r\n\r\n\r\nconst {\r\n bind,\r\n isUndefined\r\n} = angular;\r\n\r\n\r\nexport default function __identity($q) {\r\n\r\n\r\n return class Pipeline {\r\n /**\r\n * @param {Array<Function>} pipes\r\n */\r\n constructor(pipes = []) {\r\n this.pipes = pipes;\r\n }\r\n next(args) {\r\n let pipe = this.pipes.shift();\r\n if (isUndefined(pipe)) {\r\n this.onSuccessful(...args);\r\n return;\r\n }\r\n let err = new Error('The filter has not passed');\r\n err.pipe = pipe;\r\n err.args = args;\r\n if (pipe.isAsync) {\r\n let deferred = $q.defer();\r\n let onFulfilled = bind(this, this.next, args);\r\n let onRejected = bind(this, this.onThrown, err);\r\n deferred.promise.then(onFulfilled, onRejected);\r\n pipe(...args, deferred);\r\n } else {\r\n let isDone = Boolean(pipe(...args));\r\n if (isDone) {\r\n this.next(args);\r\n } else {\r\n this.onThrown(err);\r\n }\r\n }\r\n }\r\n exec(...args) {\r\n this.next(args);\r\n }\r\n onThrown(err) {\r\n\r\n }\r\n onSuccessful(...args) {\r\n\r\n }\r\n }\r\n \r\n}\r\n\r\n__identity.$inject = [\r\n '$q'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/Pipeline.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend,\r\n forEach\r\n } = angular;\r\n\r\n\r\nexport default function __identity(FileDirective) {\r\n \r\n \r\n return class FileDrop extends FileDirective {\r\n /**\r\n * Creates instance of {FileDrop} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy',\r\n drop: 'onDrop',\r\n dragover: 'onDragOver',\r\n dragleave: 'onDragLeave'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'drop'\r\n });\r\n \r\n super(extendedOptions);\r\n }\r\n /**\r\n * Returns options\r\n * @return {Object|undefined}\r\n */\r\n getOptions() {\r\n }\r\n /**\r\n * Returns filters\r\n * @return {Array<Function>|String|undefined}\r\n */\r\n getFilters() {\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDrop(event) {\r\n var transfer = this._getTransfer(event);\r\n if(!transfer) return;\r\n var options = this.getOptions();\r\n var filters = this.getFilters();\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._removeOverClass, this);\r\n this.uploader.addToQueue(transfer.files, options, filters);\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDragOver(event) {\r\n var transfer = this._getTransfer(event);\r\n if(!this._haveFiles(transfer.types)) return;\r\n transfer.dropEffect = 'copy';\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._addOverClass, this);\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDragLeave(event) {\r\n if(event.currentTarget === this.element[0]) return;\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._removeOverClass, this);\r\n }\r\n /**\r\n * Helper\r\n */\r\n _getTransfer(event) {\r\n return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;\r\n }\r\n /**\r\n * Helper\r\n */\r\n _preventAndStop(event) {\r\n event.preventDefault();\r\n event.stopPropagation();\r\n }\r\n /**\r\n * Returns \"true\" if types contains files\r\n * @param {Object} types\r\n */\r\n _haveFiles(types) {\r\n if(!types) return false;\r\n if(types.indexOf) {\r\n return types.indexOf('Files') !== -1;\r\n } else if(types.contains) {\r\n return types.contains('Files');\r\n } else {\r\n return false;\r\n }\r\n }\r\n /**\r\n * Callback\r\n */\r\n _addOverClass(item) {\r\n item.addOverClass();\r\n }\r\n /**\r\n * Callback\r\n */\r\n _removeOverClass(item) {\r\n item.removeOverClass();\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileDirective'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileDrop.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity(FileDirective) {\r\n \r\n \r\n return class FileOver extends FileDirective {\r\n /**\r\n * Creates instance of {FileDrop} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'over',\r\n // Over class\r\n overClass: 'nv-file-over'\r\n });\r\n \r\n super(extendedOptions);\r\n }\r\n /**\r\n * Adds over class\r\n */\r\n addOverClass() {\r\n this.element.addClass(this.getOverClass());\r\n }\r\n /**\r\n * Removes over class\r\n */\r\n removeOverClass() {\r\n this.element.removeClass(this.getOverClass());\r\n }\r\n /**\r\n * Returns over class\r\n * @returns {String}\r\n */\r\n getOverClass() {\r\n return this.overClass;\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileDirective'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileOver.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity($parse, FileUploader, FileSelect) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n var object = new FileSelect({\r\n uploader: uploader,\r\n element: element,\r\n scope: scope\r\n });\r\n\r\n object.getOptions = $parse(attributes.options).bind(object, scope);\r\n object.getFilters = () => attributes.filters;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$parse',\r\n 'FileUploader',\r\n 'FileSelect'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileSelect.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity($parse, FileUploader, FileDrop) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n if (!uploader.isHTML5) return;\r\n\r\n var object = new FileDrop({\r\n uploader: uploader,\r\n element: element\r\n });\r\n\r\n object.getOptions = $parse(attributes.options).bind(object, scope);\r\n object.getFilters = () => attributes.filters;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$parse',\r\n 'FileUploader',\r\n 'FileDrop'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileDrop.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity(FileUploader, FileOver) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n var object = new FileOver({\r\n uploader: uploader,\r\n element: element\r\n });\r\n\r\n object.getOverClass = () => attributes.overClass || object.overClass;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileUploader',\r\n 'FileOver'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileOver.js"],"sourceRoot":""}
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js
new file mode 100644
index 0000000000..182d1a14b6
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js
@@ -0,0 +1,7 @@
+/*
+ angular-file-upload v2.6.1
+ https://github.com/nervgh/angular-file-upload
+*/
+
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["angular-file-upload"]=t():e["angular-file-upload"]=t()}(this,function(){return function(e){function t(n){if(o[n])return o[n].exports;var r=o[n]={exports:{},id:n,loaded:!1};return e[n].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var o={};return t.m=e,t.c=o,t.p="",t(0)}([function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}var r=o(1),i=n(r),s=o(2),a=n(s),u=o(3),l=n(u),p=o(4),c=n(p),f=o(5),d=n(f),h=o(6),y=n(h),m=o(7),v=n(m),_=o(8),g=n(_),b=o(9),F=n(b),O=o(10),C=n(O),T=o(11),I=n(T),w=o(12),A=n(w),U=o(13),x=n(U);angular.module(i.default.name,[]).value("fileUploaderOptions",a.default).factory("FileUploader",l.default).factory("FileLikeObject",c.default).factory("FileItem",d.default).factory("FileDirective",y.default).factory("FileSelect",v.default).factory("FileDrop",F.default).factory("FileOver",C.default).factory("Pipeline",g.default).directive("nvFileSelect",I.default).directive("nvFileDrop",A.default).directive("nvFileOver",x.default).run(["FileUploader","FileLikeObject","FileItem","FileDirective","FileSelect","FileDrop","FileOver","Pipeline",function(e,t,o,n,r,i,s,a){e.FileLikeObject=t,e.FileItem=o,e.FileDirective=n,e.FileSelect=r,e.FileDrop=i,e.FileOver=s,e.Pipeline=a}])},function(e,t){e.exports={name:"angularFileUpload"}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={url:"/",alias:"file",headers:{},queue:[],progress:0,autoUpload:!1,removeAfterUpload:!1,method:"POST",filters:[],formData:[],queueLimit:Number.MAX_VALUE,withCredentials:!1,disableMultipart:!1}},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t,o,n,i,a,u,g){var b=n.File,F=n.FormData,O=function(){function n(t){r(this,n);var o=p(e);c(this,o,t,{isUploading:!1,_nextIndex:0,_directives:{select:[],drop:[],over:[]}}),this.filters.unshift({name:"queueLimit",fn:this._queueLimitFilter}),this.filters.unshift({name:"folder",fn:this._folderFilter})}return n.prototype.addToQueue=function(e,t,o){var n=this,r=this.isArrayLikeObject(e)?Array.prototype.slice.call(e):[e],i=this._getFilters(o),l=this.queue.length,p=[],c=function e(){var o=r.shift();if(v(o))return f();var l=n.isFile(o)?o:new a(o),c=n._convertFiltersToPipes(i),d=new g(c),h=function(t){var o=t.pipe.originalFilter,r=s(t.args,2),i=r[0],a=r[1];n._onWhenAddingFileFailed(i,o,a),e()},y=function(t,o){var r=new u(n,t,o);p.push(r),n.queue.push(r),n._onAfterAddingFile(r),e()};d.onThrown=h,d.onSuccessful=y,d.exec(l,t)},f=function(){n.queue.length!==l&&(n._onAfterAddingAll(p),n.progress=n._getTotalProgress()),n._render(),n.autoUpload&&n.uploadAll()};c()},n.prototype.removeFromQueue=function(e){var t=this.getIndexOfItem(e),o=this.queue[t];o.isUploading&&o.cancel(),this.queue.splice(t,1),o._destroy(),this.progress=this._getTotalProgress()},n.prototype.clearQueue=function(){for(;this.queue.length;)this.queue[0].remove();this.progress=0},n.prototype.uploadItem=function(e){var t=this.getIndexOfItem(e),o=this.queue[t],n=this.isHTML5?"_xhrTransport":"_iframeTransport";o._prepareToUploading(),this.isUploading||(this._onBeforeUploadItem(o),o.isCancel||(o.isUploading=!0,this.isUploading=!0,this[n](o),this._render()))},n.prototype.cancelItem=function(e){var t=this,o=this.getIndexOfItem(e),n=this.queue[o],r=this.isHTML5?"_xhr":"_form";if(n)if(n.isCancel=!0,n.isUploading)n[r].abort();else{var s=[void 0,0,{}],a=function(){t._onCancelItem.apply(t,[n].concat(s)),t._onCompleteItem.apply(t,[n].concat(s))};i(a)}},n.prototype.uploadAll=function(){var e=this.getNotUploadedItems().filter(function(e){return!e.isUploading});e.length&&(f(e,function(e){return e._prepareToUploading()}),e[0].upload())},n.prototype.cancelAll=function(){var e=this.getNotUploadedItems();f(e,function(e){return e.cancel()})},n.prototype.isFile=function(e){return this.constructor.isFile(e)},n.prototype.isFileLikeObject=function(e){return this.constructor.isFileLikeObject(e)},n.prototype.isArrayLikeObject=function(e){return this.constructor.isArrayLikeObject(e)},n.prototype.getIndexOfItem=function(e){return h(e)?e:this.queue.indexOf(e)},n.prototype.getNotUploadedItems=function(){return this.queue.filter(function(e){return!e.isUploaded})},n.prototype.getReadyItems=function(){return this.queue.filter(function(e){return e.isReady&&!e.isUploading}).sort(function(e,t){return e.index-t.index})},n.prototype.destroy=function(){var e=this;f(this._directives,function(t){f(e._directives[t],function(e){e.destroy()})})},n.prototype.onAfterAddingAll=function(e){},n.prototype.onAfterAddingFile=function(e){},n.prototype.onWhenAddingFileFailed=function(e,t,o){},n.prototype.onBeforeUploadItem=function(e){},n.prototype.onProgressItem=function(e,t){},n.prototype.onProgressAll=function(e){},n.prototype.onSuccessItem=function(e,t,o,n){},n.prototype.onErrorItem=function(e,t,o,n){},n.prototype.onCancelItem=function(e,t,o,n){},n.prototype.onCompleteItem=function(e,t,o,n){},n.prototype.onTimeoutItem=function(e){},n.prototype.onCompleteAll=function(){},n.prototype._getTotalProgress=function(e){if(this.removeAfterUpload)return e||0;var t=this.getNotUploadedItems().length,o=t?this.queue.length-t:this.queue.length,n=100/this.queue.length,r=(e||0)*n/100;return Math.round(o*n+r)},n.prototype._getFilters=function(e){if(!e)return this.filters;if(m(e))return e;var t=e.match(/[^\s,]+/g);return this.filters.filter(function(e){return t.indexOf(e.name)!==-1})},n.prototype._convertFiltersToPipes=function(e){var t=this;return e.map(function(e){var o=l(t,e.fn);return o.isAsync=3===e.fn.length,o.originalFilter=e,o})},n.prototype._render=function(){t.$$phase||t.$apply()},n.prototype._folderFilter=function(e){return!(!e.size&&!e.type)},n.prototype._queueLimitFilter=function(){return this.queue.length<this.queueLimit},n.prototype._isSuccessCode=function(e){return e>=200&&e<300||304===e},n.prototype._transformResponse=function(e,t){var n=this._headersGetter(t);return f(o.defaults.transformResponse,function(t){e=t(e,n)}),e},n.prototype._parseHeaders=function(e){var t,o,n,r={};return e?(f(e.split("\n"),function(e){n=e.indexOf(":"),t=e.slice(0,n).trim().toLowerCase(),o=e.slice(n+1).trim(),t&&(r[t]=r[t]?r[t]+", "+o:o)}),r):r},n.prototype._headersGetter=function(e){return function(t){return t?e[t.toLowerCase()]||null:e}},n.prototype._xhrTransport=function(e){var t,o=this,n=e._xhr=new XMLHttpRequest;if(e.disableMultipart?t=e._file:(t=new F,f(e.formData,function(e){f(e,function(e,o){t.append(o,e)})}),t.append(e.alias,e._file,e.file.name)),"number"!=typeof e._file.size)throw new TypeError("The file specified is no longer valid");n.upload.onprogress=function(t){var n=Math.round(t.lengthComputable?100*t.loaded/t.total:0);o._onProgressItem(e,n)},n.onload=function(){var t=o._parseHeaders(n.getAllResponseHeaders()),r=o._transformResponse(n.response,t),i=o._isSuccessCode(n.status)?"Success":"Error",s="_on"+i+"Item";o[s](e,r,n.status,t),o._onCompleteItem(e,r,n.status,t)},n.onerror=function(){var t=o._parseHeaders(n.getAllResponseHeaders()),r=o._transformResponse(n.response,t);o._onErrorItem(e,r,n.status,t),o._onCompleteItem(e,r,n.status,t)},n.onabort=function(){var t=o._parseHeaders(n.getAllResponseHeaders()),r=o._transformResponse(n.response,t);o._onCancelItem(e,r,n.status,t),o._onCompleteItem(e,r,n.status,t)},n.ontimeout=function(t){var r=o._parseHeaders(n.getAllResponseHeaders()),i="Request Timeout.";o._onTimeoutItem(e),o._onCompleteItem(e,i,408,r)},n.open(e.method,e.url,!0),n.timeout=e.timeout||0,n.withCredentials=e.withCredentials,f(e.headers,function(e,t){n.setRequestHeader(t,e)}),n.send(t)},n.prototype._iframeTransport=function(e){var t=this,o=_('<form style="display: none;" />'),n=_('<iframe name="iframeTransport'+Date.now()+'">'),r=e._input,i=0,s=null,a=!1;e._form&&e._form.replaceWith(r),e._form=o,r.prop("name",e.alias),f(e.formData,function(e){f(e,function(e,t){var n=_('<input type="hidden" name="'+t+'" />');n.val(e),o.append(n)})}),o.prop({action:e.url,method:"POST",target:n.prop("name"),enctype:"multipart/form-data",encoding:"multipart/form-data"}),n.bind("load",function(){var o="",r=200;try{o=n[0].contentDocument.body.innerHTML}catch(e){r=500}if(s&&clearTimeout(s),s=null,a)return!1;var i={response:o,status:r,dummy:!0},u={},l=t._transformResponse(i.response,u);t._onSuccessItem(e,l,i.status,u),t._onCompleteItem(e,l,i.status,u)}),o.abort=function(){var i,s={status:0,dummy:!0},a={};n.unbind("load").prop("src","javascript:false;"),o.replaceWith(r),t._onCancelItem(e,i,s.status,a),t._onCompleteItem(e,i,s.status,a)},r.after(o),o.append(r).append(n),i=e.timeout||0,s=null,i&&(s=setTimeout(function(){a=!0,e.isCancel=!0,e.isUploading&&(n.unbind("load").prop("src","javascript:false;"),o.replaceWith(r));var i={},s="Request Timeout.";t._onTimeoutItem(e),t._onCompleteItem(e,s,408,i)},i)),o[0].submit()},n.prototype._onWhenAddingFileFailed=function(e,t,o){this.onWhenAddingFileFailed(e,t,o)},n.prototype._onAfterAddingFile=function(e){this.onAfterAddingFile(e)},n.prototype._onAfterAddingAll=function(e){this.onAfterAddingAll(e)},n.prototype._onBeforeUploadItem=function(e){e._onBeforeUpload(),this.onBeforeUploadItem(e)},n.prototype._onProgressItem=function(e,t){var o=this._getTotalProgress(t);this.progress=o,e._onProgress(t),this.onProgressItem(e,t),this.onProgressAll(o),this._render()},n.prototype._onSuccessItem=function(e,t,o,n){e._onSuccess(t,o,n),this.onSuccessItem(e,t,o,n)},n.prototype._onErrorItem=function(e,t,o,n){e._onError(t,o,n),this.onErrorItem(e,t,o,n)},n.prototype._onCancelItem=function(e,t,o,n){e._onCancel(t,o,n),this.onCancelItem(e,t,o,n)},n.prototype._onCompleteItem=function(e,t,o,n){e._onComplete(t,o,n),this.onCompleteItem(e,t,o,n);var r=this.getReadyItems()[0];return this.isUploading=!1,y(r)?void r.upload():(this.onCompleteAll(),this.progress=this._getTotalProgress(),void this._render())},n.prototype._onTimeoutItem=function(e){e._onTimeout(),this.onTimeoutItem(e)},n.isFile=function(e){return b&&e instanceof b},n.isFileLikeObject=function(e){return e instanceof a},n.isArrayLikeObject=function(e){return d(e)&&"length"in e},n.inherit=function(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,e.super_=t},n}();return O.prototype.isHTML5=!(!b||!F),O.isHTML5=O.prototype.isHTML5,O}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){var o=[],n=!0,r=!1,i=void 0;try{for(var s,a=e[Symbol.iterator]();!(n=(s=a.next()).done)&&(o.push(s.value),!t||o.length!==t);n=!0);}catch(e){r=!0,i=e}finally{try{!n&&a.return&&a.return()}finally{if(r)throw i}}return o}return function(t,o){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,o);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();t.default=i;var a=o(1),u=(n(a),angular),l=u.bind,p=u.copy,c=u.extend,f=u.forEach,d=u.isObject,h=u.isNumber,y=u.isDefined,m=u.isArray,v=u.isUndefined,_=u.element;i.$inject=["fileUploaderOptions","$rootScope","$http","$window","$timeout","FileLikeObject","FileItem","Pipeline"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(){return function(){function e(t){r(this,e);var o=l(t),n=o?t.value:t,i=p(n)?"FakePath":"Object",s="_createFrom"+i;this[s](n,t)}return e.prototype._createFromFakePath=function(e,t){this.lastModifiedDate=null,this.size=null,this.type="like/"+e.slice(e.lastIndexOf(".")+1).toLowerCase(),this.name=e.slice(e.lastIndexOf("/")+e.lastIndexOf("\\")+2),this.input=t},e.prototype._createFromObject=function(e){this.lastModifiedDate=u(e.lastModifiedDate),this.size=e.size,this.type=e.type,this.name=e.name,this.input=e.input},e}()}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var s=o(1),a=(n(s),angular),u=a.copy,l=a.isElement,p=a.isString},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){return function(){function o(e,n,i){r(this,o);var s=!!n.input,a=s?p(n.input):null,c=s?null:n;l(this,{url:e.url,alias:e.alias,headers:u(e.headers),formData:u(e.formData),removeAfterUpload:e.removeAfterUpload,withCredentials:e.withCredentials,disableMultipart:e.disableMultipart,method:e.method,timeout:e.timeout},i,{uploader:e,file:new t(n),isReady:!1,isUploading:!1,isUploaded:!1,isSuccess:!1,isCancel:!1,isError:!1,progress:0,index:null,_file:c,_input:a}),a&&this._replaceNode(a)}return o.prototype.upload=function(){try{this.uploader.uploadItem(this)}catch(t){var e=t.name+":"+t.message;this.uploader._onCompleteItem(this,e,t.code,[]),this.uploader._onErrorItem(this,e,t.code,[])}},o.prototype.cancel=function(){this.uploader.cancelItem(this)},o.prototype.remove=function(){this.uploader.removeFromQueue(this)},o.prototype.onBeforeUpload=function(){},o.prototype.onProgress=function(e){},o.prototype.onSuccess=function(e,t,o){},o.prototype.onError=function(e,t,o){},o.prototype.onCancel=function(e,t,o){},o.prototype.onComplete=function(e,t,o){},o.prototype.onTimeout=function(){},o.prototype._onBeforeUpload=function(){this.isReady=!0,this.isUploading=!1,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!1,this.isError=!1,this.progress=0,this.onBeforeUpload()},o.prototype._onProgress=function(e){this.progress=e,this.onProgress(e)},o.prototype._onSuccess=function(e,t,o){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!0,this.isCancel=!1,this.isError=!1,this.progress=100,this.index=null,this.onSuccess(e,t,o)},o.prototype._onError=function(e,t,o){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!1,this.isCancel=!1,this.isError=!0,this.progress=0,this.index=null,this.onError(e,t,o)},o.prototype._onCancel=function(e,t,o){this.isReady=!1,this.isUploading=!1,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!0,this.isError=!1,this.progress=0,this.index=null,this.onCancel(e,t,o)},o.prototype._onComplete=function(e,t,o){this.onComplete(e,t,o),this.removeAfterUpload&&this.remove()},o.prototype._onTimeout=function(){this.isReady=!1,this.isUploading=!1,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!1,this.isError=!0,this.progress=0,this.index=null,this.onTimeout()},o.prototype._destroy=function(){this._input&&this._input.remove(),this._form&&this._form.remove(),delete this._form,delete this._input},o.prototype._prepareToUploading=function(){this.index=this.index||++this.uploader._nextIndex,this.isReady=!0},o.prototype._replaceNode=function(t){var o=e(t.clone())(t.scope());o.prop("value",null),t.css("display","none"),t.after(o)},o}()}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var s=o(1),a=(n(s),angular),u=a.copy,l=a.extend,p=a.element;a.isElement;i.$inject=["$compile","FileLikeObject"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(){var e=function(){function e(t){r(this,e),u(this,t),this.uploader._directives[this.prop].push(this),this._saveLinks(),this.bind()}return e.prototype.bind=function(){for(var e in this.events){var t=this.events[e];this.element.bind(e,this[t])}},e.prototype.unbind=function(){for(var e in this.events)this.element.unbind(e,this.events[e])},e.prototype.destroy=function(){var e=this.uploader._directives[this.prop].indexOf(this);this.uploader._directives[this.prop].splice(e,1),this.unbind()},e.prototype._saveLinks=function(){for(var e in this.events){var t=this.events[e];this[t]=this[t].bind(this)}},e}();return e.prototype.events={},e}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var s=o(1),a=(n(s),angular),u=a.extend},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t){return function(t){function o(e){r(this,o);var n=p(e,{events:{$destroy:"destroy",change:"onChange"},prop:"select"}),s=i(this,t.call(this,n));return s.uploader.isHTML5||s.element.removeAttr("multiple"),s.element.prop("value",null),s}return s(o,t),o.prototype.getOptions=function(){},o.prototype.getFilters=function(){},o.prototype.isEmptyAfterSelection=function(){return!!this.element.attr("multiple")},o.prototype.onChange=function(){var t=this.uploader.isHTML5?this.element[0].files:this.element[0],o=this.getOptions(),n=this.getFilters();this.uploader.isHTML5||this.destroy(),this.uploader.addToQueue(t,o,n),this.isEmptyAfterSelection()&&(this.element.prop("value",null),this.element.replaceWith(e(this.element.clone())(this.scope)))},o}(t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var u=o(1),l=(n(u),angular),p=l.extend;a.$inject=["$compile","FileDirective"]},function(e,t){"use strict";function o(e){if(Array.isArray(e)){for(var t=0,o=Array(e.length);t<e.length;t++)o[t]=e[t];return o}return Array.from(e)}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e){return function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];n(this,t),this.pipes=e}return t.prototype.next=function(t){var n=this.pipes.shift();if(a(n))return void this.onSuccessful.apply(this,o(t));var r=new Error("The filter has not passed");if(r.pipe=n,r.args=t,n.isAsync){var i=e.defer(),u=s(this,this.next,t),l=s(this,this.onThrown,r);i.promise.then(u,l),n.apply(void 0,o(t).concat([i]))}else{var p=Boolean(n.apply(void 0,o(t)));p?this.next(t):this.onThrown(r)}},t.prototype.exec=function(){for(var e=arguments.length,t=Array(e),o=0;o<e;o++)t[o]=arguments[o];this.next(t)},t.prototype.onThrown=function(e){},t.prototype.onSuccessful=function(){},t}()}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=angular,s=i.bind,a=i.isUndefined;r.$inject=["$q"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e){return function(e){function t(o){r(this,t);var n=p(o,{events:{$destroy:"destroy",drop:"onDrop",dragover:"onDragOver",dragleave:"onDragLeave"},prop:"drop"});return i(this,e.call(this,n))}return s(t,e),t.prototype.getOptions=function(){},t.prototype.getFilters=function(){},t.prototype.onDrop=function(e){var t=this._getTransfer(e);if(t){var o=this.getOptions(),n=this.getFilters();this._preventAndStop(e),c(this.uploader._directives.over,this._removeOverClass,this),this.uploader.addToQueue(t.files,o,n)}},t.prototype.onDragOver=function(e){var t=this._getTransfer(e);this._haveFiles(t.types)&&(t.dropEffect="copy",this._preventAndStop(e),c(this.uploader._directives.over,this._addOverClass,this))},t.prototype.onDragLeave=function(e){e.currentTarget!==this.element[0]&&(this._preventAndStop(e),c(this.uploader._directives.over,this._removeOverClass,this))},t.prototype._getTransfer=function(e){return e.dataTransfer?e.dataTransfer:e.originalEvent.dataTransfer},t.prototype._preventAndStop=function(e){e.preventDefault(),e.stopPropagation()},t.prototype._haveFiles=function(e){return!!e&&(e.indexOf?e.indexOf("Files")!==-1:!!e.contains&&e.contains("Files"))},t.prototype._addOverClass=function(e){e.addOverClass()},t.prototype._removeOverClass=function(e){e.removeOverClass()},t}(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var u=o(1),l=(n(u),angular),p=l.extend,c=l.forEach;a.$inject=["FileDirective"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e){return function(e){function t(o){r(this,t);var n=p(o,{events:{$destroy:"destroy"},prop:"over",overClass:"nv-file-over"});return i(this,e.call(this,n))}return s(t,e),t.prototype.addOverClass=function(){this.element.addClass(this.getOverClass())},t.prototype.removeOverClass=function(){this.element.removeClass(this.getOverClass())},t.prototype.getOverClass=function(){return this.overClass},t}(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var u=o(1),l=(n(u),angular),p=l.extend;a.$inject=["FileDirective"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t,o){return{link:function(n,r,i){var s=n.$eval(i.uploader);if(!(s instanceof t))throw new TypeError('"Uploader" must be an instance of FileUploader');var a=new o({uploader:s,element:r,scope:n});a.getOptions=e(i.options).bind(a,n),a.getFilters=function(){return i.filters}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=o(1);n(i);r.$inject=["$parse","FileUploader","FileSelect"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t,o){return{link:function(n,r,i){var s=n.$eval(i.uploader);if(!(s instanceof t))throw new TypeError('"Uploader" must be an instance of FileUploader');if(s.isHTML5){var a=new o({uploader:s,element:r});a.getOptions=e(i.options).bind(a,n),a.getFilters=function(){return i.filters}}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=o(1);n(i);r.$inject=["$parse","FileUploader","FileDrop"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function r(e,t){return{link:function(o,n,r){var i=o.$eval(r.uploader);if(!(i instanceof e))throw new TypeError('"Uploader" must be an instance of FileUploader');var s=new t({uploader:i,element:n});s.getOverClass=function(){return r.overClass||s.overClass}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=o(1);n(i);r.$inject=["FileUploader","FileOver"]}])});
+//# sourceMappingURL=angular-file-upload.min.js.map
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js.map b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js.map
new file mode 100644
index 0000000000..8e14f1a04a
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/dist/angular-file-upload.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/universalModuleDefinition?5ca6","webpack:///angular-file-upload.min.js","webpack:///webpack/bootstrap 8e3763ddc3eea8ac4eff?72bf","webpack:///./src/index.js?9552","webpack:///./src/config.json?1c25","webpack:///./src/values/options.js?b00e","webpack:///./src/services/FileUploader.js?148d","webpack:///./src/services/FileLikeObject.js?b90b","webpack:///./src/services/FileItem.js?e529","webpack:///./src/services/FileDirective.js?4dd3","webpack:///./src/services/FileSelect.js?5a11","webpack:///./src/services/Pipeline.js?322f","webpack:///./src/services/FileDrop.js?e446","webpack:///./src/services/FileOver.js?26c9","webpack:///./src/directives/FileSelect.js?8405","webpack:///./src/directives/FileDrop.js?82da","webpack:///./src/directives/FileOver.js?6161"],"names":["root","factory","exports","module","define","amd","this","modules","__webpack_require__","moduleId","installedModules","id","loaded","call","m","c","p","_interopRequireDefault","obj","__esModule","default","_config","_config2","_options","_options2","_FileUploader","_FileUploader2","_FileLikeObject","_FileLikeObject2","_FileItem","_FileItem2","_FileDirective","_FileDirective2","_FileSelect","_FileSelect2","_Pipeline","_Pipeline2","_FileDrop","_FileDrop2","_FileOver","_FileOver2","_FileSelect3","_FileSelect4","_FileDrop3","_FileDrop4","_FileOver3","_FileOver4","angular","CONFIG","name","value","options","serviceFileUploader","serviceFileLikeObject","serviceFileItem","serviceFileDirective","serviceFileSelect","serviceFileDrop","serviceFileOver","servicePipeline","directive","directiveFileSelect","directiveFileDrop","directiveFileOver","run","FileUploader","FileLikeObject","FileItem","FileDirective","FileSelect","FileDrop","FileOver","Pipeline","Object","defineProperty","url","alias","headers","queue","progress","autoUpload","removeAfterUpload","method","filters","formData","queueLimit","Number","MAX_VALUE","withCredentials","disableMultipart","_classCallCheck","instance","Constructor","TypeError","__identity","fileUploaderOptions","$rootScope","$http","$window","$timeout","File","FormData","settings","copy","extend","isUploading","_nextIndex","_directives","select","drop","over","unshift","fn","_queueLimitFilter","_folderFilter","prototype","addToQueue","files","_this","incomingQueue","isArrayLikeObject","Array","slice","arrayOfFilters","_getFilters","count","length","addedFileItems","next","something","shift","isUndefined","done","fileLikeObject","isFile","pipes","_convertFiltersToPipes","pipeline","onThrown","err","originalFilter","pipe","_err$args","_slicedToArray","args","_onWhenAddingFileFailed","onSuccessful","fileItem","push","_onAfterAddingFile","exec","_onAfterAddingAll","_getTotalProgress","_render","uploadAll","removeFromQueue","index","getIndexOfItem","item","cancel","splice","_destroy","clearQueue","remove","uploadItem","transport","isHTML5","_prepareToUploading","_onBeforeUploadItem","isCancel","cancelItem","_this2","prop","abort","dummy","undefined","onNextTick","_onCancelItem","apply","concat","_onCompleteItem","items","getNotUploadedItems","filter","forEach","upload","cancelAll","constructor","isFileLikeObject","isNumber","indexOf","isUploaded","getReadyItems","isReady","sort","item1","item2","destroy","_this3","key","object","onAfterAddingAll","fileItems","onAfterAddingFile","onWhenAddingFileFailed","onBeforeUploadItem","onProgressItem","onProgressAll","onSuccessItem","response","status","onErrorItem","onCancelItem","onCompleteItem","onTimeoutItem","onCompleteAll","notUploaded","uploaded","ratio","current","Math","round","isArray","names","match","_this4","map","bind","isAsync","$$phase","$apply","size","type","_isSuccessCode","_transformResponse","headersGetter","_headersGetter","defaults","transformResponse","transformFn","_parseHeaders","val","i","parsed","split","line","trim","toLowerCase","parsedHeaders","_xhrTransport","sendable","_this5","xhr","_xhr","XMLHttpRequest","_file","append","file","onprogress","event","lengthComputable","total","_onProgressItem","onload","getAllResponseHeaders","gist","onerror","_onErrorItem","onabort","ontimeout","e","_onTimeoutItem","open","timeout","setRequestHeader","send","_iframeTransport","_this6","form","element","iframe","Date","now","input","_input","timer","isTimedOut","_form","replaceWith","element_","action","target","enctype","encoding","html","contentDocument","body","innerHTML","clearTimeout","_onSuccessItem","unbind","after","setTimeout","submit","_onBeforeUpload","_onProgress","_onSuccess","_onError","_onCancel","_onComplete","nextItem","isDefined","_onTimeout","isObject","inherit","source","create","super_","sliceIterator","arr","_arr","_n","_d","_e","_s","_i","Symbol","iterator","_angular","$inject","fileOrInput","isInput","isElement","fakePathOrObject","postfix","isString","_createFromFakePath","path","lastModifiedDate","lastIndexOf","_createFromObject","$compile","uploader","some","isSuccess","isError","_replaceNode","message","code","onBeforeUpload","onProgress","onSuccess","onError","onCancel","onComplete","onTimeout","clone","scope","css","_saveLinks","events","_possibleConstructorReturn","self","ReferenceError","_inherits","subClass","superClass","enumerable","writable","configurable","setPrototypeOf","__proto__","extendedOptions","$destroy","change","removeAttr","getOptions","getFilters","isEmptyAfterSelection","attr","onChange","_toConsumableArray","arr2","from","$q","arguments","Error","deferred","defer","onFulfilled","onRejected","promise","then","isDone","Boolean","_len","_key","dragover","dragleave","onDrop","transfer","_getTransfer","_preventAndStop","_removeOverClass","onDragOver","_haveFiles","types","dropEffect","_addOverClass","onDragLeave","currentTarget","dataTransfer","originalEvent","preventDefault","stopPropagation","contains","addOverClass","removeOverClass","overClass","addClass","getOverClass","removeClass","$parse","link","attributes","$eval"],"mappings":"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","file":"angular-file-upload.min.js","sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"angular-file-upload\"] = factory();\n\telse\n\t\troot[\"angular-file-upload\"] = factory();\n})(this, function() {\nreturn \n\n\n// WEBPACK FOOTER //\n// webpack/universalModuleDefinition","(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"angular-file-upload\"] = factory();\n\telse\n\t\troot[\"angular-file-upload\"] = factory();\n})(this, function() {\nreturn /******/ (function(modules) { // webpackBootstrap\n/******/ \t// The module cache\n/******/ \tvar installedModules = {};\n/******/\n/******/ \t// The require function\n/******/ \tfunction __webpack_require__(moduleId) {\n/******/\n/******/ \t\t// Check if module is in cache\n/******/ \t\tif(installedModules[moduleId])\n/******/ \t\t\treturn installedModules[moduleId].exports;\n/******/\n/******/ \t\t// Create a new module (and put it into the cache)\n/******/ \t\tvar module = installedModules[moduleId] = {\n/******/ \t\t\texports: {},\n/******/ \t\t\tid: moduleId,\n/******/ \t\t\tloaded: false\n/******/ \t\t};\n/******/\n/******/ \t\t// Execute the module function\n/******/ \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n/******/\n/******/ \t\t// Flag the module as loaded\n/******/ \t\tmodule.loaded = true;\n/******/\n/******/ \t\t// Return the exports of the module\n/******/ \t\treturn module.exports;\n/******/ \t}\n/******/\n/******/\n/******/ \t// expose the modules object (__webpack_modules__)\n/******/ \t__webpack_require__.m = modules;\n/******/\n/******/ \t// expose the module cache\n/******/ \t__webpack_require__.c = installedModules;\n/******/\n/******/ \t// __webpack_public_path__\n/******/ \t__webpack_require__.p = \"\";\n/******/\n/******/ \t// Load entry module and return exports\n/******/ \treturn __webpack_require__(0);\n/******/ })\n/************************************************************************/\n/******/ ([\n/* 0 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tvar _options = __webpack_require__(2);\n\t\n\tvar _options2 = _interopRequireDefault(_options);\n\t\n\tvar _FileUploader = __webpack_require__(3);\n\t\n\tvar _FileUploader2 = _interopRequireDefault(_FileUploader);\n\t\n\tvar _FileLikeObject = __webpack_require__(4);\n\t\n\tvar _FileLikeObject2 = _interopRequireDefault(_FileLikeObject);\n\t\n\tvar _FileItem = __webpack_require__(5);\n\t\n\tvar _FileItem2 = _interopRequireDefault(_FileItem);\n\t\n\tvar _FileDirective = __webpack_require__(6);\n\t\n\tvar _FileDirective2 = _interopRequireDefault(_FileDirective);\n\t\n\tvar _FileSelect = __webpack_require__(7);\n\t\n\tvar _FileSelect2 = _interopRequireDefault(_FileSelect);\n\t\n\tvar _Pipeline = __webpack_require__(8);\n\t\n\tvar _Pipeline2 = _interopRequireDefault(_Pipeline);\n\t\n\tvar _FileDrop = __webpack_require__(9);\n\t\n\tvar _FileDrop2 = _interopRequireDefault(_FileDrop);\n\t\n\tvar _FileOver = __webpack_require__(10);\n\t\n\tvar _FileOver2 = _interopRequireDefault(_FileOver);\n\t\n\tvar _FileSelect3 = __webpack_require__(11);\n\t\n\tvar _FileSelect4 = _interopRequireDefault(_FileSelect3);\n\t\n\tvar _FileDrop3 = __webpack_require__(12);\n\t\n\tvar _FileDrop4 = _interopRequireDefault(_FileDrop3);\n\t\n\tvar _FileOver3 = __webpack_require__(13);\n\t\n\tvar _FileOver4 = _interopRequireDefault(_FileOver3);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tangular.module(_config2.default.name, []).value('fileUploaderOptions', _options2.default).factory('FileUploader', _FileUploader2.default).factory('FileLikeObject', _FileLikeObject2.default).factory('FileItem', _FileItem2.default).factory('FileDirective', _FileDirective2.default).factory('FileSelect', _FileSelect2.default).factory('FileDrop', _FileDrop2.default).factory('FileOver', _FileOver2.default).factory('Pipeline', _Pipeline2.default).directive('nvFileSelect', _FileSelect4.default).directive('nvFileDrop', _FileDrop4.default).directive('nvFileOver', _FileOver4.default).run(['FileUploader', 'FileLikeObject', 'FileItem', 'FileDirective', 'FileSelect', 'FileDrop', 'FileOver', 'Pipeline', function (FileUploader, FileLikeObject, FileItem, FileDirective, FileSelect, FileDrop, FileOver, Pipeline) {\n\t // only for compatibility\n\t FileUploader.FileLikeObject = FileLikeObject;\n\t FileUploader.FileItem = FileItem;\n\t FileUploader.FileDirective = FileDirective;\n\t FileUploader.FileSelect = FileSelect;\n\t FileUploader.FileDrop = FileDrop;\n\t FileUploader.FileOver = FileOver;\n\t FileUploader.Pipeline = Pipeline;\n\t}]);\n\n/***/ }),\n/* 1 */\n/***/ (function(module, exports) {\n\n\tmodule.exports = {\"name\":\"angularFileUpload\"}\n\n/***/ }),\n/* 2 */\n/***/ (function(module, exports) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = {\n\t url: '/',\n\t alias: 'file',\n\t headers: {},\n\t queue: [],\n\t progress: 0,\n\t autoUpload: false,\n\t removeAfterUpload: false,\n\t method: 'POST',\n\t filters: [],\n\t formData: [],\n\t queueLimit: Number.MAX_VALUE,\n\t withCredentials: false,\n\t disableMultipart: false\n\t};\n\n/***/ }),\n/* 3 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\t\n\tvar _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i[\"return\"]) _i[\"return\"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError(\"Invalid attempt to destructure non-iterable instance\"); } }; }();\n\t\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tvar _angular = angular,\n\t bind = _angular.bind,\n\t copy = _angular.copy,\n\t extend = _angular.extend,\n\t forEach = _angular.forEach,\n\t isObject = _angular.isObject,\n\t isNumber = _angular.isNumber,\n\t isDefined = _angular.isDefined,\n\t isArray = _angular.isArray,\n\t isUndefined = _angular.isUndefined,\n\t element = _angular.element;\n\tfunction __identity(fileUploaderOptions, $rootScope, $http, $window, $timeout, FileLikeObject, FileItem, Pipeline) {\n\t var File = $window.File,\n\t FormData = $window.FormData;\n\t\n\t var FileUploader = function () {\n\t /**********************\r\n\t * PUBLIC\r\n\t **********************/\n\t /**\r\n\t * Creates an instance of FileUploader\r\n\t * @param {Object} [options]\r\n\t * @constructor\r\n\t */\n\t function FileUploader(options) {\n\t _classCallCheck(this, FileUploader);\n\t\n\t var settings = copy(fileUploaderOptions);\n\t\n\t extend(this, settings, options, {\n\t isUploading: false,\n\t _nextIndex: 0,\n\t _directives: { select: [], drop: [], over: [] }\n\t });\n\t\n\t // add default filters\n\t this.filters.unshift({ name: 'queueLimit', fn: this._queueLimitFilter });\n\t this.filters.unshift({ name: 'folder', fn: this._folderFilter });\n\t }\n\t /**\r\n\t * Adds items to the queue\r\n\t * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files\r\n\t * @param {Object} [options]\r\n\t * @param {Array<Function>|String} filters\r\n\t */\n\t\n\t\n\t FileUploader.prototype.addToQueue = function addToQueue(files, options, filters) {\n\t var _this = this;\n\t\n\t var incomingQueue = this.isArrayLikeObject(files) ? Array.prototype.slice.call(files) : [files];\n\t var arrayOfFilters = this._getFilters(filters);\n\t var count = this.queue.length;\n\t var addedFileItems = [];\n\t\n\t var next = function next() {\n\t var something = incomingQueue.shift();\n\t\n\t if (isUndefined(something)) {\n\t return done();\n\t }\n\t\n\t var fileLikeObject = _this.isFile(something) ? something : new FileLikeObject(something);\n\t var pipes = _this._convertFiltersToPipes(arrayOfFilters);\n\t var pipeline = new Pipeline(pipes);\n\t var onThrown = function onThrown(err) {\n\t var originalFilter = err.pipe.originalFilter;\n\t\n\t var _err$args = _slicedToArray(err.args, 2),\n\t fileLikeObject = _err$args[0],\n\t options = _err$args[1];\n\t\n\t _this._onWhenAddingFileFailed(fileLikeObject, originalFilter, options);\n\t next();\n\t };\n\t var onSuccessful = function onSuccessful(fileLikeObject, options) {\n\t var fileItem = new FileItem(_this, fileLikeObject, options);\n\t addedFileItems.push(fileItem);\n\t _this.queue.push(fileItem);\n\t _this._onAfterAddingFile(fileItem);\n\t next();\n\t };\n\t pipeline.onThrown = onThrown;\n\t pipeline.onSuccessful = onSuccessful;\n\t pipeline.exec(fileLikeObject, options);\n\t };\n\t\n\t var done = function done() {\n\t if (_this.queue.length !== count) {\n\t _this._onAfterAddingAll(addedFileItems);\n\t _this.progress = _this._getTotalProgress();\n\t }\n\t\n\t _this._render();\n\t if (_this.autoUpload) _this.uploadAll();\n\t };\n\t\n\t next();\n\t };\n\t /**\r\n\t * Remove items from the queue. Remove last: index = -1\r\n\t * @param {FileItem|Number} value\r\n\t */\n\t\n\t\n\t FileUploader.prototype.removeFromQueue = function removeFromQueue(value) {\n\t var index = this.getIndexOfItem(value);\n\t var item = this.queue[index];\n\t if (item.isUploading) item.cancel();\n\t this.queue.splice(index, 1);\n\t item._destroy();\n\t this.progress = this._getTotalProgress();\n\t };\n\t /**\r\n\t * Clears the queue\r\n\t */\n\t\n\t\n\t FileUploader.prototype.clearQueue = function clearQueue() {\n\t while (this.queue.length) {\n\t this.queue[0].remove();\n\t }\n\t this.progress = 0;\n\t };\n\t /**\r\n\t * Uploads a item from the queue\r\n\t * @param {FileItem|Number} value\r\n\t */\n\t\n\t\n\t FileUploader.prototype.uploadItem = function uploadItem(value) {\n\t var index = this.getIndexOfItem(value);\n\t var item = this.queue[index];\n\t var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';\n\t\n\t item._prepareToUploading();\n\t if (this.isUploading) return;\n\t\n\t this._onBeforeUploadItem(item);\n\t if (item.isCancel) return;\n\t\n\t item.isUploading = true;\n\t this.isUploading = true;\n\t this[transport](item);\n\t this._render();\n\t };\n\t /**\r\n\t * Cancels uploading of item from the queue\r\n\t * @param {FileItem|Number} value\r\n\t */\n\t\n\t\n\t FileUploader.prototype.cancelItem = function cancelItem(value) {\n\t var _this2 = this;\n\t\n\t var index = this.getIndexOfItem(value);\n\t var item = this.queue[index];\n\t var prop = this.isHTML5 ? '_xhr' : '_form';\n\t if (!item) return;\n\t item.isCancel = true;\n\t if (item.isUploading) {\n\t // It will call this._onCancelItem() & this._onCompleteItem() asynchronously\n\t item[prop].abort();\n\t } else {\n\t var dummy = [undefined, 0, {}];\n\t var onNextTick = function onNextTick() {\n\t _this2._onCancelItem.apply(_this2, [item].concat(dummy));\n\t _this2._onCompleteItem.apply(_this2, [item].concat(dummy));\n\t };\n\t $timeout(onNextTick); // Trigger callbacks asynchronously (setImmediate emulation)\n\t }\n\t };\n\t /**\r\n\t * Uploads all not uploaded items of queue\r\n\t */\n\t\n\t\n\t FileUploader.prototype.uploadAll = function uploadAll() {\n\t var items = this.getNotUploadedItems().filter(function (item) {\n\t return !item.isUploading;\n\t });\n\t if (!items.length) return;\n\t\n\t forEach(items, function (item) {\n\t return item._prepareToUploading();\n\t });\n\t items[0].upload();\n\t };\n\t /**\r\n\t * Cancels all uploads\r\n\t */\n\t\n\t\n\t FileUploader.prototype.cancelAll = function cancelAll() {\n\t var items = this.getNotUploadedItems();\n\t forEach(items, function (item) {\n\t return item.cancel();\n\t });\n\t };\n\t /**\r\n\t * Returns \"true\" if value an instance of File\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype.isFile = function isFile(value) {\n\t return this.constructor.isFile(value);\n\t };\n\t /**\r\n\t * Returns \"true\" if value an instance of FileLikeObject\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype.isFileLikeObject = function isFileLikeObject(value) {\n\t return this.constructor.isFileLikeObject(value);\n\t };\n\t /**\r\n\t * Returns \"true\" if value is array like object\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t */\n\t\n\t\n\t FileUploader.prototype.isArrayLikeObject = function isArrayLikeObject(value) {\n\t return this.constructor.isArrayLikeObject(value);\n\t };\n\t /**\r\n\t * Returns a index of item from the queue\r\n\t * @param {Item|Number} value\r\n\t * @returns {Number}\r\n\t */\n\t\n\t\n\t FileUploader.prototype.getIndexOfItem = function getIndexOfItem(value) {\n\t return isNumber(value) ? value : this.queue.indexOf(value);\n\t };\n\t /**\r\n\t * Returns not uploaded items\r\n\t * @returns {Array}\r\n\t */\n\t\n\t\n\t FileUploader.prototype.getNotUploadedItems = function getNotUploadedItems() {\n\t return this.queue.filter(function (item) {\n\t return !item.isUploaded;\n\t });\n\t };\n\t /**\r\n\t * Returns items ready for upload\r\n\t * @returns {Array}\r\n\t */\n\t\n\t\n\t FileUploader.prototype.getReadyItems = function getReadyItems() {\n\t return this.queue.filter(function (item) {\n\t return item.isReady && !item.isUploading;\n\t }).sort(function (item1, item2) {\n\t return item1.index - item2.index;\n\t });\n\t };\n\t /**\r\n\t * Destroys instance of FileUploader\r\n\t */\n\t\n\t\n\t FileUploader.prototype.destroy = function destroy() {\n\t var _this3 = this;\n\t\n\t forEach(this._directives, function (key) {\n\t forEach(_this3._directives[key], function (object) {\n\t object.destroy();\n\t });\n\t });\n\t };\n\t /**\r\n\t * Callback\r\n\t * @param {Array} fileItems\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onAfterAddingAll = function onAfterAddingAll(fileItems) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} fileItem\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onAfterAddingFile = function onAfterAddingFile(fileItem) {};\n\t /**\r\n\t * Callback\r\n\t * @param {File|Object} item\r\n\t * @param {Object} filter\r\n\t * @param {Object} options\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onWhenAddingFileFailed = function onWhenAddingFileFailed(item, filter, options) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} fileItem\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onBeforeUploadItem = function onBeforeUploadItem(fileItem) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} fileItem\r\n\t * @param {Number} progress\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onProgressItem = function onProgressItem(fileItem, progress) {};\n\t /**\r\n\t * Callback\r\n\t * @param {Number} progress\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onProgressAll = function onProgressAll(progress) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onSuccessItem = function onSuccessItem(item, response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onErrorItem = function onErrorItem(item, response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onCancelItem = function onCancelItem(item, response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onCompleteItem = function onCompleteItem(item, response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {FileItem} item\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onTimeoutItem = function onTimeoutItem(item) {};\n\t /**\r\n\t * Callback\r\n\t */\n\t\n\t\n\t FileUploader.prototype.onCompleteAll = function onCompleteAll() {};\n\t /**********************\r\n\t * PRIVATE\r\n\t **********************/\n\t /**\r\n\t * Returns the total progress\r\n\t * @param {Number} [value]\r\n\t * @returns {Number}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._getTotalProgress = function _getTotalProgress(value) {\n\t if (this.removeAfterUpload) return value || 0;\n\t\n\t var notUploaded = this.getNotUploadedItems().length;\n\t var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;\n\t var ratio = 100 / this.queue.length;\n\t var current = (value || 0) * ratio / 100;\n\t\n\t return Math.round(uploaded * ratio + current);\n\t };\n\t /**\r\n\t * Returns array of filters\r\n\t * @param {Array<Function>|String} filters\r\n\t * @returns {Array<Function>}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._getFilters = function _getFilters(filters) {\n\t if (!filters) return this.filters;\n\t if (isArray(filters)) return filters;\n\t var names = filters.match(/[^\\s,]+/g);\n\t return this.filters.filter(function (filter) {\n\t return names.indexOf(filter.name) !== -1;\n\t });\n\t };\n\t /**\r\n\t * @param {Array<Function>} filters\r\n\t * @returns {Array<Function>}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._convertFiltersToPipes = function _convertFiltersToPipes(filters) {\n\t var _this4 = this;\n\t\n\t return filters.map(function (filter) {\n\t var fn = bind(_this4, filter.fn);\n\t fn.isAsync = filter.fn.length === 3;\n\t fn.originalFilter = filter;\n\t return fn;\n\t });\n\t };\n\t /**\r\n\t * Updates html\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._render = function _render() {\n\t if (!$rootScope.$$phase) $rootScope.$apply();\n\t };\n\t /**\r\n\t * Returns \"true\" if item is a file (not folder)\r\n\t * @param {File|FileLikeObject} item\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._folderFilter = function _folderFilter(item) {\n\t return !!(item.size || item.type);\n\t };\n\t /**\r\n\t * Returns \"true\" if the limit has not been reached\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._queueLimitFilter = function _queueLimitFilter() {\n\t return this.queue.length < this.queueLimit;\n\t };\n\t /**\r\n\t * Checks whether upload successful\r\n\t * @param {Number} status\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._isSuccessCode = function _isSuccessCode(status) {\n\t return status >= 200 && status < 300 || status === 304;\n\t };\n\t /**\r\n\t * Transforms the server response\r\n\t * @param {*} response\r\n\t * @param {Object} headers\r\n\t * @returns {*}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._transformResponse = function _transformResponse(response, headers) {\n\t var headersGetter = this._headersGetter(headers);\n\t forEach($http.defaults.transformResponse, function (transformFn) {\n\t response = transformFn(response, headersGetter);\n\t });\n\t return response;\n\t };\n\t /**\r\n\t * Parsed response headers\r\n\t * @param headers\r\n\t * @returns {Object}\r\n\t * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._parseHeaders = function _parseHeaders(headers) {\n\t var parsed = {},\n\t key,\n\t val,\n\t i;\n\t\n\t if (!headers) return parsed;\n\t\n\t forEach(headers.split('\\n'), function (line) {\n\t i = line.indexOf(':');\n\t key = line.slice(0, i).trim().toLowerCase();\n\t val = line.slice(i + 1).trim();\n\t\n\t if (key) {\n\t parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;\n\t }\n\t });\n\t\n\t return parsed;\n\t };\n\t /**\r\n\t * Returns function that returns headers\r\n\t * @param {Object} parsedHeaders\r\n\t * @returns {Function}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._headersGetter = function _headersGetter(parsedHeaders) {\n\t return function (name) {\n\t if (name) {\n\t return parsedHeaders[name.toLowerCase()] || null;\n\t }\n\t return parsedHeaders;\n\t };\n\t };\n\t /**\r\n\t * The XMLHttpRequest transport\r\n\t * @param {FileItem} item\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._xhrTransport = function _xhrTransport(item) {\n\t var _this5 = this;\n\t\n\t var xhr = item._xhr = new XMLHttpRequest();\n\t var sendable;\n\t\n\t if (!item.disableMultipart) {\n\t sendable = new FormData();\n\t forEach(item.formData, function (obj) {\n\t forEach(obj, function (value, key) {\n\t sendable.append(key, value);\n\t });\n\t });\n\t\n\t sendable.append(item.alias, item._file, item.file.name);\n\t } else {\n\t sendable = item._file;\n\t }\n\t\n\t if (typeof item._file.size != 'number') {\n\t throw new TypeError('The file specified is no longer valid');\n\t }\n\t\n\t xhr.upload.onprogress = function (event) {\n\t var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);\n\t _this5._onProgressItem(item, progress);\n\t };\n\t\n\t xhr.onload = function () {\n\t var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());\n\t var response = _this5._transformResponse(xhr.response, headers);\n\t var gist = _this5._isSuccessCode(xhr.status) ? 'Success' : 'Error';\n\t var method = '_on' + gist + 'Item';\n\t _this5[method](item, response, xhr.status, headers);\n\t _this5._onCompleteItem(item, response, xhr.status, headers);\n\t };\n\t\n\t xhr.onerror = function () {\n\t var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());\n\t var response = _this5._transformResponse(xhr.response, headers);\n\t _this5._onErrorItem(item, response, xhr.status, headers);\n\t _this5._onCompleteItem(item, response, xhr.status, headers);\n\t };\n\t\n\t xhr.onabort = function () {\n\t var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());\n\t var response = _this5._transformResponse(xhr.response, headers);\n\t _this5._onCancelItem(item, response, xhr.status, headers);\n\t _this5._onCompleteItem(item, response, xhr.status, headers);\n\t };\n\t\n\t xhr.ontimeout = function (e) {\n\t var headers = _this5._parseHeaders(xhr.getAllResponseHeaders());\n\t var response = \"Request Timeout.\";\n\t _this5._onTimeoutItem(item);\n\t _this5._onCompleteItem(item, response, 408, headers);\n\t };\n\t\n\t xhr.open(item.method, item.url, true);\n\t\n\t xhr.timeout = item.timeout || 0;\n\t xhr.withCredentials = item.withCredentials;\n\t\n\t forEach(item.headers, function (value, name) {\n\t xhr.setRequestHeader(name, value);\n\t });\n\t\n\t xhr.send(sendable);\n\t };\n\t /**\r\n\t * The IFrame transport\r\n\t * @param {FileItem} item\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._iframeTransport = function _iframeTransport(item) {\n\t var _this6 = this;\n\t\n\t var form = element('<form style=\"display: none;\" />');\n\t var iframe = element('<iframe name=\"iframeTransport' + Date.now() + '\">');\n\t var input = item._input;\n\t\n\t var timeout = 0;\n\t var timer = null;\n\t var isTimedOut = false;\n\t\n\t if (item._form) item._form.replaceWith(input); // remove old form\n\t item._form = form; // save link to new form\n\t\n\t input.prop('name', item.alias);\n\t\n\t forEach(item.formData, function (obj) {\n\t forEach(obj, function (value, key) {\n\t var element_ = element('<input type=\"hidden\" name=\"' + key + '\" />');\n\t element_.val(value);\n\t form.append(element_);\n\t });\n\t });\n\t\n\t form.prop({\n\t action: item.url,\n\t method: 'POST',\n\t target: iframe.prop('name'),\n\t enctype: 'multipart/form-data',\n\t encoding: 'multipart/form-data' // old IE\n\t });\n\t\n\t iframe.bind('load', function () {\n\t var html = '';\n\t var status = 200;\n\t\n\t try {\n\t // Fix for legacy IE browsers that loads internal error page\n\t // when failed WS response received. In consequence iframe\n\t // content access denied error is thrown becouse trying to\n\t // access cross domain page. When such thing occurs notifying\n\t // with empty response object. See more info at:\n\t // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object\n\t // Note that if non standard 4xx or 5xx error code returned\n\t // from WS then response content can be accessed without error\n\t // but 'XHR' status becomes 200. In order to avoid confusion\n\t // returning response via same 'success' event handler.\n\t\n\t // fixed angular.contents() for iframes\n\t html = iframe[0].contentDocument.body.innerHTML;\n\t } catch (e) {\n\t // in case we run into the access-is-denied error or we have another error on the server side\n\t // (intentional 500,40... errors), we at least say 'something went wrong' -> 500\n\t status = 500;\n\t }\n\t\n\t if (timer) {\n\t clearTimeout(timer);\n\t }\n\t timer = null;\n\t\n\t if (isTimedOut) {\n\t return false; //throw 'Request Timeout'\n\t }\n\t\n\t var xhr = { response: html, status: status, dummy: true };\n\t var headers = {};\n\t var response = _this6._transformResponse(xhr.response, headers);\n\t\n\t _this6._onSuccessItem(item, response, xhr.status, headers);\n\t _this6._onCompleteItem(item, response, xhr.status, headers);\n\t });\n\t\n\t form.abort = function () {\n\t var xhr = { status: 0, dummy: true };\n\t var headers = {};\n\t var response;\n\t\n\t iframe.unbind('load').prop('src', 'javascript:false;');\n\t form.replaceWith(input);\n\t\n\t _this6._onCancelItem(item, response, xhr.status, headers);\n\t _this6._onCompleteItem(item, response, xhr.status, headers);\n\t };\n\t\n\t input.after(form);\n\t form.append(input).append(iframe);\n\t\n\t timeout = item.timeout || 0;\n\t timer = null;\n\t\n\t if (timeout) {\n\t timer = setTimeout(function () {\n\t isTimedOut = true;\n\t\n\t item.isCancel = true;\n\t if (item.isUploading) {\n\t iframe.unbind('load').prop('src', 'javascript:false;');\n\t form.replaceWith(input);\n\t }\n\t\n\t var headers = {};\n\t var response = \"Request Timeout.\";\n\t _this6._onTimeoutItem(item);\n\t _this6._onCompleteItem(item, response, 408, headers);\n\t }, timeout);\n\t }\n\t\n\t form[0].submit();\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {File|Object} item\r\n\t * @param {Object} filter\r\n\t * @param {Object} options\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onWhenAddingFileFailed = function _onWhenAddingFileFailed(item, filter, options) {\n\t this.onWhenAddingFileFailed(item, filter, options);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onAfterAddingFile = function _onAfterAddingFile(item) {\n\t this.onAfterAddingFile(item);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {Array<FileItem>} items\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onAfterAddingAll = function _onAfterAddingAll(items) {\n\t this.onAfterAddingAll(items);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onBeforeUploadItem = function _onBeforeUploadItem(item) {\n\t item._onBeforeUpload();\n\t this.onBeforeUploadItem(item);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @param {Number} progress\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onProgressItem = function _onProgressItem(item, progress) {\n\t var total = this._getTotalProgress(progress);\n\t this.progress = total;\n\t item._onProgress(progress);\n\t this.onProgressItem(item, progress);\n\t this.onProgressAll(total);\n\t this._render();\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onSuccessItem = function _onSuccessItem(item, response, status, headers) {\n\t item._onSuccess(response, status, headers);\n\t this.onSuccessItem(item, response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onErrorItem = function _onErrorItem(item, response, status, headers) {\n\t item._onError(response, status, headers);\n\t this.onErrorItem(item, response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onCancelItem = function _onCancelItem(item, response, status, headers) {\n\t item._onCancel(response, status, headers);\n\t this.onCancelItem(item, response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onCompleteItem = function _onCompleteItem(item, response, status, headers) {\n\t item._onComplete(response, status, headers);\n\t this.onCompleteItem(item, response, status, headers);\n\t\n\t var nextItem = this.getReadyItems()[0];\n\t this.isUploading = false;\n\t\n\t if (isDefined(nextItem)) {\n\t nextItem.upload();\n\t return;\n\t }\n\t\n\t this.onCompleteAll();\n\t this.progress = this._getTotalProgress();\n\t this._render();\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {FileItem} item\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.prototype._onTimeoutItem = function _onTimeoutItem(item) {\n\t item._onTimeout();\n\t this.onTimeoutItem(item);\n\t };\n\t /**********************\r\n\t * STATIC\r\n\t **********************/\n\t /**\r\n\t * Returns \"true\" if value an instance of File\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.isFile = function isFile(value) {\n\t return File && value instanceof File;\n\t };\n\t /**\r\n\t * Returns \"true\" if value an instance of FileLikeObject\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileUploader.isFileLikeObject = function isFileLikeObject(value) {\n\t return value instanceof FileLikeObject;\n\t };\n\t /**\r\n\t * Returns \"true\" if value is array like object\r\n\t * @param {*} value\r\n\t * @returns {Boolean}\r\n\t */\n\t\n\t\n\t FileUploader.isArrayLikeObject = function isArrayLikeObject(value) {\n\t return isObject(value) && 'length' in value;\n\t };\n\t /**\r\n\t * Inherits a target (Class_1) by a source (Class_2)\r\n\t * @param {Function} target\r\n\t * @param {Function} source\r\n\t */\n\t\n\t\n\t FileUploader.inherit = function inherit(target, source) {\n\t target.prototype = Object.create(source.prototype);\n\t target.prototype.constructor = target;\n\t target.super_ = source;\n\t };\n\t\n\t return FileUploader;\n\t }();\n\t\n\t /**********************\r\n\t * PUBLIC\r\n\t **********************/\n\t /**\r\n\t * Checks a support the html5 uploader\r\n\t * @returns {Boolean}\r\n\t * @readonly\r\n\t */\n\t\n\t\n\t FileUploader.prototype.isHTML5 = !!(File && FormData);\n\t /**********************\r\n\t * STATIC\r\n\t **********************/\n\t /**\r\n\t * @borrows FileUploader.prototype.isHTML5\r\n\t */\n\t FileUploader.isHTML5 = FileUploader.prototype.isHTML5;\n\t\n\t return FileUploader;\n\t}\n\t\n\t__identity.$inject = ['fileUploaderOptions', '$rootScope', '$http', '$window', '$timeout', 'FileLikeObject', 'FileItem', 'Pipeline'];\n\n/***/ }),\n/* 4 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tvar _angular = angular,\n\t copy = _angular.copy,\n\t isElement = _angular.isElement,\n\t isString = _angular.isString;\n\tfunction __identity() {\n\t\n\t return function () {\n\t /**\r\n\t * Creates an instance of FileLikeObject\r\n\t * @param {File|HTMLInputElement|Object} fileOrInput\r\n\t * @constructor\r\n\t */\n\t function FileLikeObject(fileOrInput) {\n\t _classCallCheck(this, FileLikeObject);\n\t\n\t var isInput = isElement(fileOrInput);\n\t var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;\n\t var postfix = isString(fakePathOrObject) ? 'FakePath' : 'Object';\n\t var method = '_createFrom' + postfix;\n\t this[method](fakePathOrObject, fileOrInput);\n\t }\n\t /**\r\n\t * Creates file like object from fake path string\r\n\t * @param {String} path\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileLikeObject.prototype._createFromFakePath = function _createFromFakePath(path, input) {\n\t this.lastModifiedDate = null;\n\t this.size = null;\n\t this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();\n\t this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\\\') + 2);\n\t this.input = input;\n\t };\n\t /**\r\n\t * Creates file like object from object\r\n\t * @param {File|FileLikeObject} object\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileLikeObject.prototype._createFromObject = function _createFromObject(object) {\n\t this.lastModifiedDate = copy(object.lastModifiedDate);\n\t this.size = object.size;\n\t this.type = object.type;\n\t this.name = object.name;\n\t this.input = object.input;\n\t };\n\t\n\t return FileLikeObject;\n\t }();\n\t}\n\n/***/ }),\n/* 5 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tvar _angular = angular,\n\t copy = _angular.copy,\n\t extend = _angular.extend,\n\t element = _angular.element,\n\t isElement = _angular.isElement;\n\tfunction __identity($compile, FileLikeObject) {\n\t\n\t return function () {\n\t /**\r\n\t * Creates an instance of FileItem\r\n\t * @param {FileUploader} uploader\r\n\t * @param {File|HTMLInputElement|Object} some\r\n\t * @param {Object} options\r\n\t * @constructor\r\n\t */\n\t function FileItem(uploader, some, options) {\n\t _classCallCheck(this, FileItem);\n\t\n\t var isInput = !!some.input;\n\t var input = isInput ? element(some.input) : null;\n\t var file = !isInput ? some : null;\n\t\n\t extend(this, {\n\t url: uploader.url,\n\t alias: uploader.alias,\n\t headers: copy(uploader.headers),\n\t formData: copy(uploader.formData),\n\t removeAfterUpload: uploader.removeAfterUpload,\n\t withCredentials: uploader.withCredentials,\n\t disableMultipart: uploader.disableMultipart,\n\t method: uploader.method,\n\t timeout: uploader.timeout\n\t }, options, {\n\t uploader: uploader,\n\t file: new FileLikeObject(some),\n\t isReady: false,\n\t isUploading: false,\n\t isUploaded: false,\n\t isSuccess: false,\n\t isCancel: false,\n\t isError: false,\n\t progress: 0,\n\t index: null,\n\t _file: file,\n\t _input: input\n\t });\n\t\n\t if (input) this._replaceNode(input);\n\t }\n\t /**********************\r\n\t * PUBLIC\r\n\t **********************/\n\t /**\r\n\t * Uploads a FileItem\r\n\t */\n\t\n\t\n\t FileItem.prototype.upload = function upload() {\n\t try {\n\t this.uploader.uploadItem(this);\n\t } catch (e) {\n\t var message = e.name + ':' + e.message;\n\t this.uploader._onCompleteItem(this, message, e.code, []);\n\t this.uploader._onErrorItem(this, message, e.code, []);\n\t }\n\t };\n\t /**\r\n\t * Cancels uploading of FileItem\r\n\t */\n\t\n\t\n\t FileItem.prototype.cancel = function cancel() {\n\t this.uploader.cancelItem(this);\n\t };\n\t /**\r\n\t * Removes a FileItem\r\n\t */\n\t\n\t\n\t FileItem.prototype.remove = function remove() {\n\t this.uploader.removeFromQueue(this);\n\t };\n\t /**\r\n\t * Callback\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype.onBeforeUpload = function onBeforeUpload() {};\n\t /**\r\n\t * Callback\r\n\t * @param {Number} progress\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype.onProgress = function onProgress(progress) {};\n\t /**\r\n\t * Callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileItem.prototype.onSuccess = function onSuccess(response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileItem.prototype.onError = function onError(response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileItem.prototype.onCancel = function onCancel(response, status, headers) {};\n\t /**\r\n\t * Callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t */\n\t\n\t\n\t FileItem.prototype.onComplete = function onComplete(response, status, headers) {};\n\t /**\r\n\t * Callback \r\n\t */\n\t\n\t\n\t FileItem.prototype.onTimeout = function onTimeout() {};\n\t /**********************\r\n\t * PRIVATE\r\n\t **********************/\n\t /**\r\n\t * Inner callback\r\n\t */\n\t\n\t\n\t FileItem.prototype._onBeforeUpload = function _onBeforeUpload() {\n\t this.isReady = true;\n\t this.isUploading = false;\n\t this.isUploaded = false;\n\t this.isSuccess = false;\n\t this.isCancel = false;\n\t this.isError = false;\n\t this.progress = 0;\n\t this.onBeforeUpload();\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {Number} progress\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onProgress = function _onProgress(progress) {\n\t this.progress = progress;\n\t this.onProgress(progress);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onSuccess = function _onSuccess(response, status, headers) {\n\t this.isReady = false;\n\t this.isUploading = false;\n\t this.isUploaded = true;\n\t this.isSuccess = true;\n\t this.isCancel = false;\n\t this.isError = false;\n\t this.progress = 100;\n\t this.index = null;\n\t this.onSuccess(response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onError = function _onError(response, status, headers) {\n\t this.isReady = false;\n\t this.isUploading = false;\n\t this.isUploaded = true;\n\t this.isSuccess = false;\n\t this.isCancel = false;\n\t this.isError = true;\n\t this.progress = 0;\n\t this.index = null;\n\t this.onError(response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onCancel = function _onCancel(response, status, headers) {\n\t this.isReady = false;\n\t this.isUploading = false;\n\t this.isUploaded = false;\n\t this.isSuccess = false;\n\t this.isCancel = true;\n\t this.isError = false;\n\t this.progress = 0;\n\t this.index = null;\n\t this.onCancel(response, status, headers);\n\t };\n\t /**\r\n\t * Inner callback\r\n\t * @param {*} response\r\n\t * @param {Number} status\r\n\t * @param {Object} headers\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onComplete = function _onComplete(response, status, headers) {\n\t this.onComplete(response, status, headers);\n\t if (this.removeAfterUpload) this.remove();\n\t };\n\t /**\r\n\t * Inner callback \r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._onTimeout = function _onTimeout() {\n\t this.isReady = false;\n\t this.isUploading = false;\n\t this.isUploaded = false;\n\t this.isSuccess = false;\n\t this.isCancel = false;\n\t this.isError = true;\n\t this.progress = 0;\n\t this.index = null;\n\t this.onTimeout();\n\t };\n\t /**\r\n\t * Destroys a FileItem\r\n\t */\n\t\n\t\n\t FileItem.prototype._destroy = function _destroy() {\n\t if (this._input) this._input.remove();\n\t if (this._form) this._form.remove();\n\t delete this._form;\n\t delete this._input;\n\t };\n\t /**\r\n\t * Prepares to uploading\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._prepareToUploading = function _prepareToUploading() {\n\t this.index = this.index || ++this.uploader._nextIndex;\n\t this.isReady = true;\n\t };\n\t /**\r\n\t * Replaces input element on his clone\r\n\t * @param {JQLite|jQuery} input\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileItem.prototype._replaceNode = function _replaceNode(input) {\n\t var clone = $compile(input.clone())(input.scope());\n\t clone.prop('value', null); // FF fix\n\t input.css('display', 'none');\n\t input.after(clone); // remove jquery dependency\n\t };\n\t\n\t return FileItem;\n\t }();\n\t}\n\t\n\t__identity.$inject = ['$compile', 'FileLikeObject'];\n\n/***/ }),\n/* 6 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tvar _angular = angular,\n\t extend = _angular.extend;\n\tfunction __identity() {\n\t var FileDirective = function () {\n\t /**\r\n\t * Creates instance of {FileDirective} object\r\n\t * @param {Object} options\r\n\t * @param {Object} options.uploader\r\n\t * @param {HTMLElement} options.element\r\n\t * @param {Object} options.events\r\n\t * @param {String} options.prop\r\n\t * @constructor\r\n\t */\n\t function FileDirective(options) {\n\t _classCallCheck(this, FileDirective);\n\t\n\t extend(this, options);\n\t this.uploader._directives[this.prop].push(this);\n\t this._saveLinks();\n\t this.bind();\n\t }\n\t /**\r\n\t * Binds events handles\r\n\t */\n\t\n\t\n\t FileDirective.prototype.bind = function bind() {\n\t for (var key in this.events) {\n\t var prop = this.events[key];\n\t this.element.bind(key, this[prop]);\n\t }\n\t };\n\t /**\r\n\t * Unbinds events handles\r\n\t */\n\t\n\t\n\t FileDirective.prototype.unbind = function unbind() {\n\t for (var key in this.events) {\n\t this.element.unbind(key, this.events[key]);\n\t }\n\t };\n\t /**\r\n\t * Destroys directive\r\n\t */\n\t\n\t\n\t FileDirective.prototype.destroy = function destroy() {\n\t var index = this.uploader._directives[this.prop].indexOf(this);\n\t this.uploader._directives[this.prop].splice(index, 1);\n\t this.unbind();\n\t // this.element = null;\n\t };\n\t /**\r\n\t * Saves links to functions\r\n\t * @private\r\n\t */\n\t\n\t\n\t FileDirective.prototype._saveLinks = function _saveLinks() {\n\t for (var key in this.events) {\n\t var prop = this.events[key];\n\t this[prop] = this[prop].bind(this);\n\t }\n\t };\n\t\n\t return FileDirective;\n\t }();\n\t\n\t /**\r\n\t * Map of events\r\n\t * @type {Object}\r\n\t */\n\t\n\t\n\t FileDirective.prototype.events = {};\n\t\n\t return FileDirective;\n\t}\n\n/***/ }),\n/* 7 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\t\n\tfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\t\n\tvar _angular = angular,\n\t extend = _angular.extend;\n\tfunction __identity($compile, FileDirective) {\n\t\n\t return function (_FileDirective) {\n\t _inherits(FileSelect, _FileDirective);\n\t\n\t /**\r\n\t * Creates instance of {FileSelect} object\r\n\t * @param {Object} options\r\n\t * @constructor\r\n\t */\n\t function FileSelect(options) {\n\t _classCallCheck(this, FileSelect);\n\t\n\t var extendedOptions = extend(options, {\n\t // Map of events\n\t events: {\n\t $destroy: 'destroy',\n\t change: 'onChange'\n\t },\n\t // Name of property inside uploader._directive object\n\t prop: 'select'\n\t });\n\t\n\t var _this = _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));\n\t\n\t if (!_this.uploader.isHTML5) {\n\t _this.element.removeAttr('multiple');\n\t }\n\t _this.element.prop('value', null); // FF fix\n\t return _this;\n\t }\n\t /**\r\n\t * Returns options\r\n\t * @return {Object|undefined}\r\n\t */\n\t\n\t\n\t FileSelect.prototype.getOptions = function getOptions() {};\n\t /**\r\n\t * Returns filters\r\n\t * @return {Array<Function>|String|undefined}\r\n\t */\n\t\n\t\n\t FileSelect.prototype.getFilters = function getFilters() {};\n\t /**\r\n\t * If returns \"true\" then HTMLInputElement will be cleared\r\n\t * @returns {Boolean}\r\n\t */\n\t\n\t\n\t FileSelect.prototype.isEmptyAfterSelection = function isEmptyAfterSelection() {\n\t return !!this.element.attr('multiple');\n\t };\n\t /**\r\n\t * Event handler\r\n\t */\n\t\n\t\n\t FileSelect.prototype.onChange = function onChange() {\n\t var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];\n\t var options = this.getOptions();\n\t var filters = this.getFilters();\n\t\n\t if (!this.uploader.isHTML5) this.destroy();\n\t this.uploader.addToQueue(files, options, filters);\n\t if (this.isEmptyAfterSelection()) {\n\t this.element.prop('value', null);\n\t this.element.replaceWith($compile(this.element.clone())(this.scope)); // IE fix\n\t }\n\t };\n\t\n\t return FileSelect;\n\t }(FileDirective);\n\t}\n\t\n\t__identity.$inject = ['$compile', 'FileDirective'];\n\n/***/ }),\n/* 8 */\n/***/ (function(module, exports) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tfunction _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tvar _angular = angular,\n\t bind = _angular.bind,\n\t isUndefined = _angular.isUndefined;\n\tfunction __identity($q) {\n\t\n\t return function () {\n\t /**\r\n\t * @param {Array<Function>} pipes\r\n\t */\n\t function Pipeline() {\n\t var pipes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];\n\t\n\t _classCallCheck(this, Pipeline);\n\t\n\t this.pipes = pipes;\n\t }\n\t\n\t Pipeline.prototype.next = function next(args) {\n\t var pipe = this.pipes.shift();\n\t if (isUndefined(pipe)) {\n\t this.onSuccessful.apply(this, _toConsumableArray(args));\n\t return;\n\t }\n\t var err = new Error('The filter has not passed');\n\t err.pipe = pipe;\n\t err.args = args;\n\t if (pipe.isAsync) {\n\t var deferred = $q.defer();\n\t var onFulfilled = bind(this, this.next, args);\n\t var onRejected = bind(this, this.onThrown, err);\n\t deferred.promise.then(onFulfilled, onRejected);\n\t pipe.apply(undefined, _toConsumableArray(args).concat([deferred]));\n\t } else {\n\t var isDone = Boolean(pipe.apply(undefined, _toConsumableArray(args)));\n\t if (isDone) {\n\t this.next(args);\n\t } else {\n\t this.onThrown(err);\n\t }\n\t }\n\t };\n\t\n\t Pipeline.prototype.exec = function exec() {\n\t for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {\n\t args[_key] = arguments[_key];\n\t }\n\t\n\t this.next(args);\n\t };\n\t\n\t Pipeline.prototype.onThrown = function onThrown(err) {};\n\t\n\t Pipeline.prototype.onSuccessful = function onSuccessful() {};\n\t\n\t return Pipeline;\n\t }();\n\t}\n\t\n\t__identity.$inject = ['$q'];\n\n/***/ }),\n/* 9 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\t\n\tfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\t\n\tvar _angular = angular,\n\t extend = _angular.extend,\n\t forEach = _angular.forEach;\n\tfunction __identity(FileDirective) {\n\t\n\t return function (_FileDirective) {\n\t _inherits(FileDrop, _FileDirective);\n\t\n\t /**\r\n\t * Creates instance of {FileDrop} object\r\n\t * @param {Object} options\r\n\t * @constructor\r\n\t */\n\t function FileDrop(options) {\n\t _classCallCheck(this, FileDrop);\n\t\n\t var extendedOptions = extend(options, {\n\t // Map of events\n\t events: {\n\t $destroy: 'destroy',\n\t drop: 'onDrop',\n\t dragover: 'onDragOver',\n\t dragleave: 'onDragLeave'\n\t },\n\t // Name of property inside uploader._directive object\n\t prop: 'drop'\n\t });\n\t\n\t return _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));\n\t }\n\t /**\r\n\t * Returns options\r\n\t * @return {Object|undefined}\r\n\t */\n\t\n\t\n\t FileDrop.prototype.getOptions = function getOptions() {};\n\t /**\r\n\t * Returns filters\r\n\t * @return {Array<Function>|String|undefined}\r\n\t */\n\t\n\t\n\t FileDrop.prototype.getFilters = function getFilters() {};\n\t /**\r\n\t * Event handler\r\n\t */\n\t\n\t\n\t FileDrop.prototype.onDrop = function onDrop(event) {\n\t var transfer = this._getTransfer(event);\n\t if (!transfer) return;\n\t var options = this.getOptions();\n\t var filters = this.getFilters();\n\t this._preventAndStop(event);\n\t forEach(this.uploader._directives.over, this._removeOverClass, this);\n\t this.uploader.addToQueue(transfer.files, options, filters);\n\t };\n\t /**\r\n\t * Event handler\r\n\t */\n\t\n\t\n\t FileDrop.prototype.onDragOver = function onDragOver(event) {\n\t var transfer = this._getTransfer(event);\n\t if (!this._haveFiles(transfer.types)) return;\n\t transfer.dropEffect = 'copy';\n\t this._preventAndStop(event);\n\t forEach(this.uploader._directives.over, this._addOverClass, this);\n\t };\n\t /**\r\n\t * Event handler\r\n\t */\n\t\n\t\n\t FileDrop.prototype.onDragLeave = function onDragLeave(event) {\n\t if (event.currentTarget === this.element[0]) return;\n\t this._preventAndStop(event);\n\t forEach(this.uploader._directives.over, this._removeOverClass, this);\n\t };\n\t /**\r\n\t * Helper\r\n\t */\n\t\n\t\n\t FileDrop.prototype._getTransfer = function _getTransfer(event) {\n\t return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;\n\t };\n\t /**\r\n\t * Helper\r\n\t */\n\t\n\t\n\t FileDrop.prototype._preventAndStop = function _preventAndStop(event) {\n\t event.preventDefault();\n\t event.stopPropagation();\n\t };\n\t /**\r\n\t * Returns \"true\" if types contains files\r\n\t * @param {Object} types\r\n\t */\n\t\n\t\n\t FileDrop.prototype._haveFiles = function _haveFiles(types) {\n\t if (!types) return false;\n\t if (types.indexOf) {\n\t return types.indexOf('Files') !== -1;\n\t } else if (types.contains) {\n\t return types.contains('Files');\n\t } else {\n\t return false;\n\t }\n\t };\n\t /**\r\n\t * Callback\r\n\t */\n\t\n\t\n\t FileDrop.prototype._addOverClass = function _addOverClass(item) {\n\t item.addOverClass();\n\t };\n\t /**\r\n\t * Callback\r\n\t */\n\t\n\t\n\t FileDrop.prototype._removeOverClass = function _removeOverClass(item) {\n\t item.removeOverClass();\n\t };\n\t\n\t return FileDrop;\n\t }(FileDirective);\n\t}\n\t\n\t__identity.$inject = ['FileDirective'];\n\n/***/ }),\n/* 10 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\t\n\tfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\t\n\tfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\t\n\tvar _angular = angular,\n\t extend = _angular.extend;\n\tfunction __identity(FileDirective) {\n\t\n\t return function (_FileDirective) {\n\t _inherits(FileOver, _FileDirective);\n\t\n\t /**\r\n\t * Creates instance of {FileDrop} object\r\n\t * @param {Object} options\r\n\t * @constructor\r\n\t */\n\t function FileOver(options) {\n\t _classCallCheck(this, FileOver);\n\t\n\t var extendedOptions = extend(options, {\n\t // Map of events\n\t events: {\n\t $destroy: 'destroy'\n\t },\n\t // Name of property inside uploader._directive object\n\t prop: 'over',\n\t // Over class\n\t overClass: 'nv-file-over'\n\t });\n\t\n\t return _possibleConstructorReturn(this, _FileDirective.call(this, extendedOptions));\n\t }\n\t /**\r\n\t * Adds over class\r\n\t */\n\t\n\t\n\t FileOver.prototype.addOverClass = function addOverClass() {\n\t this.element.addClass(this.getOverClass());\n\t };\n\t /**\r\n\t * Removes over class\r\n\t */\n\t\n\t\n\t FileOver.prototype.removeOverClass = function removeOverClass() {\n\t this.element.removeClass(this.getOverClass());\n\t };\n\t /**\r\n\t * Returns over class\r\n\t * @returns {String}\r\n\t */\n\t\n\t\n\t FileOver.prototype.getOverClass = function getOverClass() {\n\t return this.overClass;\n\t };\n\t\n\t return FileOver;\n\t }(FileDirective);\n\t}\n\t\n\t__identity.$inject = ['FileDirective'];\n\n/***/ }),\n/* 11 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction __identity($parse, FileUploader, FileSelect) {\n\t\n\t return {\n\t link: function link(scope, element, attributes) {\n\t var uploader = scope.$eval(attributes.uploader);\n\t\n\t if (!(uploader instanceof FileUploader)) {\n\t throw new TypeError('\"Uploader\" must be an instance of FileUploader');\n\t }\n\t\n\t var object = new FileSelect({\n\t uploader: uploader,\n\t element: element,\n\t scope: scope\n\t });\n\t\n\t object.getOptions = $parse(attributes.options).bind(object, scope);\n\t object.getFilters = function () {\n\t return attributes.filters;\n\t };\n\t }\n\t };\n\t}\n\t\n\t__identity.$inject = ['$parse', 'FileUploader', 'FileSelect'];\n\n/***/ }),\n/* 12 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction __identity($parse, FileUploader, FileDrop) {\n\t\n\t return {\n\t link: function link(scope, element, attributes) {\n\t var uploader = scope.$eval(attributes.uploader);\n\t\n\t if (!(uploader instanceof FileUploader)) {\n\t throw new TypeError('\"Uploader\" must be an instance of FileUploader');\n\t }\n\t\n\t if (!uploader.isHTML5) return;\n\t\n\t var object = new FileDrop({\n\t uploader: uploader,\n\t element: element\n\t });\n\t\n\t object.getOptions = $parse(attributes.options).bind(object, scope);\n\t object.getFilters = function () {\n\t return attributes.filters;\n\t };\n\t }\n\t };\n\t}\n\t\n\t__identity.$inject = ['$parse', 'FileUploader', 'FileDrop'];\n\n/***/ }),\n/* 13 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\t'use strict';\n\t\n\tObject.defineProperty(exports, \"__esModule\", {\n\t value: true\n\t});\n\texports.default = __identity;\n\t\n\tvar _config = __webpack_require__(1);\n\t\n\tvar _config2 = _interopRequireDefault(_config);\n\t\n\tfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\t\n\tfunction __identity(FileUploader, FileOver) {\n\t\n\t return {\n\t link: function link(scope, element, attributes) {\n\t var uploader = scope.$eval(attributes.uploader);\n\t\n\t if (!(uploader instanceof FileUploader)) {\n\t throw new TypeError('\"Uploader\" must be an instance of FileUploader');\n\t }\n\t\n\t var object = new FileOver({\n\t uploader: uploader,\n\t element: element\n\t });\n\t\n\t object.getOverClass = function () {\n\t return attributes.overClass || object.overClass;\n\t };\n\t }\n\t };\n\t}\n\t\n\t__identity.$inject = ['FileUploader', 'FileOver'];\n\n/***/ })\n/******/ ])\n});\n;\n\n\n// WEBPACK FOOTER //\n// angular-file-upload.min.js"," \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\texports: {},\n \t\t\tid: moduleId,\n \t\t\tloaded: false\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.loaded = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(0);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 8e3763ddc3eea8ac4eff","'use strict';\r\n\r\n\r\nimport CONFIG from './config.json';\r\n\r\n\r\nimport options from './values/options'\r\n\r\n\r\nimport serviceFileUploader from './services/FileUploader';\r\nimport serviceFileLikeObject from './services/FileLikeObject';\r\nimport serviceFileItem from './services/FileItem';\r\nimport serviceFileDirective from './services/FileDirective';\r\nimport serviceFileSelect from './services/FileSelect';\r\nimport servicePipeline from './services/Pipeline';\r\nimport serviceFileDrop from './services/FileDrop';\r\nimport serviceFileOver from './services/FileOver';\r\n\r\n\r\nimport directiveFileSelect from './directives/FileSelect';\r\nimport directiveFileDrop from './directives/FileDrop';\r\nimport directiveFileOver from './directives/FileOver';\r\n\r\n\r\nangular\r\n .module(CONFIG.name, [])\r\n .value('fileUploaderOptions', options)\r\n .factory('FileUploader', serviceFileUploader)\r\n .factory('FileLikeObject', serviceFileLikeObject)\r\n .factory('FileItem', serviceFileItem)\r\n .factory('FileDirective', serviceFileDirective)\r\n .factory('FileSelect', serviceFileSelect)\r\n .factory('FileDrop', serviceFileDrop)\r\n .factory('FileOver', serviceFileOver)\r\n .factory('Pipeline', servicePipeline)\r\n .directive('nvFileSelect', directiveFileSelect)\r\n .directive('nvFileDrop', directiveFileDrop)\r\n .directive('nvFileOver', directiveFileOver)\r\n .run([\r\n 'FileUploader',\r\n 'FileLikeObject',\r\n 'FileItem',\r\n 'FileDirective',\r\n 'FileSelect',\r\n 'FileDrop',\r\n 'FileOver',\r\n 'Pipeline',\r\n function(FileUploader, FileLikeObject, FileItem, FileDirective, FileSelect, FileDrop, FileOver, Pipeline) {\r\n // only for compatibility\r\n FileUploader.FileLikeObject = FileLikeObject;\r\n FileUploader.FileItem = FileItem;\r\n FileUploader.FileDirective = FileDirective;\r\n FileUploader.FileSelect = FileSelect;\r\n FileUploader.FileDrop = FileDrop;\r\n FileUploader.FileOver = FileOver;\r\n FileUploader.Pipeline = Pipeline;\r\n }\r\n ]);\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js","module.exports = {\"name\":\"angularFileUpload\"}\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./src/config.json\n// module id = 1\n// module chunks = 0 1","'use strict';\r\n\r\n\r\nexport default {\r\n url: '/',\r\n alias: 'file',\r\n headers: {},\r\n queue: [],\r\n progress: 0,\r\n autoUpload: false,\r\n removeAfterUpload: false,\r\n method: 'POST',\r\n filters: [],\r\n formData: [],\r\n queueLimit: Number.MAX_VALUE,\r\n withCredentials: false,\r\n disableMultipart: false\r\n};\n\n\n// WEBPACK FOOTER //\n// ./src/values/options.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n bind,\r\n copy,\r\n extend,\r\n forEach,\r\n isObject,\r\n isNumber,\r\n isDefined,\r\n isArray,\r\n isUndefined,\r\n element\r\n } = angular;\r\n\r\n\r\nexport default function __identity(fileUploaderOptions, $rootScope, $http, $window, $timeout, FileLikeObject, FileItem, Pipeline) {\r\n \r\n \r\n let {\r\n File,\r\n FormData\r\n } = $window;\r\n \r\n \r\n class FileUploader {\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Creates an instance of FileUploader\r\n * @param {Object} [options]\r\n * @constructor\r\n */\r\n constructor(options) {\r\n var settings = copy(fileUploaderOptions);\r\n \r\n extend(this, settings, options, {\r\n isUploading: false,\r\n _nextIndex: 0,\r\n _directives: {select: [], drop: [], over: []}\r\n });\r\n\r\n // add default filters\r\n this.filters.unshift({name: 'queueLimit', fn: this._queueLimitFilter});\r\n this.filters.unshift({name: 'folder', fn: this._folderFilter});\r\n }\r\n /**\r\n * Adds items to the queue\r\n * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files\r\n * @param {Object} [options]\r\n * @param {Array<Function>|String} filters\r\n */\r\n addToQueue(files, options, filters) {\r\n let incomingQueue = this.isArrayLikeObject(files) ? Array.prototype.slice.call(files): [files];\r\n var arrayOfFilters = this._getFilters(filters);\r\n var count = this.queue.length;\r\n var addedFileItems = [];\r\n\r\n let next = () => {\r\n let something = incomingQueue.shift();\r\n \r\n if (isUndefined(something)) {\r\n return done();\r\n }\r\n \r\n let fileLikeObject = this.isFile(something) ? something : new FileLikeObject(something);\r\n let pipes = this._convertFiltersToPipes(arrayOfFilters);\r\n let pipeline = new Pipeline(pipes);\r\n let onThrown = (err) => {\r\n let {originalFilter} = err.pipe;\r\n let [fileLikeObject, options] = err.args;\r\n this._onWhenAddingFileFailed(fileLikeObject, originalFilter, options);\r\n next();\r\n };\r\n let onSuccessful = (fileLikeObject, options) => {\r\n let fileItem = new FileItem(this, fileLikeObject, options);\r\n addedFileItems.push(fileItem);\r\n this.queue.push(fileItem);\r\n this._onAfterAddingFile(fileItem);\r\n next();\r\n };\r\n pipeline.onThrown = onThrown;\r\n pipeline.onSuccessful = onSuccessful;\r\n pipeline.exec(fileLikeObject, options);\r\n };\r\n \r\n let done = () => {\r\n if(this.queue.length !== count) {\r\n this._onAfterAddingAll(addedFileItems);\r\n this.progress = this._getTotalProgress();\r\n }\r\n\r\n this._render();\r\n if (this.autoUpload) this.uploadAll();\r\n };\r\n \r\n next();\r\n }\r\n /**\r\n * Remove items from the queue. Remove last: index = -1\r\n * @param {FileItem|Number} value\r\n */\r\n removeFromQueue(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n if(item.isUploading) item.cancel();\r\n this.queue.splice(index, 1);\r\n item._destroy();\r\n this.progress = this._getTotalProgress();\r\n }\r\n /**\r\n * Clears the queue\r\n */\r\n clearQueue() {\r\n while(this.queue.length) {\r\n this.queue[0].remove();\r\n }\r\n this.progress = 0;\r\n }\r\n /**\r\n * Uploads a item from the queue\r\n * @param {FileItem|Number} value\r\n */\r\n uploadItem(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';\r\n\r\n item._prepareToUploading();\r\n if(this.isUploading) return;\r\n\r\n this._onBeforeUploadItem(item);\r\n if (item.isCancel) return;\r\n\r\n item.isUploading = true;\r\n this.isUploading = true;\r\n this[transport](item);\r\n this._render();\r\n }\r\n /**\r\n * Cancels uploading of item from the queue\r\n * @param {FileItem|Number} value\r\n */\r\n cancelItem(value) {\r\n var index = this.getIndexOfItem(value);\r\n var item = this.queue[index];\r\n var prop = this.isHTML5 ? '_xhr' : '_form';\r\n if (!item) return;\r\n item.isCancel = true;\r\n if(item.isUploading) {\r\n // It will call this._onCancelItem() & this._onCompleteItem() asynchronously\r\n item[prop].abort();\r\n } else {\r\n let dummy = [undefined, 0, {}];\r\n let onNextTick = () => {\r\n this._onCancelItem(item, ...dummy);\r\n this._onCompleteItem(item, ...dummy);\r\n };\r\n $timeout(onNextTick); // Trigger callbacks asynchronously (setImmediate emulation)\r\n }\r\n }\r\n /**\r\n * Uploads all not uploaded items of queue\r\n */\r\n uploadAll() {\r\n var items = this.getNotUploadedItems().filter(item => !item.isUploading);\r\n if(!items.length) return;\r\n\r\n forEach(items, item => item._prepareToUploading());\r\n items[0].upload();\r\n }\r\n /**\r\n * Cancels all uploads\r\n */\r\n cancelAll() {\r\n var items = this.getNotUploadedItems();\r\n forEach(items, item => item.cancel());\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of File\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n isFile(value) {\r\n return this.constructor.isFile(value);\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of FileLikeObject\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n isFileLikeObject(value) {\r\n return this.constructor.isFileLikeObject(value);\r\n }\r\n /**\r\n * Returns \"true\" if value is array like object\r\n * @param {*} value\r\n * @returns {Boolean}\r\n */\r\n isArrayLikeObject(value) {\r\n return this.constructor.isArrayLikeObject(value);\r\n }\r\n /**\r\n * Returns a index of item from the queue\r\n * @param {Item|Number} value\r\n * @returns {Number}\r\n */\r\n getIndexOfItem(value) {\r\n return isNumber(value) ? value : this.queue.indexOf(value);\r\n }\r\n /**\r\n * Returns not uploaded items\r\n * @returns {Array}\r\n */\r\n getNotUploadedItems() {\r\n return this.queue.filter(item => !item.isUploaded);\r\n }\r\n /**\r\n * Returns items ready for upload\r\n * @returns {Array}\r\n */\r\n getReadyItems() {\r\n return this.queue\r\n .filter(item => (item.isReady && !item.isUploading))\r\n .sort((item1, item2) => item1.index - item2.index);\r\n }\r\n /**\r\n * Destroys instance of FileUploader\r\n */\r\n destroy() {\r\n forEach(this._directives, (key) => {\r\n forEach(this._directives[key], (object) => {\r\n object.destroy();\r\n });\r\n });\r\n }\r\n /**\r\n * Callback\r\n * @param {Array} fileItems\r\n */\r\n onAfterAddingAll(fileItems) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n */\r\n onAfterAddingFile(fileItem) {\r\n }\r\n /**\r\n * Callback\r\n * @param {File|Object} item\r\n * @param {Object} filter\r\n * @param {Object} options\r\n */\r\n onWhenAddingFileFailed(item, filter, options) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n */\r\n onBeforeUploadItem(fileItem) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} fileItem\r\n * @param {Number} progress\r\n */\r\n onProgressItem(fileItem, progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {Number} progress\r\n */\r\n onProgressAll(progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onSuccessItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onErrorItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCancelItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCompleteItem(item, response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {FileItem} item\r\n */\r\n onTimeoutItem(item) {\r\n }\r\n /**\r\n * Callback\r\n */\r\n onCompleteAll() {\r\n }\r\n /**********************\r\n * PRIVATE\r\n **********************/\r\n /**\r\n * Returns the total progress\r\n * @param {Number} [value]\r\n * @returns {Number}\r\n * @private\r\n */\r\n _getTotalProgress(value) {\r\n if(this.removeAfterUpload) return value || 0;\r\n\r\n var notUploaded = this.getNotUploadedItems().length;\r\n var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;\r\n var ratio = 100 / this.queue.length;\r\n var current = (value || 0) * ratio / 100;\r\n\r\n return Math.round(uploaded * ratio + current);\r\n }\r\n /**\r\n * Returns array of filters\r\n * @param {Array<Function>|String} filters\r\n * @returns {Array<Function>}\r\n * @private\r\n */\r\n _getFilters(filters) {\r\n if(!filters) return this.filters;\r\n if(isArray(filters)) return filters;\r\n var names = filters.match(/[^\\s,]+/g);\r\n return this.filters\r\n .filter(filter => names.indexOf(filter.name) !== -1);\r\n }\r\n /**\r\n * @param {Array<Function>} filters\r\n * @returns {Array<Function>}\r\n * @private\r\n */\r\n _convertFiltersToPipes(filters) {\r\n return filters\r\n .map(filter => {\r\n let fn = bind(this, filter.fn);\r\n fn.isAsync = filter.fn.length === 3;\r\n fn.originalFilter = filter;\r\n return fn;\r\n });\r\n }\r\n /**\r\n * Updates html\r\n * @private\r\n */\r\n _render() {\r\n if(!$rootScope.$$phase) $rootScope.$apply();\r\n }\r\n /**\r\n * Returns \"true\" if item is a file (not folder)\r\n * @param {File|FileLikeObject} item\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _folderFilter(item) {\r\n return !!(item.size || item.type);\r\n }\r\n /**\r\n * Returns \"true\" if the limit has not been reached\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _queueLimitFilter() {\r\n return this.queue.length < this.queueLimit;\r\n }\r\n /**\r\n * Checks whether upload successful\r\n * @param {Number} status\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n _isSuccessCode(status) {\r\n return (status >= 200 && status < 300) || status === 304;\r\n }\r\n /**\r\n * Transforms the server response\r\n * @param {*} response\r\n * @param {Object} headers\r\n * @returns {*}\r\n * @private\r\n */\r\n _transformResponse(response, headers) {\r\n var headersGetter = this._headersGetter(headers);\r\n forEach($http.defaults.transformResponse, (transformFn) => {\r\n response = transformFn(response, headersGetter);\r\n });\r\n return response;\r\n }\r\n /**\r\n * Parsed response headers\r\n * @param headers\r\n * @returns {Object}\r\n * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js\r\n * @private\r\n */\r\n _parseHeaders(headers) {\r\n var parsed = {}, key, val, i;\r\n\r\n if(!headers) return parsed;\r\n\r\n forEach(headers.split('\\n'), (line) => {\r\n i = line.indexOf(':');\r\n key = line.slice(0, i).trim().toLowerCase();\r\n val = line.slice(i + 1).trim();\r\n\r\n if(key) {\r\n parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;\r\n }\r\n });\r\n\r\n return parsed;\r\n }\r\n /**\r\n * Returns function that returns headers\r\n * @param {Object} parsedHeaders\r\n * @returns {Function}\r\n * @private\r\n */\r\n _headersGetter(parsedHeaders) {\r\n return (name) => {\r\n if(name) {\r\n return parsedHeaders[name.toLowerCase()] || null;\r\n }\r\n return parsedHeaders;\r\n };\r\n }\r\n /**\r\n * The XMLHttpRequest transport\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _xhrTransport(item) {\r\n var xhr = item._xhr = new XMLHttpRequest();\r\n var sendable;\r\n\r\n if (!item.disableMultipart) {\r\n sendable = new FormData();\r\n forEach(item.formData, (obj) => {\r\n forEach(obj, (value, key) => {\r\n sendable.append(key, value);\r\n });\r\n });\r\n\r\n sendable.append(item.alias, item._file, item.file.name);\r\n }\r\n else {\r\n sendable = item._file;\r\n }\r\n\r\n if(typeof(item._file.size) != 'number') {\r\n throw new TypeError('The file specified is no longer valid');\r\n }\r\n\r\n xhr.upload.onprogress = (event) => {\r\n var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);\r\n this._onProgressItem(item, progress);\r\n };\r\n\r\n xhr.onload = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n var gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error';\r\n var method = '_on' + gist + 'Item';\r\n this[method](item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n xhr.onerror = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n this._onErrorItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n xhr.onabort = () => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = this._transformResponse(xhr.response, headers);\r\n this._onCancelItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n }; \r\n\r\n xhr.ontimeout = (e) => {\r\n var headers = this._parseHeaders(xhr.getAllResponseHeaders());\r\n var response = \"Request Timeout.\";\r\n this._onTimeoutItem(item);\r\n this._onCompleteItem(item, response, 408, headers);\r\n };\r\n\r\n xhr.open(item.method, item.url, true);\r\n\r\n xhr.timeout = item.timeout || 0;\r\n xhr.withCredentials = item.withCredentials;\r\n\r\n forEach(item.headers, (value, name) => {\r\n xhr.setRequestHeader(name, value);\r\n });\r\n\r\n xhr.send(sendable);\r\n }\r\n /**\r\n * The IFrame transport\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _iframeTransport(item) {\r\n var form = element('<form style=\"display: none;\" />');\r\n var iframe = element('<iframe name=\"iframeTransport' + Date.now() + '\">');\r\n var input = item._input;\r\n\r\n var timeout = 0;\r\n var timer = null;\r\n var isTimedOut = false;\r\n\r\n if(item._form) item._form.replaceWith(input); // remove old form\r\n item._form = form; // save link to new form\r\n\r\n input.prop('name', item.alias);\r\n\r\n forEach(item.formData, (obj) => {\r\n forEach(obj, (value, key) => {\r\n var element_ = element('<input type=\"hidden\" name=\"' + key + '\" />');\r\n element_.val(value);\r\n form.append(element_);\r\n });\r\n });\r\n\r\n form.prop({\r\n action: item.url,\r\n method: 'POST',\r\n target: iframe.prop('name'),\r\n enctype: 'multipart/form-data',\r\n encoding: 'multipart/form-data' // old IE\r\n });\r\n\r\n iframe.bind('load', () => {\r\n var html = '';\r\n var status = 200;\r\n\r\n try {\r\n // Fix for legacy IE browsers that loads internal error page\r\n // when failed WS response received. In consequence iframe\r\n // content access denied error is thrown becouse trying to\r\n // access cross domain page. When such thing occurs notifying\r\n // with empty response object. See more info at:\r\n // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object\r\n // Note that if non standard 4xx or 5xx error code returned\r\n // from WS then response content can be accessed without error\r\n // but 'XHR' status becomes 200. In order to avoid confusion\r\n // returning response via same 'success' event handler.\r\n\r\n // fixed angular.contents() for iframes\r\n html = iframe[0].contentDocument.body.innerHTML;\r\n } catch(e) {\r\n // in case we run into the access-is-denied error or we have another error on the server side\r\n // (intentional 500,40... errors), we at least say 'something went wrong' -> 500\r\n status = 500;\r\n }\r\n\r\n if (timer) {\r\n clearTimeout(timer);\r\n }\r\n timer = null;\r\n\r\n if (isTimedOut) {\r\n return false; //throw 'Request Timeout'\r\n }\r\n\r\n var xhr = {response: html, status: status, dummy: true};\r\n var headers = {};\r\n var response = this._transformResponse(xhr.response, headers);\r\n\r\n this._onSuccessItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n });\r\n\r\n form.abort = () => {\r\n var xhr = {status: 0, dummy: true};\r\n var headers = {};\r\n var response;\r\n\r\n iframe.unbind('load').prop('src', 'javascript:false;');\r\n form.replaceWith(input);\r\n\r\n this._onCancelItem(item, response, xhr.status, headers);\r\n this._onCompleteItem(item, response, xhr.status, headers);\r\n };\r\n\r\n input.after(form);\r\n form.append(input).append(iframe);\r\n\r\n timeout = item.timeout || 0;\r\n timer = null;\r\n\r\n if (timeout) {\r\n timer = setTimeout(() => {\r\n isTimedOut = true;\r\n\r\n item.isCancel = true;\r\n if (item.isUploading) {\r\n iframe.unbind('load').prop('src', 'javascript:false;');\r\n form.replaceWith(input);\r\n }\r\n\r\n var headers = {};\r\n var response = \"Request Timeout.\";\r\n this._onTimeoutItem(item);\r\n this._onCompleteItem(item, response, 408, headers);\r\n }, timeout);\r\n }\r\n\r\n form[0].submit();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {File|Object} item\r\n * @param {Object} filter\r\n * @param {Object} options\r\n * @private\r\n */\r\n _onWhenAddingFileFailed(item, filter, options) {\r\n this.onWhenAddingFileFailed(item, filter, options);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n */\r\n _onAfterAddingFile(item) {\r\n this.onAfterAddingFile(item);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {Array<FileItem>} items\r\n */\r\n _onAfterAddingAll(items) {\r\n this.onAfterAddingAll(items);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _onBeforeUploadItem(item) {\r\n item._onBeforeUpload();\r\n this.onBeforeUploadItem(item);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {Number} progress\r\n * @private\r\n */\r\n _onProgressItem(item, progress) {\r\n var total = this._getTotalProgress(progress);\r\n this.progress = total;\r\n item._onProgress(progress);\r\n this.onProgressItem(item, progress);\r\n this.onProgressAll(total);\r\n this._render();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onSuccessItem(item, response, status, headers) {\r\n item._onSuccess(response, status, headers);\r\n this.onSuccessItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onErrorItem(item, response, status, headers) {\r\n item._onError(response, status, headers);\r\n this.onErrorItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCancelItem(item, response, status, headers) {\r\n item._onCancel(response, status, headers);\r\n this.onCancelItem(item, response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCompleteItem(item, response, status, headers) {\r\n item._onComplete(response, status, headers);\r\n this.onCompleteItem(item, response, status, headers);\r\n\r\n var nextItem = this.getReadyItems()[0];\r\n this.isUploading = false;\r\n\r\n if(isDefined(nextItem)) {\r\n nextItem.upload();\r\n return;\r\n }\r\n\r\n this.onCompleteAll();\r\n this.progress = this._getTotalProgress();\r\n this._render();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {FileItem} item\r\n * @private\r\n */\r\n _onTimeoutItem(item) {\r\n item._onTimeout();\r\n this.onTimeoutItem(item);\r\n }\r\n /**********************\r\n * STATIC\r\n **********************/\r\n /**\r\n * Returns \"true\" if value an instance of File\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n static isFile(value) {\r\n return (File && value instanceof File);\r\n }\r\n /**\r\n * Returns \"true\" if value an instance of FileLikeObject\r\n * @param {*} value\r\n * @returns {Boolean}\r\n * @private\r\n */\r\n static isFileLikeObject(value) {\r\n return value instanceof FileLikeObject;\r\n }\r\n /**\r\n * Returns \"true\" if value is array like object\r\n * @param {*} value\r\n * @returns {Boolean}\r\n */\r\n static isArrayLikeObject(value) {\r\n return (isObject(value) && 'length' in value);\r\n }\r\n /**\r\n * Inherits a target (Class_1) by a source (Class_2)\r\n * @param {Function} target\r\n * @param {Function} source\r\n */\r\n static inherit(target, source) {\r\n target.prototype = Object.create(source.prototype);\r\n target.prototype.constructor = target;\r\n target.super_ = source;\r\n }\r\n }\r\n\r\n\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Checks a support the html5 uploader\r\n * @returns {Boolean}\r\n * @readonly\r\n */\r\n FileUploader.prototype.isHTML5 = !!(File && FormData);\r\n /**********************\r\n * STATIC\r\n **********************/\r\n /**\r\n * @borrows FileUploader.prototype.isHTML5\r\n */\r\n FileUploader.isHTML5 = FileUploader.prototype.isHTML5;\r\n\r\n \r\n return FileUploader;\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'fileUploaderOptions', \r\n '$rootScope', \r\n '$http', \r\n '$window',\r\n '$timeout',\r\n 'FileLikeObject',\r\n 'FileItem',\r\n 'Pipeline'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileUploader.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n copy,\r\n isElement,\r\n isString\r\n } = angular;\r\n\r\n\r\nexport default function __identity() {\r\n \r\n \r\n return class FileLikeObject {\r\n /**\r\n * Creates an instance of FileLikeObject\r\n * @param {File|HTMLInputElement|Object} fileOrInput\r\n * @constructor\r\n */\r\n constructor(fileOrInput) {\r\n var isInput = isElement(fileOrInput);\r\n var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;\r\n var postfix = isString(fakePathOrObject) ? 'FakePath' : 'Object';\r\n var method = '_createFrom' + postfix;\r\n this[method](fakePathOrObject, fileOrInput);\r\n }\r\n /**\r\n * Creates file like object from fake path string\r\n * @param {String} path\r\n * @private\r\n */\r\n _createFromFakePath(path, input) {\r\n this.lastModifiedDate = null;\r\n this.size = null;\r\n this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();\r\n this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\\\') + 2);\r\n this.input = input;\r\n }\r\n /**\r\n * Creates file like object from object\r\n * @param {File|FileLikeObject} object\r\n * @private\r\n */\r\n _createFromObject(object) {\r\n this.lastModifiedDate = copy(object.lastModifiedDate);\r\n this.size = object.size;\r\n this.type = object.type;\r\n this.name = object.name;\r\n this.input = object.input;\r\n }\r\n }\r\n}\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileLikeObject.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n copy,\r\n extend,\r\n element,\r\n isElement\r\n } = angular;\r\n\r\n\r\nexport default function __identity($compile, FileLikeObject) {\r\n \r\n \r\n return class FileItem {\r\n /**\r\n * Creates an instance of FileItem\r\n * @param {FileUploader} uploader\r\n * @param {File|HTMLInputElement|Object} some\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(uploader, some, options) {\r\n var isInput = !!some.input;\r\n var input = isInput ? element(some.input) : null;\r\n var file = !isInput ? some : null;\r\n\r\n extend(this, {\r\n url: uploader.url,\r\n alias: uploader.alias,\r\n headers: copy(uploader.headers),\r\n formData: copy(uploader.formData),\r\n removeAfterUpload: uploader.removeAfterUpload,\r\n withCredentials: uploader.withCredentials,\r\n disableMultipart: uploader.disableMultipart,\r\n method: uploader.method,\r\n timeout: uploader.timeout\r\n }, options, {\r\n uploader: uploader,\r\n file: new FileLikeObject(some),\r\n isReady: false,\r\n isUploading: false,\r\n isUploaded: false,\r\n isSuccess: false,\r\n isCancel: false,\r\n isError: false,\r\n progress: 0,\r\n index: null,\r\n _file: file,\r\n _input: input\r\n });\r\n\r\n if (input) this._replaceNode(input);\r\n }\r\n /**********************\r\n * PUBLIC\r\n **********************/\r\n /**\r\n * Uploads a FileItem\r\n */\r\n upload() {\r\n try {\r\n this.uploader.uploadItem(this);\r\n } catch(e) {\r\n var message = e.name + ':' + e.message;\r\n this.uploader._onCompleteItem(this, message, e.code, []);\r\n this.uploader._onErrorItem(this, message, e.code, []);\r\n }\r\n }\r\n /**\r\n * Cancels uploading of FileItem\r\n */\r\n cancel() {\r\n this.uploader.cancelItem(this);\r\n }\r\n /**\r\n * Removes a FileItem\r\n */\r\n remove() {\r\n this.uploader.removeFromQueue(this);\r\n }\r\n /**\r\n * Callback\r\n * @private\r\n */\r\n onBeforeUpload() {\r\n }\r\n /**\r\n * Callback\r\n * @param {Number} progress\r\n * @private\r\n */\r\n onProgress(progress) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onSuccess(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onError(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onCancel(response, status, headers) {\r\n }\r\n /**\r\n * Callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n */\r\n onComplete(response, status, headers) {\r\n }\r\n /**\r\n * Callback \r\n */\r\n onTimeout() {\r\n }\r\n /**********************\r\n * PRIVATE\r\n **********************/\r\n /**\r\n * Inner callback\r\n */\r\n _onBeforeUpload() {\r\n this.isReady = true;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = false;\r\n this.progress = 0;\r\n this.onBeforeUpload();\r\n }\r\n /**\r\n * Inner callback\r\n * @param {Number} progress\r\n * @private\r\n */\r\n _onProgress(progress) {\r\n this.progress = progress;\r\n this.onProgress(progress);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onSuccess(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = true;\r\n this.isSuccess = true;\r\n this.isCancel = false;\r\n this.isError = false;\r\n this.progress = 100;\r\n this.index = null;\r\n this.onSuccess(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onError(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = true;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = true;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onError(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onCancel(response, status, headers) {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = true;\r\n this.isError = false;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onCancel(response, status, headers);\r\n }\r\n /**\r\n * Inner callback\r\n * @param {*} response\r\n * @param {Number} status\r\n * @param {Object} headers\r\n * @private\r\n */\r\n _onComplete(response, status, headers) {\r\n this.onComplete(response, status, headers);\r\n if(this.removeAfterUpload) this.remove();\r\n }\r\n /**\r\n * Inner callback \r\n * @private\r\n */\r\n _onTimeout() {\r\n this.isReady = false;\r\n this.isUploading = false;\r\n this.isUploaded = false;\r\n this.isSuccess = false;\r\n this.isCancel = false;\r\n this.isError = true;\r\n this.progress = 0;\r\n this.index = null;\r\n this.onTimeout();\r\n }\r\n /**\r\n * Destroys a FileItem\r\n */\r\n _destroy() {\r\n if(this._input) this._input.remove();\r\n if(this._form) this._form.remove();\r\n delete this._form;\r\n delete this._input;\r\n }\r\n /**\r\n * Prepares to uploading\r\n * @private\r\n */\r\n _prepareToUploading() {\r\n this.index = this.index || ++this.uploader._nextIndex;\r\n this.isReady = true;\r\n }\r\n /**\r\n * Replaces input element on his clone\r\n * @param {JQLite|jQuery} input\r\n * @private\r\n */\r\n _replaceNode(input) {\r\n var clone = $compile(input.clone())(input.scope());\r\n clone.prop('value', null); // FF fix\r\n input.css('display', 'none');\r\n input.after(clone); // remove jquery dependency\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$compile',\r\n 'FileLikeObject'\r\n];\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileItem.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity() {\r\n\r\n\r\n class FileDirective {\r\n /**\r\n * Creates instance of {FileDirective} object\r\n * @param {Object} options\r\n * @param {Object} options.uploader\r\n * @param {HTMLElement} options.element\r\n * @param {Object} options.events\r\n * @param {String} options.prop\r\n * @constructor\r\n */\r\n constructor(options) {\r\n extend(this, options);\r\n this.uploader._directives[this.prop].push(this);\r\n this._saveLinks();\r\n this.bind();\r\n }\r\n /**\r\n * Binds events handles\r\n */\r\n bind() {\r\n for(var key in this.events) {\r\n var prop = this.events[key];\r\n this.element.bind(key, this[prop]);\r\n }\r\n }\r\n /**\r\n * Unbinds events handles\r\n */\r\n unbind() {\r\n for(var key in this.events) {\r\n this.element.unbind(key, this.events[key]);\r\n }\r\n }\r\n /**\r\n * Destroys directive\r\n */\r\n destroy() {\r\n var index = this.uploader._directives[this.prop].indexOf(this);\r\n this.uploader._directives[this.prop].splice(index, 1);\r\n this.unbind();\r\n // this.element = null;\r\n }\r\n /**\r\n * Saves links to functions\r\n * @private\r\n */\r\n _saveLinks() {\r\n for(var key in this.events) {\r\n var prop = this.events[key];\r\n this[prop] = this[prop].bind(this);\r\n }\r\n }\r\n }\r\n\r\n\r\n /**\r\n * Map of events\r\n * @type {Object}\r\n */\r\n FileDirective.prototype.events = {};\r\n\r\n\r\n return FileDirective;\r\n}\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileDirective.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity($compile, FileDirective) {\r\n \r\n \r\n return class FileSelect extends FileDirective {\r\n /**\r\n * Creates instance of {FileSelect} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy',\r\n change: 'onChange'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'select'\r\n });\r\n \r\n super(extendedOptions);\r\n \r\n if(!this.uploader.isHTML5) {\r\n this.element.removeAttr('multiple');\r\n }\r\n this.element.prop('value', null); // FF fix\r\n }\r\n /**\r\n * Returns options\r\n * @return {Object|undefined}\r\n */\r\n getOptions() {\r\n }\r\n /**\r\n * Returns filters\r\n * @return {Array<Function>|String|undefined}\r\n */\r\n getFilters() {\r\n }\r\n /**\r\n * If returns \"true\" then HTMLInputElement will be cleared\r\n * @returns {Boolean}\r\n */\r\n isEmptyAfterSelection() {\r\n return !!this.element.attr('multiple');\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onChange() {\r\n var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];\r\n var options = this.getOptions();\r\n var filters = this.getFilters();\r\n\r\n if(!this.uploader.isHTML5) this.destroy();\r\n this.uploader.addToQueue(files, options, filters);\r\n if(this.isEmptyAfterSelection()) {\r\n this.element.prop('value', null);\r\n this.element.replaceWith($compile(this.element.clone())(this.scope)); // IE fix\r\n }\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$compile',\r\n 'FileDirective'\r\n];\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileSelect.js","'use strict';\r\n\r\n\r\nconst {\r\n bind,\r\n isUndefined\r\n} = angular;\r\n\r\n\r\nexport default function __identity($q) {\r\n\r\n\r\n return class Pipeline {\r\n /**\r\n * @param {Array<Function>} pipes\r\n */\r\n constructor(pipes = []) {\r\n this.pipes = pipes;\r\n }\r\n next(args) {\r\n let pipe = this.pipes.shift();\r\n if (isUndefined(pipe)) {\r\n this.onSuccessful(...args);\r\n return;\r\n }\r\n let err = new Error('The filter has not passed');\r\n err.pipe = pipe;\r\n err.args = args;\r\n if (pipe.isAsync) {\r\n let deferred = $q.defer();\r\n let onFulfilled = bind(this, this.next, args);\r\n let onRejected = bind(this, this.onThrown, err);\r\n deferred.promise.then(onFulfilled, onRejected);\r\n pipe(...args, deferred);\r\n } else {\r\n let isDone = Boolean(pipe(...args));\r\n if (isDone) {\r\n this.next(args);\r\n } else {\r\n this.onThrown(err);\r\n }\r\n }\r\n }\r\n exec(...args) {\r\n this.next(args);\r\n }\r\n onThrown(err) {\r\n\r\n }\r\n onSuccessful(...args) {\r\n\r\n }\r\n }\r\n \r\n}\r\n\r\n__identity.$inject = [\r\n '$q'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/Pipeline.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend,\r\n forEach\r\n } = angular;\r\n\r\n\r\nexport default function __identity(FileDirective) {\r\n \r\n \r\n return class FileDrop extends FileDirective {\r\n /**\r\n * Creates instance of {FileDrop} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy',\r\n drop: 'onDrop',\r\n dragover: 'onDragOver',\r\n dragleave: 'onDragLeave'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'drop'\r\n });\r\n \r\n super(extendedOptions);\r\n }\r\n /**\r\n * Returns options\r\n * @return {Object|undefined}\r\n */\r\n getOptions() {\r\n }\r\n /**\r\n * Returns filters\r\n * @return {Array<Function>|String|undefined}\r\n */\r\n getFilters() {\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDrop(event) {\r\n var transfer = this._getTransfer(event);\r\n if(!transfer) return;\r\n var options = this.getOptions();\r\n var filters = this.getFilters();\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._removeOverClass, this);\r\n this.uploader.addToQueue(transfer.files, options, filters);\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDragOver(event) {\r\n var transfer = this._getTransfer(event);\r\n if(!this._haveFiles(transfer.types)) return;\r\n transfer.dropEffect = 'copy';\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._addOverClass, this);\r\n }\r\n /**\r\n * Event handler\r\n */\r\n onDragLeave(event) {\r\n if(event.currentTarget === this.element[0]) return;\r\n this._preventAndStop(event);\r\n forEach(this.uploader._directives.over, this._removeOverClass, this);\r\n }\r\n /**\r\n * Helper\r\n */\r\n _getTransfer(event) {\r\n return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;\r\n }\r\n /**\r\n * Helper\r\n */\r\n _preventAndStop(event) {\r\n event.preventDefault();\r\n event.stopPropagation();\r\n }\r\n /**\r\n * Returns \"true\" if types contains files\r\n * @param {Object} types\r\n */\r\n _haveFiles(types) {\r\n if(!types) return false;\r\n if(types.indexOf) {\r\n return types.indexOf('Files') !== -1;\r\n } else if(types.contains) {\r\n return types.contains('Files');\r\n } else {\r\n return false;\r\n }\r\n }\r\n /**\r\n * Callback\r\n */\r\n _addOverClass(item) {\r\n item.addOverClass();\r\n }\r\n /**\r\n * Callback\r\n */\r\n _removeOverClass(item) {\r\n item.removeOverClass();\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileDirective'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileDrop.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nlet {\r\n extend\r\n } = angular;\r\n\r\n\r\nexport default function __identity(FileDirective) {\r\n \r\n \r\n return class FileOver extends FileDirective {\r\n /**\r\n * Creates instance of {FileDrop} object\r\n * @param {Object} options\r\n * @constructor\r\n */\r\n constructor(options) {\r\n let extendedOptions = extend(options, {\r\n // Map of events\r\n events: {\r\n $destroy: 'destroy'\r\n },\r\n // Name of property inside uploader._directive object\r\n prop: 'over',\r\n // Over class\r\n overClass: 'nv-file-over'\r\n });\r\n \r\n super(extendedOptions);\r\n }\r\n /**\r\n * Adds over class\r\n */\r\n addOverClass() {\r\n this.element.addClass(this.getOverClass());\r\n }\r\n /**\r\n * Removes over class\r\n */\r\n removeOverClass() {\r\n this.element.removeClass(this.getOverClass());\r\n }\r\n /**\r\n * Returns over class\r\n * @returns {String}\r\n */\r\n getOverClass() {\r\n return this.overClass;\r\n }\r\n }\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileDirective'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/services/FileOver.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity($parse, FileUploader, FileSelect) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n var object = new FileSelect({\r\n uploader: uploader,\r\n element: element,\r\n scope: scope\r\n });\r\n\r\n object.getOptions = $parse(attributes.options).bind(object, scope);\r\n object.getFilters = () => attributes.filters;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$parse',\r\n 'FileUploader',\r\n 'FileSelect'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileSelect.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity($parse, FileUploader, FileDrop) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n if (!uploader.isHTML5) return;\r\n\r\n var object = new FileDrop({\r\n uploader: uploader,\r\n element: element\r\n });\r\n\r\n object.getOptions = $parse(attributes.options).bind(object, scope);\r\n object.getFilters = () => attributes.filters;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n '$parse',\r\n 'FileUploader',\r\n 'FileDrop'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileDrop.js","'use strict';\r\n\r\n\r\nimport CONFIG from './../config.json';\r\n\r\n\r\nexport default function __identity(FileUploader, FileOver) {\r\n\r\n\r\n return {\r\n link: (scope, element, attributes) => {\r\n var uploader = scope.$eval(attributes.uploader);\r\n\r\n if (!(uploader instanceof FileUploader)) {\r\n throw new TypeError('\"Uploader\" must be an instance of FileUploader');\r\n }\r\n\r\n var object = new FileOver({\r\n uploader: uploader,\r\n element: element\r\n });\r\n\r\n object.getOverClass = () => attributes.overClass || object.overClass;\r\n }\r\n };\r\n\r\n\r\n}\r\n\r\n\r\n__identity.$inject = [\r\n 'FileUploader',\r\n 'FileOver'\r\n];\n\n\n// WEBPACK FOOTER //\n// ./src/directives/FileOver.js"],"sourceRoot":""}
\ No newline at end of file
diff --git a/civicrm/bower_components/angular-file-upload/gulpfile.js b/civicrm/bower_components/angular-file-upload/gulpfile.js
new file mode 100644
index 0000000000..9237f71058
--- /dev/null
+++ b/civicrm/bower_components/angular-file-upload/gulpfile.js
@@ -0,0 +1,35 @@
+'use strict';
+
+// https://github.com/gulpjs/gulp/blob/master/docs/README.md
+let gulp = require('gulp');
+// https://github.com/shama/webpack-stream
+let webpackStream = require('webpack-stream');
+
+let WebpackConfig = require('./WebpackConfig');
+let descriptor = require('./package.json');
+
+
+let config = new WebpackConfig(descriptor, {
+ src: './src/',
+ dist: './dist/'
+});
+
+
+gulp.task(
+ `${config.name}/build`,
+ function () {
+ return gulp
+ .src(config.path.src)
+ .pipe(webpackStream(config.get()))
+ .pipe(gulp.dest(config.path.dist));
+ }
+);
+
+gulp.task(
+ `${config.name}/watch`, function () {
+ return gulp
+ .watch(`${config.path.src}**/*.*`, [
+ `${config.name}/build`
+ ]);
+ }
+);
diff --git a/civicrm/bower_components/angular-file-upload/package.json b/civicrm/bower_components/angular-file-upload/package.json
index 58bf867dd6..c3ef75a487 100644
--- a/civicrm/bower_components/angular-file-upload/package.json
+++ b/civicrm/bower_components/angular-file-upload/package.json
@@ -1,19 +1,32 @@
{
- "name": "angular-file-upload",
- "version": "1.1.6",
- "homepage": "https://github.com/nervgh/angular-file-upload",
- "description": "Angular File Upload is a module for the AngularJS framework",
- "author": {
- "name": "nerv",
- "url": "https://github.com/nervgh"
- },
- "main": "angular-file-upload.min.js",
- "dependencies": {
- "coffee-script": "~1.6.2",
- "grunt-contrib-copy": "~0.4.1",
- "grunt-contrib-clean": "~0.4.0",
- "grunt-contrib-concat": "~0.3.0",
- "grunt-contrib-uglify": "~0.2.1",
- "grunt": "~0.4.1"
- }
+ "name": "angular-file-upload",
+ "version": "2.6.1",
+ "homepage": "https://github.com/nervgh/angular-file-upload",
+ "description": "Angular File Upload is a module for the AngularJS framework",
+ "license": "MIT",
+ "author": {
+ "name": "nerv",
+ "url": "https://github.com/nervgh"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/nervgh/angular-file-upload.git"
+ },
+ "main": "dist/angular-file-upload.js",
+ "engines": {
+ "node": ">=4.0.0"
+ },
+ "devDependencies": {
+ "babel-core": "~6.8.0",
+ "babel-loader": "~6.2.4",
+ "babel-preset-es2015": "~6.6.0",
+ "gulp": "~3.9.1",
+ "json-loader": "~0.5.4",
+ "raw-loader": "~0.5.1",
+ "serve": "^11.2.0",
+ "webpack-stream": "~3.2.0"
+ },
+ "scripts": {
+ "serve": "serve ."
+ }
}
diff --git a/civicrm/bower_components/angular-file-upload/src/intro.js b/civicrm/bower_components/angular-file-upload/src/intro.js
deleted file mode 100644
index e4ff907e5b..0000000000
--- a/civicrm/bower_components/angular-file-upload/src/intro.js
+++ /dev/null
@@ -1,11 +0,0 @@
-(function(angular, factory) {
- if (typeof define === 'function' && define.amd) {
- define('angular-file-upload', ['angular'], function(angular) {
- return factory(angular);
- });
- } else {
- return factory(angular);
- }
-}(typeof angular === 'undefined' ? null : angular, function(angular) {
-
-var module = angular.module('angularFileUpload', []);
diff --git a/civicrm/bower_components/angular-file-upload/src/module.js b/civicrm/bower_components/angular-file-upload/src/module.js
deleted file mode 100644
index 3813fd16bd..0000000000
--- a/civicrm/bower_components/angular-file-upload/src/module.js
+++ /dev/null
@@ -1,1322 +0,0 @@
-'use strict';
-
-/**
- * Classes
- *
- * FileUploader
- * FileUploader.FileLikeObject
- * FileUploader.FileItem
- * FileUploader.FileDirective
- * FileUploader.FileSelect
- * FileUploader.FileDrop
- * FileUploader.FileOver
- */
-
-module
-
-
- .value('fileUploaderOptions', {
- url: '/',
- alias: 'file',
- headers: {},
- queue: [],
- progress: 0,
- autoUpload: false,
- removeAfterUpload: false,
- method: 'POST',
- filters: [],
- formData: [],
- queueLimit: Number.MAX_VALUE,
- withCredentials: false
- })
-
-
- .factory('FileUploader', ['fileUploaderOptions', '$rootScope', '$http', '$window', '$compile',
- function(fileUploaderOptions, $rootScope, $http, $window, $compile) {
- /**
- * Creates an instance of FileUploader
- * @param {Object} [options]
- * @constructor
- */
- function FileUploader(options) {
- var settings = angular.copy(fileUploaderOptions);
- angular.extend(this, settings, options, {
- isUploading: false,
- _nextIndex: 0,
- _failFilterIndex: -1,
- _directives: {select: [], drop: [], over: []}
- });
-
- // add default filters
- this.filters.unshift({name: 'queueLimit', fn: this._queueLimitFilter});
- this.filters.unshift({name: 'folder', fn: this._folderFilter});
- }
- /**********************
- * PUBLIC
- **********************/
- /**
- * Checks a support the html5 uploader
- * @returns {Boolean}
- * @readonly
- */
- FileUploader.prototype.isHTML5 = !!($window.File && $window.FormData);
- /**
- * Adds items to the queue
- * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files
- * @param {Object} [options]
- * @param {Array<Function>|String} filters
- */
- FileUploader.prototype.addToQueue = function(files, options, filters) {
- var list = this.isArrayLikeObject(files) ? files: [files];
- var arrayOfFilters = this._getFilters(filters);
- var count = this.queue.length;
- var addedFileItems = [];
-
- angular.forEach(list, function(some /*{File|HTMLInputElement|Object}*/) {
- var temp = new FileUploader.FileLikeObject(some);
-
- if (this._isValidFile(temp, arrayOfFilters, options)) {
- var fileItem = new FileUploader.FileItem(this, some, options);
- addedFileItems.push(fileItem);
- this.queue.push(fileItem);
- this._onAfterAddingFile(fileItem);
- } else {
- var filter = arrayOfFilters[this._failFilterIndex];
- this._onWhenAddingFileFailed(temp, filter, options);
- }
- }, this);
-
- if(this.queue.length !== count) {
- this._onAfterAddingAll(addedFileItems);
- this.progress = this._getTotalProgress();
- }
-
- this._render();
- if (this.autoUpload) this.uploadAll();
- };
- /**
- * Remove items from the queue. Remove last: index = -1
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.removeFromQueue = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- if (item.isUploading) item.cancel();
- this.queue.splice(index, 1);
- item._destroy();
- this.progress = this._getTotalProgress();
- };
- /**
- * Clears the queue
- */
- FileUploader.prototype.clearQueue = function() {
- while(this.queue.length) {
- this.queue[0].remove();
- }
- this.progress = 0;
- };
- /**
- * Uploads a item from the queue
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.uploadItem = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- var transport = this.isHTML5 ? '_xhrTransport' : '_iframeTransport';
-
- item._prepareToUploading();
- if(this.isUploading) return;
-
- this.isUploading = true;
- this[transport](item);
- };
- /**
- * Cancels uploading of item from the queue
- * @param {FileItem|Number} value
- */
- FileUploader.prototype.cancelItem = function(value) {
- var index = this.getIndexOfItem(value);
- var item = this.queue[index];
- var prop = this.isHTML5 ? '_xhr' : '_form';
- if (item && item.isUploading) item[prop].abort();
- };
- /**
- * Uploads all not uploaded items of queue
- */
- FileUploader.prototype.uploadAll = function() {
- var items = this.getNotUploadedItems().filter(function(item) {
- return !item.isUploading;
- });
- if (!items.length) return;
-
- angular.forEach(items, function(item) {
- item._prepareToUploading();
- });
- items[0].upload();
- };
- /**
- * Cancels all uploads
- */
- FileUploader.prototype.cancelAll = function() {
- var items = this.getNotUploadedItems();
- angular.forEach(items, function(item) {
- item.cancel();
- });
- };
- /**
- * Returns "true" if value an instance of File
- * @param {*} value
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype.isFile = function(value) {
- var fn = $window.File;
- return (fn && value instanceof fn);
- };
- /**
- * Returns "true" if value an instance of FileLikeObject
- * @param {*} value
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype.isFileLikeObject = function(value) {
- return value instanceof FileUploader.FileLikeObject;
- };
- /**
- * Returns "true" if value is array like object
- * @param {*} value
- * @returns {Boolean}
- */
- FileUploader.prototype.isArrayLikeObject = function(value) {
- return (angular.isObject(value) && 'length' in value);
- };
- /**
- * Returns a index of item from the queue
- * @param {Item|Number} value
- * @returns {Number}
- */
- FileUploader.prototype.getIndexOfItem = function(value) {
- return angular.isNumber(value) ? value : this.queue.indexOf(value);
- };
- /**
- * Returns not uploaded items
- * @returns {Array}
- */
- FileUploader.prototype.getNotUploadedItems = function() {
- return this.queue.filter(function(item) {
- return !item.isUploaded;
- });
- };
- /**
- * Returns items ready for upload
- * @returns {Array}
- */
- FileUploader.prototype.getReadyItems = function() {
- return this.queue
- .filter(function(item) {
- return (item.isReady && !item.isUploading);
- })
- .sort(function(item1, item2) {
- return item1.index - item2.index;
- });
- };
- /**
- * Destroys instance of FileUploader
- */
- FileUploader.prototype.destroy = function() {
- angular.forEach(this._directives, function(key) {
- angular.forEach(this._directives[key], function(object) {
- object.destroy();
- }, this);
- }, this);
- };
- /**
- * Callback
- * @param {Array} fileItems
- */
- FileUploader.prototype.onAfterAddingAll = function(fileItems) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- */
- FileUploader.prototype.onAfterAddingFile = function(fileItem) {};
- /**
- * Callback
- * @param {File|Object} item
- * @param {Object} filter
- * @param {Object} options
- * @private
- */
- FileUploader.prototype.onWhenAddingFileFailed = function(item, filter, options) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- */
- FileUploader.prototype.onBeforeUploadItem = function(fileItem) {};
- /**
- * Callback
- * @param {FileItem} fileItem
- * @param {Number} progress
- */
- FileUploader.prototype.onProgressItem = function(fileItem, progress) {};
- /**
- * Callback
- * @param {Number} progress
- */
- FileUploader.prototype.onProgressAll = function(progress) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onSuccessItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onErrorItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onCancelItem = function(item, response, status, headers) {};
- /**
- * Callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileUploader.prototype.onCompleteItem = function(item, response, status, headers) {};
- /**
- * Callback
- */
- FileUploader.prototype.onCompleteAll = function() {};
- /**********************
- * PRIVATE
- **********************/
- /**
- * Returns the total progress
- * @param {Number} [value]
- * @returns {Number}
- * @private
- */
- FileUploader.prototype._getTotalProgress = function(value) {
- if(this.removeAfterUpload) return value || 0;
-
- var notUploaded = this.getNotUploadedItems().length;
- var uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;
- var ratio = 100 / this.queue.length;
- var current = (value || 0) * ratio / 100;
-
- return Math.round(uploaded * ratio + current);
- };
- /**
- * Returns array of filters
- * @param {Array<Function>|String} filters
- * @returns {Array<Function>}
- * @private
- */
- FileUploader.prototype._getFilters = function(filters) {
- if (angular.isUndefined(filters)) return this.filters;
- if (angular.isArray(filters)) return filters;
- var names = filters.match(/[^\s,]+/g);
- return this.filters.filter(function(filter) {
- return names.indexOf(filter.name) !== -1;
- }, this);
- };
- /**
- * Updates html
- * @private
- */
- FileUploader.prototype._render = function() {
- if (!$rootScope.$$phase) $rootScope.$apply();
- };
- /**
- * Returns "true" if item is a file (not folder)
- * @param {File|FileLikeObject} item
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._folderFilter = function(item) {
- return !!(item.size || item.type);
- };
- /**
- * Returns "true" if the limit has not been reached
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._queueLimitFilter = function() {
- return this.queue.length < this.queueLimit;
- };
- /**
- * Returns "true" if file pass all filters
- * @param {File|Object} file
- * @param {Array<Function>} filters
- * @param {Object} options
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._isValidFile = function(file, filters, options) {
- this._failFilterIndex = -1;
- return !filters.length ? true : filters.every(function(filter) {
- this._failFilterIndex++;
- return filter.fn.call(this, file, options);
- }, this);
- };
- /**
- * Checks whether upload successful
- * @param {Number} status
- * @returns {Boolean}
- * @private
- */
- FileUploader.prototype._isSuccessCode = function(status) {
- return (status >= 200 && status < 300) || status === 304;
- };
- /**
- * Transforms the server response
- * @param {*} response
- * @param {Object} headers
- * @returns {*}
- * @private
- */
- FileUploader.prototype._transformResponse = function(response, headers) {
- var headersGetter = this._headersGetter(headers);
- angular.forEach($http.defaults.transformResponse, function(transformFn) {
- response = transformFn(response, headersGetter);
- });
- return response;
- };
- /**
- * Parsed response headers
- * @param headers
- * @returns {Object}
- * @see https://github.com/angular/angular.js/blob/master/src/ng/http.js
- * @private
- */
- FileUploader.prototype._parseHeaders = function(headers) {
- var parsed = {}, key, val, i;
-
- if (!headers) return parsed;
-
- angular.forEach(headers.split('\n'), function(line) {
- i = line.indexOf(':');
- key = line.slice(0, i).trim().toLowerCase();
- val = line.slice(i + 1).trim();
-
- if (key) {
- parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
- }
- });
-
- return parsed;
- };
- /**
- * Returns function that returns headers
- * @param {Object} parsedHeaders
- * @returns {Function}
- * @private
- */
- FileUploader.prototype._headersGetter = function(parsedHeaders) {
- return function(name) {
- if (name) {
- return parsedHeaders[name.toLowerCase()] || null;
- }
- return parsedHeaders;
- };
- };
- /**
- * The XMLHttpRequest transport
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._xhrTransport = function(item) {
- var xhr = item._xhr = new XMLHttpRequest();
- var form = new FormData();
- var that = this;
-
- that._onBeforeUploadItem(item);
-
- angular.forEach(item.formData, function(obj) {
- angular.forEach(obj, function(value, key) {
- form.append(key, value);
- });
- });
-
- if ( typeof(item._file.size) != 'number' ) {
- throw new TypeError('The file specified is no longer valid');
- }
-
- form.append(item.alias, item._file, item.file.name);
-
- xhr.upload.onprogress = function(event) {
- var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
- that._onProgressItem(item, progress);
- };
-
- xhr.onload = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- var gist = that._isSuccessCode(xhr.status) ? 'Success' : 'Error';
- var method = '_on' + gist + 'Item';
- that[method](item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.onerror = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- that._onErrorItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.onabort = function() {
- var headers = that._parseHeaders(xhr.getAllResponseHeaders());
- var response = that._transformResponse(xhr.response, headers);
- that._onCancelItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- xhr.open(item.method, item.url, true);
-
- xhr.withCredentials = item.withCredentials;
-
- angular.forEach(item.headers, function(value, name) {
- xhr.setRequestHeader(name, value);
- });
-
- xhr.send(form);
- this._render();
- };
- /**
- * The IFrame transport
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._iframeTransport = function(item) {
- var form = angular.element('<form style="display: none;" />');
- var iframe = angular.element('<iframe name="iframeTransport' + Date.now() + '">');
- var input = item._input;
- var that = this;
-
- if (item._form) item._form.replaceWith(input); // remove old form
- item._form = form; // save link to new form
-
- that._onBeforeUploadItem(item);
-
- input.prop('name', item.alias);
-
- angular.forEach(item.formData, function(obj) {
- angular.forEach(obj, function(value, key) {
- var element = angular.element('<input type="hidden" name="' + key + '" />');
- element.val(value);
- form.append(element);
- });
- });
-
- form.prop({
- action: item.url,
- method: 'POST',
- target: iframe.prop('name'),
- enctype: 'multipart/form-data',
- encoding: 'multipart/form-data' // old IE
- });
-
- iframe.bind('load', function() {
- try {
- // Fix for legacy IE browsers that loads internal error page
- // when failed WS response received. In consequence iframe
- // content access denied error is thrown becouse trying to
- // access cross domain page. When such thing occurs notifying
- // with empty response object. See more info at:
- // http://stackoverflow.com/questions/151362/access-is-denied-error-on-accessing-iframe-document-object
- // Note that if non standard 4xx or 5xx error code returned
- // from WS then response content can be accessed without error
- // but 'XHR' status becomes 200. In order to avoid confusion
- // returning response via same 'success' event handler.
-
- // fixed angular.contents() for iframes
- var html = iframe[0].contentDocument.body.innerHTML;
- } catch (e) {}
-
- var xhr = {response: html, status: 200, dummy: true};
- var headers = {};
- var response = that._transformResponse(xhr.response, headers);
-
- that._onSuccessItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- });
-
- form.abort = function() {
- var xhr = {status: 0, dummy: true};
- var headers = {};
- var response;
-
- iframe.unbind('load').prop('src', 'javascript:false;');
- form.replaceWith(input);
-
- that._onCancelItem(item, response, xhr.status, headers);
- that._onCompleteItem(item, response, xhr.status, headers);
- };
-
- input.after(form);
- form.append(input).append(iframe);
-
- form[0].submit();
- this._render();
- };
- /**
- * Inner callback
- * @param {File|Object} item
- * @param {Object} filter
- * @param {Object} options
- * @private
- */
- FileUploader.prototype._onWhenAddingFileFailed = function(item, filter, options) {
- this.onWhenAddingFileFailed(item, filter, options);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- */
- FileUploader.prototype._onAfterAddingFile = function(item) {
- this.onAfterAddingFile(item);
- };
- /**
- * Inner callback
- * @param {Array<FileItem>} items
- */
- FileUploader.prototype._onAfterAddingAll = function(items) {
- this.onAfterAddingAll(items);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @private
- */
- FileUploader.prototype._onBeforeUploadItem = function(item) {
- item._onBeforeUpload();
- this.onBeforeUploadItem(item);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {Number} progress
- * @private
- */
- FileUploader.prototype._onProgressItem = function(item, progress) {
- var total = this._getTotalProgress(progress);
- this.progress = total;
- item._onProgress(progress);
- this.onProgressItem(item, progress);
- this.onProgressAll(total);
- this._render();
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onSuccessItem = function(item, response, status, headers) {
- item._onSuccess(response, status, headers);
- this.onSuccessItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onErrorItem = function(item, response, status, headers) {
- item._onError(response, status, headers);
- this.onErrorItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onCancelItem = function(item, response, status, headers) {
- item._onCancel(response, status, headers);
- this.onCancelItem(item, response, status, headers);
- };
- /**
- * Inner callback
- * @param {FileItem} item
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileUploader.prototype._onCompleteItem = function(item, response, status, headers) {
- item._onComplete(response, status, headers);
- this.onCompleteItem(item, response, status, headers);
-
- var nextItem = this.getReadyItems()[0];
- this.isUploading = false;
-
- if(angular.isDefined(nextItem)) {
- nextItem.upload();
- return;
- }
-
- this.onCompleteAll();
- this.progress = this._getTotalProgress();
- this._render();
- };
- /**********************
- * STATIC
- **********************/
- /**
- * @borrows FileUploader.prototype.isFile
- */
- FileUploader.isFile = FileUploader.prototype.isFile;
- /**
- * @borrows FileUploader.prototype.isFileLikeObject
- */
- FileUploader.isFileLikeObject = FileUploader.prototype.isFileLikeObject;
- /**
- * @borrows FileUploader.prototype.isArrayLikeObject
- */
- FileUploader.isArrayLikeObject = FileUploader.prototype.isArrayLikeObject;
- /**
- * @borrows FileUploader.prototype.isHTML5
- */
- FileUploader.isHTML5 = FileUploader.prototype.isHTML5;
- /**
- * Inherits a target (Class_1) by a source (Class_2)
- * @param {Function} target
- * @param {Function} source
- */
- FileUploader.inherit = function(target, source) {
- target.prototype = Object.create(source.prototype);
- target.prototype.constructor = target;
- target.super_ = source;
- };
- FileUploader.FileLikeObject = FileLikeObject;
- FileUploader.FileItem = FileItem;
- FileUploader.FileDirective = FileDirective;
- FileUploader.FileSelect = FileSelect;
- FileUploader.FileDrop = FileDrop;
- FileUploader.FileOver = FileOver;
-
- // ---------------------------
-
- /**
- * Creates an instance of FileLikeObject
- * @param {File|HTMLInputElement|Object} fileOrInput
- * @constructor
- */
- function FileLikeObject(fileOrInput) {
- var isInput = angular.isElement(fileOrInput);
- var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
- var postfix = angular.isString(fakePathOrObject) ? 'FakePath' : 'Object';
- var method = '_createFrom' + postfix;
- this[method](fakePathOrObject);
- }
-
- /**
- * Creates file like object from fake path string
- * @param {String} path
- * @private
- */
- FileLikeObject.prototype._createFromFakePath = function(path) {
- this.lastModifiedDate = null;
- this.size = null;
- this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
- this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
- };
- /**
- * Creates file like object from object
- * @param {File|FileLikeObject} object
- * @private
- */
- FileLikeObject.prototype._createFromObject = function(object) {
- this.lastModifiedDate = angular.copy(object.lastModifiedDate);
- this.size = object.size;
- this.type = object.type;
- this.name = object.name;
- };
-
- // ---------------------------
-
- /**
- * Creates an instance of FileItem
- * @param {FileUploader} uploader
- * @param {File|HTMLInputElement|Object} some
- * @param {Object} options
- * @constructor
- */
- function FileItem(uploader, some, options) {
- var isInput = angular.isElement(some);
- var input = isInput ? angular.element(some) : null;
- var file = !isInput ? some : null;
-
- angular.extend(this, {
- url: uploader.url,
- alias: uploader.alias,
- headers: angular.copy(uploader.headers),
- formData: angular.copy(uploader.formData),
- removeAfterUpload: uploader.removeAfterUpload,
- withCredentials: uploader.withCredentials,
- method: uploader.method
- }, options, {
- uploader: uploader,
- file: new FileUploader.FileLikeObject(some),
- isReady: false,
- isUploading: false,
- isUploaded: false,
- isSuccess: false,
- isCancel: false,
- isError: false,
- progress: 0,
- index: null,
- _file: file,
- _input: input
- });
-
- if (input) this._replaceNode(input);
- }
- /**********************
- * PUBLIC
- **********************/
- /**
- * Uploads a FileItem
- */
- FileItem.prototype.upload = function() {
- try {
- this.uploader.uploadItem(this);
- } catch (e) {
- this.uploader._onCompleteItem( this, '', 0, [] );
- this.uploader._onErrorItem( this, '', 0, [] );
- }
- };
- /**
- * Cancels uploading of FileItem
- */
- FileItem.prototype.cancel = function() {
- this.uploader.cancelItem(this);
- };
- /**
- * Removes a FileItem
- */
- FileItem.prototype.remove = function() {
- this.uploader.removeFromQueue(this);
- };
- /**
- * Callback
- * @private
- */
- FileItem.prototype.onBeforeUpload = function() {};
- /**
- * Callback
- * @param {Number} progress
- * @private
- */
- FileItem.prototype.onProgress = function(progress) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onSuccess = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onError = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onCancel = function(response, status, headers) {};
- /**
- * Callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- */
- FileItem.prototype.onComplete = function(response, status, headers) {};
- /**********************
- * PRIVATE
- **********************/
- /**
- * Inner callback
- */
- FileItem.prototype._onBeforeUpload = function() {
- this.isReady = true;
- this.isUploading = true;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = false;
- this.progress = 0;
- this.onBeforeUpload();
- };
- /**
- * Inner callback
- * @param {Number} progress
- * @private
- */
- FileItem.prototype._onProgress = function(progress) {
- this.progress = progress;
- this.onProgress(progress);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onSuccess = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = true;
- this.isCancel = false;
- this.isError = false;
- this.progress = 100;
- this.index = null;
- this.onSuccess(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onError = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = true;
- this.progress = 0;
- this.index = null;
- this.onError(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onCancel = function(response, status, headers) {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = true;
- this.isError = false;
- this.progress = 0;
- this.index = null;
- this.onCancel(response, status, headers);
- };
- /**
- * Inner callback
- * @param {*} response
- * @param {Number} status
- * @param {Object} headers
- * @private
- */
- FileItem.prototype._onComplete = function(response, status, headers) {
- this.onComplete(response, status, headers);
- if (this.removeAfterUpload) this.remove();
- };
- /**
- * Destroys a FileItem
- */
- FileItem.prototype._destroy = function() {
- if (this._input) this._input.remove();
- if (this._form) this._form.remove();
- delete this._form;
- delete this._input;
- };
- /**
- * Prepares to uploading
- * @private
- */
- FileItem.prototype._prepareToUploading = function() {
- this.index = this.index || ++this.uploader._nextIndex;
- this.isReady = true;
- };
- /**
- * Replaces input element on his clone
- * @param {JQLite|jQuery} input
- * @private
- */
- FileItem.prototype._replaceNode = function(input) {
- var clone = $compile(input.clone())(input.scope());
- clone.prop('value', null); // FF fix
- input.css('display', 'none');
- input.after(clone); // remove jquery dependency
- };
-
- // ---------------------------
-
- /**
- * Creates instance of {FileDirective} object
- * @param {Object} options
- * @param {Object} options.uploader
- * @param {HTMLElement} options.element
- * @param {Object} options.events
- * @param {String} options.prop
- * @constructor
- */
- function FileDirective(options) {
- angular.extend(this, options);
- this.uploader._directives[this.prop].push(this);
- this._saveLinks();
- this.bind();
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileDirective.prototype.events = {};
- /**
- * Binds events handles
- */
- FileDirective.prototype.bind = function() {
- for(var key in this.events) {
- var prop = this.events[key];
- this.element.bind(key, this[prop]);
- }
- };
- /**
- * Unbinds events handles
- */
- FileDirective.prototype.unbind = function() {
- for(var key in this.events) {
- this.element.unbind(key, this.events[key]);
- }
- };
- /**
- * Destroys directive
- */
- FileDirective.prototype.destroy = function() {
- var index = this.uploader._directives[this.prop].indexOf(this);
- this.uploader._directives[this.prop].splice(index, 1);
- this.unbind();
- // this.element = null;
- };
- /**
- * Saves links to functions
- * @private
- */
- FileDirective.prototype._saveLinks = function() {
- for(var key in this.events) {
- var prop = this.events[key];
- this[prop] = this[prop].bind(this);
- }
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileSelect, FileDirective);
-
- /**
- * Creates instance of {FileSelect} object
- * @param {Object} options
- * @constructor
- */
- function FileSelect(options) {
- FileSelect.super_.apply(this, arguments);
-
- if(!this.uploader.isHTML5) {
- this.element.removeAttr('multiple');
- }
- this.element.prop('value', null); // FF fix
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileSelect.prototype.events = {
- $destroy: 'destroy',
- change: 'onChange'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileSelect.prototype.prop = 'select';
- /**
- * Returns options
- * @return {Object|undefined}
- */
- FileSelect.prototype.getOptions = function() {};
- /**
- * Returns filters
- * @return {Array<Function>|String|undefined}
- */
- FileSelect.prototype.getFilters = function() {};
- /**
- * If returns "true" then HTMLInputElement will be cleared
- * @returns {Boolean}
- */
- FileSelect.prototype.isEmptyAfterSelection = function() {
- return !!this.element.attr('multiple');
- };
- /**
- * Event handler
- */
- FileSelect.prototype.onChange = function() {
- var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];
- var options = this.getOptions();
- var filters = this.getFilters();
-
- if (!this.uploader.isHTML5) this.destroy();
- this.uploader.addToQueue(files, options, filters);
- if (this.isEmptyAfterSelection()) this.element.prop('value', null);
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileDrop, FileDirective);
-
- /**
- * Creates instance of {FileDrop} object
- * @param {Object} options
- * @constructor
- */
- function FileDrop(options) {
- FileDrop.super_.apply(this, arguments);
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileDrop.prototype.events = {
- $destroy: 'destroy',
- drop: 'onDrop',
- dragover: 'onDragOver',
- dragleave: 'onDragLeave'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileDrop.prototype.prop = 'drop';
- /**
- * Returns options
- * @return {Object|undefined}
- */
- FileDrop.prototype.getOptions = function() {};
- /**
- * Returns filters
- * @return {Array<Function>|String|undefined}
- */
- FileDrop.prototype.getFilters = function() {};
- /**
- * Event handler
- */
- FileDrop.prototype.onDrop = function(event) {
- var transfer = this._getTransfer(event);
- if (!transfer) return;
- var options = this.getOptions();
- var filters = this.getFilters();
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._removeOverClass, this);
- this.uploader.addToQueue(transfer.files, options, filters);
- };
- /**
- * Event handler
- */
- FileDrop.prototype.onDragOver = function(event) {
- var transfer = this._getTransfer(event);
- if(!this._haveFiles(transfer.types)) return;
- transfer.dropEffect = 'copy';
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._addOverClass, this);
- };
- /**
- * Event handler
- */
- FileDrop.prototype.onDragLeave = function(event) {
- if (event.currentTarget !== this.element[0]) return;
- this._preventAndStop(event);
- angular.forEach(this.uploader._directives.over, this._removeOverClass, this);
- };
- /**
- * Helper
- */
- FileDrop.prototype._getTransfer = function(event) {
- return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
- };
- /**
- * Helper
- */
- FileDrop.prototype._preventAndStop = function(event) {
- event.preventDefault();
- event.stopPropagation();
- };
- /**
- * Returns "true" if types contains files
- * @param {Object} types
- */
- FileDrop.prototype._haveFiles = function(types) {
- if (!types) return false;
- if (types.indexOf) {
- return types.indexOf('Files') !== -1;
- } else if(types.contains) {
- return types.contains('Files');
- } else {
- return false;
- }
- };
- /**
- * Callback
- */
- FileDrop.prototype._addOverClass = function(item) {
- item.addOverClass();
- };
- /**
- * Callback
- */
- FileDrop.prototype._removeOverClass = function(item) {
- item.removeOverClass();
- };
-
- // ---------------------------
-
- FileUploader.inherit(FileOver, FileDirective);
-
- /**
- * Creates instance of {FileDrop} object
- * @param {Object} options
- * @constructor
- */
- function FileOver(options) {
- FileOver.super_.apply(this, arguments);
- }
- /**
- * Map of events
- * @type {Object}
- */
- FileOver.prototype.events = {
- $destroy: 'destroy'
- };
- /**
- * Name of property inside uploader._directive object
- * @type {String}
- */
- FileOver.prototype.prop = 'over';
- /**
- * Over class
- * @type {string}
- */
- FileOver.prototype.overClass = 'nv-file-over';
- /**
- * Adds over class
- */
- FileOver.prototype.addOverClass = function() {
- this.element.addClass(this.getOverClass());
- };
- /**
- * Removes over class
- */
- FileOver.prototype.removeOverClass = function() {
- this.element.removeClass(this.getOverClass());
- };
- /**
- * Returns over class
- * @returns {String}
- */
- FileOver.prototype.getOverClass = function() {
- return this.overClass;
- };
-
- return FileUploader;
- }])
-
-
- .directive('nvFileSelect', ['$parse', 'FileUploader', function($parse, FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- var object = new FileUploader.FileSelect({
- uploader: uploader,
- element: element
- });
-
- object.getOptions = $parse(attributes.options).bind(object, scope);
- object.getFilters = function() {return attributes.filters;};
- }
- };
- }])
-
-
- .directive('nvFileDrop', ['$parse', 'FileUploader', function($parse, FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- if (!uploader.isHTML5) return;
-
- var object = new FileUploader.FileDrop({
- uploader: uploader,
- element: element
- });
-
- object.getOptions = $parse(attributes.options).bind(object, scope);
- object.getFilters = function() {return attributes.filters;};
- }
- };
- }])
-
-
- .directive('nvFileOver', ['FileUploader', function(FileUploader) {
- return {
- link: function(scope, element, attributes) {
- var uploader = scope.$eval(attributes.uploader);
-
- if (!(uploader instanceof FileUploader)) {
- throw new TypeError('"Uploader" must be an instance of FileUploader');
- }
-
- var object = new FileUploader.FileOver({
- uploader: uploader,
- element: element
- });
-
- object.getOverClass = function() {
- return attributes.overClass || this.overClass;
- };
- }
- };
- }])
diff --git a/civicrm/bower_components/angular-file-upload/src/outro.js b/civicrm/bower_components/angular-file-upload/src/outro.js
deleted file mode 100644
index a4051034f4..0000000000
--- a/civicrm/bower_components/angular-file-upload/src/outro.js
+++ /dev/null
@@ -1,2 +0,0 @@
- return module;
-}));
\ No newline at end of file
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 47e652ac31..4b1e858b56 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.41.2',
+ return array( 'version' => '5.42.0',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/composer.json b/civicrm/composer.json
index 8ae8ad71e7..ea5bd62ff2 100644
--- a/civicrm/composer.json
+++ b/civicrm/composer.json
@@ -83,7 +83,7 @@
"brick/money": "~0.4",
"ext-intl": "*",
"pear/mail_mime": "~1.10",
- "pear/db": "1.10",
+ "pear/db": "1.11",
"civicrm/composer-compile-lib": "~0.3 || ~1.0",
"ext-json": "*"
},
@@ -136,8 +136,8 @@
"url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
},
"angular-file-upload": {
- "url": "https://github.com/nervgh/angular-file-upload/archive/v1.1.6.zip",
- "ignore": ["examples"]
+ "url": "https://github.com/nervgh/angular-file-upload/archive/2.6.1.zip",
+ "ignore": ["examples", "src"]
},
"angular-jquery-dialog-service": {
"url": "https://github.com/totten/angular-jquery-dialog-service/archive/v0.8.0-civicrm-1.0.zip"
@@ -274,7 +274,7 @@
"PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch"
},
"pear/db": {
- "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch"
+ "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
},
"pear/mail": {
"Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch"
diff --git a/civicrm/composer.lock b/civicrm/composer.lock
index cbeb21f09a..9c00d15a18 100644
--- a/civicrm/composer.lock
+++ b/civicrm/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "aceccd69415b5fd67668ed7c0c870c39",
+ "content-hash": "96460a970b8f56a147890c6704c01d60",
"packages": [
{
"name": "adrienrn/php-mimetyper",
@@ -1450,27 +1450,22 @@
},
{
"name": "pear/db",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/pear/DB.git",
- "reference": "e158c3a48246b67cd8c95856ffbb93de4ef380fe"
+ "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/DB/zipball/e158c3a48246b67cd8c95856ffbb93de4ef380fe",
- "reference": "e158c3a48246b67cd8c95856ffbb93de4ef380fe",
+ "url": "https://api.github.com/repos/pear/DB/zipball/7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
+ "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
"shasum": ""
},
"require": {
"pear/pear-core-minimal": "*"
},
"type": "library",
- "extra": {
- "patches_applied": {
- "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch"
- }
- },
"autoload": {
"psr-0": {
"DB": "./"
@@ -1481,7 +1476,7 @@
"./"
],
"license": [
- "PHP License v3.01"
+ "PHP-3.01"
],
"authors": [
{
@@ -1506,7 +1501,11 @@
}
],
"description": "More info available on: http://pear.php.net/package/DB",
- "time": "2020-04-19T19:45:59+00:00"
+ "support": {
+ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=DB",
+ "source": "https://github.com/pear/DB"
+ },
+ "time": "2021-08-11T00:24:34+00:00"
},
{
"name": "pear/log",
diff --git a/civicrm/css/civicrm.css b/civicrm/css/civicrm.css
index 5aa2cf87fb..a19ac30c45 100644
--- a/civicrm/css/civicrm.css
+++ b/civicrm/css/civicrm.css
@@ -2087,6 +2087,11 @@ a.crm-i:hover {
opacity: .8;
}
+.crm-submit-buttons .helpicon {
+ float: left;
+ padding-right: 6px;
+}
+
.crm-container a.helpicon:hover,
.crm-container a.helpicon:focus {
opacity: 1;
@@ -3899,3 +3904,27 @@ span.crm-status-icon {
border-radius: 3px;
border: 1px solid grey;
}
+
+/* search kit grid layout styling */
+.crm-search-display-grid-container {
+ display: grid;
+ grid-gap: 1em;
+ align-items: center;
+ justify-items: center;
+}
+
+.crm-search-display-grid-layout-2 {
+ grid-template-columns: repeat(2, 1fr);
+}
+
+.crm-search-display-grid-layout-3 {
+ grid-template-columns: repeat(3, 1fr);
+}
+
+.crm-search-display-grid-layout-4 {
+ grid-template-columns: repeat(4, 1fr);
+}
+
+.crm-search-display-grid-layout-5 {
+ grid-template-columns: repeat(5, 1fr);
+}
diff --git a/civicrm/css/joomla.css b/civicrm/css/joomla.css
index 87d333b4ac..7656c9af0e 100644
--- a/civicrm/css/joomla.css
+++ b/civicrm/css/joomla.css
@@ -402,14 +402,37 @@ body.ui-dialog-open #status {
/* Joomla 4 */
-body.admin.com_civicrm.layout-default #content > .row > .col-md-12 {
+body.admin.com_civicrm.layout-default #content {
padding: 0;
}
-body.admin.com_civicrm.layout-default #subhead {
+body.admin.com_civicrm.layout-default #subhead-container {
display: none;
}
body.admin.com_civicrm.layout-default .crm-container .crm-dashlet {
max-width: 50vw; /* fixes over-wide news dashlet */
}
+
+body.admin.com_civicrm.layout-default .crm-container .content {
+ padding: inherit; /* overrides J4 duplicated padding */
+}
+
+/* J4 Modals */
+
+body.admin.com_civicrm.layout-default .crm-container.ui-dialog.ui-resizable {
+ z-index: 1021;
+}
+
+body.admin.com_civicrm.layout-default .ui-widget-overlay {
+ z-index: 1;
+}
+
+body.admin.com_civicrm.layout-default .crm-container .modal-dialog {
+ max-width: inherit;
+ padding: 0;
+ margin: 0;
+ overflow: scroll;
+ pointer-events: all;
+}
+
diff --git a/civicrm/css/menubar-joomla.css b/civicrm/css/menubar-joomla.css
index 6469677697..f73a1d27bc 100644
--- a/civicrm/css/menubar-joomla.css
+++ b/civicrm/css/menubar-joomla.css
@@ -42,8 +42,8 @@ body.admin.com_civicrm.layout-default #crm-qsearch label {
}
body.crm-menubar-below-cms-menu.layout-default > #civicrm-menu-nav #civicrm-menu {
- top: 70px;
- z-index: 1000;
+ top: calc($menubarHeight + 26px);
+ z-index: 10000;
position: absolute;
border-top: 1px solid #aaa;
}
@@ -60,23 +60,14 @@ body.admin.com_civicrm.layout-default #crm-qsearch label {
@media (max-width: $breakMin) {
body.com_civicrm.layout-default #header {
- min-height: 45px;
- padding: 10px 0;
margin-bottom: $menubarHeight;
}
body.admin.com_civicrm.layout-default #civicrm-menu-nav {
- margin-top: 45px;
+ margin-top: calc($menubarHeight + 14px);
background: #1b1b1b;
z-index: 1000;
height: $menubarHeight;
border-top: 1px solid #aaa;
}
}
-
-@media (max-width: 575px) {
-
- body.admin.com_civicrm.layout-default #civicrm-menu-nav {
- margin-top: 77px;
- }
-}
diff --git a/civicrm/ext/afform/admin/CRM/AfformAdmin/Upgrader.php b/civicrm/ext/afform/admin/CRM/AfformAdmin/Upgrader.php
index 616e6305cc..bc221cca57 100644
--- a/civicrm/ext/afform/admin/CRM/AfformAdmin/Upgrader.php
+++ b/civicrm/ext/afform/admin/CRM/AfformAdmin/Upgrader.php
@@ -6,9 +6,6 @@ use CRM_AfformAdmin_ExtensionUtil as E;
*/
class CRM_AfformAdmin_Upgrader extends CRM_AfformAdmin_Upgrader_Base {
- // By convention, functions that look like "function upgrade_NNNN()" are
- // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
-
/**
* Setup navigation item on new installs.
*
@@ -52,10 +49,10 @@ class CRM_AfformAdmin_Upgrader extends CRM_AfformAdmin_Upgrader_Base {
/**
* Update menu item
*
- * @return TRUE on success
+ * @return bool
* @throws Exception
*/
- public function upgrade_0001() {
+ public function upgrade_0001(): bool {
$this->ctx->log->info('Applying update 0001');
\Civi\Api4\Navigation::update(FALSE)
->addValue('icon', 'crm-i fa-list-alt')
diff --git a/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
index fa8554171b..b81b0251d7 100644
--- a/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
+++ b/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
@@ -2,6 +2,7 @@
namespace Civi\AfformAdmin;
+use Civi\Api4\Entity;
use Civi\Api4\Utils\CoreUtil;
use CRM_AfformAdmin_ExtensionUtil as E;
@@ -67,17 +68,32 @@ class AfformAdminMeta {
}
$info = \Civi\Api4\Entity::get(FALSE)
->addWhere('name', '=', $entityName)
- ->addSelect('title', 'icon')
->execute()->first();
if (!$info) {
// Disabled contact type or nonexistent api entity
return NULL;
}
- return [
- 'entity' => $entityName,
+ return self::entityToAfformMeta($info);
+ }
+
+ /**
+ * Converts info from API.Entity.get to an array of afform entity metadata
+ * @param array $info
+ * @return array
+ */
+ private static function entityToAfformMeta(array $info): array {
+ $meta = [
+ 'entity' => $info['name'],
'label' => $info['title'],
'icon' => $info['icon'],
];
+ // Custom entities are always type 'join'
+ if (in_array('CustomValue', $info['type'], TRUE)) {
+ $meta['type'] = 'join';
+ $max = (int) \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', substr($info['name'], 7), 'max_multiple', 'name');
+ $meta['repeat_max'] = $max ?: NULL;
+ }
+ return $meta;
}
/**
@@ -140,10 +156,17 @@ class AfformAdminMeta {
'icon' => 'fa-pencil-square-o',
'fields' => [],
],
- 'Contact' => self::getApiEntity('Contact'),
],
];
+ // Explicitly load Contact and Custom entities because they do not have afformEntity files
+ $entities = Entity::get(TRUE)
+ ->addClause('OR', ['name', '=', 'Contact'], ['type', 'CONTAINS', 'CustomValue'])
+ ->execute()->indexBy('name');
+ foreach ($entities as $name => $entity) {
+ $data['entities'][$name] = self::entityToAfformMeta($entity);
+ }
+
$contactTypes = \CRM_Contact_BAO_ContactType::basicTypeInfo();
// Call getFields on getFields to get input type labels
@@ -213,7 +236,7 @@ class AfformAdminMeta {
'title' => E::ts('Submit Button'),
'element' => [
'#tag' => 'button',
- 'class' => 'af-button btn-primary',
+ 'class' => 'af-button btn btn-primary',
'crm-icon' => 'fa-check',
'ng-click' => 'afform.submit()',
'#children' => [
diff --git a/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php b/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
index f8bd4cfafc..289206b08f 100644
--- a/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
+++ b/civicrm/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
@@ -4,7 +4,7 @@ namespace Civi\Api4\Action\Afform;
use Civi\AfformAdmin\AfformAdminMeta;
use Civi\Api4\Afform;
-use Civi\Api4\Entity;
+use Civi\Api4\Utils\CoreUtil;
use Civi\Api4\Query\SqlExpression;
/**
@@ -62,7 +62,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
case 'block':
$info['definition'] = $this->definition + [
'title' => '',
- 'block' => $this->entity,
+ 'entity_type' => $this->entity,
'layout' => [],
];
break;
@@ -123,8 +123,8 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
if ($embeddedForm['type'] === 'block') {
$info['blocks'][$blockTag] = $embeddedForm;
}
- if (!empty($embeddedForm['join'])) {
- $entities = array_unique(array_merge($entities, [$embeddedForm['join']]));
+ if (!empty($embeddedForm['join_entity'])) {
+ $entities = array_unique(array_merge($entities, [$embeddedForm['join_entity']]));
}
$scanBlocks($embeddedForm['layout']);
}
@@ -152,7 +152,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
}
if ($info['definition']['type'] === 'block') {
- $blockEntity = $info['definition']['join'] ?? $info['definition']['block'];
+ $blockEntity = $info['definition']['join_entity'] ?? $info['definition']['entity_type'];
if ($blockEntity !== '*') {
$entities[] = $blockEntity;
}
@@ -191,7 +191,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
if (!$newForm) {
$scanBlocks($info['definition']['layout']);
}
- $this->loadAvailableBlocks($entities, $info, [['join', 'IS NULL']]);
+ $this->loadAvailableBlocks($entities, $info, [['join_entity', 'IS NULL']]);
}
// Optimization - since contact fields are a combination of these three,
@@ -209,6 +209,10 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
$result[] = $info;
}
+ /**
+ * @param string $name
+ * @return array|null
+ */
private function loadForm($name) {
return Afform::get($this->checkPermissions)
->setFormatWhitespace(TRUE)
@@ -233,10 +237,10 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
}
if ($entities) {
$blockInfo = Afform::get($this->checkPermissions)
- ->addSelect('name', 'title', 'block', 'join', 'directive_name', 'repeat')
+ ->addSelect('name', 'title', 'entity_type', 'join_entity', 'directive_name')
->setWhere($where)
->addWhere('type', '=', 'block')
- ->addWhere('block', 'IN', $entities)
+ ->addWhere('entity_type', 'IN', $entities)
->addWhere('directive_name', 'NOT IN', array_keys($info['blocks']))
->execute();
$info['blocks'] = array_merge(array_values($info['blocks']), (array) $blockInfo);
@@ -262,10 +266,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
else {
$joinCount[$entityName] = 1;
}
- $label = Entity::get(FALSE)
- ->addWhere('name', '=', $entityName)
- ->addSelect('title')
- ->execute()->first()['title'];
+ $label = CoreUtil::getInfoItem($entityName, 'title');
$joinMap[$alias] = $label . $num;
}
@@ -288,6 +289,9 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
return $calcFields;
}
+ /**
+ * @return array[]
+ */
public function fields() {
return [
[
diff --git a/civicrm/ext/afform/admin/afformEntities/Activity.php b/civicrm/ext/afform/admin/afformEntities/Activity.php
index 860d68fd1d..cff72ead28 100644
--- a/civicrm/ext/afform/admin/afformEntities/Activity.php
+++ b/civicrm/ext/afform/admin/afformEntities/Activity.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'type' => 'primary',
'defaults' => "{
data: {
source_contact_id: 'user_contact_id',
diff --git a/civicrm/ext/afform/admin/afformEntities/Address.php b/civicrm/ext/afform/admin/afformEntities/Address.php
new file mode 100644
index 0000000000..0b07aeafba
--- /dev/null
+++ b/civicrm/ext/afform/admin/afformEntities/Address.php
@@ -0,0 +1,6 @@
+<?php
+return [
+ 'type' => 'join',
+ 'repeat_max' => NULL,
+ 'unique_fields' => ['is_primary', 'location_type_id'],
+];
diff --git a/civicrm/ext/afform/admin/afformEntities/Email.php b/civicrm/ext/afform/admin/afformEntities/Email.php
new file mode 100644
index 0000000000..0b07aeafba
--- /dev/null
+++ b/civicrm/ext/afform/admin/afformEntities/Email.php
@@ -0,0 +1,6 @@
+<?php
+return [
+ 'type' => 'join',
+ 'repeat_max' => NULL,
+ 'unique_fields' => ['is_primary', 'location_type_id'],
+];
diff --git a/civicrm/ext/afform/admin/afformEntities/Household.php b/civicrm/ext/afform/admin/afformEntities/Household.php
index 20cbab0c6d..808565deab 100644
--- a/civicrm/ext/afform/admin/afformEntities/Household.php
+++ b/civicrm/ext/afform/admin/afformEntities/Household.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'type' => 'primary',
'defaults' => "{
data: {
contact_type: 'Household',
diff --git a/civicrm/ext/afform/admin/afformEntities/IM.php b/civicrm/ext/afform/admin/afformEntities/IM.php
new file mode 100644
index 0000000000..0b07aeafba
--- /dev/null
+++ b/civicrm/ext/afform/admin/afformEntities/IM.php
@@ -0,0 +1,6 @@
+<?php
+return [
+ 'type' => 'join',
+ 'repeat_max' => NULL,
+ 'unique_fields' => ['is_primary', 'location_type_id'],
+];
diff --git a/civicrm/ext/afform/admin/afformEntities/Individual.php b/civicrm/ext/afform/admin/afformEntities/Individual.php
index 31e5ace425..3d124377d8 100644
--- a/civicrm/ext/afform/admin/afformEntities/Individual.php
+++ b/civicrm/ext/afform/admin/afformEntities/Individual.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'type' => 'primary',
'defaults' => "{
data: {
contact_type: 'Individual',
diff --git a/civicrm/ext/afform/admin/afformEntities/Organization.php b/civicrm/ext/afform/admin/afformEntities/Organization.php
index ecbf7fdd70..b36455be1b 100644
--- a/civicrm/ext/afform/admin/afformEntities/Organization.php
+++ b/civicrm/ext/afform/admin/afformEntities/Organization.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'type' => 'primary',
'defaults' => "{
data: {
contact_type: 'Organization',
diff --git a/civicrm/ext/afform/admin/afformEntities/Phone.php b/civicrm/ext/afform/admin/afformEntities/Phone.php
new file mode 100644
index 0000000000..0b07aeafba
--- /dev/null
+++ b/civicrm/ext/afform/admin/afformEntities/Phone.php
@@ -0,0 +1,6 @@
+<?php
+return [
+ 'type' => 'join',
+ 'repeat_max' => NULL,
+ 'unique_fields' => ['is_primary', 'location_type_id'],
+];
diff --git a/civicrm/ext/afform/admin/afformEntities/Website.php b/civicrm/ext/afform/admin/afformEntities/Website.php
new file mode 100644
index 0000000000..c646f06870
--- /dev/null
+++ b/civicrm/ext/afform/admin/afformEntities/Website.php
@@ -0,0 +1,6 @@
+<?php
+return [
+ 'type' => 'join',
+ 'repeat_max' => NULL,
+ 'unique_fields' => ['website_type_id'],
+];
diff --git a/civicrm/ext/afform/admin/ang/afAdmin/afAdminList.controller.js b/civicrm/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
index df46006d1b..c48d9c5586 100644
--- a/civicrm/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
+++ b/civicrm/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
@@ -58,7 +58,7 @@
if (ctrl.tab === 'form') {
_.each(CRM.afGuiEditor.entities, function(entity, name) {
- if (entity.defaults) {
+ if (entity.type === 'primary') {
links.push({
url: '#create/form/' + name,
label: entity.label,
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor.css b/civicrm/ext/afform/admin/ang/afGuiEditor.css
index a18dc73834..cd75a4411a 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor.css
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor.css
@@ -260,13 +260,14 @@ body.af-gui-dragging {
opacity: 1;
transition: opacity 0s;
}
-#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button > span,
+/* Fix button colors when bar is highlighted */
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > .btn-group > .btn-group > button > span,
#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > span {
color: white;
}
-#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button:hover > span,
-#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .open > button > span,
-#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button:focus > span {
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > .btn-group > .btn-group > button:hover > span,
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > .btn-group > .btn-group > button[aria-expanded=true] > span,
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > .btn-group > .btn-group > button:focus > span {
color: #0071bd;
}
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor.js b/civicrm/ext/afform/admin/ang/afGuiEditor.js
index 3ecfdeadc2..aca9acb706 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor.js
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor.js
@@ -180,19 +180,24 @@
CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmIconPicker.js').done(function() {
$('#af-gui-icon-picker').crmIconPicker();
});
- // Add css class while dragging
+ // Add css classes while dragging
$(document)
+ // When dragging an item over a container, add a class to highlight the target
.on('sortover', function(e) {
$('.af-gui-container').removeClass('af-gui-dragtarget');
$(e.target).closest('.af-gui-container').addClass('af-gui-dragtarget');
})
+ // Un-highlight when dragging out of a container
.on('sortout', '.af-gui-container', function() {
$(this).removeClass('af-gui-dragtarget');
})
+ // Add body class which puts the entire UI into a "dragging" state
.on('sortstart', '#afGuiEditor', function() {
$('body').addClass('af-gui-dragging');
})
- .on('sortstop', function() {
+ // Ensure dragging classes are removed when not sorting
+ // Listening to multiple event types because sort* events are not 100% reliable
+ .on('sortbeforestop mouseenter', function() {
$('body').removeClass('af-gui-dragging');
$('.af-gui-dragtarget').removeClass('af-gui-dragtarget');
});
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.component.js b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.component.js
new file mode 100644
index 0000000000..cd3ff7eac7
--- /dev/null
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.component.js
@@ -0,0 +1,115 @@
+// https://civicrm.org/licensing
+(function(angular, $, _) {
+ "use strict";
+
+ // Menu item to control the border property of a node
+ angular.module('afGuiEditor').component('afGuiContainerMultiToggle', {
+ templateUrl: '~/afGuiEditor/afGuiContainerMultiToggle.html',
+ bindings: {
+ entity: '<'
+ },
+ require: {
+ container: '^^afGuiContainer'
+ },
+ controller: function($scope, afGui) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
+ ctrl = this;
+ this.menuItems = [];
+ this.uniqueFields = {};
+
+ this.$onInit = function() {
+ this.menuItems.push({
+ key: 'repeat',
+ label: ts('Multiple')
+ });
+ _.each(afGui.getEntity(this.entity).unique_fields, function(fieldName) {
+ var field = ctrl.uniqueFields[fieldName] = afGui.getField(ctrl.entity, fieldName);
+ ctrl.menuItems.push({});
+ if (field.options) {
+ _.each(field.options, function(option) {
+ ctrl.menuItems.push({
+ field: fieldName,
+ key: option.id,
+ label: option.label
+ });
+ });
+ } else {
+ ctrl.menuItems.push({
+ field: fieldName,
+ key: true,
+ label: field.label
+ });
+ }
+ });
+ };
+
+ this.isMulti = function() {
+ return 'af-repeat' in ctrl.container.node;
+ };
+
+ this.isSelected = function(item) {
+ if (!item.field && item.key === 'repeat') {
+ return ctrl.isMulti();
+ }
+ if (ctrl.container.node.data) {
+ var field = ctrl.uniqueFields[item.field];
+ if (field.options) {
+ return ctrl.container.node.data[item.field] === item.key;
+ }
+ return ctrl.container.node.data[item.field];
+ }
+ return false;
+ };
+
+ this.selectOption = function(item) {
+ if (!item.field && item.key === 'repeat') {
+ return ctrl.container.toggleRepeat();
+ }
+ if (ctrl.isMulti()) {
+ ctrl.container.toggleRepeat();
+ }
+ var field = ctrl.uniqueFields[item.field];
+ ctrl.container.node.data = ctrl.container.node.data || {};
+ if (field.options) {
+ if (ctrl.container.node.data[item.field] === item.key) {
+ delete ctrl.container.node.data[item.field];
+ } else {
+ ctrl.container.node.data = {};
+ ctrl.container.node.data[item.field] = item.key;
+ ctrl.container.removeField(item.field);
+ }
+ } else if (ctrl.container.node.data[item.field]) {
+ delete ctrl.container.node.data[item.field];
+ } else {
+ ctrl.container.node.data = {};
+ ctrl.container.node.data[item.field] = true;
+ ctrl.container.removeField(item.field);
+ }
+ if (_.isEmpty(ctrl.container.node.data)) {
+ delete ctrl.container.node.data;
+ }
+ };
+
+ this.getButtonText = function() {
+ if (ctrl.isMulti()) {
+ return ts('Multiple');
+ }
+ var output = ts('Single');
+ _.each(ctrl.container.node.data, function(val, fieldName) {
+ if (val && (fieldName in ctrl.uniqueFields)) {
+ var field = ctrl.uniqueFields[fieldName];
+ if (field.options) {
+ output = _.result(_.findWhere(field.options, {id: val}), 'label');
+ } else {
+ output = field.label;
+ }
+ return false;
+ }
+ });
+ return output;
+ };
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.html b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.html
new file mode 100644
index 0000000000..0d1fdc80f2
--- /dev/null
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiContainerMultiToggle.html
@@ -0,0 +1,14 @@
+<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{:: ts('Toggle multi or single block') }}">
+ <span>
+ <i class="crm-i fa-{{ $ctrl.isMulti() ? 'repeat' : 'dot-circle-o' }}"></i>
+ {{ $ctrl.getButtonText() }}
+ </span>
+</button>
+<ul class="dropdown-menu dropdown-menu-right">
+ <li ng-repeat="item in $ctrl.menuItems" class="{{ item.key ? '' : 'divider' }}">
+ <a href ng-if="item.key" ng-click="$ctrl.selectOption(item)">
+ <i class="crm-i fa-{{ $ctrl.isSelected(item) ? 'check-' : '' }}circle-o"></i>
+ {{:: item.label }}
+ </a>
+ </li>
+</ul>
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
index 13a4bbe5ad..6ed1d027bd 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
@@ -69,13 +69,14 @@
if (editor.mode === 'create') {
editor.addEntity(editor.entity);
+ editor.afform.create_submission = true;
editor.layout['#children'].push(afGui.meta.elements.submit.element);
}
}
else if (editor.getFormType() === 'block') {
editor.layout['#children'] = editor.afform.layout;
- editor.blockEntity = editor.afform.join || editor.afform.block;
+ editor.blockEntity = editor.afform.join_entity || editor.afform.entity_type;
$scope.entities[editor.blockEntity] = backfillEntityDefaults({
type: editor.blockEntity,
name: editor.blockEntity,
@@ -120,7 +121,7 @@
while (!!$scope.entities[type + num]) {
num++;
}
- $scope.entities[type + num] = backfillEntityDefaults(_.assign($parse(meta.defaults)($scope), {
+ $scope.entities[type + num] = backfillEntityDefaults(_.assign($parse(meta.defaults)(editor), {
'#tag': 'af-entity',
type: meta.entity,
name: type + num,
@@ -331,7 +332,7 @@
$scope.$watch('editor.afform.title', function(newTitle, oldTitle) {
if (typeof oldTitle === 'string') {
_.each($scope.entities, function(entity) {
- if (entity.data && entity.data.source === oldTitle) {
+ if (entity.data && 'source' in entity.data && (entity.data.source || '') === oldTitle) {
entity.data.source = newTitle;
}
});
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
index 6786029542..de487e19a7 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
@@ -94,19 +94,22 @@
$scope.blockTitles.length = 0;
_.each(afGui.meta.blocks, function(block, directive) {
if ((!search || _.contains(directive, search) || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) &&
- (block.block === '*' || block.block === ctrl.entity.type || (ctrl.entity.type === 'Contact' && block.block === ctrl.entity.data.contact_type)) &&
+ (block.entity_type === '*' || block.entity_type === ctrl.entity.type || (ctrl.entity.type === 'Contact' && block.entity_type === ctrl.entity.data.contact_type)) &&
block.name !== ctrl.editor.getAfform().name
) {
- var item = {"#tag": block.join ? "div" : directive};
- if (block.join) {
- item['af-join'] = block.join;
+ var item = {"#tag": block.join_entity ? "div" : directive};
+ if (block.join_entity) {
+ var joinEntity = afGui.getEntity(block.join_entity);
+ // Skip adding block if entity does not exist
+ if (!joinEntity) {
+ return;
+ }
+ item['af-join'] = block.join_entity;
item['#children'] = [{"#tag": directive}];
- }
- if (block.repeat) {
item['af-repeat'] = ts('Add');
item.min = '1';
- if (typeof block.repeat === 'number') {
- item.max = '' + block.repeat;
+ if (typeof joinEntity.repeat_max === 'number') {
+ item.max = '' + joinEntity.repeat_max;
}
}
$scope.blockList.push(item);
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html b/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
index 59d04705b9..466f4bc251 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
@@ -88,6 +88,14 @@
<legend>{{:: ts('Submit Actions') }}</legend>
+ <div class="form-group" >
+ <label>
+ <input type="checkbox" ng-model="editor.afform.create_submission" >
+ {{:: ts('Log Submissions') }}
+ </label>
+ <p class="help-block">{{:: ts('Keep a log of the date, time, user, and items saved by each form submission.') }}</p>
+ </div>
+
<div class="form-group" ng-class="{'has-error': !!config_form.redirect.$error.pattern}">
<label for="af_config_redirect">
{{:: ts('Post-Submit Page') }}
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer-menu.html b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer-menu.html
index 9121bfeb7d..182e092e83 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer-menu.html
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer-menu.html
@@ -10,13 +10,13 @@
</li>
<li ng-if="isRepeatable()" ng-click="$event.stopPropagation()">
<div class="af-gui-field-select-in-dropdown form-inline">
- <label ng-click="toggleRepeat()">
+ <label ng-click="$ctrl.toggleRepeat()">
<i class="crm-i fa-{{ $ctrl.node['af-repeat'] || $ctrl.node['af-repeat'] === '' ? 'check-' : '' }}square-o"></i>
{{:: ts('Repeat') }}
</label>
<span ng-style="{visibility: $ctrl.node['af-repeat'] || $ctrl.node['af-repeat'] === '' ? 'visible' : 'hidden'}">
<input type="number" class="form-control" ng-model="getSetMin" ng-model-options="{getterSetter: true}" placeholder="{{:: ts('min') }}" min="0" step="1" />
- - <input type="number" class="form-control" ng-model="getSetMax" ng-model-options="{getterSetter: true}" placeholder="{{:: ts('max') }}" min="2" step="1" />
+ - <input type="number" class="form-control" ng-model="getSetMax" ng-model-options="{getterSetter: true}" placeholder="{{:: ts('max') }}" min="2" max="{{:: getRepeatMax() }}" step="1" />
</span>
</div>
</li>
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
index 3cc79a086d..f38a8a1b4f 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
@@ -76,7 +76,7 @@
return ctrl.node['af-fieldset'] || (block.directive && afGui.meta.blocks[block.directive].repeat) || ctrl.join;
};
- $scope.toggleRepeat = function() {
+ this.toggleRepeat = function() {
if ('af-repeat' in ctrl.node) {
delete ctrl.node.max;
delete ctrl.node.min;
@@ -85,9 +85,11 @@
} else {
ctrl.node.min = '1';
ctrl.node['af-repeat'] = ts('Add');
+ delete ctrl.node.data;
}
};
+ // Sets min value for af-repeat as a string, returns it as an int
$scope.getSetMin = function(val) {
if (arguments.length) {
if (ctrl.node.max && val > parseInt(ctrl.node.max, 10)) {
@@ -103,6 +105,7 @@
return ctrl.node.min ? parseInt(ctrl.node.min, 10) : null;
};
+ // Sets max value for af-repeat as a string, returns it as an int
$scope.getSetMax = function(val) {
if (arguments.length) {
if (ctrl.node.min && val && val < parseInt(ctrl.node.min, 10)) {
@@ -118,6 +121,16 @@
return ctrl.node.max ? parseInt(ctrl.node.max, 10) : null;
};
+ // Returns the maximum number of repeats allowed if this is a joined entity with a limit
+ // Value comes from civicrm_custom_group.max_multiple for custom entities,
+ // or from afformEntity php file for core entities.
+ $scope.getRepeatMax = function() {
+ if (ctrl.join) {
+ return ctrl.getJoinEntity().repeat_max || '';
+ }
+ return '';
+ };
+
$scope.pickAddIcon = function() {
afGui.pickIcon().then(function(val) {
ctrl.node['add-icon'] = val;
@@ -195,7 +208,7 @@
};
_.each(afGui.meta.blocks, function(blockInfo, directive) {
- if (directive === ctrl.node['#tag'] || (blockInfo.join && blockInfo.join === ctrl.getFieldEntityType())) {
+ if (directive === ctrl.node['#tag'] || (blockInfo.join_entity && blockInfo.join_entity === ctrl.getFieldEntityType())) {
block.options.push({
id: directive,
text: blockInfo.title
@@ -278,10 +291,21 @@
afGui.removeRecursive($scope.getSetChildren(), {$$hashKey: element.$$hashKey});
};
+ this.removeField = function(fieldName) {
+ afGui.removeRecursive($scope.getSetChildren(), {'#tag': 'af-field', name: fieldName});
+ };
+
this.getEntityName = function() {
return ctrl.entityName ? ctrl.entityName.split('-join-')[0] : null;
};
+ this.getJoinEntity = function() {
+ if (!ctrl.join) {
+ return null;
+ }
+ return afGui.getEntity(ctrl.join);
+ };
+
// Returns the primary entity type for this container e.g. "Contact"
this.getMainEntityType = function() {
return ctrl.editor && ctrl.editor.getEntity(ctrl.getEntityName()).type;
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.html b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.html
index 4082c03292..ad3fe18eb1 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.html
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.html
@@ -1,5 +1,5 @@
<div class="af-gui-bar" ng-if="$ctrl.node['#tag']" ng-click="selectEntity()" >
- <div ng-if="!$ctrl.loading" class="form-inline" af-gui-menu>
+ <div ng-if="!$ctrl.loading" class="form-inline">
<span ng-if="$ctrl.getNodeType($ctrl.node) == 'fieldset'">{{ $ctrl.editor.getEntity($ctrl.entityName).label }}</span>
<span ng-if="block">{{ $ctrl.join ? ts($ctrl.join) + ':' : ts('Block:') }}</span>
<span ng-if="!block">{{ tags[$ctrl.node['#tag']] }}</span>
@@ -8,10 +8,15 @@
<option ng-value="option.id" ng-repeat="option in block.options track by option.id">{{ option.text }}</option>
</select>
<button type="button" class="btn btn-default btn-xs" ng-if="block && !block.layout" ng-click="saveBlock()">{{:: ts('Save...') }}</button>
- <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{:: ts('Configure') }}">
- <span><i class="crm-i fa-gear"></i></span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/elements/afGuiContainer-menu.html'"></ul>
+ <div class="btn-group pull-right">
+ <af-gui-container-multi-toggle ng-if="!ctrl.loading && ($ctrl.join || $ctrl.node['af-repeat'])" entity="$ctrl.getFieldEntityType()" class="btn-group"></af-gui-container-multi-toggle>
+ <div class="btn-group" af-gui-menu>
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{:: ts('Configure') }}">
+ <span><i class="crm-i fa-gear"></i></span>
+ </button>
+ <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/elements/afGuiContainer-menu.html'"></ul>
+ </div>
+ </div>
</div>
<div ng-if="$ctrl.loading"><i class="crm-i fa-spin fa-spinner"></i></div>
</div>
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
index b20511ae61..2cc5e04a7d 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
@@ -236,11 +236,13 @@
};
$scope.defaultValueContains = function(val) {
+ val = '' + val;
var defaultVal = getSet('afform_default');
return defaultVal === val || (_.isArray(defaultVal) && _.includes(defaultVal, val));
};
$scope.toggleDefaultValueItem = function(val) {
+ val = '' + val;
if (defaultValueShouldBeArray()) {
if (!_.isArray(getSet('afform_default'))) {
ctrl.node.defn.afform_default = [];
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/File.html b/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/File.html
new file mode 100644
index 0000000000..e38db3a51c
--- /dev/null
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/File.html
@@ -0,0 +1,3 @@
+<div class="form-inline">
+ <input type="file" disabled>
+</div>
diff --git a/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/Select.html b/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
index 33dd6f932b..1f5e849f20 100644
--- a/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
+++ b/civicrm/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
@@ -6,6 +6,9 @@
<div class="input-group-btn" af-gui-menu>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="crm-i fa-caret-down"></i></button>
<ul class="dropdown-menu" ng-if="menu.open" title="{{:: ts('Set default value') }}">
+ <li class="disabled">
+ <a><strong>{{:: ts('Default Value:') }}</strong></a>
+ </li>
<li ng-repeat="opt in $ctrl.getOptions()" >
<a href ng-click="toggleDefaultValueItem(opt.id); $event.stopPropagation(); $event.target.blur();">
<i class="crm-i fa-{{defaultValueContains(opt.id) ? 'check-' : ''}}circle-o"></i>
diff --git a/civicrm/ext/afform/admin/info.xml b/civicrm/ext/afform/admin/info.xml
index 60c2e9c09c..3a4a09c4c1 100644
--- a/civicrm/ext/afform/admin/info.xml
+++ b/civicrm/ext/afform/admin/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/core/CRM/Afform/AfformScanner.php b/civicrm/ext/afform/core/CRM/Afform/AfformScanner.php
index c7e30aa4d8..f7a7125f4b 100644
--- a/civicrm/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/civicrm/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -231,7 +231,7 @@ class CRM_Afform_AfformScanner {
* @return mixed|string
* Ex: '/var/www/sites/default/files/civicrm/afform'.
*/
- private function getSiteLocalPath() {
+ public function getSiteLocalPath() {
// TODO Allow a setting override.
// return Civi::paths()->getPath(Civi::settings()->get('afformPath'));
return Civi::paths()->getPath('[civicrm.files]/ang');
diff --git a/civicrm/ext/afform/core/CRM/Afform/ArrayHtml.php b/civicrm/ext/afform/core/CRM/Afform/ArrayHtml.php
index f24a2f27e0..44eec67092 100644
--- a/civicrm/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/civicrm/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -23,12 +23,12 @@ class CRM_Afform_ArrayHtml {
'*' => [
'*' => 'text',
'af-fieldset' => 'text',
+ 'data' => 'js',
],
'af-entity' => [
'#selfClose' => TRUE,
'name' => 'text',
'type' => 'text',
- 'data' => 'js',
'security' => 'text',
'actions' => 'js',
],
diff --git a/civicrm/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php b/civicrm/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
new file mode 100644
index 0000000000..5e2bc34bb7
--- /dev/null
+++ b/civicrm/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
@@ -0,0 +1,6 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+class CRM_Afform_BAO_AfformSubmission extends CRM_Afform_DAO_AfformSubmission {
+
+}
diff --git a/civicrm/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php b/civicrm/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
new file mode 100644
index 0000000000..c0a9f1c2ef
--- /dev/null
+++ b/civicrm/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
@@ -0,0 +1,247 @@
+<?php
+
+/**
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ *
+ * Generated from org.civicrm.afform/xml/schema/CRM/Afform/AfformSubmission.xml
+ * DO NOT EDIT. Generated by CRM_Core_CodeGen
+ * (GenCodeChecksum:3018ef7f1283f7a38cdf9edae76df274)
+ */
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Database access object for the AfformSubmission entity.
+ */
+class CRM_Afform_DAO_AfformSubmission extends CRM_Core_DAO {
+ const EXT = E::LONG_NAME;
+ const TABLE_ADDED = '';
+
+ /**
+ * Static instance to hold the table name.
+ *
+ * @var string
+ */
+ public static $_tableName = 'civicrm_afform_submission';
+
+ /**
+ * Should CiviCRM log any modifications to this table in the civicrm_log table.
+ *
+ * @var bool
+ */
+ public static $_log = TRUE;
+
+ /**
+ * Unique Submission ID
+ *
+ * @var int
+ */
+ public $id;
+
+ /**
+ * @var int
+ */
+ public $contact_id;
+
+ /**
+ * Name of submitted afform
+ *
+ * @var string
+ */
+ public $afform_name;
+
+ /**
+ * IDs of saved entities
+ *
+ * @var text
+ */
+ public $data;
+
+ /**
+ * @var timestamp
+ */
+ public $submission_date;
+
+ /**
+ * Class constructor.
+ */
+ public function __construct() {
+ $this->__table = 'civicrm_afform_submission';
+ parent::__construct();
+ }
+
+ /**
+ * Returns localized title of this entity.
+ *
+ * @param bool $plural
+ * Whether to return the plural version of the title.
+ */
+ public static function getEntityTitle($plural = FALSE) {
+ return $plural ? E::ts('Form Builder Submissions') : E::ts('Form Builder Submission');
+ }
+
+ /**
+ * Returns foreign keys and entity references.
+ *
+ * @return array
+ * [CRM_Core_Reference_Interface]
+ */
+ public static function getReferenceColumns() {
+ if (!isset(Civi::$statics[__CLASS__]['links'])) {
+ Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
+ Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id');
+ CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
+ }
+ return Civi::$statics[__CLASS__]['links'];
+ }
+
+ /**
+ * Returns all the column names of this table
+ *
+ * @return array
+ */
+ public static function &fields() {
+ if (!isset(Civi::$statics[__CLASS__]['fields'])) {
+ Civi::$statics[__CLASS__]['fields'] = [
+ 'id' => [
+ 'name' => 'id',
+ 'type' => CRM_Utils_Type::T_INT,
+ 'description' => E::ts('Unique Submission ID'),
+ 'required' => TRUE,
+ 'where' => 'civicrm_afform_submission.id',
+ 'table_name' => 'civicrm_afform_submission',
+ 'entity' => 'AfformSubmission',
+ 'bao' => 'CRM_Afform_DAO_AfformSubmission',
+ 'localizable' => 0,
+ 'html' => [
+ 'type' => 'Number',
+ ],
+ 'readonly' => TRUE,
+ 'add' => '5.41',
+ ],
+ 'contact_id' => [
+ 'name' => 'contact_id',
+ 'type' => CRM_Utils_Type::T_INT,
+ 'title' => E::ts('User Contact ID'),
+ 'where' => 'civicrm_afform_submission.contact_id',
+ 'table_name' => 'civicrm_afform_submission',
+ 'entity' => 'AfformSubmission',
+ 'bao' => 'CRM_Afform_DAO_AfformSubmission',
+ 'localizable' => 0,
+ 'FKClassName' => 'CRM_Contact_DAO_Contact',
+ 'add' => '5.41',
+ ],
+ 'afform_name' => [
+ 'name' => 'afform_name',
+ 'type' => CRM_Utils_Type::T_STRING,
+ 'title' => E::ts('Afform Name'),
+ 'description' => E::ts('Name of submitted afform'),
+ 'maxlength' => 255,
+ 'size' => CRM_Utils_Type::HUGE,
+ 'where' => 'civicrm_afform_submission.afform_name',
+ 'table_name' => 'civicrm_afform_submission',
+ 'entity' => 'AfformSubmission',
+ 'bao' => 'CRM_Afform_DAO_AfformSubmission',
+ 'localizable' => 0,
+ 'add' => '5.41',
+ ],
+ 'data' => [
+ 'name' => 'data',
+ 'type' => CRM_Utils_Type::T_TEXT,
+ 'title' => E::ts('Submission Data'),
+ 'description' => E::ts('IDs of saved entities'),
+ 'where' => 'civicrm_afform_submission.data',
+ 'table_name' => 'civicrm_afform_submission',
+ 'entity' => 'AfformSubmission',
+ 'bao' => 'CRM_Afform_DAO_AfformSubmission',
+ 'localizable' => 0,
+ 'serialize' => self::SERIALIZE_JSON,
+ 'add' => '5.41',
+ ],
+ 'submission_date' => [
+ 'name' => 'submission_date',
+ 'type' => CRM_Utils_Type::T_TIMESTAMP,
+ 'title' => E::ts('Submission Date/Time'),
+ 'where' => 'civicrm_afform_submission.submission_date',
+ 'default' => 'CURRENT_TIMESTAMP',
+ 'table_name' => 'civicrm_afform_submission',
+ 'entity' => 'AfformSubmission',
+ 'bao' => 'CRM_Afform_DAO_AfformSubmission',
+ 'localizable' => 0,
+ 'readonly' => TRUE,
+ 'add' => '5.41',
+ ],
+ ];
+ CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
+ }
+ return Civi::$statics[__CLASS__]['fields'];
+ }
+
+ /**
+ * Return a mapping from field-name to the corresponding key (as used in fields()).
+ *
+ * @return array
+ * Array(string $name => string $uniqueName).
+ */
+ public static function &fieldKeys() {
+ if (!isset(Civi::$statics[__CLASS__]['fieldKeys'])) {
+ Civi::$statics[__CLASS__]['fieldKeys'] = array_flip(CRM_Utils_Array::collect('name', self::fields()));
+ }
+ return Civi::$statics[__CLASS__]['fieldKeys'];
+ }
+
+ /**
+ * Returns the names of this table
+ *
+ * @return string
+ */
+ public static function getTableName() {
+ return self::$_tableName;
+ }
+
+ /**
+ * Returns if this table needs to be logged
+ *
+ * @return bool
+ */
+ public function getLog() {
+ return self::$_log;
+ }
+
+ /**
+ * Returns the list of fields that can be imported
+ *
+ * @param bool $prefix
+ *
+ * @return array
+ */
+ public static function &import($prefix = FALSE) {
+ $r = CRM_Core_DAO_AllCoreTables::getImports(__CLASS__, 'afform_submission', $prefix, []);
+ return $r;
+ }
+
+ /**
+ * Returns the list of fields that can be exported
+ *
+ * @param bool $prefix
+ *
+ * @return array
+ */
+ public static function &export($prefix = FALSE) {
+ $r = CRM_Core_DAO_AllCoreTables::getExports(__CLASS__, 'afform_submission', $prefix, []);
+ return $r;
+ }
+
+ /**
+ * Returns the list of indices
+ *
+ * @param bool $localize
+ *
+ * @return array
+ */
+ public static function indices($localize = TRUE) {
+ $indices = [];
+ return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
+ }
+
+}
diff --git a/civicrm/ext/afform/core/CRM/Afform/Upgrader.php b/civicrm/ext/afform/core/CRM/Afform/Upgrader.php
new file mode 100644
index 0000000000..a89a9264f3
--- /dev/null
+++ b/civicrm/ext/afform/core/CRM/Afform/Upgrader.php
@@ -0,0 +1,67 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Collection of upgrade steps.
+ */
+class CRM_Afform_Upgrader extends CRM_Afform_Upgrader_Base {
+
+ /**
+ * Update names of blocks and joins
+ *
+ * @return bool
+ */
+ public function upgrade_1000(): bool {
+ $this->ctx->log->info('Applying update 1000');
+ $scanner = new CRM_Afform_AfformScanner();
+ $localDir = $scanner->getSiteLocalPath();
+
+ // Update form markup with new block directive names
+ $replacements = [
+ 'afjoin-address-default>' => 'afblock-contact-address>',
+ 'afjoin-email-default>' => 'afblock-contact-email>',
+ 'afjoin-i-m-default>' => 'afblock-contact-i-m>',
+ 'afjoin-phone-default>' => 'afblock-contact-phone>',
+ 'afjoin-website-default>' => 'afblock-contact-website>',
+ 'afjoin-custom-' => 'afblock-custom-',
+ ];
+ foreach (glob("$localDir/*." . $scanner::LAYOUT_FILE) as $fileName) {
+ $html = file_get_contents($fileName);
+ $html = str_replace(array_keys($replacements), array_values($replacements), $html);
+ file_put_contents($fileName, $html);
+ }
+
+ // Update form metadata with new block property names
+ $replacements = [
+ 'join' => 'join_entity',
+ 'block' => 'entity_type',
+ ];
+ foreach (glob("$localDir/*." . $scanner::METADATA_FILE) as $fileName) {
+ $meta = json_decode(file_get_contents($fileName), TRUE);
+ foreach ($replacements as $oldKey => $newKey) {
+ if (isset($meta[$oldKey])) {
+ $meta[$newKey] = $meta[$oldKey];
+ unset($meta[$oldKey]);
+ }
+ }
+ if (!empty($meta['entity_type'])) {
+ $meta['type'] = 'block';
+ }
+ file_put_contents($fileName, json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+ }
+ return TRUE;
+ }
+
+ /**
+ * Upgrade 1000 - install civicrm_afform_submission table
+ * @return bool
+ */
+ public function upgrade_1001(): bool {
+ $this->ctx->log->info('Applying update 1001 - install civicrm_afform_submission table.');
+ if (!CRM_Core_DAO::singleValueQuery("SHOW TABLES LIKE 'civicrm_afform_submission'")) {
+ $this->executeSqlFile('sql/auto_install.sql');
+ }
+ return TRUE;
+ }
+
+}
diff --git a/civicrm/ext/afform/core/CRM/Afform/Upgrader/Base.php b/civicrm/ext/afform/core/CRM/Afform/Upgrader/Base.php
new file mode 100644
index 0000000000..207520ddd5
--- /dev/null
+++ b/civicrm/ext/afform/core/CRM/Afform/Upgrader/Base.php
@@ -0,0 +1,396 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Base class which provides helpers to execute upgrade logic
+ */
+class CRM_Afform_Upgrader_Base {
+
+ /**
+ * @var CRM_Afform_Upgrader_Base
+ */
+ public static $instance;
+
+ /**
+ * @var CRM_Queue_TaskContext
+ */
+ protected $ctx;
+
+ /**
+ * @var string
+ * eg 'com.example.myextension'
+ */
+ protected $extensionName;
+
+ /**
+ * @var string
+ * full path to the extension's source tree
+ */
+ protected $extensionDir;
+
+ /**
+ * @var array
+ * sorted numerically
+ */
+ private $revisions;
+
+ /**
+ * @var bool
+ * Flag to clean up extension revision data in civicrm_setting
+ */
+ private $revisionStorageIsDeprecated = FALSE;
+
+ /**
+ * Obtain a reference to the active upgrade handler.
+ */
+ public static function instance() {
+ if (!self::$instance) {
+ self::$instance = new CRM_Afform_Upgrader(
+ 'org.civicrm.afform',
+ E::path()
+ );
+ }
+ return self::$instance;
+ }
+
+ /**
+ * Adapter that lets you add normal (non-static) member functions to the queue.
+ *
+ * Note: Each upgrader instance should only be associated with one
+ * task-context; otherwise, this will be non-reentrant.
+ *
+ * ```
+ * CRM_Afform_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
+ * ```
+ */
+ public static function _queueAdapter() {
+ $instance = self::instance();
+ $args = func_get_args();
+ $instance->ctx = array_shift($args);
+ $instance->queue = $instance->ctx->queue;
+ $method = array_shift($args);
+ return call_user_func_array([$instance, $method], $args);
+ }
+
+ /**
+ * CRM_Afform_Upgrader_Base constructor.
+ *
+ * @param $extensionName
+ * @param $extensionDir
+ */
+ public function __construct($extensionName, $extensionDir) {
+ $this->extensionName = $extensionName;
+ $this->extensionDir = $extensionDir;
+ }
+
+ // ******** Task helpers ********
+
+ /**
+ * Run a CustomData file.
+ *
+ * @param string $relativePath
+ * the CustomData XML file path (relative to this extension's dir)
+ * @return bool
+ */
+ public function executeCustomDataFile($relativePath) {
+ $xml_file = $this->extensionDir . '/' . $relativePath;
+ return $this->executeCustomDataFileByAbsPath($xml_file);
+ }
+
+ /**
+ * Run a CustomData file
+ *
+ * @param string $xml_file
+ * the CustomData XML file path (absolute path)
+ *
+ * @return bool
+ */
+ protected function executeCustomDataFileByAbsPath($xml_file) {
+ $import = new CRM_Utils_Migrate_Import();
+ $import->run($xml_file);
+ return TRUE;
+ }
+
+ /**
+ * Run a SQL file.
+ *
+ * @param string $relativePath
+ * the SQL file path (relative to this extension's dir)
+ *
+ * @return bool
+ */
+ public function executeSqlFile($relativePath) {
+ CRM_Utils_File::sourceSQLFile(
+ CIVICRM_DSN,
+ $this->extensionDir . DIRECTORY_SEPARATOR . $relativePath
+ );
+ return TRUE;
+ }
+
+ /**
+ * Run the sql commands in the specified file.
+ *
+ * @param string $tplFile
+ * The SQL file path (relative to this extension's dir).
+ * Ex: "sql/mydata.mysql.tpl".
+ *
+ * @return bool
+ * @throws \CRM_Core_Exception
+ */
+ public function executeSqlTemplate($tplFile) {
+ // Assign multilingual variable to Smarty.
+ $upgrade = new CRM_Upgrade_Form();
+
+ $tplFile = CRM_Utils_File::isAbsolute($tplFile) ? $tplFile : $this->extensionDir . DIRECTORY_SEPARATOR . $tplFile;
+ $smarty = CRM_Core_Smarty::singleton();
+ $smarty->assign('domainID', CRM_Core_Config::domainID());
+ CRM_Utils_File::sourceSQLFile(
+ CIVICRM_DSN, $smarty->fetch($tplFile), NULL, TRUE
+ );
+ return TRUE;
+ }
+
+ /**
+ * Run one SQL query.
+ *
+ * This is just a wrapper for CRM_Core_DAO::executeSql, but it
+ * provides syntactic sugar for queueing several tasks that
+ * run different queries
+ *
+ * @return bool
+ */
+ public function executeSql($query, $params = []) {
+ // FIXME verify that we raise an exception on error
+ CRM_Core_DAO::executeQuery($query, $params);
+ return TRUE;
+ }
+
+ /**
+ * Syntactic sugar for enqueuing a task which calls a function in this class.
+ *
+ * The task is weighted so that it is processed
+ * as part of the currently-pending revision.
+ *
+ * After passing the $funcName, you can also pass parameters that will go to
+ * the function. Note that all params must be serializable.
+ */
+ public function addTask($title) {
+ $args = func_get_args();
+ $title = array_shift($args);
+ $task = new CRM_Queue_Task(
+ [get_class($this), '_queueAdapter'],
+ $args,
+ $title
+ );
+ return $this->queue->createItem($task, ['weight' => -1]);
+ }
+
+ // ******** Revision-tracking helpers ********
+
+ /**
+ * Determine if there are any pending revisions.
+ *
+ * @return bool
+ */
+ public function hasPendingRevisions() {
+ $revisions = $this->getRevisions();
+ $currentRevision = $this->getCurrentRevision();
+
+ if (empty($revisions)) {
+ return FALSE;
+ }
+ if (empty($currentRevision)) {
+ return TRUE;
+ }
+
+ return ($currentRevision < max($revisions));
+ }
+
+ /**
+ * Add any pending revisions to the queue.
+ *
+ * @param CRM_Queue_Queue $queue
+ */
+ public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
+ $this->queue = $queue;
+
+ $currentRevision = $this->getCurrentRevision();
+ foreach ($this->getRevisions() as $revision) {
+ if ($revision > $currentRevision) {
+ $title = E::ts('Upgrade %1 to revision %2', [
+ 1 => $this->extensionName,
+ 2 => $revision,
+ ]);
+
+ // note: don't use addTask() because it sets weight=-1
+
+ $task = new CRM_Queue_Task(
+ [get_class($this), '_queueAdapter'],
+ ['upgrade_' . $revision],
+ $title
+ );
+ $this->queue->createItem($task);
+
+ $task = new CRM_Queue_Task(
+ [get_class($this), '_queueAdapter'],
+ ['setCurrentRevision', $revision],
+ $title
+ );
+ $this->queue->createItem($task);
+ }
+ }
+ }
+
+ /**
+ * Get a list of revisions.
+ *
+ * @return array
+ * revisionNumbers sorted numerically
+ */
+ public function getRevisions() {
+ if (!is_array($this->revisions)) {
+ $this->revisions = [];
+
+ $clazz = new ReflectionClass(get_class($this));
+ $methods = $clazz->getMethods();
+ foreach ($methods as $method) {
+ if (preg_match('/^upgrade_(.*)/', $method->name, $matches)) {
+ $this->revisions[] = $matches[1];
+ }
+ }
+ sort($this->revisions, SORT_NUMERIC);
+ }
+
+ return $this->revisions;
+ }
+
+ public function getCurrentRevision() {
+ $revision = CRM_Core_BAO_Extension::getSchemaVersion($this->extensionName);
+ if (!$revision) {
+ $revision = $this->getCurrentRevisionDeprecated();
+ }
+ return $revision;
+ }
+
+ private function getCurrentRevisionDeprecated() {
+ $key = $this->extensionName . ':version';
+ if ($revision = \Civi::settings()->get($key)) {
+ $this->revisionStorageIsDeprecated = TRUE;
+ }
+ return $revision;
+ }
+
+ public function setCurrentRevision($revision) {
+ CRM_Core_BAO_Extension::setSchemaVersion($this->extensionName, $revision);
+ // clean up legacy schema version store (CRM-19252)
+ $this->deleteDeprecatedRevision();
+ return TRUE;
+ }
+
+ private function deleteDeprecatedRevision() {
+ if ($this->revisionStorageIsDeprecated) {
+ $setting = new CRM_Core_BAO_Setting();
+ $setting->name = $this->extensionName . ':version';
+ $setting->delete();
+ CRM_Core_Error::debug_log_message("Migrated extension schema revision ID for {$this->extensionName} from civicrm_setting (deprecated) to civicrm_extension.\n");
+ }
+ }
+
+ // ******** Hook delegates ********
+
+ /**
+ * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+ public function onInstall() {
+ $files = glob($this->extensionDir . '/sql/*_install.sql');
+ if (is_array($files)) {
+ foreach ($files as $file) {
+ CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+ }
+ }
+ $files = glob($this->extensionDir . '/sql/*_install.mysql.tpl');
+ if (is_array($files)) {
+ foreach ($files as $file) {
+ $this->executeSqlTemplate($file);
+ }
+ }
+ $files = glob($this->extensionDir . '/xml/*_install.xml');
+ if (is_array($files)) {
+ foreach ($files as $file) {
+ $this->executeCustomDataFileByAbsPath($file);
+ }
+ }
+ if (is_callable([$this, 'install'])) {
+ $this->install();
+ }
+ }
+
+ /**
+ * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+ public function onPostInstall() {
+ $revisions = $this->getRevisions();
+ if (!empty($revisions)) {
+ $this->setCurrentRevision(max($revisions));
+ }
+ if (is_callable([$this, 'postInstall'])) {
+ $this->postInstall();
+ }
+ }
+
+ /**
+ * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+ public function onUninstall() {
+ $files = glob($this->extensionDir . '/sql/*_uninstall.mysql.tpl');
+ if (is_array($files)) {
+ foreach ($files as $file) {
+ $this->executeSqlTemplate($file);
+ }
+ }
+ if (is_callable([$this, 'uninstall'])) {
+ $this->uninstall();
+ }
+ $files = glob($this->extensionDir . '/sql/*_uninstall.sql');
+ if (is_array($files)) {
+ foreach ($files as $file) {
+ CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+ }
+ }
+ }
+
+ /**
+ * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+ public function onEnable() {
+ // stub for possible future use
+ if (is_callable([$this, 'enable'])) {
+ $this->enable();
+ }
+ }
+
+ /**
+ * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ */
+ public function onDisable() {
+ // stub for possible future use
+ if (is_callable([$this, 'disable'])) {
+ $this->disable();
+ }
+ }
+
+ public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
+ switch ($op) {
+ case 'check':
+ return [$this->hasPendingRevisions()];
+
+ case 'enqueue':
+ return $this->enqueuePendingRevisions($queue);
+
+ default:
+ }
+ }
+
+}
diff --git a/civicrm/ext/afform/core/Civi/Afform/AfformMetadataInjector.php b/civicrm/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
index 418e6cb8ab..fca28b8694 100644
--- a/civicrm/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
+++ b/civicrm/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
@@ -28,12 +28,12 @@ class AfformMetadataInjector {
->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
try {
$module = \Civi::service('angular')->getModule(basename($path, '.aff.html'));
- $meta = \Civi\Api4\Afform::get(FALSE)->addWhere('name', '=', $module['_afform'])->setSelect(['join', 'block'])->execute()->first();
+ $meta = \Civi\Api4\Afform::get(FALSE)->addWhere('name', '=', $module['_afform'])->setSelect(['join_entity', 'entity_type'])->execute()->first();
}
catch (\Exception $e) {
}
- $blockEntity = $meta['join'] ?? $meta['block'] ?? NULL;
+ $blockEntity = $meta['join_entity'] ?? $meta['entity_type'] ?? NULL;
if (!$blockEntity) {
$entities = self::getFormEntities($doc);
}
diff --git a/civicrm/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php b/civicrm/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
index afe7e1cb1a..1277cf66db 100644
--- a/civicrm/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
+++ b/civicrm/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
@@ -3,6 +3,7 @@ namespace Civi\Afform\Event;
use Civi\Afform\FormDataModel;
use Civi\Api4\Action\Afform\Submit;
+use Civi\Api4\Utils\CoreUtil;
/**
* Handle submission of an "<af-form>" entity (or set of entities in the case of `<af-repeat>`).
@@ -96,12 +97,24 @@ class AfformSubmitEvent extends AfformBaseEvent {
}
/**
- * @param $index
- * @param $entityId
+ * @param int $index
+ * @param int|string $entityId
* @return $this
*/
public function setEntityId($index, $entityId) {
- $this->entityIds[$this->entityName][$index]['id'] = $entityId;
+ $idField = CoreUtil::getIdFieldName($this->entityName);
+ $this->entityIds[$this->entityName][$index][$idField] = $entityId;
+ return $this;
+ }
+
+ /**
+ * @param int $index
+ * @param string $joinEntity
+ * @param array $joinIds
+ * @return $this
+ */
+ public function setJoinIds($index, $joinEntity, $joinIds) {
+ $this->entityIds[$this->entityName][$index]['joins'][$joinEntity] = $joinIds;
return $this;
}
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index f497f0aef8..3fcde4e9c4 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -4,6 +4,7 @@ namespace Civi\Api4\Action\Afform;
use Civi\Afform\FormDataModel;
use Civi\Api4\Generic\Result;
+use Civi\Api4\Utils\CoreUtil;
/**
* Shared functionality for form submission pre & post processing.
@@ -64,7 +65,7 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
/**
* Load all entities
*/
- private function loadEntities() {
+ protected function loadEntities() {
foreach ($this->_formDataModel->getEntities() as $entityName => $entity) {
$this->_entityIds[$entityName] = [];
if (!empty($entity['actions']['update'])) {
@@ -149,7 +150,7 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
if (self::getEntityField($joinEntityName, 'entity_id')) {
$params[] = ['entity_id', '=', $mainEntityId];
if (self::getEntityField($joinEntityName, 'entity_table')) {
- $params[] = ['entity_table', '=', 'civicrm_' . \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($mainEntityName)];
+ $params[] = ['entity_table', '=', CoreUtil::getTableName($mainEntityName)];
}
}
else {
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 277eaa1974..6a9ae6e681 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,17 +19,22 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
$scanner = \Civi::service('afform_scanner');
$getComputed = $this->_isFieldSelected('has_local') || $this->_isFieldSelected('has_base');
$getLayout = $this->_isFieldSelected('layout');
+ $values = [];
// This helps optimize lookups by file/module/directive name
- $toGet = array_filter([
+ $getNames = array_filter([
'name' => $this->_itemsToGet('name'),
'module_name' => $this->_itemsToGet('module_name'),
'directive_name' => $this->_itemsToGet('directive_name'),
]);
+ $getTypes = $this->_itemsToGet('type');
- $names = $toGet['name'] ?? array_keys($scanner->findFilePaths());
+ $names = $getNames['name'] ?? array_keys($scanner->findFilePaths());
- $values = $this->getAutoGenerated($names, $toGet, $getLayout);
+ // Get autogenerated blocks if type block is not excluded
+ if (!$getTypes || in_array('block', $getTypes, TRUE)) {
+ $values = $this->getAutoGenerated($names, $getNames, $getLayout);
+ }
if ($this->checkPermissions) {
$names = array_filter($names, [$this, 'checkPermission']);
@@ -41,13 +46,18 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
'module_name' => _afform_angular_module_name($name, 'camel'),
'directive_name' => _afform_angular_module_name($name, 'dash'),
];
- foreach ($toGet as $key => $get) {
- if (!in_array($info[$key], $get)) {
- continue;
+ // Skip if afform does not match requested name
+ foreach ($getNames as $key => $names) {
+ if (!in_array($info[$key], $names)) {
+ continue 2;
}
}
$record = $scanner->getMeta($name);
- if (!$record && !isset($values[$name])) {
+ // Skip if afform does not exist or is not of requested type(s)
+ if (
+ (!$record && !isset($values[$name])) ||
+ ($getTypes && isset($record['type']) && !in_array($record['type'], $getTypes, TRUE))
+ ) {
continue;
}
$values[$name] = array_merge($values[$name] ?? [], $record ?? [], $info);
@@ -81,28 +91,27 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
/**
* Generates afform blocks from custom field sets.
*
- * @param $names
- * @param $toGet
- * @param $getLayout
+ * @param array $names
+ * @param array $getNames
+ * @param bool $getLayout
* @return array
* @throws \API_Exception
*/
- protected function getAutoGenerated(&$names, $toGet, $getLayout) {
+ protected function getAutoGenerated(&$names, $getNames, $getLayout) {
$values = $groupNames = [];
- foreach ($toGet['name'] ?? [] as $name) {
- if (strpos($name, 'afjoinCustom_') === 0 && strlen($name) > 13) {
- $groupNames[] = substr($name, 13);
+ foreach ($getNames['name'] ?? [] as $name) {
+ if (strpos($name, 'afblockCustom_') === 0 && strlen($name) > 13) {
+ $groupNames[] = substr($name, 14);
}
}
// Early return if this api call is fetching afforms by name and those names are not custom-related
- if ((!empty($toGet['name']) && !$groupNames)
- || (!empty($toGet['module_name']) && !strstr(implode(' ', $toGet['module_name']), 'afjoinCustom'))
- || (!empty($toGet['directive_name']) && !strstr(implode(' ', $toGet['directive_name']), 'afjoin-custom'))
+ if ((!empty($getNames['name']) && !$groupNames)
+ || (!empty($getNames['module_name']) && !strstr(implode(' ', $getNames['module_name']), 'afblockCustom'))
+ || (!empty($getNames['directive_name']) && !strstr(implode(' ', $getNames['directive_name']), 'afblock-custom'))
) {
return $values;
}
- $customApi = CustomGroup::get()
- ->setCheckPermissions(FALSE)
+ $customApi = CustomGroup::get(FALSE)
->addSelect('name', 'title', 'help_pre', 'help_post', 'extends', 'max_multiple')
->addWhere('is_multiple', '=', 1)
->addWhere('is_active', '=', 1);
@@ -119,7 +128,7 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
);
}
foreach ($customApi->execute() as $custom) {
- $name = 'afjoinCustom_' . $custom['name'];
+ $name = 'afblockCustom_' . $custom['name'];
if (!in_array($name, $names)) {
$names[] = $name;
}
@@ -127,15 +136,14 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
'name' => $name,
'type' => 'block',
'requires' => [],
- 'title' => E::ts('%1 block (default)', [1 => $custom['title']]),
+ 'title' => E::ts('%1 block', [1 => $custom['title']]),
'description' => '',
'is_dashlet' => FALSE,
'is_public' => FALSE,
'is_token' => FALSE,
'permission' => 'access CiviCRM',
- 'join' => 'Custom_' . $custom['name'],
- 'block' => $custom['extends'],
- 'repeat' => $custom['max_multiple'] ?: TRUE,
+ 'join_entity' => 'Custom_' . $custom['name'],
+ 'entity_type' => $custom['extends'],
'has_base' => TRUE,
];
if ($getLayout) {
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index c33cb29bb4..029daabd41 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -3,6 +3,8 @@
namespace Civi\Api4\Action\Afform;
use Civi\Afform\Event\AfformSubmitEvent;
+use Civi\Api4\AfformSubmission;
+use Civi\Api4\Utils\CoreUtil;
/**
* Class Submit
@@ -36,9 +38,11 @@ class Submit extends AbstractProcessor {
foreach ($values['joins'] as $joinEntity => &$joinValues) {
// Enforce the limit set by join[max]
$joinValues = array_slice($joinValues, 0, $entity['joins'][$joinEntity]['max'] ?? NULL);
- // Only accept values from join fields on the form
foreach ($joinValues as $index => $vals) {
- $joinValues[$index] = array_intersect_key($vals, $entity['joins'][$joinEntity]['fields']);
+ // Only accept values from join fields on the form
+ $joinValues[$index] = array_intersect_key($vals, $entity['joins'][$joinEntity]['fields'] ?? []);
+ // Merge in pre-set data
+ $joinValues[$index] = array_merge($joinValues[$index], $entity['joins'][$joinEntity]['data'] ?? []);
}
}
$entityValues[$entityName][] = $values;
@@ -59,8 +63,21 @@ class Submit extends AbstractProcessor {
\Civi::dispatcher()->dispatch('civi.afform.submit', $event);
}
- // What should I return?
- return [];
+ // Save submission record
+ if (!empty($this->_afform['create_submission'])) {
+ $submission = AfformSubmission::create(FALSE)
+ ->addValue('contact_id', \CRM_Core_Session::getLoggedInContactID())
+ ->addValue('afform_name', $this->name)
+ ->addValue('data', $this->_entityIds)
+ ->execute()->first();
+ }
+
+ // Return ids and a token for uploading files
+ return [
+ [
+ 'token' => $this->generatePostSubmitToken(),
+ ],
+ ];
}
/**
@@ -136,7 +153,7 @@ class Submit extends AbstractProcessor {
try {
$saved = $api4($event->getEntityType(), 'save', ['records' => [$record['fields']]])->first();
$event->setEntityId($index, $saved['id']);
- self::saveJoins($event->getEntityType(), $saved['id'], $record['joins'] ?? []);
+ self::saveJoins($event, $index, $saved['id'], $record['joins'] ?? []);
}
catch (\API_Exception $e) {
// What to do here? Sometimes we should silently ignore errors, e.g. an optional entity
@@ -148,25 +165,27 @@ class Submit extends AbstractProcessor {
/**
* This saves joins (sub-entities) such as Email, Address, Phone, etc.
*
- * @param $mainEntityName
- * @param $entityId
- * @param $joins
+ * @param \Civi\Afform\Event\AfformSubmitEvent $event
+ * @param int $index
+ * @param int|string $entityId
+ * @param array $joins
* @throws \API_Exception
- * @throws \Civi\API\Exception\NotImplementedException
*/
- protected static function saveJoins($mainEntityName, $entityId, $joins) {
+ protected static function saveJoins(AfformSubmitEvent $event, $index, $entityId, $joins) {
foreach ($joins as $joinEntityName => $join) {
$values = self::filterEmptyJoins($joinEntityName, $join);
// TODO: REPLACE works for creating or updating contacts, but different logic would be needed if
// the contact was being auto-updated via a dedupe rule; in that case we would not want to
// delete any existing records.
if ($values) {
- civicrm_api4($joinEntityName, 'replace', [
+ $result = civicrm_api4($joinEntityName, 'replace', [
// Disable permission checks because the main entity has already been vetted
'checkPermissions' => FALSE,
- 'where' => self::getJoinWhereClause($mainEntityName, $joinEntityName, $entityId),
+ 'where' => self::getJoinWhereClause($event->getEntityType(), $joinEntityName, $entityId),
'records' => $values,
- ]);
+ ], ['id']);
+ $indexedResult = array_combine(array_keys($values), (array) $result);
+ $event->setJoinIds($index, $joinEntityName, $indexedResult);
}
// REPLACE doesn't work if there are no records, have to use DELETE
else {
@@ -174,25 +193,41 @@ class Submit extends AbstractProcessor {
civicrm_api4($joinEntityName, 'delete', [
// Disable permission checks because the main entity has already been vetted
'checkPermissions' => FALSE,
- 'where' => self::getJoinWhereClause($mainEntityName, $joinEntityName, $entityId),
+ 'where' => self::getJoinWhereClause($event->getEntityType(), $joinEntityName, $entityId),
]);
}
catch (\API_Exception $e) {
// No records to delete
}
+ $event->setJoinIds($index, $joinEntityName, []);
}
}
}
/**
- * Filter out joins that have been left blank on the form
+ * Filter out join entities that have been left blank on the form
*
* @param $entity
* @param $join
* @return array
*/
private static function filterEmptyJoins($entity, $join) {
- return array_filter($join, function($item) use($entity) {
+ $idField = CoreUtil::getIdFieldName($entity);
+ $fileFields = (array) civicrm_api4($entity, 'getFields', [
+ 'checkPermissions' => FALSE,
+ 'where' => [['fk_entity', '=', 'File']],
+ ], ['name']);
+ // Files will be uploaded later, fill with empty values for now
+ // TODO: Somehow check if a file has actually been selected for upload
+ foreach ($join as &$item) {
+ if (empty($item[$idField]) && $fileFields) {
+ $item += array_fill_keys($fileFields, '');
+ }
+ }
+ return array_filter($join, function($item) use($entity, $idField, $fileFields) {
+ if (!empty($item[$idField]) || $fileFields) {
+ return TRUE;
+ }
switch ($entity) {
case 'Email':
return !empty($item['email']);
@@ -207,7 +242,7 @@ class Submit extends AbstractProcessor {
return !empty($item['url']);
default:
- \CRM_Utils_Array::remove($item, 'id', 'is_primary', 'location_type_id', 'entity_id', 'contact_id', 'entity_table');
+ \CRM_Utils_Array::remove($item, 'is_primary', 'location_type_id', 'entity_id', 'contact_id', 'entity_table');
return (bool) array_filter($item);
}
});
@@ -241,4 +276,25 @@ class Submit extends AbstractProcessor {
}
}
+ /**
+ * Generates token returned from submit action
+ *
+ * @return string
+ * @throws \Civi\Crypto\Exception\CryptoException
+ */
+ private function generatePostSubmitToken(): string {
+ // 1 hour should be more than sufficient to upload files
+ $expires = \CRM_Utils_Time::time() + (60 * 60);
+
+ /** @var \Civi\Crypto\CryptoJwt $jwt */
+ $jwt = \Civi::service('crypto.jwt');
+
+ return $jwt->encode([
+ 'exp' => $expires,
+ // Note: Scope is not the same as "authx" scope. "Authx" tokens are user-login tokens. This one is a more limited access token.
+ 'scope' => 'afformPostSubmit',
+ 'civiAfformSubmission' => ['name' => $this->name, 'data' => $this->_entityIds],
+ ]);
+ }
+
}
diff --git a/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
new file mode 100644
index 0000000000..bd463b02c2
--- /dev/null
+++ b/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\API\Exception\UnauthorizedException;
+use Civi\Api4\Utils\CoreUtil;
+
+/**
+ * Special-purpose API for uploading files as part of a form submission.
+ *
+ * This API is meant to be called with a multipart POST ajax request which includes the uploaded file.
+ *
+ * @method $this setToken(string $token)
+ * @method $this setFieldName(string $fieldName)
+ * @method $this setEntityName(string $entityName)
+ * @method $this setJoinEntity(string $joinEntity)
+ * @method $this setEntityIndex(int $entityIndex)
+ * @method $this setJoinIndex(int $joinIndex)
+ * @package Civi\Api4\Action\Afform
+ */
+class SubmitFile extends AbstractProcessor {
+
+ /**
+ * Submission token
+ * @var string
+ * @required
+ */
+ protected $token;
+
+ /**
+ * @var string
+ * @required
+ */
+ protected $entityName;
+
+ /**
+ * @var string
+ * @required
+ */
+ protected $fieldName;
+
+ /**
+ * @var string
+ */
+ protected $joinEntity;
+
+ /**
+ * @var string|int
+ */
+ protected $entityIndex;
+
+ /**
+ * @var string|int
+ */
+ protected $joinIndex;
+
+ protected function processForm() {
+ if (empty($_FILES['file'])) {
+ throw new \API_Exception('File upload required');
+ }
+ $afformEntity = $this->_formDataModel->getEntity($this->entityName);
+ $apiEntity = $this->joinEntity ?: $afformEntity['type'];
+ $entityIndex = (int) $this->entityIndex;
+ $joinIndex = (int) $this->joinIndex;
+ if ($this->joinEntity) {
+ $entityId = $this->_entityIds[$this->entityName][$entityIndex]['joins'][$this->joinEntity][$joinIndex] ?? NULL;
+ }
+ else {
+ $entityId = $this->_entityIds[$this->entityName][$entityIndex]['id'] ?? NULL;
+ }
+
+ if (!$entityId) {
+ throw new \API_Exception('Entity not found');
+ }
+
+ $attachmentParams = [
+ 'entity_id' => $entityId,
+ 'mime_type' => $_FILES['file']['type'],
+ 'name' => $_FILES['file']['name'],
+ 'options' => [
+ 'move-file' => $_FILES['file']['tmp_name'],
+ ],
+ ];
+
+ if (strpos($this->fieldName, '.')) {
+ $attachmentParams['field_name'] = $this->convertFieldNameToApi3($apiEntity, $this->fieldName);
+ }
+ else {
+ $attachmentParams['entity_table'] = CoreUtil::getTableName($apiEntity);
+ }
+
+ $file = civicrm_api3('Attachment', 'create', $attachmentParams);
+
+ // Update multi-record custom field with value
+ if (strpos($apiEntity, 'Custom_') === 0) {
+ civicrm_api4($apiEntity, 'update', [
+ 'values' => [
+ 'id' => $entityId,
+ $this->fieldName => $file['id'],
+ ],
+ ]);
+ }
+
+ return [];
+ }
+
+ /**
+ * Load entityIds from web token
+ */
+ protected function loadEntities() {
+ /** @var \Civi\Crypto\CryptoJwt $jwt */
+ $jwt = \Civi::service('crypto.jwt');
+
+ // Double-decode is needed to convert PHP objects to arrays
+ $info = json_decode(json_encode($jwt->decode($this->token)), TRUE);
+
+ if ($info['civiAfformSubmission']['name'] !== $this->getName()) {
+ throw new UnauthorizedException('Name mismatch');
+ }
+
+ $this->_entityIds = $info['civiAfformSubmission']['data'];
+ }
+
+ /**
+ * @param string $apiEntity
+ * @param string $fieldName
+ * @return string
+ */
+ private function convertFieldNameToApi3($apiEntity, $fieldName) {
+ if (strpos($fieldName, '.')) {
+ $fields = civicrm_api4($apiEntity, 'getFields', [
+ 'checkPermissions' => FALSE,
+ 'where' => [['name', '=', $fieldName]],
+ ]);
+ return 'custom_' . $fields[0]['custom_field_id'];
+ }
+ return $fieldName;
+ }
+
+}
diff --git a/civicrm/ext/afform/core/Civi/Api4/Afform.php b/civicrm/ext/afform/core/Civi/Api4/Afform.php
index 5aa33eb1f5..ec76fd3df2 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Afform.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Afform.php
@@ -84,6 +84,15 @@ class Afform extends Generic\AbstractEntity {
->setCheckPermissions($checkPermissions);
}
+ /**
+ * @param bool $checkPermissions
+ * @return Action\Afform\SubmitFile
+ */
+ public static function submitFile($checkPermissions = TRUE) {
+ return (new Action\Afform\SubmitFile('Afform', __FUNCTION__))
+ ->setCheckPermissions($checkPermissions);
+ }
+
/**
* @param bool $checkPermissions
* @return Generic\BasicBatchAction
@@ -128,16 +137,19 @@ class Afform extends Generic\AbstractEntity {
[
'name' => 'type',
'options' => $self->pseudoconstantOptions('afform_type'),
+ 'suffixes' => ['id', 'name', 'label', 'icon'],
],
[
'name' => 'requires',
'data_type' => 'Array',
],
[
- 'name' => 'block',
+ 'name' => 'entity_type',
+ 'description' => 'Block used for this entity type',
],
[
- 'name' => 'join',
+ 'name' => 'join_entity',
+ 'description' => 'Used for blocks that join a sub-entity (e.g. Emails for a Contact)',
],
[
'name' => 'title',
@@ -166,10 +178,6 @@ class Afform extends Generic\AbstractEntity {
'tab' => ts('Contact Summary Tab'),
],
],
- [
- 'name' => 'repeat',
- 'data_type' => 'Mixed',
- ],
[
'name' => 'server_route',
],
@@ -179,9 +187,14 @@ class Afform extends Generic\AbstractEntity {
[
'name' => 'redirect',
],
+ [
+ 'name' => 'create_submission',
+ 'data_type' => 'Boolean',
+ ],
[
'name' => 'layout',
'data_type' => 'Array',
+ 'description' => 'HTML form layout; format is controlled by layoutFormat param',
],
];
// Calculated fields returned by get action
@@ -221,6 +234,7 @@ class Afform extends Generic\AbstractEntity {
'get' => [],
'prefill' => [],
'submit' => [],
+ 'submitFile' => [],
];
}
diff --git a/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php b/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
new file mode 100644
index 0000000000..f909d127c8
--- /dev/null
+++ b/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
@@ -0,0 +1,14 @@
+<?php
+namespace Civi\Api4;
+
+/**
+ * AfformSubmission entity.
+ *
+ * Provided by the Afform: Core Runtime extension.
+ *
+ * @searchable secondary
+ * @package Civi\Api4
+ */
+class AfformSubmission extends Generic\DAOEntity {
+
+}
diff --git a/civicrm/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/civicrm/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index bee09ea626..2f4099460a 100644
--- a/civicrm/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/civicrm/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -16,7 +16,7 @@ trait AfformSaveTrait {
// If no name given, create a unique name based on the title
if (empty($item['name'])) {
- $prefix = !empty($item['join']) ? "afjoin-{$item['join']}" : (!empty($item['block']) ? ('afblock-' . str_replace('*', 'all', $item['block'])) : 'afform');
+ $prefix = 'af' . ($item['type'] ?? '');
$item['name'] = _afform_angular_module_name($prefix . '-' . \CRM_Utils_String::munge($item['title'], '-'));
$suffix = '';
while (
diff --git a/civicrm/ext/afform/core/afform.civix.php b/civicrm/ext/afform/core/afform.civix.php
index 1ab6c2b2cf..1a10bb02d0 100644
--- a/civicrm/ext/afform/core/afform.civix.php
+++ b/civicrm/ext/afform/core/afform.civix.php
@@ -449,5 +449,11 @@ function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
*/
function _afform_civix_civicrm_entityTypes(&$entityTypes) {
- $entityTypes = array_merge($entityTypes, []);
+ $entityTypes = array_merge($entityTypes, [
+ 'CRM_Afform_DAO_AfformSubmission' => [
+ 'name' => 'AfformSubmission',
+ 'class' => 'CRM_Afform_DAO_AfformSubmission',
+ 'table' => 'civicrm_afform_submission',
+ ],
+ ]);
}
diff --git a/civicrm/ext/afform/core/afform.php b/civicrm/ext/afform/core/afform.php
index a4e3bd27a5..4822b15d23 100644
--- a/civicrm/ext/afform/core/afform.php
+++ b/civicrm/ext/afform/core/afform.php
@@ -492,7 +492,7 @@ function _afform_angular_module_name($fileBaseName, $format = 'camel') {
*/
function afform_civicrm_alterApiRoutePermissions(&$permissions, $entity, $action) {
if ($entity == 'Afform') {
- if ($action == 'prefill' || $action == 'submit') {
+ if ($action == 'prefill' || $action == 'submit' || $action == 'submitFile') {
$permissions = CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION;
}
}
diff --git a/civicrm/ext/afform/core/ang/af/afField.component.js b/civicrm/ext/afform/core/ang/af/afField.component.js
index 545351ca4a..22ba460deb 100644
--- a/civicrm/ext/afform/core/ang/af/afField.component.js
+++ b/civicrm/ext/afform/core/ang/af/afField.component.js
@@ -96,6 +96,27 @@
};
+ // Get the repeat index of the entity fieldset (not the join)
+ ctrl.getEntityIndex = function() {
+ // If already in a join repeat, look up the outer repeat
+ if ('repeatIndex' in $scope.dataProvider && $scope.dataProvider.afRepeat.getRepeatType() === 'join') {
+ return $scope.dataProvider.outerRepeatItem ? $scope.dataProvider.outerRepeatItem.repeatIndex : 0;
+ } else {
+ return ctrl.afRepeatItem ? ctrl.afRepeatItem.repeatIndex : 0;
+ }
+ };
+
+ // Params for the Afform.submitFile API when uploading a file field
+ ctrl.getFileUploadParams = function() {
+ return {
+ entityName: ctrl.afFieldset.modelName,
+ fieldName: ctrl.fieldName,
+ joinEntity: ctrl.afJoin ? ctrl.afJoin.entity : null,
+ entityIndex: ctrl.getEntityIndex(),
+ joinIndex: ctrl.afJoin && $scope.dataProvider.repeatIndex || null
+ };
+ };
+
$scope.getOptions = function () {
return ctrl.defn.options || (ctrl.fieldName === 'is_primary' && ctrl.defn.input_type === 'Radio' ? noOptions : boolOptions);
};
diff --git a/civicrm/ext/afform/core/ang/af/afForm.component.js b/civicrm/ext/afform/core/ang/af/afForm.component.js
index b39a297ad2..888953f499 100644
--- a/civicrm/ext/afform/core/ang/af/afForm.component.js
+++ b/civicrm/ext/afform/core/ang/af/afForm.component.js
@@ -4,9 +4,10 @@
bindings: {
ctrl: '@'
},
- controller: function($scope, $timeout, crmApi4, crmStatus, $window, $location) {
+ controller: function($scope, $element, $timeout, crmApi4, crmStatus, $window, $location, FileUploader) {
var schema = {},
data = {},
+ status,
ctrl = this;
this.$onInit = function() {
@@ -53,21 +54,57 @@
}
};
- this.submit = function submit() {
- var submission = crmApi4('Afform', 'submit', {name: ctrl.getFormMeta().name, args: $scope.$parent.routeParams || {}, values: data});
+ // Used when submitting file fields
+ this.fileUploader = new FileUploader({
+ url: CRM.url('civicrm/ajax/api4/Afform/submitFile'),
+ headers: {'X-Requested-With': 'XMLHttpRequest'},
+ onCompleteAll: postProcess,
+ onBeforeUploadItem: function(item) {
+ status.resolve();
+ status = CRM.status({start: ts('Uploading %1', {1: item.file.name})});
+ }
+ });
+
+ // Called after form is submitted and files are uploaded
+ function postProcess() {
var metaData = ctrl.getFormMeta();
+
if (metaData.redirect) {
- submission.then(function() {
- var url = metaData.redirect;
- if (url.indexOf('civicrm/') === 0) {
- url = CRM.url(url);
- } else if (url.indexOf('/') === 0) {
- url = $location.protocol() + '://' + $location.host() + url;
- }
- $window.location.href = url;
- });
+ var url = metaData.redirect;
+ if (url.indexOf('civicrm/') === 0) {
+ url = CRM.url(url);
+ } else if (url.indexOf('/') === 0) {
+ url = $location.protocol() + '://' + $location.host() + url;
+ }
+ $window.location.href = url;
}
- return crmStatus({start: ts('Saving'), success: ts('Saved')}, submission);
+ status.resolve();
+ $element.unblock();
+ }
+
+ this.submit = function() {
+ status = CRM.status({});
+ $element.block();
+
+ crmApi4('Afform', 'submit', {
+ name: ctrl.getFormMeta().name,
+ args: $scope.$parent.routeParams || {},
+ values: data}
+ ).then(function(response) {
+ if (ctrl.fileUploader.getNotUploadedItems().length) {
+ _.each(ctrl.fileUploader.getNotUploadedItems(), function(file) {
+ file.formData.push({
+ params: JSON.stringify(_.extend({
+ token: response[0].token,
+ name: ctrl.getFormMeta().name
+ }, file.crmApiParams()))
+ });
+ });
+ ctrl.fileUploader.uploadAll();
+ } else {
+ postProcess();
+ }
+ });
};
}
});
diff --git a/civicrm/ext/afform/core/ang/af/afRepeat.directive.js b/civicrm/ext/afform/core/ang/af/afRepeat.directive.js
index 133897bf48..f294c20630 100644
--- a/civicrm/ext/afform/core/ang/af/afRepeat.directive.js
+++ b/civicrm/ext/afform/core/ang/af/afRepeat.directive.js
@@ -58,16 +58,15 @@
.directive('afRepeatItem', function() {
return {
restrict: 'A',
- require: ['afRepeatItem', '^^afRepeat'],
+ require: {
+ afRepeat: '^^',
+ outerRepeatItem: '?^^afRepeatItem'
+ },
bindToController: {
item: '=afRepeatItem',
repeatIndex: '='
},
- link: function($scope, $el, $attr, ctrls) {
- var self = ctrls[0];
- self.afRepeat = ctrls[1];
- },
- controller: function($scope) {
+ controller: function() {
this.getFieldData = function() {
return this.afRepeat.getRepeatType() === 'join' ? this.item : this.item.fields;
};
diff --git a/civicrm/ext/afform/core/ang/af/fields/File.html b/civicrm/ext/afform/core/ang/af/fields/File.html
new file mode 100644
index 0000000000..1412e80138
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/af/fields/File.html
@@ -0,0 +1,3 @@
+<input type="file" nv-file-select
+ uploader="$ctrl.afFieldset.afFormCtrl.fileUploader"
+ options="{crmApiParams: $ctrl.getFileUploadParams}">
diff --git a/civicrm/ext/afform/core/ang/afCore.ang.php b/civicrm/ext/afform/core/ang/afCore.ang.php
index 9b23b737b2..7f2a44691e 100644
--- a/civicrm/ext/afform/core/ang/afCore.ang.php
+++ b/civicrm/ext/afform/core/ang/afCore.ang.php
@@ -7,7 +7,7 @@ return [
'ang/afCore/*/*.js',
],
'css' => ['ang/afCore.css'],
- 'requires' => ['crmUi', 'crmUtil', 'api4', 'checklist-model'],
+ 'requires' => ['crmUi', 'crmUtil', 'api4', 'checklist-model', 'angularFileUpload'],
'partials' => ['ang/afCore'],
'settings' => [],
'basePages' => [],
diff --git a/civicrm/ext/afform/core/ang/afCore.css b/civicrm/ext/afform/core/ang/afCore.css
index 124ead36ff..d1c8f0874d 100644
--- a/civicrm/ext/afform/core/ang/afCore.css
+++ b/civicrm/ext/afform/core/ang/afCore.css
@@ -17,6 +17,9 @@ a.af-api4-action-idle {
margin-right: .5em;
vertical-align: top;
}
+af-form {
+ display: block;
+}
[af-repeat-item] {
position: relative;
diff --git a/civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.html b/civicrm/ext/afform/core/ang/afblockContactAddress.aff.html
similarity index 100%
rename from civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.html
rename to civicrm/ext/afform/core/ang/afblockContactAddress.aff.html
diff --git a/civicrm/ext/afform/core/ang/afblockContactAddress.aff.json b/civicrm/ext/afform/core/ang/afblockContactAddress.aff.json
new file mode 100644
index 0000000000..0a0e209345
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/afblockContactAddress.aff.json
@@ -0,0 +1,6 @@
+{
+ "title": "Contact Address(es)",
+ "type": "block",
+ "entity_type": "Contact",
+ "join_entity": "Address"
+}
diff --git a/civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.html b/civicrm/ext/afform/core/ang/afblockContactEmail.aff.html
similarity index 100%
rename from civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.html
rename to civicrm/ext/afform/core/ang/afblockContactEmail.aff.html
diff --git a/civicrm/ext/afform/core/ang/afblockContactEmail.aff.json b/civicrm/ext/afform/core/ang/afblockContactEmail.aff.json
new file mode 100644
index 0000000000..6ddb66f259
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/afblockContactEmail.aff.json
@@ -0,0 +1,6 @@
+{
+ "title": "Contact Email(s)",
+ "type": "block",
+ "entity_type": "Contact",
+ "join_entity": "Email"
+}
diff --git a/civicrm/ext/afform/core/ang/afjoinIMDefault.aff.html b/civicrm/ext/afform/core/ang/afblockContactIM.aff.html
similarity index 100%
rename from civicrm/ext/afform/core/ang/afjoinIMDefault.aff.html
rename to civicrm/ext/afform/core/ang/afblockContactIM.aff.html
diff --git a/civicrm/ext/afform/core/ang/afblockContactIM.aff.json b/civicrm/ext/afform/core/ang/afblockContactIM.aff.json
new file mode 100644
index 0000000000..953d1a09d1
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/afblockContactIM.aff.json
@@ -0,0 +1,6 @@
+{
+ "title": "Contact IM(s)",
+ "type": "block",
+ "entity_type": "Contact",
+ "join_entity": "IM"
+}
diff --git a/civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.html b/civicrm/ext/afform/core/ang/afblockContactPhone.aff.html
similarity index 100%
rename from civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.html
rename to civicrm/ext/afform/core/ang/afblockContactPhone.aff.html
diff --git a/civicrm/ext/afform/core/ang/afblockContactPhone.aff.json b/civicrm/ext/afform/core/ang/afblockContactPhone.aff.json
new file mode 100644
index 0000000000..c66eae8b24
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/afblockContactPhone.aff.json
@@ -0,0 +1,6 @@
+{
+ "title": "Contact Phone(s)",
+ "type": "block",
+ "entity_type": "Contact",
+ "join_entity": "Phone"
+}
diff --git a/civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.html b/civicrm/ext/afform/core/ang/afblockContactWebsite.aff.html
similarity index 100%
rename from civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.html
rename to civicrm/ext/afform/core/ang/afblockContactWebsite.aff.html
diff --git a/civicrm/ext/afform/core/ang/afblockContactWebsite.aff.json b/civicrm/ext/afform/core/ang/afblockContactWebsite.aff.json
new file mode 100644
index 0000000000..89288fcfd0
--- /dev/null
+++ b/civicrm/ext/afform/core/ang/afblockContactWebsite.aff.json
@@ -0,0 +1,6 @@
+{
+ "title": "Contact Website(s)",
+ "type": "block",
+ "entity_type": "Contact",
+ "join_entity": "Website"
+}
diff --git a/civicrm/ext/afform/core/ang/afblockNameHousehold.aff.json b/civicrm/ext/afform/core/ang/afblockNameHousehold.aff.json
index c4eee679c6..dd665a10cc 100644
--- a/civicrm/ext/afform/core/ang/afblockNameHousehold.aff.json
+++ b/civicrm/ext/afform/core/ang/afblockNameHousehold.aff.json
@@ -1,5 +1,5 @@
{
- "title": "Household Name (default)",
+ "title": "Household Name",
"type": "block",
- "block": "Household"
+ "entity_type": "Household"
}
diff --git a/civicrm/ext/afform/core/ang/afblockNameIndividual.aff.json b/civicrm/ext/afform/core/ang/afblockNameIndividual.aff.json
index 51c4596ea6..1cafdc4be6 100644
--- a/civicrm/ext/afform/core/ang/afblockNameIndividual.aff.json
+++ b/civicrm/ext/afform/core/ang/afblockNameIndividual.aff.json
@@ -1,5 +1,5 @@
{
- "title": "Individual Name (default)",
+ "title": "Individual Name",
"type": "block",
- "block": "Individual"
+ "entity_type": "Individual"
}
diff --git a/civicrm/ext/afform/core/ang/afblockNameOrganization.aff.json b/civicrm/ext/afform/core/ang/afblockNameOrganization.aff.json
index e3ac17c246..ca44304b5d 100644
--- a/civicrm/ext/afform/core/ang/afblockNameOrganization.aff.json
+++ b/civicrm/ext/afform/core/ang/afblockNameOrganization.aff.json
@@ -1,5 +1,5 @@
{
- "title": "Organization Name (default)",
+ "title": "Organization Name",
"type": "block",
- "block": "Organization"
+ "entity_type": "Organization"
}
diff --git a/civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.json b/civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.json
deleted file mode 100644
index 27775770b6..0000000000
--- a/civicrm/ext/afform/core/ang/afjoinAddressDefault.aff.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "title": "Address Block (default)",
- "type": "block",
- "block": "Contact",
- "join": "Address",
- "repeat": true
-}
diff --git a/civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.json b/civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.json
deleted file mode 100644
index 7c50c579dc..0000000000
--- a/civicrm/ext/afform/core/ang/afjoinEmailDefault.aff.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "title": "Email (default)",
- "type": "block",
- "block": "Contact",
- "join": "Email",
- "repeat": true
-}
diff --git a/civicrm/ext/afform/core/ang/afjoinIMDefault.aff.json b/civicrm/ext/afform/core/ang/afjoinIMDefault.aff.json
deleted file mode 100644
index 3ec912975b..0000000000
--- a/civicrm/ext/afform/core/ang/afjoinIMDefault.aff.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "title": "IM (default)",
- "type": "block",
- "block": "Contact",
- "join": "IM",
- "repeat": true
-}
diff --git a/civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.json b/civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.json
deleted file mode 100644
index 821d288840..0000000000
--- a/civicrm/ext/afform/core/ang/afjoinPhoneDefault.aff.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "title": "Phone (default)",
- "type": "block",
- "block": "Contact",
- "join": "Phone",
- "repeat": true
-}
diff --git a/civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.json b/civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
deleted file mode 100644
index b39dd9cd73..0000000000
--- a/civicrm/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "title": "Website (default)",
- "type": "block",
- "block": "Contact",
- "join": "Website",
- "repeat": true
-}
diff --git a/civicrm/ext/afform/core/info.xml b/civicrm/ext/afform/core/info.xml
index 20a89a9659..ddbca10dfd 100644
--- a/civicrm/ext/afform/core/info.xml
+++ b/civicrm/ext/afform/core/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php b/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
new file mode 100644
index 0000000000..7b3362da3f
--- /dev/null
+++ b/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
@@ -0,0 +1,10 @@
+<?php
+// This file declares a new entity type. For more details, see "hook_civicrm_entityTypes" at:
+// https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+return [
+ [
+ 'name' => 'AfformSubmission',
+ 'class' => 'CRM_Afform_DAO_AfformSubmission',
+ 'table' => 'civicrm_afform_submission',
+ ],
+];
diff --git a/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml b/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml
new file mode 100644
index 0000000000..28278d26ab
--- /dev/null
+++ b/civicrm/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<table>
+ <base>CRM/Afform</base>
+ <class>AfformSubmission</class>
+ <name>civicrm_afform_submission</name>
+ <comment>Recorded form submissions</comment>
+ <title>Form Builder Submission</title>
+ <log>true</log>
+
+ <field>
+ <name>id</name>
+ <type>int unsigned</type>
+ <required>true</required>
+ <comment>Unique Submission ID</comment>
+ <html>
+ <type>Number</type>
+ </html>
+ <add>5.41</add>
+ </field>
+ <primaryKey>
+ <name>id</name>
+ <autoincrement>true</autoincrement>
+ </primaryKey>
+
+ <field>
+ <name>contact_id</name>
+ <type>int unsigned</type>
+ <title>User Contact ID</title>
+ <add>5.41</add>
+ </field>
+ <foreignKey>
+ <name>contact_id</name>
+ <table>civicrm_contact</table>
+ <key>id</key>
+ <onDelete>SET NULL</onDelete>
+ </foreignKey>
+
+ <field>
+ <name>afform_name</name>
+ <type>varchar</type>
+ <length>255</length>
+ <title>Afform Name</title>
+ <comment>Name of submitted afform</comment>
+ <add>5.41</add>
+ </field>
+
+ <field>
+ <name>data</name>
+ <type>text</type>
+ <title>Submission Data</title>
+ <comment>IDs of saved entities</comment>
+ <serialize>JSON</serialize>
+ <add>5.41</add>
+ </field>
+
+ <field>
+ <name>submission_date</name>
+ <type>timestamp</type>
+ <title>Submission Date/Time</title>
+ <default>CURRENT_TIMESTAMP</default>
+ <readonly>true</readonly>
+ <add>5.41</add>
+ </field>
+
+</table>
diff --git a/civicrm/ext/afform/html/info.xml b/civicrm/ext/afform/html/info.xml
index 0810c908b2..7f35d65b80 100644
--- a/civicrm/ext/afform/html/info.xml
+++ b/civicrm/ext/afform/html/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.23</ver>
diff --git a/civicrm/ext/afform/mock/info.xml b/civicrm/ext/afform/mock/info.xml
index e2b5d95217..c8b775e85f 100644
--- a/civicrm/ext/afform/mock/info.xml
+++ b/civicrm/ext/afform/mock/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-09</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
index 45222a343d..7e0b2f6f46 100644
--- a/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
+++ b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
@@ -39,7 +39,7 @@ EOHTML;
<legend class="af-text">Individual 1</legend>
<afblock-name-individual></afblock-name-individual>
<div af-join="Email" min="1" af-repeat="Add">
- <afjoin-email-default></afjoin-email-default>
+ <afblock-contact-email></afblock-contact-email>
</div>
<af-field name="employer_id" defn="{input_type: 'Select', input_attrs: {}}" />
</fieldset>
@@ -49,7 +49,7 @@ EOHTML;
<af-field name="organization_name" />
</div>
<div af-join="Email">
- <afjoin-email-default></afjoin-email-default>
+ <afblock-contact-email></afblock-contact-email>
</div>
</fieldset>
<button class="af-button btn-primary" crm-icon="fa-check" ng-click="afform.submit()">Submit</button>
@@ -91,6 +91,7 @@ EOHTML;
$this->useValues([
'layout' => self::$layouts['registerSite'],
'permission' => CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION,
+ 'create_submission' => TRUE,
]);
$firstName = uniqid(__FUNCTION__);
@@ -120,10 +121,24 @@ EOHTML;
->setName($this->formName)
->setValues($values)
->execute();
+
+ $submission = Civi\Api4\AfformSubmission::get(FALSE)
+ ->addOrderBy('id', 'DESC')
+ ->execute()->first();
+
+ $this->assertEquals($this->formName, $submission['afform_name']);
+ $this->assertIsInt($submission['data']['Activity1'][0]['id']);
+ $this->assertIsInt($submission['data']['Individual1'][0]['id']);
+
// Check that Activity was submitted correctly.
- $activity = \Civi\Api4\Activity::get(FALSE)->execute()->first();
+ $activity = \Civi\Api4\Activity::get(FALSE)
+ ->addWhere('id', '=', $submission['data']['Activity1'][0]['id'])
+ ->execute()->first();
$this->assertEquals('Individual1', $activity['subject']);
- $contact = \Civi\Api4\Contact::get()->addWhere('first_name', '=', $firstName)->execute()->first();
+ $contact = \Civi\Api4\Contact::get()
+ ->addWhere('id', '=', $submission['data']['Individual1'][0]['id'])
+ ->execute()->first();
+ $this->assertEquals($firstName, $contact['first_name']);
$this->assertEquals('site', $contact['last_name']);
// Check that the data overrides form submsision
$this->assertEquals('Register A site', $contact['source']);
diff --git a/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformCustomFieldUsageTest.php b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformCustomFieldUsageTest.php
index 4249d393b0..3ece0fb88d 100644
--- a/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformCustomFieldUsageTest.php
+++ b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformCustomFieldUsageTest.php
@@ -17,7 +17,7 @@ class api_v4_AfformCustomFieldUsageTest extends api_v4_AfformUsageTestCase {
<legend class="af-text">Individual 1</legend>
<afblock-name-individual></afblock-name-individual>
<div af-join="Custom_MyThings" af-repeat="Add" max="2">
- <afjoin-custom-my-things></afjoin-custom-my-things>
+ <afblock-custom-my-things></afblock-custom-my-things>
</div>
</fieldset>
<button class="af-button btn-primary" crm-icon="fa-check" ng-click="afform.submit()">Submit</button>
@@ -31,7 +31,7 @@ EOHTML;
* which can be submitted multiple times
*/
public function testMultiRecordCustomBlock(): void {
- $customGroup = \Civi\Api4\CustomGroup::create(FALSE)
+ \Civi\Api4\CustomGroup::create(FALSE)
->addValue('name', 'MyThings')
->addValue('title', 'My Things')
->addValue('style', 'Tab with table')
@@ -49,11 +49,11 @@ EOHTML;
// Creating a custom group should automatically create an afform block
$block = \Civi\Api4\Afform::get()
- ->addWhere('name', '=', 'afjoinCustom_MyThings')
+ ->addWhere('name', '=', 'afblockCustom_MyThings')
->setLayoutFormat('shallow')
->setFormatWhitespace(TRUE)
- ->execute()->first();
- $this->assertEquals(2, $block['repeat']);
+ ->execute()->single();
+ $this->assertEquals('afblock-custom-my-things', $block['directive_name']);
$this->assertEquals('my_text', $block['layout'][0]['name']);
$this->assertEquals('my_friend', $block['layout'][1]['name']);
diff --git a/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformFileUploadTest.php b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformFileUploadTest.php
new file mode 100644
index 0000000000..c8bfb3040d
--- /dev/null
+++ b/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformFileUploadTest.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * Test case for Afform.prefill and Afform.submit.
+ *
+ * @group headless
+ */
+require_once __DIR__ . '/AfformTestCase.php';
+require_once __DIR__ . '/AfformUsageTestCase.php';
+class api_v4_AfformFileUploadTest extends api_v4_AfformUsageTestCase {
+
+ public static function setUpBeforeClass(): void {
+ parent::setUpBeforeClass();
+
+ self::$layouts['customFiles'] = <<<EOHTML
+<af-form ctrl="afform">
+ <af-entity data="{contact_type: 'Individual'}" type="Contact" name="Individual1" label="Individual 1" actions="{create: true, update: true}" security="FBAC" />
+ <fieldset af-fieldset="Individual1" af-repeat="Add" max="2">
+ <legend class="af-text">Individual 1</legend>
+ <afblock-name-individual></afblock-name-individual>
+ <af-field name="MyInfo.single_file_field"></af-field>
+ <div af-join="Custom_MyFiles" af-repeat="Add" max="3">
+ <afjoin-custom-my-files></afjoin-custom-my-files>
+ </div>
+ </fieldset>
+ <button class="af-button btn-primary" crm-icon="fa-check" ng-click="afform.submit()">Submit</button>
+</af-form>
+EOHTML;
+ }
+
+ public function tearDown(): void {
+ parent::tearDown();
+ $_FILES = [];
+ }
+
+ /**
+ * Test the submitFile api action
+ */
+ public function testSubmitFile(): void {
+ // Single-value set
+ \Civi\Api4\CustomGroup::create(FALSE)
+ ->addValue('name', 'MyInfo')
+ ->addValue('title', 'My Info')
+ ->addValue('extends', 'Contact')
+ ->addChain('fields', \Civi\Api4\CustomField::save()
+ ->addDefault('custom_group_id', '$id')
+ ->setRecords([
+ ['name' => 'single_file_field', 'label' => 'A File', 'data_type' => 'File', 'html_type' => 'File'],
+ ])
+ )
+ ->execute();
+
+ // Multi-record set
+ \Civi\Api4\CustomGroup::create(FALSE)
+ ->addValue('name', 'MyFiles')
+ ->addValue('title', 'My Files')
+ ->addValue('style', 'Tab with table')
+ ->addValue('extends', 'Contact')
+ ->addValue('is_multiple', TRUE)
+ ->addValue('max_multiple', 3)
+ ->addChain('fields', \Civi\Api4\CustomField::save()
+ ->addDefault('custom_group_id', '$id')
+ ->setRecords([
+ ['name' => 'my_file', 'label' => 'My File', 'data_type' => 'File', 'html_type' => 'File'],
+ ])
+ )
+ ->execute();
+
+ $this->useValues([
+ 'layout' => self::$layouts['customFiles'],
+ 'permission' => CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION,
+ ]);
+
+ $lastName = uniqid(__FUNCTION__);
+ $values = [
+ 'Individual1' => [
+ [
+ 'fields' => [
+ 'first_name' => 'First',
+ 'last_name' => $lastName,
+ ],
+ 'joins' => [
+ 'Custom_MyFiles' => [
+ [],
+ [],
+ ],
+ ],
+ ],
+ [
+ 'fields' => [
+ 'first_name' => 'Second',
+ 'last_name' => $lastName,
+ ],
+ 'joins' => [
+ 'Custom_MyFiles' => [
+ [],
+ [],
+ ],
+ ],
+ ],
+ ],
+ ];
+ $submission = Civi\Api4\Afform::submit()
+ ->setName($this->formName)
+ ->setValues($values)
+ ->execute()->first();
+
+ foreach ([0, 1] as $entityIndex) {
+ $this->mockUploadFile();
+ Civi\Api4\Afform::submitFile()
+ ->setName($this->formName)
+ ->setToken($submission['token'])
+ ->setEntityName('Individual1')
+ ->setFieldName('MyInfo.single_file_field')
+ ->setEntityIndex($entityIndex)
+ ->execute();
+
+ foreach ([0, 1] as $joinIndex) {
+ $this->mockUploadFile();
+ Civi\Api4\Afform::submitFile()
+ ->setName($this->formName)
+ ->setToken($submission['token'])
+ ->setEntityName('Individual1')
+ ->setFieldName('my_file')
+ ->setEntityIndex($entityIndex)
+ ->setJoinEntity('Custom_MyFiles')
+ ->setJoinIndex($joinIndex)
+ ->execute();
+ }
+ }
+
+ $contacts = \Civi\Api4\Contact::get(FALSE)
+ ->addWhere('last_name', '=', $lastName)
+ ->addJoin('Custom_MyFiles AS MyFiles', 'LEFT', ['id', '=', 'MyFiles.entity_id'])
+ ->addSelect('first_name', 'MyInfo.single_file_field', 'MyFiles.my_file')
+ ->addOrderBy('id')
+ ->addOrderBy('MyFiles.my_file')
+ ->execute();
+ $fileId = $contacts[0]['MyInfo.single_file_field'];
+ $this->assertEquals(++$fileId, $contacts[0]['MyFiles.my_file']);
+ $this->assertEquals(++$fileId, $contacts[1]['MyFiles.my_file']);
+ $this->assertEquals(++$fileId, $contacts[2]['MyInfo.single_file_field']);
+ $this->assertEquals(++$fileId, $contacts[2]['MyFiles.my_file']);
+ $this->assertEquals(++$fileId, $contacts[3]['MyFiles.my_file']);
+ }
+
+ /**
+ * Mock a file being uploaded
+ */
+ protected function mockUploadFile() {
+ $tmpDir = sys_get_temp_dir();
+ $this->assertTrue($tmpDir && is_dir($tmpDir), 'Tmp dir must exist: ' . $tmpDir);
+ $fileName = uniqid() . '.txt';
+ $filePath = $tmpDir . '/' . $fileName;
+ file_put_contents($filePath, 'Hello');
+ $_FILES['file'] = [
+ 'name' => $fileName,
+ 'tmp_name' => $filePath,
+ 'type' => 'text/plain',
+ ];
+ }
+
+}
diff --git a/civicrm/ext/authx/info.xml b/civicrm/ext/authx/info.xml
index c59ff9b5f6..ce12fdf691 100644
--- a/civicrm/ext/authx/info.xml
+++ b/civicrm/ext/authx/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-02-11</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>alpha</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/ckeditor4/CRM/Ckeditor4/Upgrader.php b/civicrm/ext/ckeditor4/CRM/Ckeditor4/Upgrader.php
index 22d48b861c..bb700c4d5e 100644
--- a/civicrm/ext/ckeditor4/CRM/Ckeditor4/Upgrader.php
+++ b/civicrm/ext/ckeditor4/CRM/Ckeditor4/Upgrader.php
@@ -6,11 +6,8 @@ use CRM_Ckeditor4_ExtensionUtil as E;
*/
class CRM_Ckeditor4_Upgrader extends CRM_Ckeditor4_Upgrader_Base {
- // By convention, functions that look like "function upgrade_NNNN()" are
- // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
-
/**
- * Example: Run an external SQL script when the module is installed.
+ * Install extension.
*/
public function install() {
CRM_Core_BAO_OptionValue::ensureOptionValueExists([
@@ -22,25 +19,7 @@ class CRM_Ckeditor4_Upgrader extends CRM_Ckeditor4_Upgrader_Base {
}
/**
- * Example: Work with entities usually not available during the install step.
- *
- * This method can be used for any post-install tasks. For example, if a step
- * of your installation depends on accessing an entity that is itself
- * created during the installation (e.g., a setting or a managed entity), do
- * so here to avoid order of operation problems.
- */
- // public function postInstall() {
- // $customFieldId = civicrm_api3('CustomField', 'getvalue', array(
- // 'return' => array("id"),
- // 'name' => "customFieldCreatedViaManagedHook",
- // ));
- // civicrm_api3('Setting', 'create', array(
- // 'myWeirdFieldSetting' => array('id' => $customFieldId, 'weirdness' => 1),
- // ));
- // }
-
- /**
- * Example: Run an external SQL script when the module is uninstalled.
+ * Uninstall CKEditor settings.
*/
public function uninstall() {
$domains = civicrm_api3('Domain', 'get', ['options' => ['limit' => 0]])['values'];
@@ -53,95 +32,4 @@ class CRM_Ckeditor4_Upgrader extends CRM_Ckeditor4_Upgrader_Base {
civicrm_api3('OptionValue', 'get', ['name' => 'CKEditor', 'api.option_value.delete' => ['id' => "\$value.id"]]);
}
- /**
- * Example: Run a simple query when a module is enabled.
- */
- // public function enable() {
- // CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
- // }
-
- /**
- * Example: Run a simple query when a module is disabled.
- */
- // public function disable() {
- // CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
- // }
-
- /**
- * Example: Run a couple simple queries.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4200() {
- // $this->ctx->log->info('Applying update 4200');
- // CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
- // CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
- // return TRUE;
- // }
-
-
- /**
- * Example: Run an external SQL script.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4201() {
- // $this->ctx->log->info('Applying update 4201');
- // // this path is relative to the extension base dir
- // $this->executeSqlFile('sql/upgrade_4201.sql');
- // return TRUE;
- // }
-
-
- /**
- * Example: Run a slow upgrade process by breaking it up into smaller chunk.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4202() {
- // $this->ctx->log->info('Planning update 4202'); // PEAR Log interface
-
- // $this->addTask(E::ts('Process first step'), 'processPart1', $arg1, $arg2);
- // $this->addTask(E::ts('Process second step'), 'processPart2', $arg3, $arg4);
- // $this->addTask(E::ts('Process second step'), 'processPart3', $arg5);
- // return TRUE;
- // }
- // public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
- // public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
- // public function processPart3($arg5) { sleep(10); return TRUE; }
-
- /**
- * Example: Run an upgrade with a query that touches many (potentially
- * millions) of records by breaking it up into smaller chunks.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4203() {
- // $this->ctx->log->info('Planning update 4203'); // PEAR Log interface
-
- // $minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM civicrm_contribution');
- // $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contribution');
- // for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
- // $endId = $startId + self::BATCH_SIZE - 1;
- // $title = E::ts('Upgrade Batch (%1 => %2)', array(
- // 1 => $startId,
- // 2 => $endId,
- // ));
- // $sql = '
- // UPDATE civicrm_contribution SET foobar = whiz(wonky()+wanker)
- // WHERE id BETWEEN %1 and %2
- // ';
- // $params = array(
- // 1 => array($startId, 'Integer'),
- // 2 => array($endId, 'Integer'),
- // );
- // $this->addTask($title, 'executeSql', $sql, $params);
- // }
- // return TRUE;
- // }
-
}
diff --git a/civicrm/ext/ckeditor4/info.xml b/civicrm/ext/ckeditor4/info.xml
index f5de93be12..cafb74c1f7 100644
--- a/civicrm/ext/ckeditor4/info.xml
+++ b/civicrm/ext/ckeditor4/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-05-23</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.39</ver>
diff --git a/civicrm/ext/contributioncancelactions/info.xml b/civicrm/ext/contributioncancelactions/info.xml
index cb6f71c2ee..106ff1a8d6 100644
--- a/civicrm/ext/contributioncancelactions/info.xml
+++ b/civicrm/ext/contributioncancelactions/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-12</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.32</ver>
diff --git a/civicrm/ext/eventcart/info.xml b/civicrm/ext/eventcart/info.xml
index 6b5a387123..66200d4c96 100644
--- a/civicrm/ext/eventcart/info.xml
+++ b/civicrm/ext/eventcart/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-03</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/ewaysingle/info.xml b/civicrm/ext/ewaysingle/info.xml
index 13db33cdb6..f6ecf08b25 100644
--- a/civicrm/ext/ewaysingle/info.xml
+++ b/civicrm/ext/ewaysingle/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-07</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/financialacls/financialacls.php b/civicrm/ext/financialacls/financialacls.php
index a0d9454068..c36fcdc0ac 100644
--- a/civicrm/ext/financialacls/financialacls.php
+++ b/civicrm/ext/financialacls/financialacls.php
@@ -393,6 +393,16 @@ function financialacls_is_acl_limiting_enabled(): bool {
return (bool) Civi::settings()->get('acl_financial_type');
}
+/**
+ * Clear the statics cache when the setting is enabled or disabled.
+ *
+ * Note the setting will eventually disappear in favour of whether
+ * the extension is enabled or disabled.
+ */
+function financialacls_toggle() {
+ unset(\Civi::$statics['CRM_Financial_BAO_FinancialType']);
+}
+
// --- Functions below this ship commented out. Uncomment as required. ---
/**
diff --git a/civicrm/ext/financialacls/info.xml b/civicrm/ext/financialacls/info.xml
index dd3ea29ba3..b8124fe345 100644
--- a/civicrm/ext/financialacls/info.xml
+++ b/civicrm/ext/financialacls/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-27</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.30</ver>
diff --git a/civicrm/ext/financialacls/settings/financialacls.setting.php b/civicrm/ext/financialacls/settings/financialacls.setting.php
new file mode 100644
index 0000000000..e6ba889d5c
--- /dev/null
+++ b/civicrm/ext/financialacls/settings/financialacls.setting.php
@@ -0,0 +1,22 @@
+<?php
+return [
+ 'acl_financial_type' => [
+ 'group_name' => 'Contribute Preferences',
+ 'group' => 'contribute',
+ 'name' => 'acl_financial_type',
+ 'type' => 'Boolean',
+ 'html_type' => 'checkbox',
+ 'quick_form_type' => 'Element',
+ 'default' => 0,
+ 'add' => '4.7',
+ 'title' => ts('Enable Access Control by Financial Type'),
+ 'is_domain' => 1,
+ 'is_contact' => 0,
+ 'help_text' => NULL,
+ 'help' => ['id' => 'acl_financial_type'],
+ 'settings_pages' => ['contribute' => ['weight' => 30]],
+ 'on_change' => [
+ 'financialacls_toggle',
+ ],
+ ],
+];
diff --git a/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/MembershipTypesTest.php b/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/MembershipTypesTest.php
index 131754a129..3daf742b60 100644
--- a/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/MembershipTypesTest.php
+++ b/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/MembershipTypesTest.php
@@ -2,6 +2,7 @@
namespace Civi\Financialacls;
+use Civi\Api4\Generic\Result;
use Civi\Api4\MembershipType;
// I fought the Autoloader and the autoloader won.
@@ -38,13 +39,13 @@ class MembershipTypesTest extends BaseTestClass {
* @throws \API_Exception
* @throws \Civi\API\Exception\UnauthorizedException
*/
- protected function setUpMembershipTypesACLLimited(): \Civi\Api4\Generic\Result {
+ protected function setUpMembershipTypesACLLimited(): Result {
$types = MembershipType::save(FALSE)
->setRecords([
['name' => 'Forbidden', 'financial_type_id:name' => 'Member Dues', 'weight' => 1],
['name' => 'Go for it', 'financial_type_id:name' => 'Donation', 'weight' => 2],
])
- ->setDefaults(['period_type' => 'rolling', 'member_of_contact_id' => 1])
+ ->setDefaults(['period_type' => 'rolling', 'member_of_contact_id' => 1, 'duration_unit' => 'month'])
->execute()
->indexBy('name');
$this->setupLoggedInUserWithLimitedFinancialTypeAccess();
diff --git a/civicrm/ext/flexmailer/info.xml b/civicrm/ext/flexmailer/info.xml
index 960110c1f1..0d10583201 100644
--- a/civicrm/ext/flexmailer/info.xml
+++ b/civicrm/ext/flexmailer/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-08-05</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<comments>
FlexMailer is an email delivery engine which replaces the internal guts
diff --git a/civicrm/ext/greenwich/info.xml b/civicrm/ext/greenwich/info.xml
index e4cfbc8da1..9d66643127 100644
--- a/civicrm/ext/greenwich/info.xml
+++ b/civicrm/ext/greenwich/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-07-21</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/legacycustomsearches/info.xml b/civicrm/ext/legacycustomsearches/info.xml
index b0cc4abf0d..7b60669b2c 100644
--- a/civicrm/ext/legacycustomsearches/info.xml
+++ b/civicrm/ext/legacycustomsearches/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-07-25</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<tags>
<tag>mgmt:hidden</tag>
diff --git a/civicrm/ext/oauth-client/CRM/OAuth/Upgrader.php b/civicrm/ext/oauth-client/CRM/OAuth/Upgrader.php
index ce471b7a8f..9b38f5c40e 100644
--- a/civicrm/ext/oauth-client/CRM/OAuth/Upgrader.php
+++ b/civicrm/ext/oauth-client/CRM/OAuth/Upgrader.php
@@ -6,9 +6,6 @@ use CRM_OAuth_ExtensionUtil as E;
*/
class CRM_OAuth_Upgrader extends CRM_OAuth_Upgrader_Base {
- // By convention, functions that look like "function upgrade_NNNN()" are
- // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
-
/**
* @see CRM_Utils_Hook::install()
*/
@@ -30,7 +27,7 @@ class CRM_OAuth_Upgrader extends CRM_OAuth_Upgrader_Base {
/**
* Add support for OAuthContactToken
*
- * @return bool TRUE on success
+ * @return bool
* @throws Exception
*/
public function upgrade_0001(): bool {
@@ -39,127 +36,4 @@ class CRM_OAuth_Upgrader extends CRM_OAuth_Upgrader_Base {
return TRUE;
}
- /**
- * Example: Run an external SQL script when the module is installed.
- *
- * public function install() {
- * $this->executeSqlFile('sql/myinstall.sql');
- * }
- *
- * /**
- * Example: Work with entities usually not available during the install step.
- *
- * This method can be used for any post-install tasks. For example, if a step
- * of your installation depends on accessing an entity that is itself
- * created during the installation (e.g., a setting or a managed entity), do
- * so here to avoid order of operation problems.
- */
- // public function postInstall() {
- // $customFieldId = civicrm_api3('CustomField', 'getvalue', array(
- // 'return' => array("id"),
- // 'name' => "customFieldCreatedViaManagedHook",
- // ));
- // civicrm_api3('Setting', 'create', array(
- // 'myWeirdFieldSetting' => array('id' => $customFieldId, 'weirdness' => 1),
- // ));
- // }
-
- /**
- * Example: Run an external SQL script when the module is uninstalled.
- */
- // public function uninstall() {
- // $this->executeSqlFile('sql/myuninstall.sql');
- // }
-
- /**
- * Example: Run a simple query when a module is enabled.
- */
- // public function enable() {
- // CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
- // }
-
- /**
- * Example: Run a simple query when a module is disabled.
- */
- // public function disable() {
- // CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
- // }
-
- /**
- * Example: Run a couple simple queries.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4200() {
- // $this->ctx->log->info('Applying update 4200');
- // CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
- // CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
- // return TRUE;
- // }
-
-
- /**
- * Example: Run an external SQL script.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4201() {
- // $this->ctx->log->info('Applying update 4201');
- // // this path is relative to the extension base dir
- // $this->executeSqlFile('sql/upgrade_4201.sql');
- // return TRUE;
- // }
-
-
- /**
- * Example: Run a slow upgrade process by breaking it up into smaller chunk.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4202() {
- // $this->ctx->log->info('Planning update 4202'); // PEAR Log interface
-
- // $this->addTask(E::ts('Process first step'), 'processPart1', $arg1, $arg2);
- // $this->addTask(E::ts('Process second step'), 'processPart2', $arg3, $arg4);
- // $this->addTask(E::ts('Process second step'), 'processPart3', $arg5);
- // return TRUE;
- // }
- // public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
- // public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
- // public function processPart3($arg5) { sleep(10); return TRUE; }
-
- /**
- * Example: Run an upgrade with a query that touches many (potentially
- * millions) of records by breaking it up into smaller chunks.
- *
- * @return TRUE on success
- * @throws Exception
- */
- // public function upgrade_4203() {
- // $this->ctx->log->info('Planning update 4203'); // PEAR Log interface
-
- // $minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM civicrm_contribution');
- // $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contribution');
- // for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
- // $endId = $startId + self::BATCH_SIZE - 1;
- // $title = E::ts('Upgrade Batch (%1 => %2)', array(
- // 1 => $startId,
- // 2 => $endId,
- // ));
- // $sql = '
- // UPDATE civicrm_contribution SET foobar = whiz(wonky()+wanker)
- // WHERE id BETWEEN %1 and %2
- // ';
- // $params = array(
- // 1 => array($startId, 'Integer'),
- // 2 => array($endId, 'Integer'),
- // );
- // $this->addTask($title, 'executeSql', $sql, $params);
- // }
- // return TRUE;
- // }
-
}
diff --git a/civicrm/ext/oauth-client/info.xml b/civicrm/ext/oauth-client/info.xml
index 9c52050c6a..b119dede07 100644
--- a/civicrm/ext/oauth-client/info.xml
+++ b/civicrm/ext/oauth-client/info.xml
@@ -9,13 +9,13 @@
<email>info@civicrm.org</email>
</maintainer>
<urls>
- <url desc="Main Extension Page">http://FIXME</url>
- <url desc="Documentation">http://FIXME</url>
- <url desc="Support">http://FIXME</url>
+ <url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/oauth-client</url>
+ <url desc="Documentation">https://docs.civicrm.org/sysadmin/en/latest/setup/oauth/</url>
+ <url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-10-23</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.38</ver>
@@ -23,7 +23,7 @@
<requires>
<ext version="~4.5">org.civicrm.afform</ext>
</requires>
- <comments>This extension provides a framework for oauth support</comments>
+ <comments>This extension provides a framework for OAuth support</comments>
<classloader>
<psr0 prefix="CRM_" path=""/>
<psr4 prefix="Civi\" path="Civi"/>
diff --git a/civicrm/ext/payflowpro/info.xml b/civicrm/ext/payflowpro/info.xml
index f88fd1df97..1768eff73e 100644
--- a/civicrm/ext/payflowpro/info.xml
+++ b/civicrm/ext/payflowpro/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-13</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
diff --git a/civicrm/ext/recaptcha/info.xml b/civicrm/ext/recaptcha/info.xml
index 7b540afaed..d15cf37f2c 100644
--- a/civicrm/ext/recaptcha/info.xml
+++ b/civicrm/ext/recaptcha/info.xml
@@ -13,7 +13,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-04-03</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/ext/recaptcha/lib/recaptcha/recaptchalib.php b/civicrm/ext/recaptcha/lib/recaptcha/recaptchalib.php
index fdc506eed1..fa15dc4456 100644
--- a/civicrm/ext/recaptcha/lib/recaptcha/recaptchalib.php
+++ b/civicrm/ext/recaptcha/lib/recaptcha/recaptchalib.php
@@ -67,7 +67,7 @@ function _recaptcha_qsencode ($data) {
function _recaptcha_http_post($host, $path, $data) {
$client = new Client();
try {
- $response = $client->request('POST', $host . '/' . $path, ['query' => $data]);
+ $response = $client->request('POST', $host . '/' . $path, ['query' => $data, 'timeout' => \Civi::settings()->get('http_timeout')]);
}
catch (Exception $e) {
return '';
diff --git a/civicrm/ext/search_kit/CRM/Search/Upgrader.php b/civicrm/ext/search_kit/CRM/Search/Upgrader.php
index cab3255156..523425c522 100644
--- a/civicrm/ext/search_kit/CRM/Search/Upgrader.php
+++ b/civicrm/ext/search_kit/CRM/Search/Upgrader.php
@@ -36,7 +36,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1000 - install schema
* @return bool
*/
- public function upgrade_1000() {
+ public function upgrade_1000(): bool {
$this->ctx->log->info('Applying update 1000 - install schema.');
// For early, early adopters who installed the extension pre-beta
if (!CRM_Core_DAO::singleValueQuery("SHOW TABLES LIKE 'civicrm_search_display'")) {
@@ -50,7 +50,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1001 - normalize search display column keys
* @return bool
*/
- public function upgrade_1001() {
+ public function upgrade_1001(): bool {
$this->ctx->log->info('Applying update 1001 - normalize search display columns.');
$savedSearches = \Civi\Api4\SavedSearch::get(FALSE)
->addWhere('api_params', 'IS NOT NULL')
@@ -89,7 +89,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1002 - embellish search display link data
* @return bool
*/
- public function upgrade_1002() {
+ public function upgrade_1002(): bool {
$this->ctx->log->info('Applying update 1002 - embellish search display link data.');
$displays = \Civi\Api4\SearchDisplay::get(FALSE)
->setSelect(['id', 'settings'])
@@ -115,7 +115,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1003 - update APIv4 join syntax in saved searches
* @return bool
*/
- public function upgrade_1003() {
+ public function upgrade_1003(): bool {
$this->ctx->log->info('Applying 1003 - update APIv4 join syntax in saved searches.');
$savedSearches = \Civi\Api4\SavedSearch::get(FALSE)
->addSelect('id', 'api_params')
@@ -138,7 +138,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1004 - fix menu permission.
* @return bool
*/
- public function upgrade_1004() {
+ public function upgrade_1004(): bool {
$this->ctx->log->info('Applying update 1004 - fix menu permission.');
CRM_Core_DAO::executeQuery("UPDATE civicrm_navigation SET permission = 'administer CiviCRM data' WHERE url = 'civicrm/admin/search'");
return TRUE;
@@ -148,7 +148,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
* Upgrade 1005 - add acl_bypass column.
* @return bool
*/
- public function upgrade_1005() {
+ public function upgrade_1005(): bool {
$this->ctx->log->info('Applying update 1005 - add acl_bypass column.');
$this->addTask('Add Cancel Button Setting to the Profile', 'addColumn',
'civicrm_search_display', 'acl_bypass', "tinyint DEFAULT 0 COMMENT 'Skip permission checks and ACLs when running this display.'");
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
new file mode 100644
index 0000000000..d18254c7c1
--- /dev/null
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -0,0 +1,425 @@
+<?php
+
+namespace Civi\Api4\Action\SearchDisplay;
+
+use Civi\API\Exception\UnauthorizedException;
+use Civi\Api4\Query\SqlExpression;
+use Civi\Api4\SavedSearch;
+use Civi\Api4\SearchDisplay;
+use Civi\Api4\Utils\CoreUtil;
+
+/**
+ * Base class for running a search.
+ *
+ * @package Civi\Api4\Action\SearchDisplay
+ */
+abstract class AbstractRunAction extends \Civi\Api4\Generic\AbstractAction {
+
+ /**
+ * Either the name of the savedSearch or an array containing the savedSearch definition (for preview mode)
+ * @var string|array
+ * @required
+ */
+ protected $savedSearch;
+
+ /**
+ * Either the name of the display or an array containing the display definition (for preview mode)
+ * @var string|array
+ * @required
+ */
+ protected $display;
+
+ /**
+ * Array of fields to use for ordering the results
+ * @var array
+ */
+ protected $sort = [];
+
+ /**
+ * Search conditions that will be automatically added to the WHERE or HAVING clauses
+ * @var array
+ */
+ protected $filters = [];
+
+ /**
+ * Name of Afform, if this display is embedded (used for permissioning)
+ * @var string
+ */
+ protected $afform;
+
+ /**
+ * @var \Civi\Api4\Query\Api4SelectQuery
+ */
+ private $_selectQuery;
+
+ /**
+ * @var array
+ */
+ private $_afform;
+
+ /**
+ * @param \Civi\Api4\Generic\Result $result
+ * @throws UnauthorizedException
+ * @throws \API_Exception
+ */
+ public function _run(\Civi\Api4\Generic\Result $result) {
+ // Only administrators can use this in unsecured "preview mode"
+ if (!(is_string($this->savedSearch) && is_string($this->display)) && $this->checkPermissions && !\CRM_Core_Permission::check('administer CiviCRM data')) {
+ throw new UnauthorizedException('Access denied');
+ }
+ if (is_string($this->savedSearch)) {
+ $this->savedSearch = SavedSearch::get(FALSE)
+ ->addWhere('name', '=', $this->savedSearch)
+ ->execute()->first();
+ }
+ if (is_string($this->display) && !empty($this->savedSearch['id'])) {
+ $this->display = SearchDisplay::get(FALSE)
+ ->setSelect(['*', 'type:name'])
+ ->addWhere('name', '=', $this->display)
+ ->addWhere('saved_search_id', '=', $this->savedSearch['id'])
+ ->execute()->first();
+ }
+ if (!$this->savedSearch || !$this->display) {
+ throw new \API_Exception("Error: SearchDisplay not found.");
+ }
+ // Displays with acl_bypass must be embedded on an afform which the user has access to
+ if (
+ $this->checkPermissions && !empty($this->display['acl_bypass']) &&
+ !\CRM_Core_Permission::check('all CiviCRM permissions and ACLs') && !$this->loadAfform()
+ ) {
+ throw new UnauthorizedException('Access denied');
+ }
+
+ $this->savedSearch['api_params'] += ['where' => []];
+ $this->savedSearch['api_params']['checkPermissions'] = empty($this->display['acl_bypass']);
+ $this->display['settings']['columns'] = $this->display['settings']['columns'] ?? [];
+
+ $this->processResult($result);
+ }
+
+ abstract protected function processResult(\Civi\Api4\Generic\Result $result);
+
+ /**
+ * Transform each value returned by the API into 'raw' and 'view' properties
+ * @param \Civi\Api4\Generic\Result $result
+ * @return array
+ */
+ protected function formatResult(\Civi\Api4\Generic\Result $result): array {
+ $select = [];
+ foreach ($this->savedSearch['api_params']['select'] as $selectExpr) {
+ $expr = SqlExpression::convert($selectExpr, TRUE);
+ $item = [
+ 'fields' => [],
+ 'dataType' => $expr->getDataType(),
+ ];
+ foreach ($expr->getFields() as $field) {
+ $item['fields'][] = $this->getField($field);
+ }
+ if (!isset($item['dataType']) && $item['fields']) {
+ $item['dataType'] = $item['fields'][0]['data_type'];
+ }
+ $select[$expr->getAlias()] = $item;
+ }
+ $formatted = [];
+ foreach ($result as $data) {
+ $row = [];
+ foreach ($select as $key => $item) {
+ $raw = $data[$key] ?? NULL;
+ $row[$key] = [
+ 'raw' => $raw,
+ 'view' => $this->formatViewValue($item['dataType'], $raw),
+ ];
+ }
+ $formatted[] = $row;
+ }
+ return $formatted;
+ }
+
+ /**
+ * Returns field definition for a given field or NULL if not found
+ * @param $fieldName
+ * @return array|null
+ */
+ protected function getField($fieldName) {
+ if (!$this->_selectQuery) {
+ $api = \Civi\API\Request::create($this->savedSearch['api_entity'], 'get', $this->savedSearch['api_params']);
+ $this->_selectQuery = new \Civi\Api4\Query\Api4SelectQuery($api);
+ }
+ return $this->_selectQuery->getField($fieldName, FALSE);
+ }
+
+ /**
+ * Format raw field value according to data type
+ * @param $dataType
+ * @param mixed $rawValue
+ * @return array|string
+ */
+ protected function formatViewValue($dataType, $rawValue) {
+ if (is_array($rawValue)) {
+ return array_map(function($val) use ($dataType) {
+ return $this->formatViewValue($dataType, $val);
+ }, $rawValue);
+ }
+
+ $formatted = $rawValue;
+
+ switch ($dataType) {
+ case 'Boolean':
+ if (is_bool($rawValue)) {
+ $formatted = $rawValue ? ts('Yes') : ts('No');
+ }
+ break;
+
+ case 'Money':
+ $formatted = \CRM_Utils_Money::format($rawValue);
+ break;
+
+ case 'Date':
+ case 'Timestamp':
+ $formatted = \CRM_Utils_Date::customFormat($rawValue);
+ }
+
+ return $formatted;
+ }
+
+ /**
+ * Applies supplied filters to the where clause
+ */
+ protected function applyFilters() {
+ // Ignore empty strings
+ $filters = array_filter($this->filters, [$this, 'hasValue']);
+ if (!$filters) {
+ return;
+ }
+
+ // Process all filters that are included in SELECT clause or are allowed by the Afform.
+ $allowedFilters = array_merge($this->getSelectAliases(), $this->getAfformFilters());
+ foreach ($filters as $fieldName => $value) {
+ if (in_array($fieldName, $allowedFilters, TRUE)) {
+ $this->applyFilter($fieldName, $value);
+ }
+ }
+ }
+
+ /**
+ * Returns an array of field names or aliases + allowed suffixes from the SELECT clause
+ * @return string[]
+ */
+ protected function getSelectAliases() {
+ $result = [];
+ $selectAliases = array_map(function($select) {
+ return array_slice(explode(' AS ', $select), -1)[0];
+ }, $this->savedSearch['api_params']['select']);
+ foreach ($selectAliases as $alias) {
+ [$alias] = explode(':', $alias);
+ $result[] = $alias;
+ foreach (['name', 'label', 'abbr'] as $allowedSuffix) {
+ $result[] = $alias . ':' . $allowedSuffix;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * @param string $fieldName
+ * @param mixed $value
+ */
+ private function applyFilter(string $fieldName, $value) {
+ // Global setting determines if % wildcard should be added to both sides (default) or only the end of a search string
+ $prefixWithWildcard = \Civi::settings()->get('includeWildCardInName');
+
+ $field = $this->getField($fieldName);
+ // If field is not found it must be an aggregated column & belongs in the HAVING clause.
+ if (!$field) {
+ $this->savedSearch['api_params']['having'] = $this->savedSearch['api_params']['having'] ?? [];
+ $clause =& $this->savedSearch['api_params']['having'];
+ }
+ // If field belongs to an EXCLUDE join, it should be added as a join condition
+ else {
+ $prefix = strpos($fieldName, '.') ? explode('.', $fieldName)[0] : NULL;
+ foreach ($this->savedSearch['api_params']['join'] ?? [] as $idx => $join) {
+ if (($join[1] ?? 'LEFT') === 'EXCLUDE' && (explode(' AS ', $join[0])[1] ?? '') === $prefix) {
+ $clause =& $this->savedSearch['api_params']['join'][$idx];
+ }
+ }
+ }
+ // Default: add filter to WHERE clause
+ if (!isset($clause)) {
+ $clause =& $this->savedSearch['api_params']['where'];
+ }
+
+ $dataType = $field['data_type'] ?? NULL;
+
+ // Array is either associative `OP => VAL` or sequential `IN (...)`
+ if (is_array($value)) {
+ $value = array_filter($value, [$this, 'hasValue']);
+ // If array does not contain operators as keys, assume array of values
+ if (array_diff_key($value, array_flip(CoreUtil::getOperators()))) {
+ // Use IN for regular fields
+ if (empty($field['serialize'])) {
+ $clause[] = [$fieldName, 'IN', $value];
+ }
+ // Use an OR group of CONTAINS for array fields
+ else {
+ $orGroup = [];
+ foreach ($value as $val) {
+ $orGroup[] = [$fieldName, 'CONTAINS', $val];
+ }
+ $clause[] = ['OR', $orGroup];
+ }
+ }
+ // Operator => Value array
+ else {
+ foreach ($value as $operator => $val) {
+ $clause[] = [$fieldName, $operator, $val];
+ }
+ }
+ }
+ elseif (!empty($field['serialize'])) {
+ $clause[] = [$fieldName, 'CONTAINS', $value];
+ }
+ elseif (!empty($field['options']) || in_array($dataType, ['Integer', 'Boolean', 'Date', 'Timestamp'])) {
+ $clause[] = [$fieldName, '=', $value];
+ }
+ elseif ($prefixWithWildcard) {
+ $clause[] = [$fieldName, 'CONTAINS', $value];
+ }
+ else {
+ $clause[] = [$fieldName, 'LIKE', $value . '%'];
+ }
+ }
+
+ /**
+ * Transforms the SORT param (which is expected to be an array of arrays)
+ * to the ORDER BY clause (which is an associative array of [field => DIR]
+ *
+ * @return array
+ */
+ protected function getOrderByFromSort() {
+ $defaultSort = $this->display['settings']['sort'] ?? [];
+ $currentSort = $this->sort;
+
+ // Validate that requested sort fields are part of the SELECT
+ foreach ($this->sort as $item) {
+ if (!in_array($item[0], $this->getSelectAliases())) {
+ $currentSort = NULL;
+ }
+ }
+
+ $orderBy = [];
+ foreach ($currentSort ?: $defaultSort as $item) {
+ $orderBy[$item[0]] = $item[1];
+ }
+ return $orderBy;
+ }
+
+ /**
+ * Adds additional fields to the select clause required to render the display
+ *
+ * @param array $apiParams
+ */
+ protected function augmentSelectClause(&$apiParams): void {
+ $existing = array_map(function($item) {
+ return explode(' AS ', $item)[1] ?? $item;
+ }, $apiParams['select']);
+ $additions = [];
+ // Add primary key field if actions are enabled
+ if (!empty($this->display['settings']['actions'])) {
+ $additions = CoreUtil::getInfoItem($this->savedSearch['api_entity'], 'primary_key');
+ }
+ $possibleTokens = '';
+ foreach ($this->display['settings']['columns'] as $column) {
+ // Collect display values in which a token is allowed
+ $possibleTokens .= ($column['rewrite'] ?? '') . ($column['link']['path'] ?? '');
+ if (!empty($column['links'])) {
+ $possibleTokens .= implode('', array_column($column['links'], 'path'));
+ $possibleTokens .= implode('', array_column($column['links'], 'text'));
+ }
+
+ // Select value fields for in-place editing
+ if (isset($column['editable']['value'])) {
+ $additions[] = $column['editable']['value'];
+ }
+ }
+ // Add fields referenced via token
+ $tokens = [];
+ preg_match_all('/\\[([^]]+)\\]/', $possibleTokens, $tokens);
+ // Only add fields not already in SELECT clause
+ $additions = array_diff(array_merge($additions, $tokens[1]), $existing);
+ $apiParams['select'] = array_unique(array_merge($apiParams['select'], $additions));
+ }
+
+ /**
+ * Checks if a filter contains a non-empty value
+ *
+ * "Empty" search values are [], '', and NULL.
+ * Also recursively checks arrays to ensure they contain at least one non-empty value.
+ *
+ * @param $value
+ * @return bool
+ */
+ private function hasValue($value) {
+ return $value !== '' && $value !== NULL && (!is_array($value) || array_filter($value, [$this, 'hasValue']));
+ }
+
+ /**
+ * Returns a list of filter fields and directive filters
+ *
+ * Automatically applies directive filters
+ *
+ * @return array
+ */
+ private function getAfformFilters() {
+ $afform = $this->loadAfform();
+ if (!$afform) {
+ return [];
+ }
+ // Get afform field filters
+ $filterKeys = array_column(\CRM_Utils_Array::findAll(
+ $afform['layout'] ?? [],
+ ['#tag' => 'af-field']
+ ), 'name');
+ // Get filters passed into search display directive from Afform markup
+ $filterAttr = $afform['searchDisplay']['filters'] ?? NULL;
+ if ($filterAttr && is_string($filterAttr) && $filterAttr[0] === '{') {
+ foreach (\CRM_Utils_JS::decode($filterAttr) as $filterKey => $filterVal) {
+ $filterKeys[] = $filterKey;
+ // Automatically apply filters from the markup if they have a value
+ // (if it's a javascript variable it will have come back from decode() as NULL and we'll ignore it).
+ if ($this->hasValue($filterVal)) {
+ $this->applyFilter($filterKey, $filterVal);
+ }
+ }
+ }
+ return $filterKeys;
+ }
+
+ /**
+ * Return afform with name specified in api call.
+ *
+ * Verifies the searchDisplay is embedded in the afform and the user has permission to view it.
+ *
+ * @return array|false|null
+ */
+ private function loadAfform() {
+ // Only attempt to load afform once.
+ if ($this->afform && !isset($this->_afform)) {
+ $this->_afform = FALSE;
+ // Permission checks are enabled in this api call to ensure the user has permission to view the form
+ $afform = \Civi\Api4\Afform::get()
+ ->addWhere('name', '=', $this->afform)
+ ->setLayoutFormat('shallow')
+ ->execute()->first();
+ // Validate that the afform contains this search display
+ $afform['searchDisplay'] = \CRM_Utils_Array::findAll(
+ $afform['layout'] ?? [],
+ ['#tag' => "{$this->display['type:name']}", 'display-name' => $this->display['name']]
+ )[0] ?? NULL;
+ if ($afform['searchDisplay']) {
+ $this->_afform = $afform;
+ }
+ }
+ return $this->_afform;
+ }
+
+}
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
new file mode 100644
index 0000000000..3371bfdc05
--- /dev/null
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Civi\Api4\Action\SearchDisplay;
+
+use League\Csv\Writer;
+
+/**
+ * Download the results of a SearchDisplay as a spreadsheet.
+ *
+ * Note: unlike other APIs this action directly outputs a file.
+ *
+ * @package Civi\Api4\Action\SearchDisplay
+ */
+class Download extends AbstractRunAction {
+
+ /**
+ * Requested file format
+ * @var string
+ * @required
+ * @options csv
+ */
+ protected $format;
+
+ /**
+ * @param \Civi\Api4\Generic\Result $result
+ * @throws \API_Exception
+ */
+ protected function processResult(\Civi\Api4\Generic\Result $result) {
+ $entityName = $this->savedSearch['api_entity'];
+ $apiParams =& $this->savedSearch['api_params'];
+ $settings = $this->display['settings'];
+
+ // Displays are only exportable if they have actions enabled
+ if (empty($settings['actions'])) {
+ \CRM_Utils_System::permissionDenied();
+ }
+
+ // Force limit if the display has no pager
+ if (!isset($settings['pager']) && !empty($settings['limit'])) {
+ $apiParams['limit'] = $settings['limit'];
+ }
+ $apiParams['orderBy'] = $this->getOrderByFromSort();
+ $this->augmentSelectClause($apiParams);
+
+ $this->applyFilters();
+
+ $apiResult = civicrm_api4($entityName, 'get', $apiParams);
+
+ $rows = $this->formatResult($apiResult);
+
+ $columns = [];
+ foreach ($this->display['settings']['columns'] as $col) {
+ $col += ['type' => NULL, 'label' => '', 'rewrite' => FALSE];
+ if ($col['type'] === 'field' && !empty($col['key'])) {
+ $columns[] = $col;
+ }
+ }
+
+ // This weird little API spits out a file and exits instead of returning a result
+ $fileName = \CRM_Utils_File::makeFilenameWithUnicode($this->display['label']) . '.' . $this->format;
+
+ switch ($this->format) {
+ case 'csv':
+ $this->outputCSV($rows, $columns, $fileName);
+ break;
+ }
+
+ \CRM_Utils_System::civiExit();
+ }
+
+ /**
+ * Outputs csv format directly to browser for download
+ * @param array $rows
+ * @param array $columns
+ * @param string $fileName
+ */
+ private function outputCSV(array $rows, array $columns, string $fileName) {
+ $csv = Writer::createFromFileObject(new \SplTempFileObject());
+ $csv->setOutputBOM(Writer::BOM_UTF8);
+
+ // Header row
+ $csv->insertOne(array_column($columns, 'label'));
+
+ foreach ($rows as $data) {
+ $row = [];
+ foreach ($columns as $col) {
+ $row[] = $this->formatColumnValue($col, $data);
+ }
+ $csv->insertOne($row);
+ }
+ // Echo headers and content directly to browser
+ $csv->output($fileName);
+ }
+
+ /**
+ * Returns final formatted column value
+ *
+ * @param array $col
+ * @param array $data
+ * @return string
+ */
+ protected function formatColumnValue(array $col, array $data) {
+ $val = $col['rewrite'] ?: $data[$col['key']]['view'] ?? '';
+ if ($col['rewrite']) {
+ foreach ($data as $k => $v) {
+ $val = str_replace("[$k]", $v['view'], $val);
+ }
+ }
+ return is_array($val) ? implode(', ', $val) : $val;
+ }
+
+}
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
index 1c58800f43..94c332ccb6 100644
--- a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
@@ -45,6 +45,15 @@ class GetSearchTasks extends \Civi\Api4\Generic\AbstractAction {
];
}
+ $tasks[$entity['name']]['download'] = [
+ 'module' => 'crmSearchTasks',
+ 'title' => E::ts('Download Spreadsheet'),
+ 'icon' => 'fa-download',
+ 'uiDialog' => ['templateUrl' => '~/crmSearchTasks/crmSearchTaskDownload.html'],
+ // Does not require any rows to be selected
+ 'number' => '>= 0',
+ ];
+
if (array_key_exists('update', $entity['actions'])) {
$tasks[$entity['name']]['update'] = [
'module' => 'crmSearchTasks',
@@ -126,6 +135,8 @@ class GetSearchTasks extends \Civi\Api4\Generic\AbstractAction {
foreach ($tasks[$entity['name']] as $name => &$task) {
$task['name'] = $name;
+ // Add default for number of rows action requires
+ $task += ['number' => '> 0'];
}
$result->exchangeArray(array_values($tasks[$entity['name']]));
diff --git a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
index a4ef5d8f5a..3ba06edbd3 100644
--- a/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
+++ b/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
@@ -2,37 +2,12 @@
namespace Civi\Api4\Action\SearchDisplay;
-use Civi\API\Exception\UnauthorizedException;
-use Civi\Api4\SavedSearch;
-use Civi\Api4\SearchDisplay;
-use Civi\Api4\Utils\CoreUtil;
-
/**
* Load the results for rendering a SearchDisplay.
*
* @package Civi\Api4\Action\SearchDisplay
*/
-class Run extends \Civi\Api4\Generic\AbstractAction {
-
- /**
- * Either the name of the savedSearch or an array containing the savedSearch definition (for preview mode)
- * @var string|array
- * @required
- */
- protected $savedSearch;
-
- /**
- * Either the name of the display or an array containing the display definition (for preview mode)
- * @var string|array
- * @required
- */
- protected $display;
-
- /**
- * Array of fields to use for ordering the results
- * @var array
- */
- protected $sort = [];
+class Run extends AbstractRunAction {
/**
* Should this api call return a page of results or the row_count or the ids
@@ -42,68 +17,18 @@ class Run extends \Civi\Api4\Generic\AbstractAction {
protected $return;
/**
- * Search conditions that will be automatically added to the WHERE or HAVING clauses
- * @var array
- */
- protected $filters = [];
-
- /**
- * Name of Afform, if this display is embedded (used for permissioning)
- * @var string
- */
- protected $afform;
-
- /**
- * @var \Civi\Api4\Query\Api4SelectQuery
- */
- private $_selectQuery;
-
- /**
- * @var array
- */
- private $_afform;
-
- /**
- * @var array
+ * Number of results to return
+ * @var int
*/
- private $_extraEntityFields = [];
+ protected $limit;
/**
* @param \Civi\Api4\Generic\Result $result
- * @throws UnauthorizedException
* @throws \API_Exception
*/
- public function _run(\Civi\Api4\Generic\Result $result) {
- // Only administrators can use this in unsecured "preview mode"
- if (!(is_string($this->savedSearch) && is_string($this->display)) && $this->checkPermissions && !\CRM_Core_Permission::check('administer CiviCRM data')) {
- throw new UnauthorizedException('Access denied');
- }
- if (is_string($this->savedSearch)) {
- $this->savedSearch = SavedSearch::get(FALSE)
- ->addWhere('name', '=', $this->savedSearch)
- ->execute()->first();
- }
- if (is_string($this->display) && !empty($this->savedSearch['id'])) {
- $this->display = SearchDisplay::get(FALSE)
- ->setSelect(['*', 'type:name'])
- ->addWhere('name', '=', $this->display)
- ->addWhere('saved_search_id', '=', $this->savedSearch['id'])
- ->execute()->first();
- }
- if (!$this->savedSearch || !$this->display) {
- throw new \API_Exception("Error: SearchDisplay not found.");
- }
- // Displays with acl_bypass must be embedded on an afform which the user has access to
- if (
- $this->checkPermissions && !empty($this->display['acl_bypass']) &&
- !\CRM_Core_Permission::check('all CiviCRM permissions and ACLs') && !$this->loadAfform()
- ) {
- throw new UnauthorizedException('Access denied');
- }
+ protected function processResult(\Civi\Api4\Generic\Result $result) {
$entityName = $this->savedSearch['api_entity'];
$apiParams =& $this->savedSearch['api_params'];
- $apiParams['checkPermissions'] = empty($this->display['acl_bypass']);
- $apiParams += ['where' => []];
$settings = $this->display['settings'];
$page = NULL;
@@ -120,10 +45,12 @@ class Run extends \Civi\Api4\Generic\AbstractAction {
break;
default:
- if (!empty($settings['pager']) && preg_match('/^page:\d+$/', $this->return)) {
+ if (($settings['pager'] ?? FALSE) !== FALSE && preg_match('/^page:\d+$/', $this->return)) {
$page = explode(':', $this->return)[1];
}
- $apiParams['limit'] = $settings['limit'] ?? NULL;
+ $limit = !empty($settings['pager']['expose_limit']) && $this->limit ? $this->limit : NULL;
+ $apiParams['debug'] = $this->debug;
+ $apiParams['limit'] = $limit ?? $settings['limit'] ?? NULL;
$apiParams['offset'] = $page ? $apiParams['limit'] * ($page - 1) : 0;
$apiParams['orderBy'] = $this->getOrderByFromSort();
$this->augmentSelectClause($apiParams);
@@ -132,252 +59,17 @@ class Run extends \Civi\Api4\Generic\AbstractAction {
$this->applyFilters();
$apiResult = civicrm_api4($entityName, 'get', $apiParams);
-
+ // Copy over meta properties to this result
$result->rowCount = $apiResult->rowCount;
- $result->exchangeArray($apiResult->getArrayCopy());
- }
-
- /**
- * Checks if a filter contains a non-empty value
- *
- * "Empty" search values are [], '', and NULL.
- * Also recursively checks arrays to ensure they contain at least one non-empty value.
- *
- * @param $value
- * @return bool
- */
- private function hasValue($value) {
- return $value !== '' && $value !== NULL && (!is_array($value) || array_filter($value, [$this, 'hasValue']));
- }
-
- /**
- * Applies supplied filters to the where clause
- */
- private function applyFilters() {
- // Ignore empty strings
- $filters = array_filter($this->filters, [$this, 'hasValue']);
- if (!$filters) {
- return;
- }
-
- // Process all filters that are included in SELECT clause or are allowed by the Afform.
- $allowedFilters = array_merge($this->getSelectAliases(), $this->getAfformFilters());
- foreach ($filters as $fieldName => $value) {
- if (in_array($fieldName, $allowedFilters, TRUE)) {
- $this->applyFilter($fieldName, $value);
- }
- }
- }
-
- /**
- * @param string $fieldName
- * @param mixed $value
- */
- private function applyFilter(string $fieldName, $value) {
- // Global setting determines if % wildcard should be added to both sides (default) or only the end of a search string
- $prefixWithWildcard = \Civi::settings()->get('includeWildCardInName');
-
- $field = $this->getField($fieldName);
- // If field is not found it must be an aggregated column & belongs in the HAVING clause.
- if (!$field) {
- $this->savedSearch['api_params']['having'] = $this->savedSearch['api_params']['having'] ?? [];
- $clause =& $this->savedSearch['api_params']['having'];
- }
- // If field belongs to an EXCLUDE join, it should be added as a join condition
- else {
- $prefix = strpos($fieldName, '.') ? explode('.', $fieldName)[0] : NULL;
- foreach ($this->savedSearch['api_params']['join'] ?? [] as $idx => $join) {
- if (($join[1] ?? 'LEFT') === 'EXCLUDE' && (explode(' AS ', $join[0])[1] ?? '') === $prefix) {
- $clause =& $this->savedSearch['api_params']['join'][$idx];
- }
- }
- }
- // Default: add filter to WHERE clause
- if (!isset($clause)) {
- $clause =& $this->savedSearch['api_params']['where'];
- }
-
- $dataType = $field['data_type'] ?? NULL;
+ $result->debug = $apiResult->debug;
- // Array is either associative `OP => VAL` or sequential `IN (...)`
- if (is_array($value)) {
- $value = array_filter($value, [$this, 'hasValue']);
- // If array does not contain operators as keys, assume array of values
- if (array_diff_key($value, array_flip(CoreUtil::getOperators()))) {
- // Use IN for regular fields
- if (empty($field['serialize'])) {
- $clause[] = [$fieldName, 'IN', $value];
- }
- // Use an OR group of CONTAINS for array fields
- else {
- $orGroup = [];
- foreach ($value as $val) {
- $orGroup[] = [$fieldName, 'CONTAINS', $val];
- }
- $clause[] = ['OR', $orGroup];
- }
- }
- // Operator => Value array
- else {
- foreach ($value as $operator => $val) {
- $clause[] = [$fieldName, $operator, $val];
- }
- }
- }
- elseif (!empty($field['serialize'])) {
- $clause[] = [$fieldName, 'CONTAINS', $value];
- }
- elseif (!empty($field['options']) || in_array($dataType, ['Integer', 'Boolean', 'Date', 'Timestamp'])) {
- $clause[] = [$fieldName, '=', $value];
- }
- elseif ($prefixWithWildcard) {
- $clause[] = [$fieldName, 'CONTAINS', $value];
+ if ($this->return === 'row_count' || $this->return === 'id') {
+ $result->exchangeArray($apiResult->getArrayCopy());
}
else {
- $clause[] = [$fieldName, 'LIKE', $value . '%'];
- }
- }
-
- /**
- * Transforms the SORT param (which is expected to be an array of arrays)
- * to the ORDER BY clause (which is an associative array of [field => DIR]
- *
- * @return array
- */
- private function getOrderByFromSort() {
- $defaultSort = $this->display['settings']['sort'] ?? [];
- $currentSort = $this->sort;
-
- // Validate that requested sort fields are part of the SELECT
- foreach ($this->sort as $item) {
- if (!in_array($item[0], $this->getSelectAliases())) {
- $currentSort = NULL;
- }
- }
-
- $orderBy = [];
- foreach ($currentSort ?: $defaultSort as $item) {
- $orderBy[$item[0]] = $item[1];
- }
- return $orderBy;
- }
-
- /**
- * Returns an array of field names or aliases + allowed suffixes from the SELECT clause
- * @return string[]
- */
- private function getSelectAliases() {
- $result = [];
- $selectAliases = array_map(function($select) {
- return array_slice(explode(' AS ', $select), -1)[0];
- }, $this->savedSearch['api_params']['select']);
- foreach ($selectAliases as $alias) {
- [$alias] = explode(':', $alias);
- $result[] = $alias;
- foreach (['name', 'label', 'abbr'] as $allowedSuffix) {
- $result[] = $alias . ':' . $allowedSuffix;
- }
- }
- return $result;
- }
-
- /**
- * Returns field definition for a given field or NULL if not found
- * @param $fieldName
- * @return array|null
- */
- private function getField($fieldName) {
- if (!$this->_selectQuery) {
- $api = \Civi\API\Request::create($this->savedSearch['api_entity'], 'get', $this->savedSearch['api_params']);
- $this->_selectQuery = new \Civi\Api4\Query\Api4SelectQuery($api);
+ $result->exchangeArray($this->formatResult($apiResult));
}
- return $this->_selectQuery->getField($fieldName, FALSE);
- }
- /**
- * Returns a list of filter fields and directive filters
- *
- * Automatically applies directive filters
- *
- * @return array
- */
- private function getAfformFilters() {
- $afform = $this->loadAfform();
- if (!$afform) {
- return [];
- }
- // Get afform field filters
- $filterKeys = array_column(\CRM_Utils_Array::findAll(
- $afform['layout'] ?? [],
- ['#tag' => 'af-field']
- ), 'name');
- // Get filters passed into search display directive from Afform markup
- $filterAttr = $afform['searchDisplay']['filters'] ?? NULL;
- if ($filterAttr && is_string($filterAttr) && $filterAttr[0] === '{') {
- foreach (\CRM_Utils_JS::decode($filterAttr) as $filterKey => $filterVal) {
- $filterKeys[] = $filterKey;
- // Automatically apply filters from the markup if they have a value
- // (if it's a javascript variable it will have come back from decode() as NULL and we'll ignore it).
- if ($this->hasValue($filterVal)) {
- $this->applyFilter($filterKey, $filterVal);
- }
- }
- }
- return $filterKeys;
- }
-
- /**
- * Return afform with name specified in api call.
- *
- * Verifies the searchDisplay is embedded in the afform and the user has permission to view it.
- *
- * @return array|false|null
- */
- private function loadAfform() {
- // Only attempt to load afform once.
- if ($this->afform && !isset($this->_afform)) {
- $this->_afform = FALSE;
- // Permission checks are enabled in this api call to ensure the user has permission to view the form
- $afform = \Civi\Api4\Afform::get()
- ->addWhere('name', '=', $this->afform)
- ->setLayoutFormat('shallow')
- ->execute()->first();
- // Validate that the afform contains this search display
- $afform['searchDisplay'] = \CRM_Utils_Array::findAll(
- $afform['layout'] ?? [],
- ['#tag' => "{$this->display['type:name']}", 'display-name' => $this->display['name']]
- )[0] ?? NULL;
- if ($afform['searchDisplay']) {
- $this->_afform = $afform;
- }
- }
- return $this->_afform;
- }
-
- /**
- * Adds additional fields to the select clause required to render the display
- *
- * @param array $apiParams
- */
- private function augmentSelectClause(&$apiParams): void {
- $possibleTokens = '';
- foreach ($this->display['settings']['columns'] ?? [] as $column) {
- // Collect display values in which a token is allowed
- $possibleTokens .= ($column['rewrite'] ?? '') . ($column['link']['path'] ?? '');
- if (!empty($column['links'])) {
- $possibleTokens .= implode('', array_column($column['links'], 'path'));
- $possibleTokens .= implode('', array_column($column['links'], 'text'));
- }
-
- // Select value fields for in-place editing
- if (isset($column['editable']['value']) && !in_array($column['editable']['value'], $apiParams['select'])) {
- $apiParams['select'][] = $column['editable']['value'];
- }
- }
- // Add fields referenced via token
- $tokens = [];
- preg_match_all('/\\[([^]]+)\\]/', $possibleTokens, $tokens);
- $apiParams['select'] = array_unique(array_merge($apiParams['select'], $tokens[1]));
}
}
diff --git a/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php b/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
index 3327eaa361..41ea74c95d 100644
--- a/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
+++ b/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
@@ -29,9 +29,19 @@ class SearchDisplay extends Generic\DAOEntity {
->setCheckPermissions($checkPermissions);
}
+ /**
+ * @param bool $checkPermissions
+ * @return Action\SearchDisplay\Run
+ */
+ public static function download($checkPermissions = TRUE) {
+ return (new Action\SearchDisplay\Download(__CLASS__, __FUNCTION__))
+ ->setCheckPermissions($checkPermissions);
+ }
+
public static function permissions() {
$permissions = parent::permissions();
$permissions['default'] = ['administer CiviCRM data'];
+ $permissions['get'] = ['access CiviCRM'];
$permissions['getSearchTasks'] = ['access CiviCRM'];
// Permission for run action is checked internally
$permissions['run'] = [];
diff --git a/civicrm/ext/search_kit/Civi/Search/Admin.php b/civicrm/ext/search_kit/Civi/Search/Admin.php
index 901c0a1440..963b02c44d 100644
--- a/civicrm/ext/search_kit/Civi/Search/Admin.php
+++ b/civicrm/ext/search_kit/Civi/Search/Admin.php
@@ -68,6 +68,7 @@ class Admin {
return [
'default' => E::ts('Default'),
'primary' => E::ts('Primary'),
+ 'secondary' => E::ts('Secondary'),
'success' => E::ts('Success'),
'info' => E::ts('Info'),
'warning' => E::ts('Warning'),
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin.ang.php b/civicrm/ext/search_kit/ang/crmSearchAdmin.ang.php
index 31ff79962f..f6c673415c 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin.ang.php
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin.ang.php
@@ -5,6 +5,7 @@ return [
'ang/crmSearchAdmin.module.js',
'ang/crmSearchAdmin/*.js',
'ang/crmSearchAdmin/*/*.js',
+ 'ang/crmSearchAdmin/*/*/*.js',
],
'css' => [
'css/crmSearchAdmin.css',
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js b/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
index 6293e92cec..265d5708ac 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin.module.js
@@ -11,34 +11,10 @@
.config(function($routeProvider) {
$routeProvider.when('/list', {
- controller: 'searchList',
- templateUrl: '~/crmSearchAdmin/searchList.html',
- resolve: {
- // Load data for lists
- savedSearches: function(crmApi4) {
- return crmApi4('SavedSearch', 'get', {
- select: [
- 'id',
- 'name',
- 'label',
- 'api_entity',
- 'api_params',
- 'created_id.display_name',
- 'modified_id.display_name',
- 'created_date',
- 'modified_date',
- 'GROUP_CONCAT(display.name ORDER BY display.id) AS display_name',
- 'GROUP_CONCAT(display.label ORDER BY display.id) AS display_label',
- 'GROUP_CONCAT(display.type:icon ORDER BY display.id) AS display_icon',
- 'GROUP_CONCAT(display.acl_bypass ORDER BY display.id) AS display_acl_bypass',
- 'GROUP_CONCAT(DISTINCT group.title) AS groups'
- ],
- join: [['SearchDisplay AS display'], ['Group AS group']],
- where: [['api_entity', 'IS NOT NULL']],
- groupBy: ['id']
- });
- }
- }
+ controller: function() {
+ searchEntity = 'SavedSearch';
+ },
+ template: '<crm-search-admin-search-listing></crm-search-admin-search-listing>',
});
$routeProvider.when('/create/:entity', {
controller: 'searchCreate',
@@ -187,6 +163,29 @@
}
return info;
}
+ function getDefaultLabel(col) {
+ var info = parseExpr(col),
+ label = info.field.label;
+ if (info.fn) {
+ label = '(' + info.fn.title + ') ' + label;
+ }
+ if (info.join) {
+ label = info.join.label + ': ' + label;
+ }
+ return label;
+ }
+ function fieldToColumn(fieldExpr, defaults) {
+ var info = parseExpr(fieldExpr),
+ values = _.merge({
+ type: 'field',
+ key: info.alias,
+ dataType: (info.fn && info.fn.dataType) || (info.field && info.field.data_type)
+ }, defaults);
+ if (defaults.label === true) {
+ values.label = getDefaultLabel(fieldExpr);
+ }
+ return values;
+ }
return {
getEntity: getEntity,
getField: function(fieldName, entityName) {
@@ -194,17 +193,8 @@
},
getJoin: getJoin,
parseExpr: parseExpr,
- getDefaultLabel: function(col) {
- var info = parseExpr(col),
- label = info.field.label;
- if (info.fn) {
- label = '(' + info.fn.title + ') ' + label;
- }
- if (info.join) {
- label = info.join.label + ': ' + label;
- }
- return label;
- },
+ getDefaultLabel: getDefaultLabel,
+ fieldToColumn: fieldToColumn,
// Find all possible search columns that could serve as contact_id for a smart group
getSmartGroupColumns: function(api_entity, api_params) {
var joins = _.pluck((api_params.join || []), 0);
@@ -231,6 +221,15 @@
deferred.resolve($(this).val());
});
return deferred.promise;
+ },
+ // Returns name of explicit or implicit join, for links
+ getJoinEntity: function(info) {
+ if (info.field.fk_entity || info.field.name !== info.field.fieldName) {
+ return info.prefix + (info.field.fk_entity ? info.field.name : info.field.name.substr(0, info.field.name.lastIndexOf('.')));
+ } else if (info.prefix) {
+ return info.prefix.replace('.', '');
+ }
+ return '';
}
};
})
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/criteria.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/compose.html
similarity index 100%
rename from civicrm/ext/search_kit/ang/crmSearchAdmin/compose/criteria.html
rename to civicrm/ext/search_kit/ang/crmSearchAdmin/compose.html
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/controls.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/controls.html
deleted file mode 100644
index bd2c52c2d4..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/controls.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<hr>
-<div class="form-inline">
- <div class="btn-group" role="group">
- <button type="button" class="btn btn-primary{{ $ctrl.autoSearch ? '-outline' : '' }}" ng-click="onClickSearch()" ng-disabled="loading || (!$ctrl.autoSearch && !$ctrl.stale)">
- <i class="crm-i {{ loading ? 'fa-spin fa-spinner' : 'fa-search' }}"></i>
- {{:: ts('Search') }}
- </button>
- <button type="button" class="btn crm-search-auto-toggle btn-primary{{ $ctrl.autoSearch ? '' : '-outline' }}" ng-click="onClickAuto()">
- <i class="crm-i fa-toggle-{{ $ctrl.autoSearch ? 'on' : 'off' }}"></i>
- {{:: ts('Auto') }}
- </button>
- </div>
- <crm-search-tasks entity="$ctrl.savedSearch.api_entity" ids="$ctrl.selectedRows" refresh="$ctrl.refreshPage()"></crm-search-tasks>
-</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/debug.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/debug.html
deleted file mode 100644
index 4bb483d1af..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/debug.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<fieldset class="crm-collapsible collapsed">
- <legend class="collapsible-title">{{:: ts('Query Info') }}</legend>
- <div>
- <pre ng-if="$ctrl.debug.timeIndex">{{ ts('Request took %1 seconds.', {1: $ctrl.debug.timeIndex}) }}</pre>
- <div><strong>API:</strong></div>
- <pre>{{ $ctrl.debug.params }}</pre>
- <div><strong>SQL:</strong></div>
- <pre ng-repeat="query in $ctrl.debug.sql">{{ query }}</pre>
- </div>
-</fieldset>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/pager.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
deleted file mode 100644
index 954911b1aa..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="crm-flex-box">
- <div>
- <div class="form-inline">
- <label ng-if="$ctrl.rowCount === false"><i class="crm-i fa-spin fa-spinner"></i></label>
- <label ng-if="$ctrl.rowCount === 1">
- {{ $ctrl.selectedRows.length ? ts('%1 selected of 1 result', {1: $ctrl.selectedRows.length}) : ts('1 result') }}
- </label>
- <label ng-if="$ctrl.rowCount === 0 || $ctrl.rowCount > 1">
- {{ $ctrl.selectedRows.length ? ts('%1 selected of %2 results', {1: $ctrl.selectedRows.length, 2: $ctrl.rowCount}) : ts('%1 results', {1: $ctrl.rowCount}) }}
- </label>
- </div>
- </div>
- <div class="text-center crm-flex-2">
- <ul uib-pagination ng-if="$ctrl.rowCount && !$ctrl.stale"
- class="pagination"
- boundary-links="true"
- total-items="$ctrl.rowCount"
- ng-model="$ctrl.page"
- ng-change="$ctrl.changePage()"
- items-per-page="$ctrl.limit"
- max-size="6"
- force-ellipses="true"
- previous-text="‹"
- next-text="›"
- first-text="«"
- last-text="»"
- ></ul>
- </div>
- <div class="form-inline text-right">
- <label for="crm-search-results-page-size" >
- {{:: ts('Page Size') }}
- </label>
- <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10" ng-change="onChangeLimit()">
- </div>
-</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/results.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/results.html
deleted file mode 100644
index 1f7f053176..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/compose/results.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<table>
- <thead>
- <tr ng-model="$ctrl.savedSearch.api_params.select" ui-sortable="sortableColumnOptions">
- <th class="crm-search-result-select">
- <input type="checkbox" ng-checked="$ctrl.allRowsSelected" ng-click="selectAllRows()" ng-disabled="!($ctrl.rowCount && loading === false && !loadingAllRows && $ctrl.results[$ctrl.page] && $ctrl.results[$ctrl.page][0].id)">
- </th>
- <th ng-repeat="col in $ctrl.savedSearch.api_params.select" ng-click="setOrderBy(col, $event)" title="{{$index || !$ctrl.groupExists ? ts('Drag to reorder columns, click to sort results (shift-click to sort by multiple).') : ts('Column reserved for smart group.')}}">
- <i class="crm-i {{ getOrderBy(col) }}"></i>
- <span ng-class="{'crm-draggable': $index || !$ctrl.groupExists}">{{ $ctrl.getFieldLabel(col) }}</span>
- <span ng-switch="$index || !$ctrl.groupExists ? 'sortable' : 'locked'">
- <i ng-switch-when="locked" class="crm-i fa-lock" aria-hidden="true"></i>
- <a href ng-switch-default class="crm-hover-button" title="{{:: ts('Clear') }}" ng-click="$ctrl.clearParam('select', $index)"><i class="crm-i fa-times" aria-hidden="true"></i></a>
- </span>
- </th>
- <th class="form-inline">
- <input class="form-control crm-action-menu fa-plus"
- crm-ui-select="::{data: fieldsForSelect, placeholder: ts('Add'), width: '80px', containerCss: {minWidth: '80px'}, dropdownCss: {width: '300px'}}"
- on-crm-ui-select="$ctrl.addParam('select', selection)" >
- </th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="row in $ctrl.results[$ctrl.page]">
- <td>
- <input type="checkbox" ng-checked="isRowSelected(row)" ng-click="selectRow(row)" ng-disabled="!(loading === false && !loadingAllRows && row.id)">
- </td>
- <td ng-repeat="col in $ctrl.savedSearch.api_params.select" ng-bind-html="formatResult(row, col)"></td>
- <td></td>
- </tr>
- </tbody>
-</table>
-<div class="messages warning no-popup" ng-if="error">
- <h4>{{:: ts('An error occurred') }}</h4>
- <p>{{ error }}</p>
-</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index 532726c2a2..822f2556ee 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -13,17 +13,7 @@
this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';
- this.selectedRows = [];
- this.limit = CRM.crmSearchAdmin.defaultPagerSize;
- this.page = 1;
this.displayTypes = _.indexBy(CRM.crmSearchAdmin.displayTypes, 'id');
- // After a search this.results is an object of result arrays keyed by page,
- // Initially this.results is an empty string because 1: it's falsey (unlike an empty object) and 2: it doesn't throw an error if you try to access undefined properties (unlike null)
- this.results = '';
- this.rowCount = false;
- this.allRowsSelected = false;
- // Have the filters (WHERE, HAVING, GROUP BY, JOIN) changed?
- this.stale = true;
$scope.controls = {tab: 'compose', joinType: 'LEFT'};
$scope.joinTypes = [
@@ -69,21 +59,16 @@
$scope.$watchCollection('$ctrl.savedSearch.api_params.select', onChangeSelect);
- $scope.$watch('$ctrl.savedSearch.api_params.where', onChangeFilters, true);
-
if (this.paramExists('groupBy')) {
this.savedSearch.api_params.groupBy = this.savedSearch.api_params.groupBy || [];
- $scope.$watchCollection('$ctrl.savedSearch.api_params.groupBy', onChangeFilters);
}
if (this.paramExists('join')) {
this.savedSearch.api_params.join = this.savedSearch.api_params.join || [];
- $scope.$watch('$ctrl.savedSearch.api_params.join', onChangeFilters, true);
}
if (this.paramExists('having')) {
this.savedSearch.api_params.having = this.savedSearch.api_params.having || [];
- $scope.$watch('$ctrl.savedSearch.api_params.having', onChangeFilters, true);
}
$scope.$watch('$ctrl.savedSearch', onChangeAnything, true);
@@ -114,6 +99,7 @@
} else if (params.id) {
apiCalls.deleteGroup = ['Group', 'delete', {where: [['saved_search_id', '=', params.id]]}];
}
+ _.remove(params.displays, {trashed: true});
if (params.displays && params.displays.length) {
chain.displays = ['SearchDisplay', 'replace', {where: [['saved_search_id', '=', '$id']], records: params.displays}];
} else if (params.id) {
@@ -382,37 +368,6 @@
return !errors.length;
}
- /**
- * Called when clicking on a column header
- * @param col
- * @param $event
- */
- $scope.setOrderBy = function(col, $event) {
- col = _.last(col.split(' AS '));
- var dir = $scope.getOrderBy(col) === 'fa-sort-asc' ? 'DESC' : 'ASC';
- if (!$event.shiftKey || !ctrl.savedSearch.api_params.orderBy) {
- ctrl.savedSearch.api_params.orderBy = {};
- }
- ctrl.savedSearch.api_params.orderBy[col] = dir;
- if (ctrl.results) {
- ctrl.refreshPage();
- }
- };
-
- /**
- * Returns crm-i icon class for a sortable column
- * @param col
- * @returns {string}
- */
- $scope.getOrderBy = function(col) {
- col = _.last(col.split(' AS '));
- var dir = ctrl.savedSearch.api_params.orderBy && ctrl.savedSearch.api_params.orderBy[col];
- if (dir) {
- return 'fa-sort-' + dir.toLowerCase();
- }
- return 'fa-sort disabled';
- };
-
this.addParam = function(name, value) {
if (value && !_.contains(ctrl.savedSearch.api_params[name], value)) {
ctrl.savedSearch.api_params[name].push(value);
@@ -426,148 +381,6 @@
ctrl.savedSearch.api_params[name].splice(idx, 1);
};
- // Prevent visual jumps in results table height during loading
- function lockTableHeight() {
- var $table = $('.crm-search-results', $element);
- $table.css('height', $table.height());
- }
-
- function unlockTableHeight() {
- $('.crm-search-results', $element).css('height', '');
- }
-
- // Debounced callback for loadResults
- function _loadResultsCallback() {
- // Multiply limit to read 2 pages at once & save ajax requests
- var params = _.merge(_.cloneDeep(ctrl.savedSearch.api_params), {debug: true, limit: ctrl.limit * 2});
- // Select the join field of implicitly joined entities (helps with displaying links)
- _.each(params.select, function(fieldName) {
- if (_.includes(fieldName, '.') && !_.includes(fieldName, ' AS ')) {
- var info = searchMeta.parseExpr(fieldName);
- if (info.field && !info.suffix && !info.fn && (info.field.name !== info.field.fieldName)) {
- var idField = fieldName.substr(0, fieldName.lastIndexOf('.'));
- if (!_.includes(params.select, idField) && !ctrl.canAggregate(idField)) {
- params.select.push(idField);
- }
- }
- }
- });
- // Select primary key of explicitly joined entities (helps with displaying links)
- _.each(params.join, function(join) {
- var entity = join[0].split(' AS ')[0],
- alias = join[0].split(' AS ')[1],
- primaryKeys = searchMeta.getEntity(entity).primary_key,
- idField = alias + '.' + primaryKeys[0];
- if (primaryKeys.length && !_.includes(params.select, idField) && !ctrl.canAggregate(idField)) {
- params.select.push(idField);
- }
- });
- lockTableHeight();
- $scope.error = false;
- if (ctrl.stale) {
- ctrl.page = 1;
- ctrl.rowCount = false;
- }
- params.offset = ctrl.limit * (ctrl.page - 1);
- crmApi4(ctrl.savedSearch.api_entity, 'get', params).then(function(success) {
- if (ctrl.stale) {
- ctrl.results = {};
- // Get row count for pager
- if (success.length < params.limit) {
- ctrl.rowCount = success.count;
- } else {
- var countParams = _.cloneDeep(params);
- // Select is only needed needed by HAVING
- countParams.select = countParams.having && countParams.having.length ? countParams.select : [];
- countParams.select.push('row_count');
- delete countParams.debug;
- crmApi4(ctrl.savedSearch.api_entity, 'get', countParams).then(function(result) {
- ctrl.rowCount = result.count;
- });
- }
- }
- ctrl.debug = success.debug;
- // populate this page & the next
- ctrl.results[ctrl.page] = success.slice(0, ctrl.limit);
- if (success.length > ctrl.limit) {
- ctrl.results[ctrl.page + 1] = success.slice(ctrl.limit);
- }
- $scope.loading = false;
- ctrl.stale = false;
- unlockTableHeight();
- }, function(error) {
- $scope.loading = false;
- ctrl.results = {};
- ctrl.stale = true;
- ctrl.debug = error.debug;
- $scope.error = errorMsg(error);
- })
- .finally(function() {
- if (ctrl.debug) {
- ctrl.debug.params = JSON.stringify(params, null, 2);
- if (ctrl.debug.timeIndex) {
- ctrl.debug.timeIndex = Number.parseFloat(ctrl.debug.timeIndex).toPrecision(2);
- }
- }
- });
- }
-
- var _loadResults = _.debounce(_loadResultsCallback, 250);
-
- function loadResults() {
- $scope.loading = true;
- _loadResults();
- }
-
- // What to tell the user when search returns an error from the server
- // Todo: parse error codes and give helpful feedback.
- function errorMsg(error) {
- return ts('Ensure all search critera are set correctly and try again.');
- }
-
- this.changePage = function() {
- if (ctrl.stale || !ctrl.results[ctrl.page]) {
- lockTableHeight();
- loadResults();
- }
- };
-
- this.refreshAll = function() {
- ctrl.stale = true;
- clearSelection();
- loadResults();
- };
-
- // Refresh results while staying on current page.
- this.refreshPage = function() {
- lockTableHeight();
- ctrl.results = {};
- loadResults();
- };
-
- $scope.onClickSearch = function() {
- if (ctrl.autoSearch) {
- ctrl.autoSearch = false;
- } else {
- ctrl.refreshAll();
- }
- };
-
- $scope.onClickAuto = function() {
- ctrl.autoSearch = !ctrl.autoSearch;
- if (ctrl.autoSearch && ctrl.stale) {
- ctrl.refreshAll();
- }
- $('.crm-search-auto-toggle').blur();
- };
-
- $scope.onChangeLimit = function() {
- // Refresh only if search has already been run
- if (ctrl.autoSearch || ctrl.results) {
- ctrl.refreshAll();
- }
- };
-
function onChangeSelect(newSelect, oldSelect) {
// When removing a column from SELECT, also remove from ORDER BY & HAVING
_.each(_.difference(oldSelect, newSelect), function(col) {
@@ -577,68 +390,8 @@
return clauseUsesFields(clause, [col]);
});
});
- // Re-arranging or removing columns doesn't merit a refresh, only adding columns does
- if (!oldSelect || _.difference(newSelect, oldSelect).length) {
- if (ctrl.autoSearch) {
- ctrl.refreshPage();
- } else {
- ctrl.stale = true;
- }
- }
- }
-
- function onChangeFilters() {
- ctrl.stale = true;
- clearSelection();
- if (ctrl.autoSearch) {
- ctrl.refreshAll();
- }
- }
-
- function clearSelection() {
- ctrl.allRowsSelected = false;
- ctrl.selectedRows.length = 0;
}
- $scope.selectAllRows = function() {
- // Deselect all
- if (ctrl.allRowsSelected) {
- clearSelection();
- return;
- }
- // Select all
- ctrl.allRowsSelected = true;
- if (ctrl.page === 1 && ctrl.results[1].length < ctrl.limit) {
- ctrl.selectedRows = _.pluck(ctrl.results[1], 'id');
- return;
- }
- // If more than one page of results, use ajax to fetch all ids
- $scope.loadingAllRows = true;
- var params = _.cloneDeep(ctrl.savedSearch.api_params);
- // Select is only needed needed by HAVING
- params.select = params.having && params.having.length ? params.select : [];
- params.select.push('id');
- crmApi4(ctrl.savedSearch.api_entity, 'get', params, ['id']).then(function(ids) {
- $scope.loadingAllRows = false;
- ctrl.selectedRows = _.toArray(ids);
- });
- };
-
- $scope.selectRow = function(row) {
- var index = ctrl.selectedRows.indexOf(row.id);
- if (index < 0) {
- ctrl.selectedRows.push(row.id);
- ctrl.allRowsSelected = (ctrl.rowCount === ctrl.selectedRows.length);
- } else {
- ctrl.allRowsSelected = false;
- ctrl.selectedRows.splice(index, 1);
- }
- };
-
- $scope.isRowSelected = function(row) {
- return ctrl.allRowsSelected || _.includes(ctrl.selectedRows, row.id);
- };
-
this.getFieldLabel = searchMeta.getDefaultLabel;
// Is a column eligible to use an aggregate function?
@@ -657,70 +410,6 @@
return ctrl.savedSearch.api_params.groupBy.indexOf(info.prefix + idField) < 0;
};
- $scope.formatResult = function(row, col) {
- var info = searchMeta.parseExpr(col),
- value = row[info.alias];
- return formatFieldValue(row, info, value);
- };
-
- // Attempts to construct a view url for a given entity
- function getEntityUrl(row, info, index) {
- var entity = searchMeta.getEntity(info.field.entity),
- path = _.result(_.findWhere(entity.paths, {action: 'view'}), 'path');
- // Only proceed if the path metadata exists for this entity
- if (path) {
- // Replace tokens in the path (e.g. [id])
- var tokens = path.match(/\[\w*]/g) || [],
- prefix = info.prefix;
- var replacements = _.transform(tokens, function(replacements, token) {
- var fieldName = token.slice(1, token.length - 1);
- // For implicit join fields
- if (fieldName === 'id' && info.field.name !== info.field.fieldName) {
- fieldName = info.field.name.substr(0, info.field.name.lastIndexOf('.'));
- }
- var replacement = row[prefix + fieldName];
- if (replacement) {
- replacements.push(_.isArray(replacement) ? replacement[index] : replacement);
- }
- });
- // Only proceed if the row contains all the necessary data to resolve tokens
- if (tokens.length === replacements.length) {
- _.each(tokens, function(token, key) {
- path = path.replace(token, replacements[key]);
- });
- return {url: CRM.url(path), title: path.title};
- }
- }
- }
-
- function formatFieldValue(row, info, value, index) {
- var type = (info.fn && info.fn.dataType) || info.field.data_type,
- result = value,
- link;
- if (_.isArray(value)) {
- return _.map(value, function(val, idx) {
- return formatFieldValue(row, info, val, idx);
- }).join(', ');
- }
- if (value && (type === 'Date' || type === 'Timestamp') && /^\d{4}-\d{2}-\d{2}/.test(value)) {
- result = CRM.utils.formatDate(value, null, type === 'Timestamp');
- }
- else if (type === 'Boolean' && typeof value === 'boolean') {
- result = value ? ts('Yes') : ts('No');
- }
- else if (type === 'Money' && typeof value === 'number') {
- result = CRM.formatMoney(value);
- }
- // Output user-facing name/label fields as a link, if possible
- if (info.field.fieldName === searchMeta.getEntity(info.field.entity).label_field && !info.fn) {
- link = getEntityUrl(row, info, index || 0);
- }
- if (link) {
- return '<a href="' + _.escape(link.url) + '" title="' + _.escape(link.title) + '">' + _.escape(result) + '</a>';
- }
- return _.escape(result);
- }
-
$scope.fieldsForGroupBy = function() {
return {results: ctrl.getAllFields('', ['Field', 'Custom'], function(key) {
return _.contains(ctrl.savedSearch.api_params.groupBy, key);
@@ -728,13 +417,6 @@
};
};
- $scope.fieldsForSelect = function() {
- return {results: ctrl.getAllFields(':label', ['Field', 'Custom', 'Extra'], function(key) {
- return _.contains(ctrl.savedSearch.api_params.select, key);
- })
- };
- };
-
function getFieldsForJoin(joinEntity) {
return {results: ctrl.getAllFields(':name', ['Field', 'Custom'], null, joinEntity)};
}
@@ -754,17 +436,6 @@
return {results: ctrl.getSelectFields()};
};
- $scope.sortableColumnOptions = {
- axis: 'x',
- handle: '.crm-draggable',
- update: function(e, ui) {
- // Don't allow items to be moved to position 0 if locked
- if (!ui.item.sortable.dropindex && ctrl.groupExists) {
- ui.item.sortable.cancel();
- }
- }
- };
-
// Sets the default select clause based on commonly-named fields
function getDefaultSelect() {
var entity = searchMeta.getEntity(ctrl.savedSearch.api_entity);
@@ -907,6 +578,85 @@
}
}
+ // Build a list of all possible links to main entity & join entities
+ this.buildLinks = function() {
+ function addTitle(link, entityName) {
+ switch (link.action) {
+ case 'view':
+ link.title = ts('View %1', {1: entityName});
+ link.icon = 'fa-external-link';
+ link.style = 'default';
+ break;
+
+ case 'update':
+ link.title = ts('Edit %1', {1: entityName});
+ link.icon = 'fa-pencil';
+ link.style = 'default';
+ break;
+
+ case 'delete':
+ link.title = ts('Delete %1', {1: entityName});
+ link.icon = 'fa-trash';
+ link.style = 'danger';
+ break;
+ }
+ }
+
+ // Links to main entity
+ // @return {Array}
+ var mainEntity = searchMeta.getEntity(ctrl.savedSearch.api_entity),
+ links = _.cloneDeep(mainEntity.paths || []);
+ _.each(links, function(link) {
+ link.join = '';
+ addTitle(link, mainEntity.title);
+ });
+ // Links to explicitly joined entities
+ _.each(ctrl.savedSearch.api_params.join, function(joinClause) {
+ var join = searchMeta.getJoin(joinClause[0]),
+ joinEntity = searchMeta.getEntity(join.entity),
+ primaryKey = joinEntity.primary_key[0],
+ isAggregate = ctrl.canAggregate(join.alias + '.' + primaryKey),
+ bridgeEntity = _.isString(joinClause[2]) ? searchMeta.getEntity(joinClause[2]) : null;
+ _.each(joinEntity.paths, function(path) {
+ var link = _.cloneDeep(path);
+ link.isAggregate = isAggregate;
+ link.path = link.path.replace(/\[/g, '[' + join.alias + '.');
+ link.join = join.alias;
+ addTitle(link, join.label);
+ links.push(link);
+ });
+ _.each(bridgeEntity && bridgeEntity.paths, function(path) {
+ var link = _.cloneDeep(path);
+ link.path = link.path.replace(/\[/g, '[' + join.alias + '.');
+ link.join = join.alias;
+ addTitle(link, join.label + (bridgeEntity.bridge_title ? ' ' + bridgeEntity.bridge_title : ''));
+ links.push(link);
+ });
+ });
+ // Links to implicit joins
+ _.each(ctrl.savedSearch.api_params.select, function(fieldName) {
+ if (!_.includes(fieldName, ' AS ')) {
+ var info = searchMeta.parseExpr(fieldName);
+ if (info.field && !info.suffix && !info.fn && (info.field.fk_entity || info.field.name !== info.field.fieldName)) {
+ var idFieldName = info.field.fk_entity ? fieldName : fieldName.substr(0, fieldName.lastIndexOf('.')),
+ idField = searchMeta.parseExpr(idFieldName).field;
+ if (!ctrl.canAggregate(idFieldName)) {
+ var joinEntity = searchMeta.getEntity(idField.fk_entity),
+ label = (idField.join ? idField.join.label + ': ' : '') + (idField.input_attrs && idField.input_attrs.label || idField.label);
+ _.each((joinEntity || {}).paths, function(path) {
+ var link = _.cloneDeep(path);
+ link.path = link.path.replace(/\[id/g, '[' + idFieldName);
+ link.join = idFieldName;
+ addTitle(link, label);
+ links.push(link);
+ });
+ }
+ }
+ }
+ });
+ return _.uniq(links, 'path');
+ };
+
}
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
index db7c24aa50..a486708809 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
@@ -33,11 +33,8 @@
<ul class="nav nav-pills nav-stacked" ng-include="'~/crmSearchAdmin/tabs.html'"></ul>
<div class="crm-flex-4" ng-switch="controls.tab">
<div ng-switch-when="compose">
- <div ng-include="'~/crmSearchAdmin/compose/criteria.html'"></div>
- <div ng-include="'~/crmSearchAdmin/compose/controls.html'"></div>
- <div ng-include="'~/crmSearchAdmin/compose/debug.html'" ng-if="$ctrl.debug"></div>
- <div ng-include="'~/crmSearchAdmin/compose/results.html'" class="crm-search-results"></div>
- <div ng-include="'~/crmSearchAdmin/compose/pager.html'" ng-if="$ctrl.results"></div>
+ <div ng-include="'~/crmSearchAdmin/compose.html'"></div>
+ <crm-search-admin-results-table search="$ctrl.savedSearch"></crm-search-admin-results-table>
</div>
<div ng-switch-when="group">
<fieldset ng-include="'~/crmSearchAdmin/group.html'"></fieldset>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
index f151226aa3..a8e6ebe14f 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
@@ -68,16 +68,12 @@
links: []
}
},
- };
-
- this.toggleLimit = function() {
- if (ctrl.display.settings.limit) {
- ctrl.display.settings.limit = 0;
- if (ctrl.display.settings.pager) {
- ctrl.display.settings.pager = false;
+ include: {
+ label: ts('Custom Code'),
+ icon: 'fa-code',
+ defaults: {
+ path: ''
}
- } else {
- ctrl.display.settings.limit = CRM.crmSearchAdmin.defaultPagerSize;
}
};
@@ -144,6 +140,17 @@
}
};
+ this.toggleImage = function(col) {
+ if (col.image) {
+ delete col.image;
+ } else {
+ col.image = {
+ alt: this.getColLabel(col)
+ };
+ delete col.editable;
+ }
+ };
+
this.toggleEditable = function(col) {
if (col.editable) {
delete col.editable;
@@ -171,24 +178,9 @@
this.isEditable = function(col) {
var expr = ctrl.getExprFromSelect(col.key),
info = searchMeta.parseExpr(expr);
- return !col.rewrite && !col.link && !info.fn && info.field && !info.field.readonly;
+ return !col.image && !col.rewrite && !col.link && !info.fn && info.field && !info.field.readonly;
};
- function fieldToColumn(fieldExpr, defaults) {
- var info = searchMeta.parseExpr(fieldExpr),
- values = _.cloneDeep(defaults);
- if (defaults.key) {
- values.key = info.alias;
- }
- if (defaults.label) {
- values.label = searchMeta.getDefaultLabel(fieldExpr);
- }
- if (defaults.dataType) {
- values.dataType = (info.fn && info.fn.dataType) || (info.field && info.field.data_type);
- }
- return values;
- }
-
this.toggleLink = function(column) {
if (column.link) {
ctrl.onChangeLink(column, column.link.path, '');
@@ -216,95 +208,20 @@
this.getLinks = function(columnKey) {
if (!ctrl.links) {
- ctrl.links = {'*': buildLinks()};
+ ctrl.links = {'*': ctrl.crmSearchAdmin.buildLinks()};
}
if (!columnKey) {
return ctrl.links['*'];
}
var expr = ctrl.getExprFromSelect(columnKey),
info = searchMeta.parseExpr(expr),
- joinEntity = '';
- if (info.field.fk_entity || info.field.name !== info.field.fieldName) {
- joinEntity = info.prefix + (info.field.fk_entity ? info.field.name : info.field.name.substr(0, info.field.name.lastIndexOf('.')));
- } else if (info.prefix) {
- joinEntity = info.prefix.replace('.', '');
- }
+ joinEntity = searchMeta.getJoinEntity(info);
if (!ctrl.links[joinEntity]) {
- ctrl.links[joinEntity] = _.filter(ctrl.links['*'], function(link) {
- return joinEntity === (link.join || '');
- });
+ ctrl.links[joinEntity] = _.filter(ctrl.links['*'], {join: joinEntity});
}
return ctrl.links[joinEntity];
};
- // Build a list of all possible links to main entity or join entities
- function buildLinks() {
- function addTitle(link, entityName) {
- switch (link.action) {
- case 'view':
- link.title = ts('View %1', {1: entityName});
- break;
-
- case 'update':
- link.title = ts('Edit %1', {1: entityName});
- break;
-
- case 'delete':
- link.title = ts('Delete %1', {1: entityName});
- break;
- }
- }
-
- // Links to main entity
- var mainEntity = searchMeta.getEntity(ctrl.savedSearch.api_entity),
- links = _.cloneDeep(mainEntity.paths || []);
- _.each(links, function(link) {
- addTitle(link, mainEntity.title);
- });
- // Links to explicitly joined entities
- _.each(ctrl.savedSearch.api_params.join, function(joinClause) {
- var join = searchMeta.getJoin(joinClause[0]),
- joinEntity = searchMeta.getEntity(join.entity),
- bridgeEntity = _.isString(joinClause[2]) ? searchMeta.getEntity(joinClause[2]) : null;
- _.each(joinEntity.paths, function(path) {
- var link = _.cloneDeep(path);
- link.path = link.path.replace(/\[/g, '[' + join.alias + '.');
- link.join = join.alias;
- addTitle(link, join.label);
- links.push(link);
- });
- _.each(bridgeEntity && bridgeEntity.paths, function(path) {
- var link = _.cloneDeep(path);
- link.path = link.path.replace(/\[/g, '[' + join.alias + '.');
- link.join = join.alias;
- addTitle(link, join.label + (bridgeEntity.bridge_title ? ' ' + bridgeEntity.bridge_title : ''));
- links.push(link);
- });
- });
- // Links to implicit joins
- _.each(ctrl.savedSearch.api_params.select, function(fieldName) {
- if (!_.includes(fieldName, ' AS ')) {
- var info = searchMeta.parseExpr(fieldName);
- if (info.field && !info.suffix && !info.fn && (info.field.fk_entity || info.field.name !== info.field.fieldName)) {
- var idFieldName = info.field.fk_entity ? fieldName : fieldName.substr(0, fieldName.lastIndexOf('.')),
- idField = searchMeta.parseExpr(idFieldName).field;
- if (!ctrl.crmSearchAdmin.canAggregate(idFieldName)) {
- var joinEntity = searchMeta.getEntity(idField.fk_entity),
- label = (idField.join ? idField.join.label + ': ' : '') + (idField.input_attrs && idField.input_attrs.label || idField.label);
- _.each((joinEntity || {}).paths, function(path) {
- var link = _.cloneDeep(path);
- link.path = link.path.replace(/\[id/g, '[' + idFieldName);
- link.join = idFieldName;
- addTitle(link, label);
- links.push(link);
- });
- }
- }
- }
- });
- return _.uniq(links, 'path');
- }
-
this.pickIcon = function(model, key) {
searchMeta.pickIcon().then(function(icon) {
model[key] = icon;
@@ -315,7 +232,7 @@
this.initColumns = function(defaults) {
if (!ctrl.display.settings.columns) {
ctrl.display.settings.columns = _.transform(ctrl.savedSearch.api_params.select, function(columns, fieldExpr) {
- columns.push(fieldToColumn(fieldExpr, defaults));
+ columns.push(searchMeta.fieldToColumn(fieldExpr, defaults));
});
ctrl.hiddenColumns = [];
} else {
@@ -326,7 +243,7 @@
ctrl.hiddenColumns = _.transform(ctrl.savedSearch.api_params.select, function(hiddenColumns, fieldExpr) {
var key = _.last(fieldExpr.split(' AS '));
if (!_.includes(activeColumns, key)) {
- hiddenColumns.push(fieldToColumn(fieldExpr, defaults));
+ hiddenColumns.push(searchMeta.fieldToColumn(fieldExpr, defaults));
}
});
_.eachRight(activeColumns, function(key, index) {
@@ -352,10 +269,18 @@
return _.findIndex(ctrl.display.settings.sort, [key]) >= 0;
}
return {
- results: [{
- text: ts('Columns'),
- children: ctrl.crmSearchAdmin.getSelectFields(disabledIf)
- }].concat(ctrl.crmSearchAdmin.getAllFields('', ['Field', 'Custom'], disabledIf))
+ results: [
+ {
+ text: ts('Random'),
+ icon: 'crm-i fa-random',
+ id: 'RAND()',
+ disabled: disabledIf('RAND()')
+ },
+ {
+ text: ts('Columns'),
+ children: ctrl.crmSearchAdmin.getSelectFields(disabledIf)
+ }
+ ].concat(ctrl.crmSearchAdmin.getAllFields('', ['Field', 'Custom'], disabledIf))
};
};
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
index 4e548899aa..a3a1cf737e 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
@@ -1,7 +1,7 @@
<div class="form-inline" ng-repeat="sort in $ctrl.display.settings.sort">
<label for="crm-search-display-sort-{{$index}}">{{ $index ? ts('Also by') : ts('Sort by') }}</label>
<input id="crm-search-display-sort-{{$index}}" class="form-control huge" ng-model="sort[0]" crm-ui-select="{data: $ctrl.parent.fieldsForSort}" />
- <select class="form-control" ng-model="sort[1]">
+ <select class="form-control" ng-model="sort[1]" ng-show="sort[0] !== 'RAND()'">
<option value="ASC">{{ ts('Ascending') }}</option>
<option value="DESC">{{ ts('Descending') }}</option>
</select>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
index f6e4799659..5053c6ba17 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
@@ -31,18 +31,6 @@
}
};
- var defaultIcons = {
- view: 'fa-external-link',
- update: 'fa-pencil',
- delete: 'fa-trash'
- };
-
- var defaultStyles = {
- view: 'primary',
- update: 'warning',
- delete: 'danger'
- };
-
$scope.pickIcon = function(index) {
searchMeta.pickIcon().then(function(icon) {
ctrl.group[index].icon = icon;
@@ -53,9 +41,9 @@
var link = ctrl.getLink(path);
ctrl.group.push({
path: path,
- style: link && defaultStyles[link.action] || 'default',
+ style: link && link.style || 'default',
text: link ? link.title : ts('Link'),
- icon: link && defaultIcons[link.action] || 'fa-external-link'
+ icon: link && link.icon || 'fa-external-link'
});
};
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
index bdc96368c0..f364ebf66d 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
@@ -15,6 +15,13 @@
var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
ctrl = this;
+ this.$onInit = function() {
+ // Because this widget is so small, some placeholder text is helpful once it's open
+ $element.on('select2-open', function() {
+ $('#select2-drop > .select2-search > input').attr('placeholder', ts('Insert Token'));
+ });
+ };
+
this.insertToken = function(key) {
ctrl.model[ctrl.field] = (ctrl.model[ctrl.field] || '') + '[' + key + ']';
};
@@ -32,6 +39,17 @@
};
};
+ this.tokenSelectSettings = {
+ data: this.getTokens,
+ // The crm-action-menu icon doesn't show without a placeholder
+ placeholder: ' ',
+ // Make this widget very compact
+ width: '52px',
+ containerCss: {minWidth: '52px'},
+ // Make the dropdown wider than the widget
+ dropdownCss: {width: '250px'}
+ };
+
}
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html
index f4e1b37d77..1f37c9aab4 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html
@@ -1,6 +1,6 @@
-<span title="{{:: ts('Insert Tokens') }}">
+<span title="{{:: ts('Insert Token') }}">
<input class="form-control crm-action-menu fa-code collapsible-optgroups"
- crm-ui-select="{placeholder: ' ', data: $ctrl.getTokens, width: '52px', containerCss: {minWidth: '52px'}, dropdownCss: {width: '250px'}}"
+ crm-ui-select="$ctrl.tokenSelectSettings"
on-crm-ui-select="$ctrl.insertToken(selection)"
/>
</span>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
index 8b0cbff69e..ddc0383657 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
@@ -19,6 +19,21 @@
<input class="form-control crm-flex-1" type="text" ng-model="col.title" ng-if="col.title" ng-model-options="{updateOn: 'blur'}" />
<crm-search-admin-token-select ng-if="col.title" model="col" field="title" suffix=":label"></crm-search-admin-token-select>
</div>
+<div class="form-inline">
+ <label>
+ <input type="checkbox" ng-checked="col.image" ng-click="$ctrl.parent.toggleImage(col)" >
+ {{:: ts('Image') }}
+ </label>
+ <div class="crm-search-admin-flex-row" ng-if="col.image">
+ <label>{{:: ts('Width') }}</label>
+ <input type="number" min="1" class="form-control crm-flex-1" placeholder="Auto" ng-model="col.image.width">
+ <label>{{:: ts('Height') }}</label>
+ <input type="number" min="1" class="form-control crm-flex-1" placeholder="Auto" ng-model="col.image.height">
+ <label>{{:: ts('Alt Text') }}</label>
+ <input type="text" class="form-control crm-flex-2" ng-model="col.image.alt">
+ <crm-search-admin-token-select api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col.image" field="alt"></crm-search-admin-token-select>
+ </div>
+</div>
<div class="form-inline crm-search-admin-flex-row">
<label title="{{ ts('Change the contents of this field, or combine multiple field values.') }}">
<input type="checkbox" ng-checked="col.rewrite" ng-click="$ctrl.parent.toggleRewrite(col)" >
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/include.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/include.html
new file mode 100644
index 0000000000..6b7dd04447
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/include.html
@@ -0,0 +1,9 @@
+<div class="form-inline crm-search-admin-flex-row">
+ <label>
+ {{:: ts('Template File') }}
+ </label>
+ <input class="form-control crm-flex-1" type="text" ng-model="col.path">
+</div>
+<p class="help-block">
+ {{:: ts('Relative path to the custom template, e.g. "~/myModule/myTemplate.html"') }}
+</p>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
index f9ea37ce1a..9b0e15e7cd 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
@@ -12,12 +12,13 @@
{{:: ts('Style') }}
</label>
<select id="crm-search-admin-col-style-{{$index}}" class="form-control" ng-model="col.style">
- <option ng-repeat="opt in $ctrl.parent.styles" value="{{ opt.key }}">{{ opt.value }}</option>
+ <option ng-repeat="opt in $ctrl.parent.styles" value="{{:: opt.key }}">{{:: opt.value }}</option>
+ <option ng-repeat="opt in $ctrl.parent.styles" value="{{:: opt.key + '-outline' }}">{{:: opt.value + ' ' + ts('Outline') }}</option>
</select>
</div>
<div class="form-inline">
<label>
- {{:: ts('Menu Text/Icon') }}
+ {{:: ts('Menu Icon/Text') }}
</label>
<div class="btn-group">
<button type="button" class="btn btn-{{ col.style + ' ' + col.size }}">
@@ -27,6 +28,7 @@
<span crm-ui-editable ng-model="col.text">{{ col.text }}</span>
</button>
</div>
+ <crm-search-admin-token-select model="col" field="text" suffix=":label"></crm-search-admin-token-select>
</div>
<hr>
<crm-search-admin-link-group links="$ctrl.parent.getLinks()" group="col.links" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams"></crm-search-admin-link-group>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html
index 55e2c89cf3..bfe415a80a 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html
@@ -1,4 +1,4 @@
-<button type="button" class="btn dropdown-toggle btn-default-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<button type="button" class="btn dropdown-toggle btn-secondary-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="crm-i fa-plus"></i>
{{:: ts('Add') }} <span class="caret"></span>
</button>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.component.js
new file mode 100644
index 0000000000..d4fd289d2e
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.component.js
@@ -0,0 +1,48 @@
+(function(angular, $, _) {
+ "use strict";
+
+ angular.module('crmSearchAdmin').component('searchAdminPagerConfig', {
+ bindings: {
+ display: '<',
+ },
+ templateUrl: '~/crmSearchAdmin/displays/common/searchAdminPagerConfig.html',
+ controller: function($scope) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ ctrl = this;
+
+ function getDefaultSettings() {
+ return _.cloneDeep({
+ show_count: false,
+ expose_limit: false
+ });
+ }
+
+ this.$onInit = function() {
+ // Legacy support
+ if (this.display.settings.pager === true) {
+ this.display.settings.pager = getDefaultSettings();
+ }
+ if (this.display.settings.pager && !this.display.settings.limit) {
+ this.toggleLimit();
+ }
+ };
+
+ this.togglePager = function() {
+ this.display.settings.pager = this.display.settings.pager ? false : getDefaultSettings();
+ if (this.display.settings.pager && !this.display.settings.limit) {
+ this.toggleLimit();
+ }
+ };
+
+ this.toggleLimit = function() {
+ if (ctrl.display.settings.limit) {
+ ctrl.display.settings.limit = 0;
+ } else {
+ ctrl.display.settings.limit = CRM.crmSearchAdmin.defaultPagerSize;
+ }
+ };
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
new file mode 100644
index 0000000000..184f6ff2cb
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchAdminPagerConfig.html
@@ -0,0 +1,33 @@
+<div class="form-inline">
+ <div class="checkbox-inline form-control">
+ <label>
+ <input type="checkbox" ng-checked="$ctrl.display.settings.pager" ng-click="$ctrl.togglePager()">
+ <span>{{:: ts('Use Pager') }}</span>
+ </label>
+ </div>
+ <div class="checkbox-inline form-control" ng-if="!$ctrl.display.settings.pager">
+ <label>
+ <input type="checkbox" ng-checked="$ctrl.display.settings.limit" ng-click="$ctrl.toggleLimit()">
+ <span>{{:: ts('Limit Results') }}</span>
+ </label>
+ <input ng-if="$ctrl.display.settings.limit" type="number" min="1" step="1" class="form-control" ng-model="$ctrl.display.settings.limit">
+ </div>
+ <div class="form-group" ng-if="$ctrl.display.settings.pager">
+ <label for="crm-search-admin-display-limit">
+ {{:: ts('Page Size') }}
+ </label>
+ <input id="crm-search-admin-display-limit" ng-if="$ctrl.display.settings.limit" type="number" min="1" step="1" class="form-control" ng-model="$ctrl.display.settings.limit">
+ <div class="checkbox-inline form-control">
+ <label>
+ <input type="checkbox" ng-model="$ctrl.display.settings.pager.show_count" >
+ <span>{{:: ts('Show Count') }}</span>
+ </label>
+ </div>
+ <div class="checkbox-inline form-control">
+ <label>
+ <input type="checkbox" ng-model="$ctrl.display.settings.pager.expose_limit" >
+ <span>{{:: ts('Adjustable Page Size') }}</span>
+ </label>
+ </div>
+ </div>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
new file mode 100644
index 0000000000..64c67b8dee
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/common/searchButtonConfig.html
@@ -0,0 +1,13 @@
+<div class="input-group">
+ <div class="input-group-btn" title="{{:: ts('Should the search be run immediately, or wait for the user to click a button?') }}">
+ <button type="button" class="btn btn-outline-default" ng-click="$ctrl.display.settings.button = null" ng-class="{active: !$ctrl.display.settings.button}">
+ <i class="crm-i fa-{{ $ctrl.display.settings.button ? '' : 'check-' }}circle-o"></i>
+ {{:: ts('Auto-Run') }}
+ </button>
+ <button type="button" class="btn btn-outline-default" ng-click="$ctrl.display.settings.button = ts('Search')" ng-class="{active: $ctrl.display.settings.button}">
+ <i class="crm-i fa-{{ !$ctrl.display.settings.button ? '' : 'check-' }}circle-o"></i>
+ {{:: ts('Search Button') }}
+ </button>
+ </div>
+ <input type="text" ng-show="$ctrl.display.settings.button" ng-model="$ctrl.display.settings.button" ng-model-options="{updateOn: 'blur'}" class="form-control" title="{{:: ts('Search button text') }}" placeholder="{{:: ts('Search button text') }}">
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.component.js
new file mode 100644
index 0000000000..3a55a7aab1
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.component.js
@@ -0,0 +1,32 @@
+(function(angular, $, _) {
+ "use strict";
+
+ angular.module('crmSearchAdmin').component('searchAdminDisplayGrid', {
+ bindings: {
+ display: '<',
+ apiEntity: '<',
+ apiParams: '<'
+ },
+ require: {
+ parent: '^crmSearchAdminDisplay'
+ },
+ templateUrl: '~/crmSearchAdmin/displays/searchAdminDisplayGrid.html',
+ controller: function($scope) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ ctrl = this;
+
+ this.$onInit = function () {
+ if (!ctrl.display.settings) {
+ ctrl.display.settings = {
+ colno: '3',
+ limit: CRM.crmSearchAdmin.defaultPagerSize,
+ pager: {}
+ };
+ }
+ ctrl.parent.initColumns({});
+ };
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
new file mode 100644
index 0000000000..2da44b5580
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayGrid.html
@@ -0,0 +1,46 @@
+<fieldset ng-include="'~/crmSearchAdmin/crmSearchAdminDisplaySort.html'"></fieldset>
+<fieldset>
+ <div class="form-inline">
+ <label for="crm-search-admin-display-colno">{{:: ts('Layout') }}</label>
+ <select id="crm-search-admin-display-colno" class="form-control" ng-model="$ctrl.display.settings.colno">
+ <option value="2">{{:: ts('2 x 2') }}</option>
+ <option value="3">{{:: ts('3 x 3') }}</option>
+ <option value="4">{{:: ts('4 x 4') }}</option>
+ <option value="5">{{:: ts('5 x 5') }}</option>
+ </select>
+ <div class="form-group" ng-include="'~/crmSearchAdmin/displays/common/searchButtonConfig.html'"></div>
+ </div>
+ <search-admin-pager-config display="$ctrl.display"></search-admin-pager-config>
+</fieldset>
+<fieldset class="crm-search-admin-edit-columns-wrapper">
+ <legend>
+ {{:: ts('Fields') }}
+ <div ng-include="'~/crmSearchAdmin/displays/common/addColMenu.html'" class="btn-group btn-group-xs"></div>
+ </legend>
+ <div class="crm-search-admin-edit-columns" ng-model="$ctrl.display.settings.columns" ui-sortable="$ctrl.parent.sortableOptions">
+ <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
+ <legend><i class="crm-i fa-arrows crm-search-move-icon"></i> {{ $ctrl.parent.getColLabel(col) }}</legend>
+ <div class="form-inline" title="{{ ts('Should this item display on its own line or inline with other items?') }}">
+ <label><input type="checkbox" ng-model="col.break"> {{:: ts('New Line') }}</label>
+ <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.removeCol($index)" title="{{:: ts('Remove') }}">
+ <i class="crm-i fa-ban"></i>
+ </button>
+ </div>
+ <div class="form-inline crm-search-admin-flex-row">
+ <label>
+ <input type="checkbox" ng-checked="col.label" ng-click="col.label = col.label ? null : $ctrl.parent.getColLabel(col)" >
+ {{:: ts('Label') }}
+ </label>
+ <input ng-if="col.label" class="form-control crm-flex-1" type="text" ng-model="col.label" ng-model-options="{updateOn: 'blur'}">
+ <crm-search-admin-token-select ng-if="col.label" model="col" field="label" suffix=":label"></crm-search-admin-token-select>
+ </div>
+ <div class="form-inline" ng-if="col.label">
+ <label style="visibility: hidden"><input type="checkbox" disabled></label><!--To indent by 1 checkbox-width-->
+ <div class="checkbox">
+ <label><input type="checkbox" ng-model="col.forceLabel"> {{:: ts('Show label even when field is blank') }}</label>
+ </div>
+ </div>
+ <div ng-include="'~/crmSearchAdmin/displays/colType/' + col.type + '.html'"></div>
+ </fieldset>
+ </div>
+</fieldset>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
index 081b45393f..fe35e0a024 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
@@ -35,10 +35,10 @@
ctrl.display.settings = {
style: 'ul',
limit: CRM.crmSearchAdmin.defaultPagerSize,
- pager: true
+ pager: {}
};
}
- ctrl.parent.initColumns({key: true, dataType: true, type: 'field'});
+ ctrl.parent.initColumns({});
};
}
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
index 51aeaccf72..5d733db80b 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
@@ -12,22 +12,9 @@
{{ symbol.label }}
</option>
</select>
+ <div class="form-group" ng-include="'~/crmSearchAdmin/displays/common/searchButtonConfig.html'"></div>
</div>
- <div class="form-inline">
- <div class="checkbox-inline form-control">
- <label>
- <input type="checkbox" ng-checked="$ctrl.display.settings.limit" ng-click="$ctrl.parent.toggleLimit()">
- <span>{{:: ts('Limit Results') }}</span>
- </label>
- <input id="crm-search-admin-display-limit" ng-if="$ctrl.display.settings.limit" type="number" min="1" step="1" class="form-control" ng-model="$ctrl.display.settings.limit">
- </div>
- <div class="checkbox-inline form-control">
- <label ng-class="{disabled: !$ctrl.display.settings.limit}">
- <input type="checkbox" ng-model="$ctrl.display.settings.pager" ng-disabled="!$ctrl.display.settings.limit">
- <span>{{:: ts('Use Pager') }}</span>
- </label>
- </div>
- </div>
+ <search-admin-pager-config display="$ctrl.display"></search-admin-pager-config>
</fieldset>
<fieldset class="crm-search-admin-edit-columns-wrapper">
<legend>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
index 937b85d174..23b7c4daeb 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
@@ -19,10 +19,10 @@
if (!ctrl.display.settings) {
ctrl.display.settings = {
limit: CRM.crmSearchAdmin.defaultPagerSize,
- pager: true
+ pager: {}
};
}
- ctrl.parent.initColumns({key: true, label: true, dataType: true, type: 'field'});
+ ctrl.parent.initColumns({label: true});
};
}
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
index f068b4bcda..c2961ecf25 100644
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
@@ -1,26 +1,15 @@
<fieldset ng-include="'~/crmSearchAdmin/crmSearchAdminDisplaySort.html'"></fieldset>
<fieldset>
<div class="form-inline">
- <div class="checkbox-inline form-control">
- <label>
- <input type="checkbox" ng-checked="$ctrl.display.settings.limit" ng-click="$ctrl.parent.toggleLimit()">
- <span>{{:: ts('Limit Results') }}</span>
- </label>
- <input id="crm-search-admin-display-limit" ng-if="$ctrl.display.settings.limit" type="number" min="1" step="1" class="form-control" ng-model="$ctrl.display.settings.limit">
- </div>
- <div class="checkbox-inline form-control">
- <label ng-class="{disabled: !$ctrl.display.settings.limit}">
- <input type="checkbox" ng-model="$ctrl.display.settings.pager" ng-disabled="!$ctrl.display.settings.limit">
- <span>{{:: ts('Use Pager') }}</span>
- </label>
- </div>
<div class="checkbox-inline form-control">
<label>
<input type="checkbox" ng-model="$ctrl.display.settings.actions">
<span>{{:: ts('Enable Actions') }}</span>
</label>
</div>
+ <div class="form-group" ng-include="'~/crmSearchAdmin/displays/common/searchButtonConfig.html'"></div>
</div>
+ <search-admin-pager-config display="$ctrl.display"></search-admin-pager-config>
</fieldset>
<fieldset class="crm-search-admin-edit-columns-wrapper">
<legend>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js
new file mode 100644
index 0000000000..71f09c22ea
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.component.js
@@ -0,0 +1,130 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Specialized searchDisplay, only used by Admins
+ angular.module('crmSearchAdmin').component('crmSearchAdminResultsTable', {
+ bindings: {
+ search: '<'
+ },
+ require: {
+ crmSearchAdmin: '^crmSearchAdmin'
+ },
+ templateUrl: '~/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html',
+ controller: function($scope, $element, searchMeta, searchDisplayBaseTrait, searchDisplayTasksTrait, searchDisplaySortableTrait) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ // Mix in traits to this controller
+ ctrl = angular.extend(this, searchDisplayBaseTrait, searchDisplayTasksTrait, searchDisplaySortableTrait);
+
+ // Output user-facing name/label fields as a link, if possible
+ function getViewLink(fieldExpr, links) {
+ var info = searchMeta.parseExpr(fieldExpr),
+ entity = searchMeta.getEntity(info.field.entity);
+ if (!info.fn && entity && info.field.fieldName === entity.label_field) {
+ var joinEntity = searchMeta.getJoinEntity(info);
+ return _.find(links, {join: joinEntity, action: 'view'});
+ }
+ }
+
+ function buildSettings() {
+ var links = ctrl.crmSearchAdmin.buildLinks();
+ ctrl.apiEntity = ctrl.search.api_entity;
+ ctrl.display = {
+ type: 'table',
+ settings: {
+ limit: CRM.crmSearchAdmin.defaultPagerSize,
+ pager: {show_count: true, expose_limit: true},
+ actions: true,
+ button: ts('Search'),
+ columns: _.transform(ctrl.search.api_params.select, function(columns, fieldExpr) {
+ var column = {label: true},
+ link = getViewLink(fieldExpr, links);
+ if (link) {
+ column.title = link.title;
+ column.link = {
+ path: link.path,
+ target: '_blank'
+ };
+ }
+ columns.push(searchMeta.fieldToColumn(fieldExpr, column));
+ })
+ }
+ };
+ if (links.length) {
+ ctrl.display.settings.columns.push({
+ text: '',
+ icon: 'fa-bars',
+ type: 'menu',
+ size: 'btn-xs',
+ style: 'secondary-outline',
+ alignment: 'text-right',
+ links: _.transform(links, function(links, link) {
+ if (!link.isAggregate) {
+ links.push({
+ path: link.path,
+ text: link.title,
+ icon: link.icon,
+ style: link.style,
+ target: link.action === 'view' ? '_blank' : 'crm-popup'
+ });
+ }
+ })
+ });
+ }
+ ctrl.debug = {
+ apiParams: JSON.stringify(ctrl.search.api_params, null, 2)
+ };
+ ctrl.settings = ctrl.display.settings;
+ setLabel();
+ }
+
+ function setLabel() {
+ ctrl.display.label = ctrl.search.label || searchMeta.getEntity(ctrl.search.api_entity).title_plural;
+ }
+
+ this.$onInit = function() {
+ buildSettings();
+ this.initializeDisplay($scope, $element);
+ $scope.$watch('$ctrl.search.api_entity', buildSettings);
+ $scope.$watch('$ctrl.search.api_params', buildSettings, true);
+ $scope.$watch('$ctrl.search.label', setLabel);
+ };
+
+ // Add callbacks for pre & post run
+ this.onPreRun.push(function(apiParams) {
+ apiParams.debug = true;
+ });
+
+ this.onPostRun.push(function(result) {
+ ctrl.debug = _.extend(_.pick(ctrl.debug, 'apiParams'), result.debug);
+ });
+
+ $scope.sortableColumnOptions = {
+ axis: 'x',
+ handle: '.crm-draggable',
+ update: function(e, ui) {
+ // Don't allow items to be moved to position 0 if locked
+ if (!ui.item.sortable.dropindex && ctrl.crmSearchAdmin.groupExists) {
+ ui.item.sortable.cancel();
+ }
+ }
+ };
+
+ $scope.fieldsForSelect = function() {
+ return {results: ctrl.crmSearchAdmin.getAllFields(':label', ['Field', 'Custom', 'Extra'], function(key) {
+ return _.contains(ctrl.search.api_params.select, key);
+ })
+ };
+ };
+
+ $scope.addColumn = function(col) {
+ ctrl.crmSearchAdmin.addParam('select', col);
+ };
+
+ $scope.removeColumn = function(index) {
+ ctrl.crmSearchAdmin.clearParam('select', index);
+ };
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
new file mode 100644
index 0000000000..101d101949
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/crmSearchAdminResultsTable.html
@@ -0,0 +1,31 @@
+<div class="crm-search-display crm-search-display-table">
+ <div ng-include="'~/crmSearchAdmin/resultsTable/debug.html'"></div>
+ <div class="form-inline">
+ <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'"></div>
+ <crm-search-tasks entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" search="$ctrl.search" display="$ctrl.display" display-controller="$ctrl" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
+ </div>
+ <table>
+ <thead>
+ <tr ng-model="$ctrl.search.api_params.select" ui-sortable="sortableColumnOptions">
+ <th class="crm-search-result-select" ng-if=":: $ctrl.settings.actions">
+ <input type="checkbox" ng-disabled="$ctrl.loading || !$ctrl.results.length" ng-checked="$ctrl.allRowsSelected" ng-click="$ctrl.selectAllRows()" >
+ </th>
+ <th ng-repeat="item in $ctrl.search.api_params.select" ng-click="$ctrl.setSort($ctrl.settings.columns[$index], $event)" title="{{$index || !$ctrl.crmSearchAdmin.groupExists ? ts('Drag to reorder columns, click to sort results (shift-click to sort by multiple).') : ts('Column reserved for smart group.')}}">
+ <i class="crm-i {{ $ctrl.getSort($ctrl.settings.columns[$index]) }}"></i>
+ <span ng-class="{'crm-draggable': $index || !$ctrl.crmSearchAdmin.groupExists}">{{ $ctrl.settings.columns[$index].label }}</span>
+ <span ng-switch="$index || !$ctrl.crmSearchAdmin.groupExists ? 'sortable' : 'locked'">
+ <i ng-switch-when="locked" class="crm-i fa-lock" aria-hidden="true"></i>
+ <a href ng-switch-default class="crm-hover-button" title="{{:: ts('Clear') }}" ng-click="removeColumn($index); $event.stopPropagation();"><i class="crm-i fa-times" aria-hidden="true"></i></a>
+ </span>
+ </th>
+ <th class="form-inline">
+ <input class="form-control crm-action-menu fa-plus"
+ crm-ui-select="::{data: fieldsForSelect, placeholder: ts('Add'), width: '80px', containerCss: {minWidth: '80px'}, dropdownCss: {width: '300px'}}"
+ on-crm-ui-select="addColumn(selection)" >
+ </th>
+ </tr>
+ </thead>
+ <tbody ng-include="'~/crmSearchDisplayTable/crmSearchDisplayTableBody.html'"></tbody>
+ </table>
+ <div ng-include="'~/crmSearchDisplay/Pager.html'"></div>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/debug.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/debug.html
new file mode 100644
index 0000000000..d435faed5d
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/resultsTable/debug.html
@@ -0,0 +1,17 @@
+<fieldset id="crm-search-admin-debug">
+ <legend ng-click="$ctrl.showDebug = !$ctrl.showDebug">
+ <i class="crm-i fa-caret-{{ !$ctrl.showDebug ? 'right' : 'down' }}"></i>
+ {{:: ts('Query Info') }}
+ </legend>
+ <div ng-if="$ctrl.showDebug">
+ <pre ng-if="$ctrl.debug.timeIndex">{{ ts('Request took %1 seconds.', {1: $ctrl.debug.timeIndex}) }}</pre>
+ <div>
+ <strong>API:</strong>
+ </div>
+ <pre>{{ $ctrl.debug.apiParams }}</pre>
+ <div ng-if="$ctrl.debug.sql">
+ <strong>SQL:</strong>
+ </div>
+ <pre ng-repeat="query in $ctrl.debug.sql">{{ query }}</pre>
+ </div>
+</fieldset>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.controller.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.controller.js
deleted file mode 100644
index 2266b65d7c..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.controller.js
+++ /dev/null
@@ -1,76 +0,0 @@
-(function(angular, $, _) {
- "use strict";
-
- angular.module('crmSearchAdmin').controller('searchList', function($scope, savedSearches, crmApi4, searchMeta) {
- var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
- ctrl = $scope.$ctrl = this;
- $scope.formatDate = CRM.utils.formatDate;
- this.savedSearches = savedSearches;
- this.sortField = 'modified_date';
- this.sortDir = true;
- this.afformEnabled = CRM.crmSearchAdmin.afformEnabled;
- this.afformAdminEnabled = CRM.crmSearchAdmin.afformAdminEnabled;
-
- _.each(savedSearches, function(search) {
- search.entity_title = searchMeta.getEntity(search.api_entity).title_plural;
- search.permissionToEdit = CRM.checkPerm('all CiviCRM permissions and ACLs') || !_.includes(search.display_acl_bypass, true);
- search.afform_count = 0;
- });
-
- this.searchPath = CRM.url('civicrm/search');
- this.afformPath = CRM.url('civicrm/admin/afform');
-
- this.encode = function(params) {
- return encodeURI(angular.toJson(params));
- };
-
- // Change sort field/direction when clicking a column header
- this.sortBy = function(col) {
- ctrl.sortDir = ctrl.sortField === col ? !ctrl.sortDir : false;
- ctrl.sortField = col;
- };
-
- this.deleteSearch = function(search) {
- var index = _.findIndex(savedSearches, {id: search.id});
- if (index > -1) {
- crmApi4([
- ['Group', 'delete', {where: [['saved_search_id', '=', search.id]]}],
- ['SavedSearch', 'delete', {where: [['id', '=', search.id]]}]
- ]);
- savedSearches.splice(index, 1);
- }
- };
-
- this.loadAfforms = function() {
- if (ctrl.afforms || ctrl.afforms === null) {
- return;
- }
- ctrl.afforms = null;
- crmApi4('Afform', 'get', {
- select: ['layout', 'name', 'title', 'server_route'],
- where: [['type', '=', 'search']],
- layoutFormat: 'html'
- }).then(function(afforms) {
- ctrl.afforms = {};
- _.each(afforms, function(afform) {
- var searchName = afform.layout.match(/<crm-search-display-[^>]+search-name[ ]*=[ ]*['"]([^"']+)/);
- if (searchName) {
- var search = _.find(ctrl.savedSearches, {name: searchName[1]});
- if (search) {
- search.afform_count++;
- ctrl.afforms[searchName[1]] = ctrl.afforms[searchName[1]] || [];
- ctrl.afforms[searchName[1]].push({
- title: afform.title,
- name: afform.name,
- // FIXME: This is the view url, currently not exposed to the UI, as BS3 doesn't support submenus.
- url: afform.server_route ? CRM.url(afform.server_route) : null
- });
- }
- }
- });
- });
- };
-
- });
-
-})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.html
deleted file mode 100644
index 9d27013163..0000000000
--- a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchList.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<div id="bootstrap-theme" class="crm-search crm-search-admin-list">
- <h1 crm-page-title>{{:: ts('Saved Searches') }}</h1>
- <div class="form-inline">
- <label for="search-list-filter">{{:: ts('Filter') }}</label>
- <input class="form-control" type="search" id="search-list-filter" ng-model="$ctrl.searchFilter" placeholder="">
- <a class="btn btn-primary pull-right" href="#/create/Contact/">
- <i class="crm-i fa-plus"></i>
- {{:: ts('New Search') }}
- </a>
- </div>
- <table>
- <thead>
- <tr>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('label')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'label'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'label'"></i>
- {{:: ts('Label') }}
- </th>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('entity_title')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'entity_title'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'entity_title'"></i>
- {{:: ts('For') }}
- </th>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('display_name.length')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'display_name.length'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'display_name.length'"></i>
- {{:: ts('Displays') }}
- </th>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('groups[0]')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'groups[0]'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'groups[0]'"></i>
- {{:: ts('Smart Group') }}
- </th>
- <th ng-if="$ctrl.afformEnabled" ng-click="$ctrl.sortBy('afform_count')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'afform_count'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'afform_count'"></i>
- {{:: ts('Forms') }}
- </th>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('created_date')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'created_date'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'created_date'"></i>
- {{:: ts('Created') }}
- </th>
- <th title="{{:: ts('Click to sort') }}" ng-click="$ctrl.sortBy('modified_date')">
- <i class="crm-i fa-sort disabled" ng-if="$ctrl.sortField !== 'modified_date'"></i>
- <i class="crm-i fa-sort-{{ $ctrl.sortDir ? 'asc' : 'desc' }}" ng-if="$ctrl.sortField === 'modified_date'"></i>
- {{:: ts('Last Modified') }}
- </th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="search in $ctrl.savedSearches | filter:$ctrl.searchFilter | orderBy:$ctrl.sortField:$ctrl.sortDir">
- <td>{{:: search.label }}</td>
- <td>{{:: search.entity_title }}</td>
- <td>
- <div class="btn-group">
- <button type="button" disabled ng-if="!search.display_name" class="btn btn-xs dropdown-toggle btn-primary-outline">
- {{:: ts('0 Displays') }}
- </button>
- <button type="button" ng-if="search.display_name" class="btn btn-xs dropdown-toggle btn-primary-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- {{:: search.display_name.length === 1 ? ts('1 Display') : ts('%1 Displays', {1: search.display_name.length}) }} <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" ng-if=":: search.display_name.length">
- <li ng-repeat="display_name in search.display_name" ng-class="{disabled: search.display_acl_bypass[$index]}" title="{{:: search.display_acl_bypass[$index] ? ts('Display has permissions disabled') : ts('View display') }}">
- <a ng-href="{{:: search.display_acl_bypass[$index] ? '' : $ctrl.searchPath + '#/display/' + search.name + '/' + display_name }}" target="_blank">
- <i class="fa {{:: search.display_icon[$index] }}"></i>
- {{:: search.display_label[$index] }}
- </a>
- </li>
- </ul>
- </div>
- </td>
- <td>{{:: search.groups.join(', ') }}</td>
- <td ng-if="::$ctrl.afformEnabled">
- <div class="btn-group">
- <button type="button" ng-click="$ctrl.loadAfforms()" ng-if="search.display_name" class="btn btn-xs dropdown-toggle btn-primary-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- {{ $ctrl.afforms ? (search.afform_count === 1 ? ts('1 Form') : ts('%1 Forms', {1: search.afform_count})) : ts('Forms...') }}
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- <li ng-repeat="display_name in search.display_name" ng-if="::$ctrl.afformAdminEnabled">
- <a href="{{:: $ctrl.afformPath + '#/create/search/' + search.name + '.' + display_name }}">
- <i class="fa fa-plus"></i> {{:: ts('Create form for %1', {1: search.display_label[$index]}) }}
- </a>
- </li>
- <li class="divider" role="separator" ng-if="::$ctrl.afformAdminEnabled"></li>
- <li ng-if="!search.afform_count" class="disabled">
- <a href>
- <i ng-if="!$ctrl.afforms" class="crm-i fa-spinner fa-spin"></i>
- <em ng-if="$ctrl.afforms && !$ctrl.afforms[search.name]">{{:: ts('None Found') }}</em>
- </a>
- </li>
- <li ng-if="$ctrl.afforms" ng-repeat="afform in $ctrl.afforms[search.name]" title="{{:: ts('Edit form') }}">
- <a href="{{:: $ctrl.afformPath + '#/edit/' + afform.name }}">
- <i class="crm-i fa-pencil-square-o"></i>
- {{:: afform.title }}
- </a>
- </li>
- </ul>
- </div>
- </td>
- <td title="{{:: formatDate(search.created_date, null, true) }}">
- {{:: search['created_id.display_name'] ? ts('%1 by %2', {1: formatDate(search.created_date), 2: search['created_id.display_name']}) : formatDate(search.created_date) }}
- </td>
- <td title="{{:: formatDate(search.modified_date, null, true) }}">
- {{:: search['modified_id.display_name'] ? ts('%1 by %2', {1: formatDate(search.modified_date), 2: search['modified_id.display_name']}) : formatDate(search.modified_date) }}
- </td>
- <td class="text-right">
- <a class="btn btn-xs btn-default" href="#/edit/{{:: search.id }}" ng-if="search.permissionToEdit">{{:: ts('Edit') }}</a>
- <a class="btn btn-xs btn-default" href="#/create/{{:: search.api_entity + '?params=' + $ctrl.encode(search.api_params) }}">{{:: ts('Clone') }}</a>
- <a href class="btn btn-xs btn-danger" crm-confirm="{type: 'delete', obj: search}" on-yes="$ctrl.deleteSearch(search)">{{:: ts('Delete') }}</a>
- </td>
- </tr>
- <tr ng-if="$ctrl.savedSearches.length === 0">
- <td colspan="9">
- <p class="messages status no-popup text-center">
- {{:: ts('No saved searches.')}}
- </p>
- </td>
- </tr>
- </tbody>
- </table>
-</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html
new file mode 100644
index 0000000000..12f6a40387
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html
@@ -0,0 +1,26 @@
+<div class="btn-group" ng-if=":: row.display_name.raw">
+ <button type="button" ng-click="$ctrl.loadAfforms(); row.openAfformMenu = true;" class="btn btn-xs dropdown-toggle btn-primary-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ {{ $ctrl.afforms ? (row.afform_count === 1 ? ts('1 Form') : ts('%1 Forms', {1: row.afform_count})) : ts('Forms...') }}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" ng-if=":: row.openAfformMenu">
+ <li ng-repeat="display_name in row.display_name.raw" ng-if="::$ctrl.afformAdminEnabled">
+ <a target="_blank" href="{{:: $ctrl.afformPath + '#/create/search/' + row.name.raw + '.' + display_name }}">
+ <i class="fa fa-plus"></i> {{:: ts('Create form for %1', {1: row.display_label.raw[$index]}) }}
+ </a>
+ </li>
+ <li class="divider" role="separator" ng-if="::$ctrl.afformAdminEnabled"></li>
+ <li ng-if="!row.afform_count" class="disabled">
+ <a href>
+ <i ng-if="!$ctrl.afforms" class="crm-i fa-spinner fa-spin"></i>
+ <em ng-if="$ctrl.afforms && !$ctrl.afforms[row.name.raw]">{{:: ts('None Found') }}</em>
+ </a>
+ </li>
+ <li ng-if="$ctrl.afforms" ng-repeat="afform in $ctrl.afforms[row.name.raw]" title="{{:: ts('Edit form') }}">
+ <a target="_blank" href="{{:: $ctrl.afformPath + '#/edit/' + afform.name }}">
+ <i class="crm-i fa-pencil-square-o"></i>
+ {{:: afform.title }}
+ </a>
+ </li>
+ </ul>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
new file mode 100644
index 0000000000..ee5eff3621
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html
@@ -0,0 +1,9 @@
+<a class="btn btn-xs btn-default" href="#/edit/{{:: row.id.raw }}" ng-if="row.permissionToEdit">
+ {{:: ts('Edit') }}
+</a>
+<a class="btn btn-xs btn-default" href="#/create/{{:: row.api_entity.raw + '?params=' + $ctrl.encode(row.api_params.raw) }}">
+ {{:: ts('Clone') }}
+</a>
+<a href class="btn btn-xs btn-danger" crm-confirm="{type: 'delete', obj: row}" on-yes="$ctrl.deleteSearch(row)">
+ {{:: ts('Delete') }}
+</a>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
new file mode 100644
index 0000000000..038ec00c2e
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
@@ -0,0 +1,161 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Specialized searchDisplay, only used by Admins
+ angular.module('crmSearchAdmin').component('crmSearchAdminSearchListing', {
+ templateUrl: '~/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html',
+ controller: function($scope, crmApi4, crmStatus, searchMeta, searchDisplayBaseTrait, searchDisplaySortableTrait) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ // Mix in traits to this controller
+ ctrl = angular.extend(this, searchDisplayBaseTrait, searchDisplaySortableTrait);
+
+ this.searchDisplayPath = CRM.url('civicrm/search');
+ this.afformPath = CRM.url('civicrm/admin/afform');
+ this.afformEnabled = CRM.crmSearchAdmin.afformEnabled;
+ this.afformAdminEnabled = CRM.crmSearchAdmin.afformAdminEnabled;
+
+ this.apiEntity = 'SavedSearch';
+ this.search = {
+ api_entity: 'SavedSearch',
+ api_params: {
+ version: 4,
+ select: [
+ 'id',
+ 'name',
+ 'label',
+ 'api_entity',
+ 'api_entity:label',
+ 'api_params',
+ 'created_date',
+ 'modified_date',
+ 'GROUP_CONCAT(display.name ORDER BY display.id) AS display_name',
+ 'GROUP_CONCAT(display.label ORDER BY display.id) AS display_label',
+ 'GROUP_CONCAT(display.type:icon ORDER BY display.id) AS display_icon',
+ 'GROUP_CONCAT(display.acl_bypass ORDER BY display.id) AS display_acl_bypass',
+ 'GROUP_CONCAT(DISTINCT group.title) AS groups'
+ ],
+ join: [['SearchDisplay AS display'], ['Group AS group']],
+ where: [['api_entity', 'IS NOT NULL']],
+ groupBy: ['id']
+ }
+ };
+
+ this.$onInit = function() {
+ buildDisplaySettings();
+ this.initializeDisplay($scope, $());
+ };
+
+ this.onPostRun.push(function(result) {
+ _.each(result, function(row) {
+ row.permissionToEdit = CRM.checkPerm('all CiviCRM permissions and ACLs') || !_.includes(row.display_acl_bypass.raw, true);
+ // Saves rendering cycles to not show an empty menu of search displays
+ if (!row.display_name.raw) {
+ row.openDisplayMenu = false;
+ }
+ });
+ updateAfformCounts();
+ });
+
+ this.encode = function(params) {
+ return encodeURI(angular.toJson(params));
+ };
+
+ this.deleteSearch = function(search) {
+ crmStatus({start: ts('Deleting...'), success: ts('Search Deleted')},
+ crmApi4('SavedSearch', 'delete', {where: [['id', '=', search.id.raw]]}).then(function() {
+ ctrl.rowCount = null;
+ ctrl.runSearch();
+ })
+ );
+ };
+
+ function buildDisplaySettings() {
+ ctrl.display = {
+ type: 'table',
+ settings: {
+ limit: CRM.crmSearchAdmin.defaultPagerSize,
+ pager: {show_count: true, expose_limit: true},
+ actions: false,
+ sort: [['modified_date', 'DESC']],
+ columns: [
+ searchMeta.fieldToColumn('label', {
+ label: true,
+ title: ts('Edit Label'),
+ editable: {entity: 'SavedSearch', id: 'id', name: 'label', value: 'label'}
+ }),
+ searchMeta.fieldToColumn('api_entity:label', {
+ label: ts('For'),
+ }),
+ {
+ type: 'include',
+ label: ts('Displays'),
+ path: '~/crmSearchAdmin/searchListing/displays.html'
+ },
+ searchMeta.fieldToColumn('GROUP_CONCAT(DISTINCT group.title) AS groups', {
+ label: ts('Smart Group')
+ }),
+ searchMeta.fieldToColumn('created_date', {
+ label: ts('Created'),
+ dataType: 'Date',
+ rewrite: ts('%1 by %2', {1: '[created_date]', 2: '[created_id.display_name]'})
+ }),
+ searchMeta.fieldToColumn('modified_date', {
+ label: ts('Last Modified'),
+ dataType: 'Date',
+ rewrite: ts('%1 by %2', {1: '[modified_date]', 2: '[modified_id.display_name]'})
+ }),
+ {
+ type: 'include',
+ alignment: 'text-right',
+ path: '~/crmSearchAdmin/searchListing/buttons.html'
+ }
+ ]
+ }
+ };
+ if (ctrl.afformEnabled) {
+ ctrl.display.settings.columns.splice(3, 0, {
+ type: 'include',
+ label: ts('Forms'),
+ path: '~/crmSearchAdmin/searchListing/afforms.html'
+ });
+ }
+ ctrl.settings = ctrl.display.settings;
+ }
+
+ this.loadAfforms = function() {
+ if (ctrl.afforms || ctrl.afforms === null) {
+ return;
+ }
+ ctrl.afforms = null;
+ crmApi4('Afform', 'get', {
+ select: ['layout', 'name', 'title', 'server_route'],
+ where: [['type', '=', 'search']],
+ layoutFormat: 'html'
+ }).then(function(afforms) {
+ ctrl.afforms = {};
+ _.each(afforms, function(afform) {
+ var searchName = afform.layout.match(/<crm-search-display-[^>]+search-name[ ]*=[ ]*['"]([^"']+)/);
+ if (searchName) {
+ ctrl.afforms[searchName[1]] = ctrl.afforms[searchName[1]] || [];
+ ctrl.afforms[searchName[1]].push({
+ title: afform.title,
+ name: afform.name,
+ // FIXME: This is the view url, currently not exposed to the UI, as BS3 doesn't support submenus.
+ url: afform.server_route ? CRM.url(afform.server_route) : null
+ });
+ }
+ });
+ updateAfformCounts();
+ });
+ };
+
+ function updateAfformCounts() {
+ _.each(ctrl.results, function(row) {
+ row.afform_count = ctrl.afforms && ctrl.afforms[row.name.raw] && ctrl.afforms[row.name.raw].length || 0;
+ });
+ }
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html
new file mode 100644
index 0000000000..b2e0db8b3f
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html
@@ -0,0 +1,12 @@
+<div id="bootstrap-theme" class="crm-search">
+ <h1 crm-page-title>{{:: ts('Saved Searches') }}</h1>
+ <div class="form-inline">
+ <label for="search-list-filter">{{:: ts('Filter') }}</label>
+ <input class="form-control" type="search" id="search-list-filter" ng-model="$ctrl.filters.label" placeholder="">
+ <a class="btn btn-primary pull-right" href="#/create/Contact/">
+ <i class="crm-i fa-plus"></i>
+ {{:: ts('New Search') }}
+ </a>
+ </div>
+ <div ng-include="'~/crmSearchDisplayTable/crmSearchDisplayTable.html'"></div>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/displays.html b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/displays.html
new file mode 100644
index 0000000000..c16c66eb9b
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/displays.html
@@ -0,0 +1,16 @@
+<div class="btn-group">
+ <button type="button" disabled ng-if="!row.display_name.raw" class="btn btn-xs dropdown-toggle btn-primary-outline">
+ {{:: ts('0 Displays') }}
+ </button>
+ <button type="button" ng-if=":: row.display_name.raw" ng-click="row.openDisplayMenu = true" class="btn btn-xs dropdown-toggle btn-primary-outline" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ {{:: row.display_name.raw.length === 1 ? ts('1 Display') : ts('%1 Displays', {1: row.display_name.raw.length}) }} <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" ng-if=":: row.openDisplayMenu">
+ <li ng-repeat="display_name in row.display_name.raw" ng-class="{disabled: row.display_acl_bypass.raw[$index]}" title="{{:: row.display_acl_bypass.raw[$index] ? ts('Display has permissions disabled') : ts('View display') }}">
+ <a ng-href="{{:: row.display_acl_bypass.raw[$index] ? '' : $ctrl.searchDisplayPath + '#/display/' + row.name.raw + '/' + display_name }}" target="_blank">
+ <i class="fa {{:: row.display_icon.rw[$index] }}"></i>
+ {{:: row.display_label.raw[$index] }}
+ </a>
+ </li>
+ </ul>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay.module.js b/civicrm/ext/search_kit/ang/crmSearchDisplay.module.js
index 14b863f67b..beae3e52e1 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplay.module.js
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay.module.js
@@ -2,166 +2,6 @@
"use strict";
// Declare module
- angular.module('crmSearchDisplay', CRM.angRequires('crmSearchDisplay'))
-
- // Provides base methods and properties common to all search display types
- .factory('searchDisplayBaseTrait', function(crmApi4) {
- var ts = CRM.ts('org.civicrm.search_kit');
-
- // Replace tokens keyed to rowData.
- // If rowMeta is provided, values will be formatted; if omitted, raw values will be provided.
- function replaceTokens(str, rowData, rowMeta, index) {
- if (!str) {
- return '';
- }
- _.each(rowData, function(value, key) {
- if (str.indexOf('[' + key + ']') >= 0) {
- var column = rowMeta && _.findWhere(rowMeta, {key: key}),
- val = column ? formatRawValue(column, value) : value,
- replacement = angular.isArray(val) ? val[index || 0] : val;
- str = str.replace(new RegExp(_.escapeRegExp('[' + key + ']', 'g')), replacement);
- }
- });
- return str;
- }
-
- function getUrl(link, rowData, index) {
- var url = replaceTokens(link, rowData, null, index);
- if (url.slice(0, 1) !== '/' && url.slice(0, 4) !== 'http') {
- url = CRM.url(url);
- }
- return url;
- }
-
- // Returns display value for a single column in a row
- function formatDisplayValue(rowData, key, columns) {
- var column = _.findWhere(columns, {key: key}),
- displayValue = column.rewrite ? replaceTokens(column.rewrite, rowData, columns) : formatRawValue(column, rowData[key]);
- return angular.isArray(displayValue) ? displayValue.join(', ') : displayValue;
- }
-
- // Returns value and url for a column formatted as link(s)
- function formatLinks(rowData, key, columns) {
- var column = _.findWhere(columns, {key: key}),
- value = formatRawValue(column, rowData[key]),
- values = angular.isArray(value) ? value : [value],
- links = [];
- _.each(values, function(value, index) {
- links.push({
- value: value,
- url: getUrl(column.link.path, rowData, index)
- });
- });
- return links;
- }
-
- // Formats raw field value according to data type
- function formatRawValue(column, value) {
- var type = column && column.dataType,
- result = value;
- if (_.isArray(value)) {
- return _.map(value, function(val) {
- return formatRawValue(column, val);
- });
- }
- if (value && (type === 'Date' || type === 'Timestamp') && /^\d{4}-\d{2}-\d{2}/.test(value)) {
- result = CRM.utils.formatDate(value, null, type === 'Timestamp');
- }
- else if (type === 'Boolean' && typeof value === 'boolean') {
- result = value ? ts('Yes') : ts('No');
- }
- else if (type === 'Money' && typeof value === 'number') {
- result = CRM.formatMoney(value);
- }
- return result;
- }
-
- // Return a base trait shared by all search display controllers
- // Gets mixed in using angular.extend()
- return {
- page: 1,
- rowCount: null,
- getUrl: getUrl,
-
- // Called by the controller's $onInit function
- initializeDisplay: function($scope, $element) {
- var ctrl = this;
- this.sort = this.settings.sort ? _.cloneDeep(this.settings.sort) : [];
-
- $scope.getResults = _.debounce(function() {
- ctrl.getResults();
- }, 100);
-
- // If search is embedded in contact summary tab, display count in tab-header
- var contactTab = $element.closest('.crm-contact-page .ui-tabs-panel').attr('id');
- if (contactTab) {
- var unwatchCount = $scope.$watch('$ctrl.rowCount', function(rowCount) {
- if (typeof rowCount === 'number') {
- unwatchCount();
- CRM.tabHeader.updateCount(contactTab.replace('contact-', '#tab_'), rowCount);
- }
- });
- }
-
- function onChangeFilters() {
- ctrl.page = 1;
- ctrl.rowCount = null;
- if (ctrl.onChangeFilters) {
- ctrl.onChangeFilters();
- }
- $scope.getResults();
- }
-
- if (this.afFieldset) {
- $scope.$watch(this.afFieldset.getFieldData, onChangeFilters, true);
- }
- $scope.$watch('$ctrl.filters', onChangeFilters, true);
- },
-
- // Generate params for the SearchDisplay.run api
- getApiParams: function(mode) {
- return {
- return: mode || 'page:' + this.page,
- savedSearch: this.search,
- display: this.display,
- sort: this.sort,
- filters: _.assign({}, (this.afFieldset ? this.afFieldset.getFieldData() : {}), this.filters),
- afform: this.afFieldset ? this.afFieldset.getFormName() : null
- };
- },
-
- // Call SearchDisplay.run and update ctrl.results and ctrl.rowCount
- getResults: function() {
- var ctrl = this;
- return crmApi4('SearchDisplay', 'run', ctrl.getApiParams()).then(function(results) {
- ctrl.results = results;
- ctrl.editing = false;
- if (!ctrl.rowCount) {
- if (!ctrl.settings.limit || results.length < ctrl.settings.limit) {
- ctrl.rowCount = results.length;
- } else if (ctrl.settings.pager) {
- var params = ctrl.getApiParams('row_count');
- crmApi4('SearchDisplay', 'run', params).then(function(result) {
- ctrl.rowCount = result.count;
- });
- }
- }
- });
- },
- replaceTokens: function(value, row) {
- return replaceTokens(value, row, this.settings.columns);
- },
- getLinks: function(rowData, col) {
- rowData._links = rowData._links || {};
- if (!(col.key in rowData._links)) {
- rowData._links[col.key] = formatLinks(rowData, col.key, this.settings.columns);
- }
- return rowData._links[col.key];
- },
- formatFieldValue: function(rowData, col) {
- return formatDisplayValue(rowData, col.key, this.settings.columns);
- }
- };
- });
+ angular.module('crmSearchDisplay', CRM.angRequires('crmSearchDisplay'));
})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/Pager.html b/civicrm/ext/search_kit/ang/crmSearchDisplay/Pager.html
index 868bc8b855..00bd38b32b 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplay/Pager.html
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/Pager.html
@@ -1,16 +1,36 @@
-<div class="text-center" ng-if="$ctrl.rowCount && $ctrl.settings.pager">
- <ul uib-pagination
- class="pagination"
- boundary-links="true"
- total-items="$ctrl.rowCount"
- ng-model="$ctrl.page"
- ng-change="getResults()"
- items-per-page="$ctrl.settings.limit"
- max-size="6"
- force-ellipses="true"
- previous-text="‹"
- next-text="›"
- first-text="«"
- last-text="»"
- ></ul>
+<div class="crm-flex-box crm-search-display-pager" ng-if="$ctrl.rowCount && $ctrl.settings.pager">
+ <div>
+ <div class="form-inline" ng-if="$ctrl.settings.pager.show_count">
+ <label ng-if="$ctrl.rowCount === 1">
+ {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of 1 result', {1: $ctrl.selectedRows.length}) : ts('1 result') }}
+ </label>
+ <label ng-if="$ctrl.rowCount === 0 || $ctrl.rowCount > 1">
+ {{ $ctrl.selectedRows && $ctrl.selectedRows.length ? ts('%1 selected of %2 results', {1: $ctrl.selectedRows.length, 2: $ctrl.rowCount}) : ts('%1 results', {1: $ctrl.rowCount}) }}
+ </label>
+ </div>
+ </div>
+ <div class="text-center crm-flex-2">
+ <ul uib-pagination
+ class="pagination"
+ boundary-links="true"
+ total-items="$ctrl.rowCount"
+ ng-model="$ctrl.page"
+ ng-change="$ctrl.getResults()"
+ items-per-page="$ctrl.limit"
+ max-size="6"
+ force-ellipses="true"
+ previous-text="‹"
+ next-text="›"
+ first-text="«"
+ last-text="»"
+ ></ul>
+ </div>
+ <div>
+ <div class="form-inline text-right" ng-if="$ctrl.settings.pager.expose_limit">
+ <label for="crm-search-results-page-size" >
+ {{:: ts('Page Size') }}
+ </label>
+ <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10">
+ </div>
+ </div>
</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/SearchButton.html b/civicrm/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
new file mode 100644
index 0000000000..9f20d5e955
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
@@ -0,0 +1,5 @@
+<button type="button" class="btn btn-primary" ng-click="$ctrl.onClickSearchButton()" ng-disabled="$ctrl.loading">
+ <i ng-if="$ctrl.loading" class="crm-i fa-spin fa-spinner"></i>
+ <i ng-if="!$ctrl.loading" class="crm-i fa-search"></i>
+ {{:: $ctrl.settings.button }}
+</button>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/field.html b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/field.html
index 342f9cae44..daeb5eb4df 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/field.html
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/field.html
@@ -1,11 +1,17 @@
-<crm-search-display-editable row="row" col="col" on-success="$ctrl.refresh(row)" cancel="$ctrl.editing = null;" ng-if="col.editable && $ctrl.editing && $ctrl.editing[0] === rowIndex && $ctrl.editing[1] === col.key"></crm-search-display-editable>
-<span ng-if="::!col.link" ng-class="{'crm-editable-enabled': col.editable && !$ctrl.editing && row[col.editable.id]}" ng-click="col.editable && !$ctrl.editing && ($ctrl.editing = [rowIndex, col.key])">
+<crm-search-display-editable row="row" col="col" on-success="$ctrl.runSearch(row)" cancel="$ctrl.editing = null;" ng-if="col.editable && $ctrl.editing && $ctrl.editing[0] === rowIndex && $ctrl.editing[1] === col.key"></crm-search-display-editable>
+<span ng-if="::!col.link && !col.image" ng-class="{'crm-editable-enabled': col.editable && !$ctrl.editing && row[col.editable.id]}" ng-click="col.editable && !$ctrl.editing && ($ctrl.editing = [rowIndex, col.key])">
{{:: $ctrl.formatFieldValue(row, col) }}
</span>
<span ng-if="::col.link">
<span ng-repeat="link in $ctrl.getLinks(row, col)">
<a target="{{:: col.link.target }}" href="{{:: link.url }}">
+ <span ng-if=":: col.image && $ctrl.formatFieldValue(row, col).length">
+ <img ng-src="{{:: $ctrl.formatFieldValue(row, col) }}" alt="{{:: $ctrl.replaceTokens(col.image.alt, row) }}" height="{{:: col.image.height }}" width="{{:: col.image.width }}"/>
+ </span>
{{:: link.value }}</a><span ng-if="!$last">,
</span>
</span>
</span>
+<span ng-if=":: !col.link && col.image && $ctrl.formatFieldValue(row, col).length">
+ <img ng-src="{{:: $ctrl.formatFieldValue(row, col) }}" alt="{{:: $ctrl.replaceTokens(col.image.alt, row, $ctrl.settings.columns) }}" height="{{:: col.image.height }}" width="{{:: col.image.width }}"/>
+</span>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/include.html b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/include.html
new file mode 100644
index 0000000000..46ea829942
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/include.html
@@ -0,0 +1 @@
+<div ng-include="col.path"></div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/menu.html b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
index fa961dcf37..fdc4b398b6 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/colType/menu.html
@@ -1,7 +1,7 @@
<div class="btn-group">
<button type="button" class="dropdown-toggle {{:: col.size }} btn-{{:: col.style }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="col.open = true">
<i ng-if=":: col.icon" class="crm-i {{:: col.icon }}"></i>
- {{:: col.text }}
+ {{:: $ctrl.replaceTokens(col.text, row) }}
</button>
<ul class="dropdown-menu {{ col.alignment === 'text-right' ? 'dropdown-menu-right' : '' }}" ng-if=":: col.open">
<li ng-repeat="item in col.links" class="bg-{{:: item.style }}">
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js b/civicrm/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js
index 181c0d26d2..b6b6957562 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js
@@ -19,8 +19,8 @@
this.$onInit = function() {
col = this.col;
- this.value = _.cloneDeep(this.row[col.editable.value]);
- initialValue = _.cloneDeep(this.row[col.editable.value]);
+ this.value = _.cloneDeep(this.row[col.editable.value].raw);
+ initialValue = _.cloneDeep(this.row[col.editable.value].raw);
this.field = {
data_type: col.dataType,
@@ -54,7 +54,7 @@
ctrl.cancel();
return;
}
- var values = {id: ctrl.row[col.editable.id]};
+ var values = {id: ctrl.row[col.editable.id].raw};
values[col.editable.name] = ctrl.value;
$('input', $element).attr('disabled', true);
crmStatus({}, crmApi4(col.editable.entity, 'update', {
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js b/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
new file mode 100644
index 0000000000..f4700a6b01
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
@@ -0,0 +1,190 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Trait provides base methods and properties common to all search display types
+ angular.module('crmSearchDisplay').factory('searchDisplayBaseTrait', function(crmApi4) {
+ var ts = CRM.ts('org.civicrm.search_kit');
+
+ // Replace tokens keyed to rowData.
+ // Pass view=true to replace with view value, otherwise raw value is used.
+ function replaceTokens(str, rowData, view, index) {
+ if (!str) {
+ return '';
+ }
+ _.each(rowData, function(value, key) {
+ if (str.indexOf('[' + key + ']') >= 0) {
+ var val = view ? value.view : value.raw,
+ replacement = angular.isArray(val) ? val[index || 0] : val;
+ str = str.replace(new RegExp(_.escapeRegExp('[' + key + ']', 'g')), replacement);
+ }
+ });
+ return str;
+ }
+
+ function getUrl(link, rowData, index) {
+ var url = replaceTokens(link, rowData, false, index);
+ if (url.slice(0, 1) !== '/' && url.slice(0, 4) !== 'http') {
+ url = CRM.url(url);
+ }
+ return url;
+ }
+
+ // Returns display value for a single column in a row
+ function formatDisplayValue(rowData, key, columns) {
+ var column = _.findWhere(columns, {key: key}),
+ displayValue = column.rewrite ? replaceTokens(column.rewrite, rowData, columns) : getValue(rowData[key], 'view');
+ return angular.isArray(displayValue) ? displayValue.join(', ') : displayValue;
+ }
+
+ // Returns value and url for a column formatted as link(s)
+ function formatLinks(rowData, key, columns) {
+ var column = _.findWhere(columns, {key: key}),
+ value = column.image ? '' : getValue(rowData[key], 'view'),
+ values = angular.isArray(value) ? value : [value],
+ links = [];
+ _.each(values, function(value, index) {
+ links.push({
+ value: value,
+ url: getUrl(column.link.path, rowData, index)
+ });
+ });
+ return links;
+ }
+
+ // Get value from column data, specify either 'raw' or 'view'
+ function getValue(data, ret) {
+ return (data || {})[ret];
+ }
+
+ // Return a base trait shared by all search display controllers
+ // Gets mixed in using angular.extend()
+ return {
+ page: 1,
+ rowCount: null,
+ getUrl: getUrl,
+ // Arrays may contain callback functions for various events
+ onChangeFilters: [],
+ onPreRun: [],
+ onPostRun: [],
+
+ // Called by the controller's $onInit function
+ initializeDisplay: function($scope, $element) {
+ var ctrl = this;
+ this.limit = this.settings.limit;
+ this.sort = this.settings.sort ? _.cloneDeep(this.settings.sort) : [];
+
+ this.getResults = _.debounce(function() {
+ $scope.$apply(function() {
+ ctrl.runSearch();
+ });
+ }, 100);
+
+ // If search is embedded in contact summary tab, display count in tab-header
+ var contactTab = $element.closest('.crm-contact-page .ui-tabs-panel').attr('id');
+ if (contactTab) {
+ var unwatchCount = $scope.$watch('$ctrl.rowCount', function(rowCount) {
+ if (typeof rowCount === 'number') {
+ unwatchCount();
+ CRM.tabHeader.updateCount(contactTab.replace('contact-', '#tab_'), rowCount);
+ }
+ });
+ }
+
+ $element.on('crmPopupFormSuccess', this.getResults);
+
+ function onChangeFilters() {
+ ctrl.page = 1;
+ ctrl.rowCount = null;
+ _.each(ctrl.onChangeFilters, function(callback) {
+ callback.call(ctrl);
+ });
+ if (!ctrl.settings.button) {
+ ctrl.getResults();
+ }
+ }
+
+ function onChangePageSize() {
+ ctrl.page = 1;
+ // Only refresh if search has already been run
+ if (ctrl.results) {
+ ctrl.getResults();
+ }
+ }
+
+ if (this.afFieldset) {
+ $scope.$watch(this.afFieldset.getFieldData, onChangeFilters, true);
+ }
+ if (this.settings.pager && this.settings.pager.expose_limit) {
+ $scope.$watch('$ctrl.limit', onChangePageSize);
+ }
+ $scope.$watch('$ctrl.filters', onChangeFilters, true);
+ },
+
+ // Generate params for the SearchDisplay.run api
+ getApiParams: function(mode) {
+ return {
+ return: mode || 'page:' + this.page,
+ savedSearch: this.search,
+ display: this.display,
+ sort: this.sort,
+ limit: this.limit,
+ filters: _.assign({}, (this.afFieldset ? this.afFieldset.getFieldData() : {}), this.filters),
+ afform: this.afFieldset ? this.afFieldset.getFormName() : null
+ };
+ },
+
+ onClickSearchButton: function() {
+ this.rowCount = null;
+ this.page = 1;
+ this.getResults();
+ },
+
+ // Call SearchDisplay.run and update ctrl.results and ctrl.rowCount
+ runSearch: function(editedRow) {
+ var ctrl = this,
+ apiParams = this.getApiParams();
+ this.loading = true;
+ _.each(ctrl.onPreRun, function(callback) {
+ callback.call(ctrl, apiParams);
+ });
+ return crmApi4('SearchDisplay', 'run', apiParams).then(function(results) {
+ ctrl.results = results;
+ ctrl.editing = ctrl.loading = false;
+ if (!ctrl.rowCount) {
+ if (!ctrl.limit || results.length < ctrl.limit) {
+ ctrl.rowCount = results.length;
+ } else if (ctrl.settings.pager) {
+ var params = ctrl.getApiParams('row_count');
+ crmApi4('SearchDisplay', 'run', params).then(function(result) {
+ ctrl.rowCount = result.count;
+ });
+ }
+ }
+ _.each(ctrl.onPostRun, function(callback) {
+ callback.call(ctrl, results, 'success', editedRow);
+ });
+ }, function(error) {
+ ctrl.results = [];
+ ctrl.editing = ctrl.loading = false;
+ _.each(ctrl.onPostRun, function(callback) {
+ callback.call(ctrl, error, 'error', editedRow);
+ });
+ });
+ },
+ replaceTokens: function(value, row) {
+ return replaceTokens(value, row, this.settings.columns);
+ },
+ getLinks: function(rowData, col) {
+ rowData._links = rowData._links || {};
+ if (!(col.key in rowData._links)) {
+ rowData._links[col.key] = formatLinks(rowData, col.key, this.settings.columns);
+ }
+ return rowData._links[col.key];
+ },
+ formatFieldValue: function(rowData, col) {
+ return formatDisplayValue(rowData, col.key, this.settings.columns);
+ }
+ };
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplaySortableTrait.service.js b/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplaySortableTrait.service.js
new file mode 100644
index 0000000000..207da88e10
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplaySortableTrait.service.js
@@ -0,0 +1,45 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Trait shared by any search display controllers which allow sorting
+ angular.module('crmSearchDisplay').factory('searchDisplaySortableTrait', function() {
+ var ts = CRM.ts('org.civicrm.search_kit');
+
+ // Trait properties get mixed into display controller using angular.extend()
+ return {
+
+ sort: [],
+
+ getSort: function(col) {
+ var dir = _.reduce(this.sort, function(dir, item) {
+ return item[0] === col.key ? item[1] : dir;
+ }, null);
+ if (dir) {
+ return 'fa-sort-' + dir.toLowerCase();
+ }
+ return 'fa-sort disabled';
+ },
+
+ setSort: function(col, $event) {
+ if (col.type !== 'field') {
+ return;
+ }
+ var dir = this.getSort(col) === 'fa-sort-asc' ? 'DESC' : 'ASC';
+ if (!$event.shiftKey || !this.sort) {
+ this.sort = [];
+ }
+ var index = _.findIndex(this.sort, [col.key]);
+ if (index > -1) {
+ this.sort[index][1] = dir;
+ } else {
+ this.sort.push([col.key, dir]);
+ }
+ if (this.results || !this.settings.button) {
+ this.getResults();
+ }
+ }
+
+ };
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.ang.php b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
new file mode 100644
index 0000000000..727e6d5f4f
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
@@ -0,0 +1,17 @@
+<?php
+// Module for rendering List Search Displays.
+return [
+ 'js' => [
+ 'ang/crmSearchDisplayGrid.module.js',
+ 'ang/crmSearchDisplayGrid/*.js',
+ ],
+ 'partials' => [
+ 'ang/crmSearchDisplayGrid',
+ ],
+ 'basePages' => ['civicrm/search', 'civicrm/admin/search'],
+ 'requires' => ['crmSearchDisplay', 'crmUi', 'ui.bootstrap'],
+ 'bundles' => ['bootstrap3'],
+ 'exports' => [
+ 'crm-search-display-grid' => 'E',
+ ],
+];
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.module.js b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.module.js
new file mode 100644
index 0000000000..ae9b5aae95
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid.module.js
@@ -0,0 +1,7 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Declare module
+ angular.module('crmSearchDisplayGrid', CRM.angRequires('crmSearchDisplayGrid'));
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.component.js b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.component.js
new file mode 100644
index 0000000000..d66e594382
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.component.js
@@ -0,0 +1,29 @@
+(function(angular, $, _) {
+ "use strict";
+
+ angular.module('crmSearchDisplayGrid').component('crmSearchDisplayGrid', {
+ bindings: {
+ apiEntity: '@',
+ search: '<',
+ display: '<',
+ apiParams: '<',
+ settings: '<',
+ filters: '<'
+ },
+ require: {
+ afFieldset: '?^^afFieldset'
+ },
+ templateUrl: '~/crmSearchDisplayGrid/crmSearchDisplayGrid.html',
+ controller: function($scope, $element, searchDisplayBaseTrait) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ // Mix in properties of searchDisplayBaseTrait
+ ctrl = angular.extend(this, searchDisplayBaseTrait);
+
+ this.$onInit = function() {
+ this.initializeDisplay($scope, $element);
+ };
+
+ }
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
new file mode 100644
index 0000000000..5d8c3b7196
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGrid.html
@@ -0,0 +1,8 @@
+<div class="crm-search-display crm-search-display-grid">
+ <div ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
+ <div
+ class="crm-search-display-grid-container crm-search-display-grid-layout-{{$ctrl.settings.colno}}"
+ ng-include="'~/crmSearchDisplayGrid/crmSearchDisplayGridItems.html'"
+ ></div>
+ <div ng-include="'~/crmSearchDisplay/Pager.html'"></div>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGridItems.html b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGridItems.html
new file mode 100644
index 0000000000..bb908bfbb6
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayGrid/crmSearchDisplayGridItems.html
@@ -0,0 +1,8 @@
+<div ng-repeat="(rowIndex, row) in $ctrl.results">
+ <div ng-repeat="col in $ctrl.settings.columns" title="{{:: $ctrl.replaceTokens(col.title, row) }}" class="{{:: col.break ? '' : 'crm-inline-block' }}">
+ <label ng-if=":: col.label && (col.type !== 'field' || col.forceLabel || row[col.key])">
+ {{:: $ctrl.replaceTokens(col.label, row) }}
+ </label>
+ <span ng-include="'~/crmSearchDisplay/colType/' + col.type + '.html'"></span>
+ </div>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js b/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
index 718452d35e..e033c007d5 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
@@ -23,11 +23,6 @@
this.initializeDisplay($scope, $element);
};
- // Refresh current page
- this.refresh = function(row) {
- ctrl.getResults();
- };
-
}
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html b/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
index 9d039ba19c..5428a7713d 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html
@@ -1,4 +1,5 @@
<div class="crm-search-display crm-search-display-list">
+ <div ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
<ol ng-if=":: $ctrl.settings.style === 'ol'" ng-include="'~/crmSearchDisplayList/crmSearchDisplayListItems.html'" ng-style="{'list-style': $ctrl.settings.symbol}"></ol>
<ul ng-if=":: $ctrl.settings.style !== 'ol'" ng-include="'~/crmSearchDisplayList/crmSearchDisplayListItems.html'" ng-style="{'list-style': $ctrl.settings.symbol}"></ul>
<div ng-include="'~/crmSearchDisplay/Pager.html'"></div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
index c4ed51c7d0..096c033d95 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
@@ -13,110 +13,15 @@
afFieldset: '?^^afFieldset'
},
templateUrl: '~/crmSearchDisplayTable/crmSearchDisplayTable.html',
- controller: function($scope, $element, crmApi4, searchDisplayBaseTrait) {
+ controller: function($scope, $element, searchDisplayBaseTrait, searchDisplayTasksTrait, searchDisplaySortableTrait) {
var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
- // Mix in properties of searchDisplayBaseTrait
- ctrl = angular.extend(this, searchDisplayBaseTrait);
-
- this.selectedRows = [];
- this.allRowsSelected = false;
+ // Mix in traits to this controller
+ ctrl = angular.extend(this, searchDisplayBaseTrait, searchDisplayTasksTrait, searchDisplaySortableTrait);
this.$onInit = function() {
this.initializeDisplay($scope, $element);
};
- // Refresh page after inline-editing a row
- this.refresh = function(row) {
- var rowId = row.id;
- ctrl.getResults()
- .then(function() {
- // If edited row disappears (because edits cause it to not meet search criteria), deselect it
- var index = ctrl.selectedRows.indexOf(rowId);
- if (index > -1 && !_.findWhere(ctrl.results, {id: rowId})) {
- ctrl.selectedRows.splice(index, 1);
- }
- });
- };
-
- this.onChangeFilters = function() {
- ctrl.selectedRows.legth = 0;
- ctrl.allRowsSelected = false;
- };
-
- /**
- * Returns crm-i icon class for a sortable column
- * @param col
- * @returns {string}
- */
- $scope.getSort = function(col) {
- var dir = _.reduce(ctrl.sort, function(dir, item) {
- return item[0] === col.key ? item[1] : dir;
- }, null);
- if (dir) {
- return 'fa-sort-' + dir.toLowerCase();
- }
- return 'fa-sort disabled';
- };
-
- /**
- * Called when clicking on a column header
- * @param col
- * @param $event
- */
- $scope.setSort = function(col, $event) {
- if (col.type !== 'field') {
- return;
- }
- var dir = $scope.getSort(col) === 'fa-sort-asc' ? 'DESC' : 'ASC';
- if (!$event.shiftKey || !ctrl.sort) {
- ctrl.sort = [];
- }
- var index = _.findIndex(ctrl.sort, [col.key]);
- if (index > -1) {
- ctrl.sort[index][1] = dir;
- } else {
- ctrl.sort.push([col.key, dir]);
- }
- $scope.getResults();
- };
-
- $scope.selectAllRows = function() {
- // Deselect all
- if (ctrl.allRowsSelected) {
- ctrl.allRowsSelected = false;
- ctrl.selectedRows.length = 0;
- return;
- }
- // Select all
- ctrl.allRowsSelected = true;
- if (ctrl.page === 1 && ctrl.results.length < ctrl.settings.limit) {
- ctrl.selectedRows = _.pluck(ctrl.results, 'id');
- return;
- }
- // If more than one page of results, use ajax to fetch all ids
- $scope.loadingAllRows = true;
- var params = ctrl.getApiParams('id');
- crmApi4('SearchDisplay', 'run', params, ['id']).then(function(ids) {
- $scope.loadingAllRows = false;
- ctrl.selectedRows = _.toArray(ids);
- });
- };
-
- $scope.selectRow = function(row) {
- var index = ctrl.selectedRows.indexOf(row.id);
- if (index < 0) {
- ctrl.selectedRows.push(row.id);
- ctrl.allRowsSelected = (ctrl.rowCount === ctrl.selectedRows.length);
- } else {
- ctrl.allRowsSelected = false;
- ctrl.selectedRows.splice(index, 1);
- }
- };
-
- $scope.isRowSelected = function(row) {
- return ctrl.allRowsSelected || _.includes(ctrl.selectedRows, row.id);
- };
-
}
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
index ba1eed9e13..86c5b1ca07 100644
--- a/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html
@@ -1,29 +1,21 @@
<div class="crm-search-display crm-search-display-table">
- <div class="form-inline" ng-if="$ctrl.settings.actions">
- <crm-search-tasks entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" refresh="getResults()"></crm-search-tasks>
+ <div class="form-inline">
+ <div class="btn-group" ng-include="'~/crmSearchDisplay/SearchButton.html'" ng-if="$ctrl.settings.button"></div>
+ <crm-search-tasks ng-if="$ctrl.settings.actions" entity="$ctrl.apiEntity" ids="$ctrl.selectedRows" search="$ctrl.search" display="$ctrl.display" display-controller="$ctrl" refresh="$ctrl.refreshAfterTask()"></crm-search-tasks>
</div>
<table>
<thead>
<tr>
<th class="crm-search-result-select" ng-if=":: $ctrl.settings.actions">
- <input type="checkbox" ng-checked="$ctrl.allRowsSelected" ng-click="selectAllRows()" >
+ <input type="checkbox" ng-disabled="$ctrl.loading || !$ctrl.results.length" ng-checked="$ctrl.allRowsSelected" ng-click="$ctrl.selectAllRows()" >
</th>
- <th ng-repeat="col in $ctrl.settings.columns" ng-click="setSort(col, $event)" title="{{:: ts('Click to sort results (shift-click to sort by multiple).') }}">
- <i ng-if="col.type === 'field'" class="crm-i {{ getSort(col) }}"></i>
- <span>{{ col.label }}</span>
+ <th ng-repeat="col in $ctrl.settings.columns" ng-click="$ctrl.setSort(col, $event)" title="{{:: col.type === 'field' ? ts('Click to sort results (shift-click to sort by multiple).') : '' }}">
+ <i ng-if=":: col.type === 'field'" class="crm-i {{ $ctrl.getSort(col) }}"></i>
+ <span>{{:: col.label }}</span>
</th>
</tr>
</thead>
- <tbody>
- <tr ng-repeat="(rowIndex, row) in $ctrl.results">
- <td ng-if=":: $ctrl.settings.actions">
- <input type="checkbox" ng-checked="isRowSelected(row)" ng-click="selectRow(row)" ng-disabled="!(!loadingAllRows && row.id)">
- </td>
- <td ng-repeat="col in $ctrl.settings.columns" ng-include="'~/crmSearchDisplay/colType/' + col.type + '.html'" title="{{:: $ctrl.replaceTokens(col.title, row) }}" class="{{:: col.alignment }}">
- </td>
- <td></td>
- </tr>
- </tbody>
+ <tbody ng-include="'~/crmSearchDisplayTable/crmSearchDisplayTableBody.html'"></tbody>
</table>
<div ng-include="'~/crmSearchDisplay/Pager.html'"></div>
</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
new file mode 100644
index 0000000000..af14b31abe
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
@@ -0,0 +1,14 @@
+<tr ng-repeat="(rowIndex, row) in $ctrl.results">
+ <td ng-if=":: $ctrl.settings.actions">
+ <input type="checkbox" ng-checked="$ctrl.isRowSelected(row)" ng-click="$ctrl.selectRow(row)" ng-disabled="!(!$ctrl.loadingAllRows && row.id)">
+ </td>
+ <td ng-repeat="col in $ctrl.settings.columns" ng-include="'~/crmSearchDisplay/colType/' + col.type + '.html'" title="{{:: $ctrl.replaceTokens(col.title, row) }}" class="{{:: col.alignment }}">
+ </td>
+</tr>
+<tr ng-if="$ctrl.rowCount === 0">
+ <td colspan="{{ $ctrl.settings.columns.length + 2 }}">
+ <p class="alert alert-info text-center">
+ {{:: ts('None Found') }}
+ </p>
+ </td>
+</tr>
diff --git a/civicrm/ext/search_kit/ang/crmSearchPage.module.js b/civicrm/ext/search_kit/ang/crmSearchPage.module.js
index 6a19473954..064ca8bea4 100644
--- a/civicrm/ext/search_kit/ang/crmSearchPage.module.js
+++ b/civicrm/ext/search_kit/ang/crmSearchPage.module.js
@@ -16,8 +16,8 @@
display: function($route, crmApi4) {
var params = $route.current.params;
return crmApi4('SearchDisplay', 'get', {
- where: [['name', '=', params.displayName], ['saved_search.name', '=', params.savedSearchName]],
- select: ['*', 'saved_search.api_entity', 'saved_search.name']
+ where: [['name', '=', params.displayName], ['saved_search_id.name', '=', params.savedSearchName]],
+ select: ['*', 'saved_search_id.api_entity', 'saved_search_id.name']
}, 0);
}
}
@@ -28,8 +28,8 @@
.controller('crmSearchPageDisplay', function($scope, $location, display) {
var ctrl = $scope.$ctrl = this;
this.display = display;
- this.searchName = display['saved_search.name'];
- this.apiEntity = display['saved_search.api_entity'];
+ this.searchName = display['saved_search_id.name'];
+ this.apiEntity = display['saved_search_id.api_entity'];
$scope.$watch(function() {return $location.search();}, function(params) {
ctrl.filters = params;
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInput.component.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInput.component.js
index c98d4705e5..b3bce0409d 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInput.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInput.component.js
@@ -21,7 +21,7 @@
}
// If no search operator this is an input for e.g. the bulk update action
// Return `true` if the field is multi-valued, else `null`
- return ctrl.field.serialize || ctrl.field.data_type === 'Array' ? true : null;
+ return ctrl.field && (ctrl.field.serialize || ctrl.field.data_type === 'Array') ? true : null;
};
this.$onInit = function() {
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js
index cd6dfe78cd..1e19729a71 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js
@@ -85,28 +85,29 @@
};
this.getTemplate = function() {
+ var field = ctrl.field || {};
- if (ctrl.field.input_type === 'Date') {
+ if (field.input_type === 'Date') {
return '~/crmSearchTasks/crmSearchInput/date.html';
}
- if (ctrl.field.data_type === 'Boolean') {
+ if (field.data_type === 'Boolean') {
return '~/crmSearchTasks/crmSearchInput/boolean.html';
}
- if (ctrl.field.options) {
+ if (field.options) {
return '~/crmSearchTasks/crmSearchInput/select.html';
}
- if (ctrl.field.fk_entity || ctrl.field.name === 'id') {
+ if (field.fk_entity || field.name === 'id') {
return '~/crmSearchTasks/crmSearchInput/entityRef.html';
}
- if (ctrl.field.data_type === 'Integer') {
+ if (field.data_type === 'Integer') {
return '~/crmSearchTasks/crmSearchInput/integer.html';
}
- if (ctrl.field.data_type === 'Float') {
+ if (field.data_type === 'Float') {
return '~/crmSearchTasks/crmSearchInput/float.html';
}
@@ -114,7 +115,8 @@
};
this.getFieldOptions = function() {
- return {results: formatForSelect2(ctrl.field.options, ctrl.optionKey || 'id', 'label', ['description', 'color', 'icon'])};
+ var field = ctrl.field || {};
+ return {results: formatForSelect2(field.options || [], ctrl.optionKey || 'id', 'label', ['description', 'color', 'icon'])};
};
}
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.ctrl.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.ctrl.js
index 273a206344..ddce87d984 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.ctrl.js
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.ctrl.js
@@ -1,30 +1,21 @@
(function(angular, $, _) {
"use strict";
- angular.module('crmSearchTasks').controller('crmSearchTaskDelete', function($scope, dialogService) {
+ angular.module('crmSearchTasks').controller('crmSearchTaskDelete', function($scope, searchTaskBaseTrait) {
var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
- model = $scope.model,
- ctrl = this;
+ // Combine this controller with model properties (ids, entity, entityInfo) and searchTaskBaseTrait
+ ctrl = angular.extend(this, $scope.model, searchTaskBaseTrait);
- this.entityTitle = model.ids.length === 1 ? model.entityInfo.title : model.entityInfo.title_plural;
-
- this.cancel = function() {
- dialogService.cancel('crmSearchTask');
- };
-
- this.delete = function() {
- $('.ui-dialog-titlebar button').hide();
- ctrl.run = {};
- };
+ this.entityTitle = this.getEntityTitle();
this.onSuccess = function() {
- CRM.alert(ts('Successfully deleted %1 %2.', {1: model.ids.length, 2: ctrl.entityTitle}), ts('Deleted'), 'success');
- dialogService.close('crmSearchTask');
+ CRM.alert(ts('Successfully deleted %1 %2.', {1: ctrl.ids.length, 2: ctrl.entityTitle}), ts('Deleted'), 'success');
+ this.close();
};
this.onError = function() {
- CRM.alert(ts('An error occurred while attempting to delete %1 %2.', {1: model.ids.length, 2: ctrl.entityTitle}), ts('Error'), 'error');
- dialogService.close('crmSearchTask');
+ CRM.alert(ts('An error occurred while attempting to delete %1 %2.', {1: ctrl.ids.length, 2: ctrl.entityTitle}), ts('Error'), 'error');
+ this.cancel();
};
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.html b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.html
index 74e0aec7ae..e2a5c999b8 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.html
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.html
@@ -12,7 +12,7 @@
<i class="crm-i fa-times"></i>
{{:: ts('Cancel') }}
</button>
- <button ng-click="$ctrl.delete()" class="btn btn-primary" ng-disabled="$ctrl.run">
+ <button ng-click="$ctrl.start()" class="btn btn-primary" ng-disabled="$ctrl.run">
<i class="crm-i fa-{{ $ctrl.run ? 'spin fa-spinner' : 'trash' }}"></i>
{{:: ts('Delete %1', {1: $ctrl.entityTitle}) }}
</button>
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.ctrl.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.ctrl.js
new file mode 100644
index 0000000000..8482eca9fe
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.ctrl.js
@@ -0,0 +1,78 @@
+(function(angular, $, _) {
+ "use strict";
+
+ angular.module('crmSearchTasks').controller('crmSearchTaskDownload', function($scope, $http, searchTaskBaseTrait, $timeout, $interval) {
+ var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
+ // Combine this controller with model properties (ids, entity, entityInfo) and searchTaskBaseTrait
+ ctrl = angular.extend(this, $scope.model, searchTaskBaseTrait);
+
+ this.entityTitle = this.getEntityTitle();
+ this.format = 'csv';
+ this.progress = null;
+
+ this.download = function() {
+ ctrl.progress = 0;
+ $('.ui-dialog-titlebar button').hide();
+ // Show the user something is happening (even though it doesn't accurately reflect progress)
+ var incrementer = $interval(function() {
+ if (ctrl.progress < 90) {
+ ctrl.progress += 10;
+ }
+ }, 1000);
+ var apiParams = ctrl.displayController.getApiParams();
+ delete apiParams.return;
+ delete apiParams.limit;
+ apiParams.filters.id = ctrl.ids || null;
+ apiParams.format = ctrl.format;
+ // Use AJAX to fetch file with arrayBuffer
+ var httpConfig = {
+ responseType: 'arraybuffer',
+ headers: {'X-Requested-With': 'XMLHttpRequest', 'Content-Type': 'application/x-www-form-urlencoded'}
+ };
+ $http.post(CRM.url('civicrm/ajax/api4/SearchDisplay/download'), $.param({
+ params: JSON.stringify(apiParams)
+ }), httpConfig)
+ .then(function(response) {
+ $interval.cancel(incrementer);
+ ctrl.progress = 100;
+ // Convert arrayBuffer response to blob
+ var blob = new Blob([response.data], {
+ type: response.headers('Content-Type')
+ }),
+ a = document.createElement("a"),
+ url = a.href = window.URL.createObjectURL(blob),
+ fileName = getFileNameFromHeader(response.headers('Content-Disposition'));
+ a.download = fileName;
+ // Trigger file download
+ a.click();
+ // Free browser memory
+ window.URL.revokeObjectURL(url);
+ $timeout(function() {
+ CRM.alert(ts('%1 has been downloaded to your computer.', {1: fileName}), ts('Download Complete'), 'success');
+ // This action does not update data so don't trigger a refresh
+ ctrl.cancel();
+ }, 1000);
+ });
+ };
+
+ // Parse and decode fileName from Content-Disposition header
+ function getFileNameFromHeader(contentDisposition) {
+ var utf8FilenameRegex = /filename\*=utf-8''([\w%\-\.]+)(?:; ?|$)/i,
+ asciiFilenameRegex = /filename=(["']?)(.*?[^\\])\1(?:; ?|$)/;
+
+ if (contentDisposition && contentDisposition.length) {
+ if (utf8FilenameRegex.test(contentDisposition)) {
+ return decodeURIComponent(utf8FilenameRegex.exec(contentDisposition)[1]);
+ } else {
+ var matches = asciiFilenameRegex.exec(contentDisposition);
+ if (matches != null && matches[2]) {
+ return matches[2];
+ }
+ }
+ }
+ // Fallback in case header could not be parsed
+ return ctrl.entityTitle + '.' + ctrl.format;
+ }
+
+ });
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.html b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.html
new file mode 100644
index 0000000000..7e1dff79c2
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskDownload.html
@@ -0,0 +1,32 @@
+<div id="bootstrap-theme">
+ <form ng-controller="crmSearchTaskDownload as $ctrl">
+ <p>
+ <strong ng-if="$ctrl.ids.length">{{:: ts('Download %1 %2', {1: $ctrl.ids.length, 2: $ctrl.entityTitle}) }}</strong>
+ <strong ng-if="!$ctrl.ids.length">{{:: ts('Download %1 %2', {1: $ctrl.displayController.rowCount, 2: $ctrl.entityTitle}) }}</strong>
+ </p>
+ <div class="form-inline">
+ <label for="crmSearchTaskDownload-format">{{:: ts('Format') }}</label>
+ <select id="crmSearchTaskDownload-format" class="form-control" ng-model="$ctrl.format">
+ <option value="csv">{{:: ts('CSV File') }}</option>
+ </select>
+ </div>
+ <hr />
+ <div ng-if="$ctrl.progress !== null" class="crm-search-task-progress">
+ <h5>{{:: ts('Downloading...') }}</h5>
+ <div class="progress">
+ <div class="progress-bar progress-bar-striped active" role="progressbar" ng-style="{width: '' + $ctrl.progress + '%'}"></div>
+ </div>
+ </div>
+ <hr />
+ <div class="buttons text-right">
+ <button type="button" ng-click="$ctrl.cancel()" class="btn btn-danger" ng-hide="$ctrl.run">
+ <i class="crm-i fa-times"></i>
+ {{:: ts('Cancel') }}
+ </button>
+ <button ng-click="$ctrl.download()" class="btn btn-primary" ng-disabled="$ctrl.run">
+ <i class="crm-i fa-{{ $ctrl.run ? 'spin fa-spinner' : 'download' }}"></i>
+ {{:: ts('Download') }}
+ </button>
+ </div>
+ </form>
+</div>
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskUpdate.ctrl.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskUpdate.ctrl.js
index bb684b03ab..5fd14a504c 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskUpdate.ctrl.js
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTaskUpdate.ctrl.js
@@ -1,19 +1,19 @@
(function(angular, $, _) {
"use strict";
- angular.module('crmSearchTasks').controller('crmSearchTaskUpdate', function ($scope, $timeout, crmApi4, dialogService) {
+ angular.module('crmSearchTasks').controller('crmSearchTaskUpdate', function ($scope, $timeout, crmApi4, searchTaskBaseTrait) {
var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
- model = $scope.model,
- ctrl = this;
+ // Combine this controller with model properties (ids, entity, entityInfo) and searchTaskBaseTrait
+ ctrl = angular.extend(this, $scope.model, searchTaskBaseTrait);
- this.entityTitle = model.ids.length === 1 ? model.entityInfo.title : model.entityInfo.title_plural;
+ this.entityTitle = this.getEntityTitle();
this.values = [];
this.add = null;
this.fields = null;
- crmApi4(model.entity, 'getFields', {
+ crmApi4(this.entity, 'getFields', {
action: 'update',
- select: ['name', 'label', 'description', 'data_type', 'serialize', 'options', 'fk_entity'],
+ select: ['name', 'label', 'description', 'input_type', 'data_type', 'serialize', 'options', 'fk_entity'],
loadOptions: ['id', 'name', 'label', 'description', 'color', 'icon'],
where: [["readonly", "=", false]],
}).then(function(fields) {
@@ -67,25 +67,20 @@
return {results: results};
};
- this.cancel = function() {
- dialogService.cancel('crmSearchTask');
- };
-
this.save = function() {
- $('.ui-dialog-titlebar button').hide();
- ctrl.run = {
+ ctrl.start({
values: _.zipObject(ctrl.values)
- };
+ });
};
this.onSuccess = function() {
- CRM.alert(ts('Successfully updated %1 %2.', {1: model.ids.length, 2: ctrl.entityTitle}), ts('Saved'), 'success');
- dialogService.close('crmSearchTask');
+ CRM.alert(ts('Successfully updated %1 %2.', {1: ctrl.ids.length, 2: ctrl.entityTitle}), ts('Saved'), 'success');
+ this.close();
};
this.onError = function() {
- CRM.alert(ts('An error occurred while attempting to update %1 %2.', {1: model.ids.length, 2: ctrl.entityTitle}), ts('Error'), 'error');
- dialogService.close('crmSearchTask');
+ CRM.alert(ts('An error occurred while attempting to update %1 %2.', {1: ctrl.ids.length, 2: ctrl.entityTitle}), ts('Error'), 'error');
+ this.cancel();
};
});
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.component.js b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.component.js
index 0e1ae4a1a5..04dd42a820 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.component.js
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.component.js
@@ -5,6 +5,9 @@
bindings: {
entity: '<',
refresh: '&',
+ search: '<',
+ display: '<',
+ displayController: '<',
ids: '<'
},
templateUrl: '~/crmSearchTasks/crmSearchTasks.html',
@@ -15,14 +18,17 @@
unwatchIDs = $scope.$watch('$ctrl.ids.length', watchIDs);
function watchIDs() {
- if (ctrl.ids && ctrl.ids.length && !initialized) {
+ if (ctrl.ids && ctrl.ids.length) {
unwatchIDs();
- initialized = true;
- initialize();
+ ctrl.getTasks();
}
}
- function initialize() {
+ this.getTasks = function() {
+ if (initialized) {
+ return;
+ }
+ initialized = true;
crmApi4({
entityInfo: ['Entity', 'get', {select: ['name', 'title', 'title_plural'], where: [['name', '=', ctrl.entity]]}, 0],
tasks: ['SearchDisplay', 'getSearchTasks', {entity: ctrl.entity}]
@@ -30,19 +36,22 @@
ctrl.entityInfo = result.entityInfo;
ctrl.tasks = result.tasks;
});
- }
+ };
this.isActionAllowed = function(action) {
- return !action.number || $scope.eval('' + $ctrl.ids.length + action.number);
+ return $scope.$eval('' + ctrl.ids.length + action.number);
};
this.doAction = function(action) {
- if (!ctrl.isActionAllowed(action) || !ctrl.ids.length) {
+ if (!ctrl.isActionAllowed(action)) {
return;
}
var data = {
ids: ctrl.ids,
entity: ctrl.entity,
+ search: ctrl.search,
+ display: ctrl.display,
+ displayController: ctrl.displayController,
entityInfo: ctrl.entityInfo
};
// If action uses a crmPopup form
@@ -59,7 +68,8 @@
title: action.title
});
dialogService.open('crmSearchTask', action.uiDialog.templateUrl, data, options)
- .then(ctrl.refresh);
+ // Reload results on success, do nothing on cancel
+ .then(ctrl.refresh, _.noop);
}
};
}
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.html b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.html
index 54fbdb2034..a61cb9b811 100644
--- a/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.html
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchTasks.html
@@ -1,10 +1,10 @@
<div class="btn-group" title="{{:: ts('Perform action on selected items.') }}">
- <button type="button" ng-disabled="!$ctrl.ids.length" class="btn dropdown-toggle btn-default" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <button type="button" ng-disabled="$ctrl.displayController.loading || !$ctrl.displayController.results.length" ng-click="$ctrl.getTasks()" class="btn dropdown-toggle btn-default" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="crm-i fa-pencil"></i>
{{:: ts('Action') }} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
- <li ng-disabled="!$ctrl.isActionAllowed(action)" ng-repeat="action in $ctrl.tasks">
+ <li ng-class="{disabled: !$ctrl.isActionAllowed(action)}" ng-repeat="action in $ctrl.tasks">
<a href ng-click="$ctrl.doAction(action)"><i class="fa {{:: action.icon }}"></i> {{:: action.title }}</a>
</li>
<li class="disabled" ng-if="!$ctrl.tasks">
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js b/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
new file mode 100644
index 0000000000..b78a189cf9
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchDisplayTasksTrait.service.js
@@ -0,0 +1,82 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Trait shared by any search display controllers which use tasks
+ angular.module('crmSearchDisplay').factory('searchDisplayTasksTrait', function(crmApi4) {
+ var ts = CRM.ts('org.civicrm.search_kit');
+
+ // Trait properties get mixed into display controller using angular.extend()
+ return {
+
+ selectedRows: [],
+ allRowsSelected: false,
+
+ // Toggle the "select all" checkbox
+ selectAllRows: function() {
+ var ctrl = this;
+ // Deselect all
+ if (ctrl.allRowsSelected) {
+ ctrl.allRowsSelected = false;
+ ctrl.selectedRows.length = 0;
+ return;
+ }
+ // Select all
+ ctrl.allRowsSelected = true;
+ if (ctrl.page === 1 && ctrl.results.length < ctrl.limit) {
+ ctrl.selectedRows = _.pluck(_.pluck(ctrl.results, 'id'), 'raw');
+ return;
+ }
+ // If more than one page of results, use ajax to fetch all ids
+ ctrl.loadingAllRows = true;
+ var params = ctrl.getApiParams('id');
+ crmApi4('SearchDisplay', 'run', params, ['id']).then(function(ids) {
+ ctrl.loadingAllRows = false;
+ ctrl.selectedRows = _.toArray(ids);
+ });
+ },
+
+ // Toggle row selection
+ selectRow: function(row) {
+ var index = this.selectedRows.indexOf(row.id.raw);
+ if (index < 0) {
+ this.selectedRows.push(row.id.raw);
+ this.allRowsSelected = (this.rowCount === this.selectedRows.length);
+ } else {
+ this.allRowsSelected = false;
+ this.selectedRows.splice(index, 1);
+ }
+ },
+
+ // @return bool
+ isRowSelected: function(row) {
+ return this.allRowsSelected || _.includes(this.selectedRows, row.id.raw);
+ },
+
+ refreshAfterTask: function() {
+ this.selectedRows.length = 0;
+ this.allRowsSelected = false;
+ this.runSearch();
+ },
+
+ // Overwrite empty onChangeFilters array from searchDisplayBaseTrait
+ onChangeFilters: [function() {
+ // Reset selection when filters are changed
+ this.selectedRows.length = 0;
+ this.allRowsSelected = false;
+ }],
+
+ // Overwrite empty onPostRun array from searchDisplayBaseTrait
+ onPostRun: [function(results, status, editedRow) {
+ if (editedRow && status === 'success') {
+ // If edited row disappears (because edits cause it to not meet search criteria), deselect it
+ var index = this.selectedRows.indexOf(editedRow.id.raw);
+ if (index > -1 && !_.findWhere(results, {id: editedRow.id.raw})) {
+ this.selectedRows.splice(index, 1);
+ }
+ }
+ }]
+
+ };
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchTaskBaseTrait.service.js b/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchTaskBaseTrait.service.js
new file mode 100644
index 0000000000..c6ae0c6ce7
--- /dev/null
+++ b/civicrm/ext/search_kit/ang/crmSearchTasks/traits/searchTaskBaseTrait.service.js
@@ -0,0 +1,31 @@
+(function(angular, $, _) {
+ "use strict";
+
+ // Trait shared by task controllers
+ angular.module('crmSearchDisplay').factory('searchTaskBaseTrait', function(dialogService) {
+ var ts = CRM.ts('org.civicrm.search_kit');
+
+ // Trait properties get mixed into task controller using angular.extend()
+ return {
+
+ getEntityTitle: function() {
+ return this.ids.length === 1 ? this.entityInfo.title : this.entityInfo.title_plural;
+ },
+
+ start: function(runParams) {
+ $('.ui-dialog-titlebar button').hide();
+ this.run = runParams || {};
+ },
+
+ cancel: function() {
+ dialogService.cancel('crmSearchTask');
+ },
+
+ close: function() {
+ dialogService.close('crmSearchTask');
+ }
+
+ };
+ });
+
+})(angular, CRM.$, CRM._);
diff --git a/civicrm/ext/search_kit/css/crmSearchAdmin.css b/civicrm/ext/search_kit/css/crmSearchAdmin.css
index eceab7fcf6..bdcf4123c5 100644
--- a/civicrm/ext/search_kit/css/crmSearchAdmin.css
+++ b/civicrm/ext/search_kit/css/crmSearchAdmin.css
@@ -1,25 +1,8 @@
-#bootstrap-theme.crm-search-admin-list th[ng-click] {
- cursor: pointer;
-}
-#bootstrap-theme.crm-search-admin-list th i.fa-sort-desc,
-#bootstrap-theme.crm-search-admin-list th i.fa-sort-asc {
- color: #1a5a82;
-}
-#bootstrap-theme.crm-search-admin-list th:not(:hover) i.fa-sort {
- opacity: .5;
-}
#bootstrap-theme .crm-search-criteria-column {
min-width: 500px;
}
-#bootstrap-theme #crm-search-results-page-size {
- width: 5em;
-}
-#bootstrap-theme .crm-search-results {
- min-height: 200px;
-}
-
#bootstrap-theme.crm-search .nav-stacked {
margin-left: 0;
margin-right: 20px;
diff --git a/civicrm/ext/search_kit/info.xml b/civicrm/ext/search_kit/info.xml
index 5884de56d5..259bc8af9a 100644
--- a/civicrm/ext/search_kit/info.xml
+++ b/civicrm/ext/search_kit/info.xml
@@ -14,7 +14,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-06</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.38</ver>
diff --git a/civicrm/ext/search_kit/managed/SearchDisplayType.mgd.php b/civicrm/ext/search_kit/managed/SearchDisplayType.mgd.php
index ed54c8fe83..694a37e753 100644
--- a/civicrm/ext/search_kit/managed/SearchDisplayType.mgd.php
+++ b/civicrm/ext/search_kit/managed/SearchDisplayType.mgd.php
@@ -32,4 +32,15 @@ return [
'icon' => 'fa-list',
],
],
+ [
+ 'name' => 'SearchDisplayType:grid',
+ 'entity' => 'OptionValue',
+ 'params' => [
+ 'option_group_id' => 'search_display_type',
+ 'value' => 'grid',
+ 'name' => 'crm-search-display-grid',
+ 'label' => 'Grid',
+ 'icon' => 'fa-th',
+ ],
+ ],
];
diff --git a/civicrm/ext/search_kit/search_kit.php b/civicrm/ext/search_kit/search_kit.php
index ef80c87717..846b2b61b6 100644
--- a/civicrm/ext/search_kit/search_kit.php
+++ b/civicrm/ext/search_kit/search_kit.php
@@ -23,6 +23,21 @@ function search_kit_civicrm_container($container) {
]);
}
+/**
+ * Implements hook_civicrm_alterApiRoutePermissions().
+ *
+ * Allow anonymous users to run a search display. Permissions are checked internally.
+ *
+ * @see CRM_Utils_Hook::alterApiRoutePermissions
+ */
+function search_kit_civicrm_alterApiRoutePermissions(&$permissions, $entity, $action) {
+ if ($entity === 'SearchDisplay') {
+ if ($action === 'run' || $action === 'download' || $action === 'getSearchTasks') {
+ $permissions = CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION;
+ }
+ }
+}
+
/**
* Implements hook_civicrm_xmlMenu().
*
diff --git a/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
new file mode 100644
index 0000000000..fd28518640
--- /dev/null
+++ b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
@@ -0,0 +1,97 @@
+<?php
+namespace api\v4\SearchDisplay;
+
+use Civi\Api4\Contact;
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * @group headless
+ */
+class SearchDownloadTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
+
+ public function setUpHeadless() {
+ // Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+ // See: https://docs.civicrm.org/dev/en/latest/testing/phpunit/#civitest
+ return \Civi\Test::headless()
+ ->installMe(__DIR__)
+ ->apply();
+ }
+
+ /**
+ * Test downloading CSV format.
+ *
+ * Must run in separate process to capture direct output to browser
+ *
+ * @runInSeparateProcess
+ * @preserveGlobalState disabled
+ */
+ public function testDownloadCSV() {
+ $this->markTestIncomplete('Unable to get this test working in separate process, probably due to being in an extension');
+
+ // Re-enable because this test has to run in a separate process
+ \CRM_Extension_System::singleton()->getManager()->install('org.civicrm.search_kit');
+
+ $lastName = uniqid(__FUNCTION__);
+ $sampleData = [
+ ['first_name' => 'One', 'last_name' => $lastName],
+ ['first_name' => 'Two', 'last_name' => $lastName],
+ ['first_name' => 'Three', 'last_name' => $lastName],
+ ['first_name' => 'Four', 'last_name' => $lastName],
+ ];
+ Contact::save(FALSE)->setRecords($sampleData)->execute();
+
+ $params = [
+ 'checkPermissions' => FALSE,
+ 'format' => 'csv',
+ 'savedSearch' => [
+ 'api_entity' => 'Contact',
+ 'api_params' => [
+ 'version' => 4,
+ 'select' => ['last_name'],
+ 'where' => [],
+ ],
+ ],
+ 'display' => [
+ 'type' => 'table',
+ 'label' => '',
+ 'settings' => [
+ 'limit' => 2,
+ 'actions' => TRUE,
+ 'pager' => [],
+ 'columns' => [
+ [
+ 'key' => 'last_name',
+ 'label' => 'First Last',
+ 'dataType' => 'String',
+ 'type' => 'field',
+ 'rewrite' => '[first_name] [last_name]',
+ ],
+ ],
+ 'sort' => [
+ ['id', 'ASC'],
+ ],
+ ],
+ ],
+ 'filters' => ['last_name' => $lastName],
+ 'afform' => NULL,
+ ];
+
+ // UTF-8 BOM
+ $expectedOut = preg_quote("\xEF\xBB\xBF");
+ $expectedOut .= preg_quote('"First Last"');
+ foreach ($sampleData as $row) {
+ $expectedOut .= '\s+' . preg_quote('"' . $row['first_name'] . ' ' . $lastName . '"');
+ }
+ $this->expectOutputRegex('#' . $expectedOut . '#');
+
+ try {
+ civicrm_api4('SearchDisplay', 'download', $params);
+ $this->fail();
+ }
+ catch (\CRM_Core_Exception_PrematureExitException $e) {
+ // All good, we expected the api to exit
+ }
+ }
+
+}
diff --git a/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
index bf0364a3cc..c22b32e6de 100644
--- a/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
+++ b/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
@@ -52,7 +52,7 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
'api_entity' => 'Contact',
'api_params' => [
'version' => 4,
- 'select' => ['id', 'first_name', 'last_name', 'contact_sub_type:label'],
+ 'select' => ['id', 'first_name', 'last_name', 'contact_sub_type:label', 'is_deceased'],
'where' => [],
],
],
@@ -103,15 +103,19 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
$params['filters']['first_name'] = ['One', 'Two'];
$result = civicrm_api4('SearchDisplay', 'run', $params);
$this->assertCount(2, $result);
- $this->assertEquals('One', $result[0]['first_name']);
- $this->assertEquals('Two', $result[1]['first_name']);
+ $this->assertEquals('One', $result[0]['first_name']['raw']);
+ $this->assertEquals('Two', $result[1]['first_name']['raw']);
- $params['filters'] = ['id' => ['>' => $result[0]['id'], '<=' => $result[1]['id'] + 1]];
+ // Raw value should be boolean, view value should be string
+ $this->assertEquals(FALSE, $result[0]['is_deceased']['raw']);
+ $this->assertEquals(ts('No'), $result[0]['is_deceased']['view']);
+
+ $params['filters'] = ['id' => ['>' => $result[0]['id']['raw'], '<=' => $result[1]['id']['raw'] + 1]];
$params['sort'] = [['first_name', 'ASC']];
$result = civicrm_api4('SearchDisplay', 'run', $params);
$this->assertCount(2, $result);
- $this->assertEquals('Three', $result[0]['first_name']);
- $this->assertEquals('Two', $result[1]['first_name']);
+ $this->assertEquals('Three', $result[0]['first_name']['raw']);
+ $this->assertEquals('Two', $result[1]['first_name']['raw']);
$params['filters'] = ['contact_sub_type:label' => ['Tester', 'Bot']];
$result = civicrm_api4('SearchDisplay', 'run', $params);
@@ -176,9 +180,9 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
$result = civicrm_api4('SearchDisplay', 'run', $params);
$this->assertCount(2, $result);
- $this->assertNotEmpty($result->first()['display_name']);
+ $this->assertNotEmpty($result->first()['display_name']['raw']);
// Assert that display name was added to the search due to the link token
- $this->assertNotEmpty($result->first()['sort_name']);
+ $this->assertNotEmpty($result->first()['sort_name']['raw']);
// These items are not part of the search, but will be added via links
$this->assertArrayNotHasKey('contact_type', $result->first());
@@ -195,9 +199,9 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
],
];
$result = civicrm_api4('SearchDisplay', 'run', $params);
- $this->assertEquals('Individual', $result->first()['contact_type']);
- $this->assertEquals('Unit test', $result->first()['source']);
- $this->assertEquals($lastName, $result->first()['last_name']);
+ $this->assertEquals('Individual', $result->first()['contact_type']['raw']);
+ $this->assertEquals('Unit test', $result->first()['source']['raw']);
+ $this->assertEquals($lastName, $result->first()['last_name']['raw']);
}
/**
@@ -294,14 +298,14 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
$this->cleanupCachedPermissions();
$result = civicrm_api4('SearchDisplay', 'run', $params);
$this->assertCount(1, $result);
- $this->assertEquals($sampleData['Two'], $result[0]['id']);
+ $this->assertEquals($sampleData['Two'], $result[0]['id']['raw']);
$hooks->setHook('civicrm_aclWhereClause', [$this, 'aclWhereGreaterThan']);
$this->cleanupCachedPermissions();
$result = civicrm_api4('SearchDisplay', 'run', $params);
$this->assertCount(2, $result);
- $this->assertEquals($sampleData['Three'], $result[0]['id']);
- $this->assertEquals($sampleData['Four'], $result[1]['id']);
+ $this->assertEquals($sampleData['Three'], $result[0]['id']['raw']);
+ $this->assertEquals($sampleData['Four'], $result[1]['id']['raw']);
}
public function testWithACLBypass() {
@@ -464,7 +468,7 @@ class SearchRunTest extends \PHPUnit\Framework\TestCase implements HeadlessInter
}
$this->assertStringContainsString('failed', $error);
- $config->userPermissionClass->permissions = ['administer CiviCRM data'];
+ $config->userPermissionClass->permissions = ['access CiviCRM', 'administer CiviCRM data'];
// Admins can edit the search and the display
SavedSearch::update()->addWhere('name', '=', $searchName)
diff --git a/civicrm/ext/sequentialcreditnotes/info.xml b/civicrm/ext/sequentialcreditnotes/info.xml
index 22fa606a1b..47e6d752ca 100644
--- a/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/civicrm/ext/sequentialcreditnotes/info.xml
@@ -15,7 +15,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-01-28</releaseDate>
- <version>5.41.2</version>
+ <version>5.42.0</version>
<tags>
<tag>mgmt:hidden</tag>
</tags>
diff --git a/civicrm/packages/HTML/QuickForm/Rule/Email.php b/civicrm/packages/HTML/QuickForm/Rule/Email.php
index 4abed48d4b..771dbb43a4 100644
--- a/civicrm/packages/HTML/QuickForm/Rule/Email.php
+++ b/civicrm/packages/HTML/QuickForm/Rule/Email.php
@@ -37,28 +37,7 @@ require_once 'HTML/QuickForm/Rule.php';
*/
class HTML_QuickForm_Rule_Email extends HTML_QuickForm_Rule
{
-
- /**
- * Compatibility layer for PHP versions running ICU 4.4, as the constant INTL_IDNA_VARIANT_UTS46
- * is only available as of ICU 4.6.
- *
- * Please note: Once PHP 7.4 is the minimum requirement, this method will vanish without further notice
- * as it is recommended to use the native method instead, when working against a clean environment.
- *
- * @param string $part.
- * @return string|bool
- */
- private static function idn_to_ascii($part)
- {
- if (defined('INTL_IDNA_VARIANT_UTS46')) {
- return idn_to_ascii($part, 0, INTL_IDNA_VARIANT_UTS46);
- }
- return idn_to_ascii($part);
- }
-
- // switching to a better regex as per CRM-40
- // var $regex = '/^((\"[^\"\f\n\r\t\v\b]+\")|([\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+(\.[\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+)*))@((\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/';
- var $regex = '/^([a-zA-Z0-9&_?\/`!|#*$^%=~{}+\'-]+|"([\x00-\x0C\x0E-\x21\x23-\x5B\x5D-\x7F]|\\[\x00-\x7F])*")(\.([a-zA-Z0-9&_?\/`!|#*$^%=~{}+\'-]+|"([\x00-\x0C\x0E-\x21\x23-\x5B\x5D-\x7F]|\\[\x00-\x7F])*"))*@([a-zA-Z0-9&_?\/`!|#*$^%=~{}+\'-]+|\[([\x00-\x0C\x0E-\x5A\x5E-\x7F]|\\[\x00-\x7F])*\])(\.([a-zA-Z0-9&_?\/`!|#*$^%=~{}+\'-]+|\[([\x00-\x0C\x0E-\x5A\x5E-\x7F]|\\[\x00-\x7F])*\]))*$/';
+ var $regex = '/^((\"[^\"\f\n\r\t\v\b]+\")|([\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+(\.[\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+)*))@((\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/';
/**
* Validates an email address
@@ -70,17 +49,6 @@ class HTML_QuickForm_Rule_Email extends HTML_QuickForm_Rule
*/
function validate($email, $checkDomain = false)
{
- if (function_exists('idn_to_ascii')) {
- if ($parts = explode('@', $email)) {
- if (sizeof($parts) == 2) {
- foreach ($parts as &$part) {
- $part = self::idn_to_ascii($part);
- }
- $email = implode('@', $parts);
- }
- }
- }
-
// Fix for bug #10799: add 'D' modifier to regex
if (preg_match($this->regex . 'D', $email)) {
if ($checkDomain && function_exists('checkdnsrr')) {
diff --git a/civicrm/packages/kcfinder/integration/civicrm.php b/civicrm/packages/kcfinder/integration/civicrm.php
index 4efa68ddf4..dccf72c718 100644
--- a/civicrm/packages/kcfinder/integration/civicrm.php
+++ b/civicrm/packages/kcfinder/integration/civicrm.php
@@ -98,7 +98,7 @@ function authenticate_drupal8($config) {
$connection = \Drupal::database();
$query = $connection->query("SELECT uid FROM {sessions} WHERE sid = :sid", array(":sid" => \Drupal\Component\Utility\Crypt::hashBase64($session)));
if (($uid = $query->fetchField()) > 0) {
- $username = \Drupal\user\Entity\User::load($uid)->getUsername();
+ $username = \Drupal\user\Entity\User::load($uid)->getAccountName();
if ($username) {
$config->userSystem->loadUser($username);
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 63bda47749..3b7ce9a7b7 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,17 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.42.0
+
+Released October 6, 2021
+
+- **[Synopsis](release-notes/5.42.0.md#synopsis)**
+- **[Features](release-notes/5.42.0.md#features)**
+- **[Bugs resolved](release-notes/5.42.0.md#bugs)**
+- **[Miscellany](release-notes/5.42.0.md#misc)**
+- **[Credits](release-notes/5.42.0.md#credits)**
+- **[Feedback](release-notes/5.42.0.md#feedback)**
+
## CiviCRM 5.41.2
Released September 25, 2021
diff --git a/civicrm/release-notes/5.42.0.md b/civicrm/release-notes/5.42.0.md
new file mode 100644
index 0000000000..2e20bb9bb5
--- /dev/null
+++ b/civicrm/release-notes/5.42.0.md
@@ -0,0 +1,761 @@
+# CiviCRM 5.42.0
+
+Released October 6, 2021
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| **Change the database schema?** | **yes** |
+| **Alter the API?** | **yes** |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| **Introduce features?** | **yes** |
+| **Fix bugs?** | **yes** |
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **Edit Contact: Hide email signatures for contacts that do not have a user/CMS
+ account
+ ([dev/user-interface#38](https://lab.civicrm.org/dev/user-interface/-/issues/38):
+ [21103](https://github.com/civicrm/civicrm-core/pull/21103))**
+
+ Improves the user interface by hiding the email signature section for contacts
+ for whom it is not relevant.
+
+- **Option to rename the file before downloading
+ ([dev/core#2121](https://lab.civicrm.org/dev/core/-/issues/2121):
+ [21006](https://github.com/civicrm/civicrm-core/pull/21006))**
+
+ Gives the user the option to change the PDF file name on the "Print/Merge
+ Document" screen.
+
+- **Add Settings, Disable, Delete buttons to group contacts listing page
+ (Work Towards [dev/core#2546](https://lab.civicrm.org/dev/core/-/issues/2546):
+ [20135](https://github.com/civicrm/civicrm-core/pull/20135))**
+
+ Adds a "Edit Group Settings" button that pops up the group settings edit
+ overlay to the smog group page.
+
+- **On logging detail report show the words not the numbers
+ ([dev/core#2691](https://lab.civicrm.org/dev/core/-/issues/2691):
+ [20907](https://github.com/civicrm/civicrm-core/pull/20907))**
+
+ Improves logging by displaying more context.
+
+- **Tokens - contributions - could we show them all?
+ (Work Towards [dev/core#2745](https://lab.civicrm.org/dev/core/-/issues/2745):
+ [21134](https://github.com/civicrm/civicrm-core/pull/21134))**
+
+ Ensures support for the Contribution Token "contributionId".
+
+- **Allow dedupe by websites
+ ([dev/core#2770](https://lab.civicrm.org/dev/core/-/issues/2770):
+ [21168](https://github.com/civicrm/civicrm-core/pull/21168))**
+
+ Makes it so one can dedupe based on websites.
+
+- **APIv4 pseudoconstant improvements
+ ([21184](https://github.com/civicrm/civicrm-core/pull/21184))**
+
+ Makes SearchKit handle large option lists more efficiently, and adds APIv4
+ field metadata about available suffixes.
+
+- **SearchKit - Add placeholder to token select
+ ([21172](https://github.com/civicrm/civicrm-core/pull/21172))**
+
+ Adds placeholder text to the token select dropdown in SearchKit.
+
+- **Searchkit - Add grid display layout
+ ([dev/core#2776](https://lab.civicrm.org/dev/core/-/issues/2776):
+ [21194](https://github.com/civicrm/civicrm-core/pull/21194))**
+
+ Adds support to display SearchKit results in a grid format.
+
+- **SearchKit - Merge admin results table with searchDisplay code
+ ([21069](https://github.com/civicrm/civicrm-core/pull/21069) and
+ [21488](https://github.com/civicrm/civicrm-core/pull/21488))**
+
+ Improves and streamlines the SearchKit Angular code to reconcile two
+ different ways of fetching, formatting & displaying results. This reduces code
+ duplication, while adding a few features from the admin table to all search
+ display tables.
+
+- **SearchKit - Add download CSV action
+ ([21328](https://github.com/civicrm/civicrm-core/pull/21328))**
+
+ Adds an option to SearchKit to download a CSV.
+
+- **SearchKit - Add links to admin table and refresh after popups
+ ([21343](https://github.com/civicrm/civicrm-core/pull/21343))**
+
+ Adds quick-action links to the SearchKit admin results table.
+
+- **SearchKit - Use a search display to display searches
+ ([21270](https://github.com/civicrm/civicrm-core/pull/21270))**
+
+ Simplifies code by using a SearchKit display to display searches.
+
+- **Include random as an option when sorting displays
+ ([dev/report#75](https://lab.civicrm.org/dev/report/-/issues/75):
+ [21177](https://github.com/civicrm/civicrm-core/pull/21177))**
+
+ Adds a sort option of random to SearchKit.
+
+- **Searchkit: Add image field handler
+ ([dev/core#2781](https://lab.civicrm.org/dev/core/-/issues/2781):
+ [21300](https://github.com/civicrm/civicrm-core/pull/21300))**
+
+ Makes it possible to show images in SearchKit displays.
+
+- **SearchKit - Allow tokens in menu button text
+ ([21217](https://github.com/civicrm/civicrm-core/pull/21217))**
+
+ Makes it so users can include tokens in SearchKit menu button text.
+
+- **TokenProcessor - Allow defining Smarty variables which are populated via
+ token ([21336](https://github.com/civicrm/civicrm-core/pull/21336))**
+
+ Allows more interoperability between Smarty expressions and tokens.
+
+- **Token Parser - Allow tokens with multiple dots (eg
+ {contribution.contribution_recur_id.amount})
+ ([21076](https://github.com/civicrm/civicrm-core/pull/21076))**
+
+ Adjusts the naming/parsing rules for Civi-style tokens so that tokens may
+ include dots and colons.
+
+- **Afform - support file uploads
+ ([21150](https://github.com/civicrm/civicrm-core/pull/21150))**
+
+ Supports file fields as part of Afform.
+
+- **Not possible to set the location type (address, mail, telephone) to a
+ specific value
+ ([dev/core#2703](https://lab.civicrm.org/dev/core/-/issues/2703):
+ [21254](https://github.com/civicrm/civicrm-core/pull/21254))**
+
+ Makes it possible in Afform to select a single location type for an address,
+ email, phone etc. block instead of having the field on the form.
+
+- **Afform - Store submissions in a new database table
+ ([21105](https://github.com/civicrm/civicrm-core/pull/21105))**
+
+ Adds a Afform setting "log submissions", when checked, Afform submissions are
+ stored in the database.
+
+- **Move financial acl setting to the extension
+ ([21120](https://github.com/civicrm/civicrm-core/pull/21120))**
+
+ Moves financial ACL settings to the financial ACL extension.
+
+- **SavedSearch - Add pseudoconstant for api_entity field
+ ([21312](https://github.com/civicrm/civicrm-core/pull/21312))**
+
+ Adds a pseudoconstant to facilitate display in the UI of what a search is for,
+ e.g. ->addSelect('api_entity:label') would return "Contacts" for a search of
+ Contacts.
+
+- **Change the default PDF file name from "CiviLetter.pdf" to use the Activity
+ Subject, if available
+ ([21220](https://github.com/civicrm/civicrm-core/pull/21220))**
+
+ Improves PDF file naming to be more specific.
+
+- **Change PDF file name from "civicrmContributionReceipt.pdf" to use the
+ standard "receipt.pdf" file name
+ ([21221](https://github.com/civicrm/civicrm-core/pull/21221))**
+
+ Improves PDF file naming.
+
+- **Scheduled Reminders UI - Show more activity tokens in admin GUI
+ ([21091](https://github.com/civicrm/civicrm-core/pull/21091))**
+
+ Adds more Activity Tokens to the Scheduled Reminders UI.
+
+### CiviContribute
+
+- **Logging improvements for "Failed to update contribution in database"
+ ([21243](https://github.com/civicrm/civicrm-core/pull/21243))**
+
+ Improves logging when contribution fails.
+
+- **Add recurring contributions to contribution reports
+ (Work Towards [dev/report#63](https://lab.civicrm.org/dev/report/-/issues/63):
+ [20168](https://github.com/civicrm/civicrm-core/pull/20168))**
+
+ Adds "Contribution Recurring" as a filter, column and group by to the
+ Contribution Summary Report.
+
+### CiviMail
+
+- **System Workflow Messages - Improve localization experience (Work Towards
+ [dev/mail#83](https://lab.civicrm.org/dev/mail/-/issues/83):
+ [21139](https://github.com/civicrm/civicrm-core/pull/21139))**
+
+ Introduces a class contracts for system workflow messages which will enable
+ richer APIs and UIs.
+
+### CiviMember
+
+- **Membership api for v4
+ ([dev/core#2634](https://lab.civicrm.org/dev/core/-/issues/2634):
+ [21106](https://github.com/civicrm/civicrm-core/pull/21106))**
+
+ Adds the Membership entity to APIv4.
+
+- **Fix code to use Order api to create Memberships in core forms
+ (Work Towards [dev/core#2717](https://lab.civicrm.org/dev/core/-/issues/2717):
+ [20936](https://github.com/civicrm/civicrm-core/pull/20936),
+ [21126](https://github.com/civicrm/civicrm-core/pull/21126) and
+ [20935](https://github.com/civicrm/civicrm-core/pull/20935))**
+
+ Work towards using the Order API to create Memberships in core forms.
+
+### Joomla Integration
+
+- **CiviCRM-Joomla should accept web-service calls
+ ([58](https://github.com/civicrm/civicrm-joomla/pull/58))**
+
+ Ensures that on a stock configuration of CiviCRM-Joomla, it is possible to
+ create a page-route for accepting web-service calls.
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **Multi-lingual: Contact Type label is cached regardless of language
+ ([dev/translation#70](https://lab.civicrm.org/dev/translation/-/issues/70):
+ [21268](https://github.com/civicrm/civicrm-core/pull/21268))**
+
+ Fixes loading multiple translations within same page-view (OptionValues,
+ ContactTypes).
+
+- **Activity export broken - takes you to some other screen instead
+ ([dev/core#2835](https://lab.civicrm.org/dev/core/-/issues/2835):
+ [21456](https://github.com/civicrm/civicrm-core/pull/21456))**
+
+- **APIv4 - entityBatch linkage
+ ([dev/core#2682](https://lab.civicrm.org/dev/core/-/issues/2682):
+ [21241](https://github.com/civicrm/civicrm-core/pull/21241))**
+
+ Work Towards APIv4 entity parity. Ensures that the values for entity_table are
+ discoverable.
+
+- **Consider replacing fopen() call in CRM_Utils_File::isIncludable with
+ stream_resolve_include_path()
+ ([dev/core#2730](https://lab.civicrm.org/dev/core/-/issues/2730):
+ [21060](https://github.com/civicrm/civicrm-core/pull/21060))**
+
+ Replaces fopen call in CRM_Utils_File::isIncludable with one that doesn't need
+ error-supression to avoid problems in php8.
+
+- **SearchKit: have a quick Export task
+ (Work Towards [dev/core#2732](https://lab.civicrm.org/dev/core/-/issues/2732):
+ [21320](https://github.com/civicrm/civicrm-core/pull/21320))**
+
+ Refactoring work towards making it possible to have a direct export feature in
+ SearchKit.
+
+- **SearchKit - Fix deleting search displays
+ ([21444](https://github.com/civicrm/civicrm-core/pull/21444))**
+
+- **SearchKit - Fix anonymous access to running search displays
+ #([21752](https://github.com/civicrm/civicrm-core/pull/21752))**
+
+ Recently SearchKit added the ability for anonymous users to access search
+ displays. However, due to an oversight the feature doesn't actually work for
+ anonymous users. This fixes the problem.
+
+- **Afform - ensure dragging classes are removed when not sorting
+ ([21750](https://github.com/civicrm/civicrm-core/pull/21750))**
+
+ Fixes an annoying UI glitch in Afform where the screen can appear "locked" or
+ "frozen" after dragging fields into a fieldset.
+
+- **Expose Contribution token processor
+ ([dev/core#2747](https://lab.civicrm.org/dev/core/-/issues/2747):
+ [21046](https://github.com/civicrm/civicrm-core/pull/21046) and
+ [21057](https://github.com/civicrm/civicrm-core/pull/21057))**
+
+ Reconciles contribution legacy tokens and scheduled reminders tokens.
+
+- **CRM_Core_BAO_CustomField::getChangeSerialize always returns a change
+ ([dev/core#2762](https://lab.civicrm.org/dev/core/-/issues/2762):
+ [21160](https://github.com/civicrm/civicrm-core/pull/21160))**
+
+- **Caching issue on apiv4 + install
+ ([dev/core#2763](https://lab.civicrm.org/dev/core/-/issues/2763):
+ [21166](https://github.com/civicrm/civicrm-core/pull/21166))**
+
+- **CiviCRM email validation failing incorrectly
+ ([dev/core#2769](https://lab.civicrm.org/dev/core/-/issues/2769):
+ [329](https://github.com/civicrm/civicrm-packages/pull/329) and
+ [21169](https://github.com/civicrm/civicrm-core/pull/21169))**
+
+- **Sort by date column on multirecord field listing section on profile edit
+ mode doesn't work
+ ([dev/core#2774](https://lab.civicrm.org/dev/core/-/issues/2774):
+ [21191](https://github.com/civicrm/civicrm-core/pull/21191))**
+
+- **Error when using search in 'Find and Merge Duplicate Contacts' page
+ ([dev/core#2778](https://lab.civicrm.org/dev/core/-/issues/2778):
+ [21223](https://github.com/civicrm/civicrm-core/pull/21223))**
+
+- **Print/merge document has awkward filename if activity subject uses
+ non-english letters
+ ([dev/core#2789](https://lab.civicrm.org/dev/core/-/issues/2789):
+ [21259](https://github.com/civicrm/civicrm-core/pull/21259))**
+
+- **Contribution custom field tokens are duplicated in the dropdown
+ ([dev/core#2806](https://lab.civicrm.org/dev/core/-/issues/2806):
+ [21337](https://github.com/civicrm/civicrm-core/pull/21337))**
+
+- **[regression] Search forms with entities that include File custom fields
+ don't render in Afform Admin screen
+ ([dev/core#2751](https://lab.civicrm.org/dev/core/-/issues/2751):
+ [21084](https://github.com/civicrm/civicrm-core/pull/21084))**
+
+- **APIv4 - Throw exception instead of munging illegal join aliases
+ ([21072](https://github.com/civicrm/civicrm-core/pull/21072))**
+
+ Improves APIv4 validation of explicit join aliases.
+
+- **Fix deprecated API4 Join on Email in dynamic profile
+ ([21308](https://github.com/civicrm/civicrm-core/pull/21308))**
+
+- **Search Kit doesn't display related contact custom fields
+ ([dev/report#73](https://lab.civicrm.org/dev/report/-/issues/73):
+ [21071](https://github.com/civicrm/civicrm-core/pull/21071))**
+
+- **SearchKit - Misc bulk action bug fixes
+ ([21159](https://github.com/civicrm/civicrm-core/pull/21159))**
+
+- **SearchKit - Fix aggregated joins
+ ([21411](https://github.com/civicrm/civicrm-core/pull/21411))**
+
+- **SearchKit - Fix pager count and add 'None Found' text in empty tables
+ ([21333](https://github.com/civicrm/civicrm-core/pull/21333))**
+
+- **Fix Searchkit "Add" columns button UI
+ ([21315](https://github.com/civicrm/civicrm-core/pull/21315))**
+
+- **Afform - Fix button appearance and block form during submission
+ ([21287](https://github.com/civicrm/civicrm-core/pull/21287))**
+
+- **Afform - fix contact source field & field defaults
+ ([21228](https://github.com/civicrm/civicrm-core/pull/21228))**
+
+- **Fix support link just added in oauth-client extension info.xml
+ ([21256](https://github.com/civicrm/civicrm-core/pull/21256))**
+
+- **better target multivalue checkbox and multiselect import validation
+ ([21317](https://github.com/civicrm/civicrm-core/pull/21317))**
+
+- **Do not add tracking to internal anchor URLs
+ ([20115](https://github.com/civicrm/civicrm-core/pull/20115))**
+
+- **Fix for new prefetch key
+ ([21292](https://github.com/civicrm/civicrm-core/pull/21292))**
+
+- **Do not enable custom activity search on new installs
+ ([21260](https://github.com/civicrm/civicrm-core/pull/21260))**
+
+- **Add date metadata for email.on_hold, reset_date
+ ([21233](https://github.com/civicrm/civicrm-core/pull/21233))**
+
+- **Add no-prefetch campaign pseudoconstants
+ ([21185](https://github.com/civicrm/civicrm-core/pull/21185))**
+
+- **Replace extension key with label during install/upgrade/disable/uninstall
+ ([21094](https://github.com/civicrm/civicrm-core/pull/21094))**
+
+- **ActionSchedule - Pass real batches into TokenProcessor. Simplify
+ CRM_Activity_Tokens.
+ ([21088](https://github.com/civicrm/civicrm-core/pull/21088))**
+
+- **MessageTemplate::sendTemplate() - Accept `array $messageTemplate` and `array
+ $tokenContext` ([21073](https://github.com/civicrm/civicrm-core/pull/21073))**
+
+- **Alternate to 20131 - Avoid crash during import for blank lines in a
+ one-column csv file
+ ([21216](https://github.com/civicrm/civicrm-core/pull/21216))**
+
+- **CRM_Queue_Service - Use ?? instead of error-supression operator
+ ([21207](https://github.com/civicrm/civicrm-core/pull/21207))**
+
+- **Respect http_timeout core setting for Guzzle HTTP requests
+ ([21096](https://github.com/civicrm/civicrm-core/pull/21096))**
+
+- **Smarty notice - Explicitly set hideRelativeLabel var on Find Cases form
+ ([21070](https://github.com/civicrm/civicrm-core/pull/21070))**
+
+- **(Smart Group) is being constantly added while editing the smart group title
+ from 'Manage Group' page
+ ([20898](https://github.com/civicrm/civicrm-core/pull/20898))**
+
+- **Enotice fixes in tpl
+ ([21170](https://github.com/civicrm/civicrm-core/pull/21170))**
+
+- **Template fixes - notices, syntax
+ ([21257](https://github.com/civicrm/civicrm-core/pull/21257))**
+
+- **Fix invalid parameter giving E_WARNING
+ ([21255](https://github.com/civicrm/civicrm-core/pull/21255))**
+
+- **Fix search display access for non-admin users
+ ([21082](https://github.com/civicrm/civicrm-core/pull/21082))**
+
+- **Use convenience function for one-off token evaluations to avoid too-long
+ filenames and possible privacy issues
+ ([21140](https://github.com/civicrm/civicrm-core/pull/21140))**
+
+- **Replace deprecated calls to `renderMessageTemplate()`
+ ([21121](https://github.com/civicrm/civicrm-core/pull/21121))**
+
+- **Scheduled Reminders - Pass locale through to TokenProcessor
+ ([21085](https://github.com/civicrm/civicrm-core/pull/21085))**
+
+### CiviCampaign
+
+- **Fix caching on campaign pseudoconstant
+ ([21083](https://github.com/civicrm/civicrm-core/pull/21083))**
+
+### CiviContribute
+
+- **Fix the check to see if the financialAclExtension is installed
+ ([21077](https://github.com/civicrm/civicrm-core/pull/21077))**
+
+- **Simplify ContributionView form. Always display "lineitems"
+ ([21285](https://github.com/civicrm/civicrm-core/pull/21285))**
+
+- **Can we re-order the 'recur links'
+ ([dev/core#2843](https://lab.civicrm.org/dev/core/-/issues/2843):
+ [21559](https://github.com/civicrm/civicrm-core/pull/21559))**
+
+ The new link to View Template on a recurring contribution row is now moved to
+ the end, allowing the Edit link to return to the second spot.
+
+- **When a recurring contribution template has no line items, the contact
+ contribution tab crashes
+ ([dev/financial#187](https://lab.civicrm.org/dev/financial/-/issues/187):
+ [21734](https://github.com/civicrm/civicrm-core/pull/21734))**
+
+- **Call line item pre hook after tax amount is calculated
+ ([21731](https://github.com/civicrm/civicrm-core/pull/21731))**
+
+ `hook_civicrm_pre` is now invoked on a line item entity after the tax amount
+ has been calculated for it.
+
+### CiviMail
+
+- **CiviCRM Mailing, function unsub_from_mailing has spelling error,
+ "experiement" impacts A/B Mailing unsubscribes
+ ([21245](https://github.com/civicrm/civicrm-core/pull/21245))**
+
+- **In an email, a token from an extension in a subject will inhibits the same
+ token group in the email body
+ ([dev/core#2673](https://lab.civicrm.org/dev/core/-/issues/2673):
+ [21080](https://github.com/civicrm/civicrm-core/pull/21080))**
+
+- **Log details of mailing error and don't display details to end user
+ ([21173](https://github.com/civicrm/civicrm-core/pull/21173))**
+
+### CiviMember
+
+- **Fix Membership.create in BAO to respect passed in status_id
+ ([20976](https://github.com/civicrm/civicrm-core/pull/20976))**
+
+- **Membership Dashboard - Fatal Error starting with 5.41.beta1
+ ([dev/core#2758](https://lab.civicrm.org/dev/core/-/issues/2758):
+ [21171](https://github.com/civicrm/civicrm-core/pull/21171) and
+ [21167](https://github.com/civicrm/civicrm-core/pull/21167))**
+
+- **Update MembershipType.duration and MembershipStatus.name to be required
+ ([21119](https://github.com/civicrm/civicrm-core/pull/21119))**
+
+- **Fix missing value of End Adjustment column from Membership status page
+ ([21664](https://github.com/civicrm/civicrm-core/pull/21664))**
+
+### Drupal Integration
+
+- **Syntax errors when loading sample data
+ ([dev/drupal#161](https://lab.civicrm.org/dev/drupal/-/issues/161):
+ [648](https://github.com/civicrm/civicrm-drupal/pull/648))**
+
+ Removes drush sample data install option that doesn't work.
+
+- **Replace Drupal 9 user function, function getUsername is no more valid
+ ([328](https://github.com/civicrm/civicrm-packages/pull/328))**
+
+### Joomla Integration
+
+- **Fixes unusable modals in Joomla 4
+ ([21286](https://github.com/civicrm/civicrm-core/pull/21286))**
+
+- **Tidies Joomla 4 integration (menu, padding) after final release
+ ([21342](https://github.com/civicrm/civicrm-core/pull/21342))**
+
+## <a name="misc"></a>Miscellany
+
+- **MessageTemplate - Add renderTemplate(). Deprecate renderMessageTemplate().
+ ([21115](https://github.com/civicrm/civicrm-core/pull/21115))**
+
+- **Provided standard links in ext/oauth-client/info.xml, fixed typo
+ ([21252](https://github.com/civicrm/civicrm-core/pull/21252))**
+
+- **Use getter to get subscription id
+ ([21309](https://github.com/civicrm/civicrm-core/pull/21309))**
+
+- **Extract ACL contact cache clearing part out
+ ([21219](https://github.com/civicrm/civicrm-core/pull/21219))**
+
+- **Update quickform original
+ ([330](https://github.com/civicrm/civicrm-packages/pull/330))**
+
+- **Afform - Rename blocks and joins for clarity
+ ([21218](https://github.com/civicrm/civicrm-core/pull/21218))**
+
+- **Afform - Optimize Get by checking type
+ ([21316](https://github.com/civicrm/civicrm-core/pull/21316))**
+
+- **[REF] Cleanup pdf classes to use a trait like we do for email classes
+ ([dev/core#2790](https://lab.civicrm.org/dev/core/-/issues/2790):
+ [21334](https://github.com/civicrm/civicrm-core/pull/21334),
+ [21305](https://github.com/civicrm/civicrm-core/pull/21305),
+ [21310](https://github.com/civicrm/civicrm-core/pull/21310),
+ [21276](https://github.com/civicrm/civicrm-core/pull/21276),
+ [21297](https://github.com/civicrm/civicrm-core/pull/21297),
+ [21331](https://github.com/civicrm/civicrm-core/pull/21331) and
+ [21290](https://github.com/civicrm/civicrm-core/pull/21290))**
+
+- **Upgrade angular-file-uploader to v2.6.1
+ ([21081](https://github.com/civicrm/civicrm-core/pull/21081))**
+
+- **Upgrade Pear/DB package to be version 1.11.0
+ ([21087](https://github.com/civicrm/civicrm-core/pull/21087))**
+
+- **CRM_Core_Component - Remove unused code
+ ([21086](https://github.com/civicrm/civicrm-core/pull/21086))**
+
+- **Move make-sure-single-set out of shared function
+ ([21062](https://github.com/civicrm/civicrm-core/pull/21062))**
+
+- **Remove unused, duplicate functions getEntitiesByTag
+ ([21209](https://github.com/civicrm/civicrm-core/pull/21209))**
+
+- **Remove deprecated function
+ ([21179](https://github.com/civicrm/civicrm-core/pull/21179))**
+
+- **Remove extraneous buildQuickForm
+ ([21325](https://github.com/civicrm/civicrm-core/pull/21325))**
+
+- **Remove unused assignment
+ ([21061](https://github.com/civicrm/civicrm-core/pull/21061))**
+
+- **Remove no longer used variable in Email.tpl / smarty warning
+ ([21074](https://github.com/civicrm/civicrm-core/pull/21074))**
+
+- **Remove deprecated isDevelopment() function
+ ([21269](https://github.com/civicrm/civicrm-core/pull/21269))**
+
+- **[REF] Move acl delete logic to an event listener
+ ([dev/core#2757](https://lab.civicrm.org/dev/core/-/issues/2757):
+ [21201](https://github.com/civicrm/civicrm-core/pull/21201) and
+ [21213](https://github.com/civicrm/civicrm-core/pull/21213))**
+
+- **[REF] Remove references to contribution_invoice_settings (Work Towards
+ [dev/core#2719](https://lab.civicrm.org/dev/core/-/issues/2719):
+ [20991](https://github.com/civicrm/civicrm-core/pull/20991))**
+
+- **[REF] Afform - Code cleanup in LoadAdminData API action
+ ([21089](https://github.com/civicrm/civicrm-core/pull/21089))**
+
+- **[REF] SearchKit - Refactor search task code to share a trait
+ ([21156](https://github.com/civicrm/civicrm-core/pull/21156))**
+
+- **[REF] SearchKit - display code refactor + pager options
+ ([21049](https://github.com/civicrm/civicrm-core/pull/21049))**
+
+- **[REF] SearchKit - Use non-deprecated join syntax when loading standalone
+ displays ([21095](https://github.com/civicrm/civicrm-core/pull/21095))**
+
+- **[REF] APIv4 Notes - Ensure child notes are deleted with parent, and hooks
+ are called ([21208](https://github.com/civicrm/civicrm-core/pull/21208))**
+
+- **[REF] Remove unused/unneeded variables from Note View page
+ ([21226](https://github.com/civicrm/civicrm-core/pull/21226))**
+
+- **[REF] CRM_Utils_Recent - Use hook listener to delete items
+ ([21204](https://github.com/civicrm/civicrm-core/pull/21204) and
+ [21492](https://github.com/civicrm/civicrm-core/pull/21492))**
+
+- **[REF] Deprecate unnecessary del() functions
+ ([21200](https://github.com/civicrm/civicrm-core/pull/21200))**
+
+- **REF Switch to CRM_Core_Form::setTitle() instead of
+ CRM_Utils_System::setTitle() part 1
+ ([21193](https://github.com/civicrm/civicrm-core/pull/21193))**
+
+- **[Ref] remove unused variable
+ ([21161](https://github.com/civicrm/civicrm-core/pull/21161))**
+
+- **[Ref] Move id fetching to the classes
+ ([21075](https://github.com/civicrm/civicrm-core/pull/21075))**
+
+- **(REF) ReflectionUtils - Add findStandardProperties() and findMethodHelpers()
+ ([21114](https://github.com/civicrm/civicrm-core/pull/21114))**
+
+- **[Ref] Simplify IF clause
+ ([21078](https://github.com/civicrm/civicrm-core/pull/21078))**
+
+- **[Ref] extract function to getEmailDefaults
+ ([21067](https://github.com/civicrm/civicrm-core/pull/21067))**
+
+- **[Ref] Clarify what parameters are passed in
+ ([21063](https://github.com/civicrm/civicrm-core/pull/21063))**
+
+- **[Ref] Move rule to email trait
+ ([21066](https://github.com/civicrm/civicrm-core/pull/21066))**
+
+- **[Ref] cleanup alterActionSchedule
+ ([21047](https://github.com/civicrm/civicrm-core/pull/21047))**
+
+- **[Ref] Copy emailcommon function back to email trait
+ ([21251](https://github.com/civicrm/civicrm-core/pull/21251))**
+
+- **[REF] Update a few references to invoicing
+ ([21101](https://github.com/civicrm/civicrm-core/pull/21101))**
+
+- **[Ref] intial testing on case tokens, make knownTokens optional
+ ([21289](https://github.com/civicrm/civicrm-core/pull/21289))**
+
+- **[Ref] Deprecate Core_Error handling
+ ([21279](https://github.com/civicrm/civicrm-core/pull/21279))**
+
+- **[REF] Fix Page Hook test on php8 by putting in guard into customDataB…
+ ([21344](https://github.com/civicrm/civicrm-core/pull/21344))**
+
+- **[REF] Fix undefined smarty vars in Advanced Search
+ ([21321](https://github.com/civicrm/civicrm-core/pull/21321))**
+
+- **[REF] Improve Custom data insert performance when using the copyCusto…
+ ([21313](https://github.com/civicrm/civicrm-core/pull/21313))**
+
+- **[REF] Copy preProcessFromAddress back into the pdf function
+ ([21306](https://github.com/civicrm/civicrm-core/pull/21306))**
+
+- **[REF] Remove duplicate IF
+ ([21298](https://github.com/civicrm/civicrm-core/pull/21298))**
+
+- **[REF] Minor extraction
+ ([21296](https://github.com/civicrm/civicrm-core/pull/21296))**
+
+- **[REF] Remove unreachable code
+ ([21294](https://github.com/civicrm/civicrm-core/pull/21294))**
+
+- **[Ref] Minor extraction
+ ([21293](https://github.com/civicrm/civicrm-core/pull/21293))**
+
+- **REF Don't check if id is set in ContributionView form - it's required
+ ([21274](https://github.com/civicrm/civicrm-core/pull/21274))**
+
+- **[REF] Remove meaningless if
+ ([21273](https://github.com/civicrm/civicrm-core/pull/21273))**
+
+- **[NFC] Fix APIv4 Conformance tests on php8
+ ([21302](https://github.com/civicrm/civicrm-core/pull/21302))**
+
+- **[NFC] - Replace deprecated function in AngularLoaderTest
+ ([21244](https://github.com/civicrm/civicrm-core/pull/21244))**
+
+- **[NFC] CRM_Utils_SystemTest - Call to Uri->withPath() using deprecated format
+ ([21215](https://github.com/civicrm/civicrm-core/pull/21215))**
+
+- **[NFC] CRM_Extension_Manager_ModuleUpgTest - use ?? instead of
+ error-suppression operator
+ ([21214](https://github.com/civicrm/civicrm-core/pull/21214))**
+
+- **[NFC] CRM_Extension_Manager_ModuleTest - use ?? instead of error-suppression
+ operator ([21206](https://github.com/civicrm/civicrm-core/pull/21206))**
+
+- **[NFC] Update CRM_Core_RegionTest so it doesn't need the error-suppression
+ operator ([21155](https://github.com/civicrm/civicrm-core/pull/21155))**
+
+- **[NFC] Update testCaseActivityCopyTemplate to provide variable that would
+ usually be present
+ ([21146](https://github.com/civicrm/civicrm-core/pull/21146))**
+
+- **NFC - Fix docblock in CRM_Core_Transaction
+ ([21125](https://github.com/civicrm/civicrm-core/pull/21125))**
+
+- **[NFC] {Test} Minor cleanup
+ ([21116](https://github.com/civicrm/civicrm-core/pull/21116))**
+
+- **[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor
+ ([21324](https://github.com/civicrm/civicrm-core/pull/21324))**
+
+- **(NFC) Expand test coverage for scheduled-reminders with `{activity.*}`
+ tokens ([21092](https://github.com/civicrm/civicrm-core/pull/21092))**
+
+- **(NFC) TokenProcessorTest - Add scenario inspired by dev/core#2673
+ ([21090](https://github.com/civicrm/civicrm-core/pull/21090))**
+
+- **[NFC] Fix E-notice in Afform unit tests
+ ([21345](https://github.com/civicrm/civicrm-core/pull/21345))**
+
+- **[NFC] Cleanup boilerplate code in extension upgrader classes
+ ([21340](https://github.com/civicrm/civicrm-core/pull/21340))**
+
+- **[NFC/Unit test] Update flaky test
+ CRM_Utils_TokenConsistencyTest::testCaseTokenConsistency
+ ([21341](https://github.com/civicrm/civicrm-core/pull/21341))**
+
+- **(NFC) MailingQueryEvent - Add more docblocks about query-writing and
+ `tokenContext_*`
+ ([21098](https://github.com/civicrm/civicrm-core/pull/21098))**
+
+- **[NFC] Fix undefined array key when running CRM unit test suite in php8
+ ([21314](https://github.com/civicrm/civicrm-core/pull/21314))**
+
+- **Add test to UpdateSubscription form
+ ([21282](https://github.com/civicrm/civicrm-core/pull/21282))**
+
+- **Improve test for CRM_Utils_Recent
+ ([21222](https://github.com/civicrm/civicrm-core/pull/21222))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Alice Frumin, Andie Hunt; Agileware - Justin Freeman;
+Australian Greens - John Twyman; Benjamin W; CiviCRM - Coleman Watts, Tim Otten;
+CompuCorp - Debarshi Bhaumik, Lisandro; Coop SymbioTIC - Mathieu Lutfy; Dave D;
+Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick
+Figel; JMA Consulting - Joe Murray, Monish Deb, Seamus Lee; Joinery - Allen
+Shaw; Megaphone Technology Consulting - Jon Goldberg; MJW Consulting - Matthew
+Wire; Nicol Wistreich; Skvare - Sunil Pawar; Tadpole Collective - Kevin
+Cristiano; Third Sector Design - Kurund Jalmi, Michael McAndrew; Wikimedia
+Foundation - Eileen McNaughton; Wildsight - Lars Sanders-Green
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+Black Brick Software - David Hayes; CiviCoop - Jaap Jansma; Joinery - Allen
+Shaw; Lighthouse Consulting and Design - Brian Shaughnessy; redcuillin
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andie Hunt. If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/civicrm/settings/Contribute.setting.php b/civicrm/settings/Contribute.setting.php
index 28874f830c..fca6aee40e 100644
--- a/civicrm/settings/Contribute.setting.php
+++ b/civicrm/settings/Contribute.setting.php
@@ -145,22 +145,6 @@ return [
'is_contact' => 0,
'pseudoconstant' => ['callback' => 'CRM_Core_SelectValues::taxDisplayOptions'],
],
- 'acl_financial_type' => [
- 'group_name' => 'Contribute Preferences',
- 'group' => 'contribute',
- 'name' => 'acl_financial_type',
- 'type' => 'Boolean',
- 'html_type' => 'checkbox',
- 'quick_form_type' => 'Element',
- 'default' => 0,
- 'add' => '4.7',
- 'title' => ts('Enable Access Control by Financial Type'),
- 'is_domain' => 1,
- 'is_contact' => 0,
- 'help_text' => NULL,
- 'help' => ['id' => 'acl_financial_type'],
- 'settings_pages' => ['contribute' => ['weight' => 30]],
- ],
'deferred_revenue_enabled' => [
'group_name' => 'Contribute Preferences',
'group' => 'contribute',
diff --git a/civicrm/sql/civicrm.mysql b/civicrm/sql/civicrm.mysql
index 92195efaa3..d6df7ec8ce 100644
--- a/civicrm/sql/civicrm.mysql
+++ b/civicrm/sql/civicrm.mysql
@@ -995,7 +995,7 @@ ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMA
-- *******************************************************/
CREATE TABLE `civicrm_membership_status` (
`id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
- `name` varchar(128) COMMENT 'Name for Membership Status',
+ `name` varchar(128) NOT NULL COMMENT 'Name for Membership Status',
`label` varchar(128) COMMENT 'Label for Membership Status',
`start_event` varchar(12) COMMENT 'Event when this status starts.',
`start_event_adjust_unit` varchar(8) COMMENT 'Unit used for adjusting from start_event.',
@@ -2463,7 +2463,7 @@ CREATE TABLE `civicrm_membership_type` (
`member_of_contact_id` int unsigned NOT NULL COMMENT 'Owner organization for this membership type. FK to Contact ID',
`financial_type_id` int unsigned NOT NULL COMMENT 'If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id',
`minimum_fee` decimal(18,9) DEFAULT 0 COMMENT 'Minimum fee for this membership (0 for free/complimentary memberships).',
- `duration_unit` varchar(8) COMMENT 'Unit in which membership period is expressed.',
+ `duration_unit` varchar(8) NOT NULL COMMENT 'Unit in which membership period is expressed.',
`duration_interval` int COMMENT 'Number of duration units in membership period (e.g. 1 year, 12 months).',
`period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.',
`fixed_period_start_day` int COMMENT 'For fixed period memberships, month and day (mmdd) on which subscription/membership will start. Period start is back-dated unless after rollover day.',
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 363aa72871..c13880cd35 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -4809,7 +4809,8 @@ VALUES
('pledge_status' , 'Pledge Status' , NULL, 1, 1, 1),
('contribution_recur_status' , 'Recurring Contribution Status' , NULL, 1, 1, 1),
('environment' , 'Environment' , NULL, 1, 1, 0),
- ('activity_default_assignee' , 'Activity default assignee' , NULL, 1, 1, 0);
+ ('activity_default_assignee' , 'Activity default assignee' , NULL, 1, 1, 0),
+ ('entity_batch_extends' , 'Entity Batch Extends' , NULL, 1, 1, 0);
SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method';
SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type';
@@ -4894,6 +4895,7 @@ SELECT @option_group_id_ps := max(id) from civicrm_option_group where name =
SELECT @option_group_id_crs := max(id) from civicrm_option_group where name = 'contribution_recur_status';
SELECT @option_group_id_env := max(id) from civicrm_option_group where name = 'environment';
SELECT @option_group_id_default_assignee := max(id) from civicrm_option_group where name = 'activity_default_assignee';
+SELECT @option_group_id_entity_batch_extends := max(id) from civicrm_option_group where name = 'entity_batch_extends';
SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute';
SELECT @eventCompId := max(id) FROM civicrm_component where name = 'CiviEvent';
@@ -5181,7 +5183,7 @@ VALUES
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PostalMailing' , 5, 'CRM_Contact_Form_Search_Custom_PostalMailing', NULL, 0, NULL, 5, 'Postal Mailing', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Proximity' , 6, 'CRM_Contact_Form_Search_Custom_Proximity', NULL, 0, NULL, 6, 'Proximity Search', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_EventAggregate' , 7, 'CRM_Contact_Form_Search_Custom_EventAggregate', NULL, 0, NULL, 7, 'Event Aggregate', 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch' , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, NULL, 8, 'Activity Search', 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch' , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, NULL, 8, 'Activity Search', 0, 0, 0, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PriceSet' , 9, 'CRM_Contact_Form_Search_Custom_PriceSet', NULL, 0, NULL, 9, 'Price Set Details for Event Participants', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ZipCodeRange' ,10, 'CRM_Contact_Form_Search_Custom_ZipCodeRange', NULL, 0, NULL, 10, 'Zip Code Range', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_DateAdded' ,11, 'CRM_Contact_Form_Search_Custom_DateAdded', NULL, 0, NULL, 11, 'Date Added to CiviCRM', 0, 0, 1, NULL, NULL, NULL),
@@ -5664,7 +5666,12 @@ VALUES
(@option_group_id_default_assignee, 'None', '1', 'NONE', NULL, 0, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_default_assignee, 'By relationship to case client', '2', 'BY_RELATIONSHIP', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_default_assignee, 'Specific contact', '3', 'SPECIFIC_CONTACT', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-(@option_group_id_default_assignee, 'User creating the case', '4', 'USER_CREATING_THE_CASE', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL);
+(@option_group_id_default_assignee, 'User creating the case', '4', 'USER_CREATING_THE_CASE', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+-- Entity Batch options
+-- (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
+(@option_group_id_entity_batch_extends, 'Financial Transactions', 'civicrm_financial_trxn', 'civicrm_financial_trxn', NULL, 0, 1, 1, NULL, 0, 0, 1, @contributeCompId, NULL, NULL);
+
-- financial accounts
SELECT @opval := value FROM civicrm_option_value WHERE name = 'Revenue' and option_group_id = @option_group_id_fat;
@@ -23954,4 +23961,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.41.2';
+UPDATE civicrm_domain SET version = '5.42.0';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 4e5a1c42ee..a982baff27 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -2866,7 +2866,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES
- (1,'Default Domain Name',NULL,'5.41.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.42.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
@@ -5593,18 +5593,19 @@ INSERT INTO `civicrm_option_group` (`id`, `name`, `title`, `description`, `data_
(82,'contribution_recur_status','Recurring Contribution Status',NULL,NULL,1,1,1),
(83,'environment','Environment',NULL,NULL,1,1,0),
(84,'activity_default_assignee','Activity default assignee',NULL,NULL,1,1,0),
- (85,'languages','Languages','List of Languages',NULL,1,1,0),
- (86,'encounter_medium','Encounter Medium','Encounter medium for case activities (e.g. In Person, By Phone, etc.)',NULL,1,1,0),
- (87,'msg_tpl_workflow_case','Message Template Workflow for Cases','Message Template Workflow for Cases',NULL,1,1,0),
- (88,'msg_tpl_workflow_contribution','Message Template Workflow for Contributions','Message Template Workflow for Contributions',NULL,1,1,0),
- (89,'msg_tpl_workflow_event','Message Template Workflow for Events','Message Template Workflow for Events',NULL,1,1,0),
- (90,'msg_tpl_workflow_friend','Message Template Workflow for Tell-a-Friend','Message Template Workflow for Tell-a-Friend',NULL,1,1,0),
- (91,'msg_tpl_workflow_membership','Message Template Workflow for Memberships','Message Template Workflow for Memberships',NULL,1,1,0),
- (92,'msg_tpl_workflow_meta','Message Template Workflow for Meta Templates','Message Template Workflow for Meta Templates',NULL,1,1,0),
- (93,'msg_tpl_workflow_pledge','Message Template Workflow for Pledges','Message Template Workflow for Pledges',NULL,1,1,0),
- (94,'msg_tpl_workflow_uf','Message Template Workflow for Profiles','Message Template Workflow for Profiles',NULL,1,1,0),
- (95,'msg_tpl_workflow_petition','Message Template Workflow for Petition','Message Template Workflow for Petition',NULL,1,1,0),
- (96,'soft_credit_type','Soft Credit Types',NULL,NULL,1,1,0);
+ (85,'entity_batch_extends','Entity Batch Extends',NULL,NULL,1,1,0),
+ (86,'languages','Languages','List of Languages',NULL,1,1,0),
+ (87,'encounter_medium','Encounter Medium','Encounter medium for case activities (e.g. In Person, By Phone, etc.)',NULL,1,1,0),
+ (88,'msg_tpl_workflow_case','Message Template Workflow for Cases','Message Template Workflow for Cases',NULL,1,1,0),
+ (89,'msg_tpl_workflow_contribution','Message Template Workflow for Contributions','Message Template Workflow for Contributions',NULL,1,1,0),
+ (90,'msg_tpl_workflow_event','Message Template Workflow for Events','Message Template Workflow for Events',NULL,1,1,0),
+ (91,'msg_tpl_workflow_friend','Message Template Workflow for Tell-a-Friend','Message Template Workflow for Tell-a-Friend',NULL,1,1,0),
+ (92,'msg_tpl_workflow_membership','Message Template Workflow for Memberships','Message Template Workflow for Memberships',NULL,1,1,0),
+ (93,'msg_tpl_workflow_meta','Message Template Workflow for Meta Templates','Message Template Workflow for Meta Templates',NULL,1,1,0),
+ (94,'msg_tpl_workflow_pledge','Message Template Workflow for Pledges','Message Template Workflow for Pledges',NULL,1,1,0),
+ (95,'msg_tpl_workflow_uf','Message Template Workflow for Profiles','Message Template Workflow for Profiles',NULL,1,1,0),
+ (96,'msg_tpl_workflow_petition','Message Template Workflow for Petition','Message Template Workflow for Petition',NULL,1,1,0),
+ (97,'soft_credit_type','Soft Credit Types',NULL,NULL,1,1,0);
/*!40000 ALTER TABLE `civicrm_option_group` ENABLE KEYS */;
UNLOCK TABLES;
@@ -5838,7 +5839,7 @@ INSERT INTO `civicrm_option_value` (`id`, `option_group_id`, `label`, `value`, `
(221,25,'CRM_Contact_Form_Search_Custom_PostalMailing','5','CRM_Contact_Form_Search_Custom_PostalMailing',NULL,0,NULL,5,'Postal Mailing',0,0,1,NULL,NULL,NULL,NULL,NULL),
(222,25,'CRM_Contact_Form_Search_Custom_Proximity','6','CRM_Contact_Form_Search_Custom_Proximity',NULL,0,NULL,6,'Proximity Search',0,0,1,NULL,NULL,NULL,NULL,NULL),
(223,25,'CRM_Contact_Form_Search_Custom_EventAggregate','7','CRM_Contact_Form_Search_Custom_EventAggregate',NULL,0,NULL,7,'Event Aggregate',0,0,1,NULL,NULL,NULL,NULL,NULL),
- (224,25,'CRM_Contact_Form_Search_Custom_ActivitySearch','8','CRM_Contact_Form_Search_Custom_ActivitySearch',NULL,0,NULL,8,'Activity Search',0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (224,25,'CRM_Contact_Form_Search_Custom_ActivitySearch','8','CRM_Contact_Form_Search_Custom_ActivitySearch',NULL,0,NULL,8,'Activity Search',0,0,0,NULL,NULL,NULL,NULL,NULL),
(225,25,'CRM_Contact_Form_Search_Custom_PriceSet','9','CRM_Contact_Form_Search_Custom_PriceSet',NULL,0,NULL,9,'Price Set Details for Event Participants',0,0,1,NULL,NULL,NULL,NULL,NULL),
(226,25,'CRM_Contact_Form_Search_Custom_ZipCodeRange','10','CRM_Contact_Form_Search_Custom_ZipCodeRange',NULL,0,NULL,10,'Zip Code Range',0,0,1,NULL,NULL,NULL,NULL,NULL),
(227,25,'CRM_Contact_Form_Search_Custom_DateAdded','11','CRM_Contact_Form_Search_Custom_DateAdded',NULL,0,NULL,11,'Date Added to CiviCRM',0,0,1,NULL,NULL,NULL,NULL,NULL),
@@ -6228,259 +6229,260 @@ INSERT INTO `civicrm_option_value` (`id`, `option_group_id`, `label`, `value`, `
(611,84,'By relationship to case client','2','BY_RELATIONSHIP',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
(612,84,'Specific contact','3','SPECIFIC_CONTACT',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
(613,84,'User creating the case','4','USER_CREATING_THE_CASE',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (614,31,'\"FIXME\" <info@EXAMPLE.ORG>','1','\"FIXME\" <info@EXAMPLE.ORG>',NULL,0,1,1,'Default domain email address and from name.',0,0,1,NULL,1,NULL,NULL,NULL),
- (615,24,'Emergency','1','Emergency',NULL,0,1,1,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
- (616,24,'Family Support','2','Family Support',NULL,0,NULL,2,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
- (617,24,'General Protection','3','General Protection',NULL,0,NULL,3,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
- (618,24,'Impunity','4','Impunity',NULL,0,NULL,4,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
- (619,56,'Approved','1','Approved',NULL,0,1,1,NULL,0,1,1,4,1,NULL,NULL,NULL),
- (620,56,'Rejected','2','Rejected',NULL,0,0,2,NULL,0,1,1,4,1,NULL,NULL,NULL),
- (621,56,'None','3','None',NULL,0,0,3,NULL,0,1,1,4,1,NULL,NULL,NULL),
- (622,58,'Survey','Survey','civicrm_survey',NULL,0,NULL,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (623,58,'Cases','Case','civicrm_case',NULL,0,NULL,2,'CRM_Case_PseudoConstant::caseType;',0,0,1,NULL,NULL,NULL,NULL,NULL),
- (624,85,'Abkhaz','ab','ab_GE',NULL,0,0,1,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (625,85,'Afar','aa','aa_ET',NULL,0,0,2,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (626,85,'Afrikaans','af','af_ZA',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (627,85,'Akan','ak','ak_GH',NULL,0,0,4,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (628,85,'Albanian','sq','sq_AL',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (629,85,'Amharic','am','am_ET',NULL,0,0,6,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (630,85,'Arabic','ar','ar_EG',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (631,85,'Aragonese','an','an_ES',NULL,0,0,8,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (632,85,'Armenian','hy','hy_AM',NULL,0,0,9,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (633,85,'Assamese','as','as_IN',NULL,0,0,10,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (634,85,'Avaric','av','av_RU',NULL,0,0,11,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (635,85,'Avestan','ae','ae_XX',NULL,0,0,12,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (636,85,'Aymara','ay','ay_BO',NULL,0,0,13,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (637,85,'Azerbaijani','az','az_AZ',NULL,0,0,14,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (638,85,'Bambara','bm','bm_ML',NULL,0,0,15,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (639,85,'Bashkir','ba','ba_RU',NULL,0,0,16,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (640,85,'Basque','eu','eu_ES',NULL,0,0,17,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (641,85,'Belarusian','be','be_BY',NULL,0,0,18,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (642,85,'Bengali','bn','bn_BD',NULL,0,0,19,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (643,85,'Bihari','bh','bh_IN',NULL,0,0,20,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (644,85,'Bislama','bi','bi_VU',NULL,0,0,21,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (645,85,'Bosnian','bs','bs_BA',NULL,0,0,22,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (646,85,'Breton','br','br_FR',NULL,0,0,23,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (647,85,'Bulgarian','bg','bg_BG',NULL,0,0,24,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (648,85,'Burmese','my','my_MM',NULL,0,0,25,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (649,85,'Catalan; Valencian','ca','ca_ES',NULL,0,0,26,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (650,85,'Chamorro','ch','ch_GU',NULL,0,0,27,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (651,85,'Chechen','ce','ce_RU',NULL,0,0,28,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (652,85,'Chichewa; Chewa; Nyanja','ny','ny_MW',NULL,0,0,29,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (653,85,'Chinese (China)','zh','zh_CN',NULL,0,0,30,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (654,85,'Chinese (Taiwan)','zh','zh_TW',NULL,0,0,31,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (655,85,'Chuvash','cv','cv_RU',NULL,0,0,32,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (656,85,'Cornish','kw','kw_GB',NULL,0,0,33,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (657,85,'Corsican','co','co_FR',NULL,0,0,34,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (658,85,'Cree','cr','cr_CA',NULL,0,0,35,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (659,85,'Croatian','hr','hr_HR',NULL,0,0,36,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (660,85,'Czech','cs','cs_CZ',NULL,0,0,37,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (661,85,'Danish','da','da_DK',NULL,0,0,38,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (662,85,'Divehi; Dhivehi; Maldivian;','dv','dv_MV',NULL,0,0,39,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (663,85,'Dutch (Netherlands)','nl','nl_NL',NULL,0,0,40,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (664,85,'Dutch (Belgium)','nl','nl_BE',NULL,0,0,41,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (665,85,'Dzongkha','dz','dz_BT',NULL,0,0,42,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (666,85,'English (Australia)','en','en_AU',NULL,0,0,43,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (667,85,'English (Canada)','en','en_CA',NULL,0,0,44,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (668,85,'English (United Kingdom)','en','en_GB',NULL,0,0,45,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (669,85,'English (United States)','en','en_US',NULL,0,1,46,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (670,85,'Esperanto','eo','eo_XX',NULL,0,0,47,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (671,85,'Estonian','et','et_EE',NULL,0,0,48,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (672,85,'Ewe','ee','ee_GH',NULL,0,0,49,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (673,85,'Faroese','fo','fo_FO',NULL,0,0,50,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (674,85,'Fijian','fj','fj_FJ',NULL,0,0,51,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (675,85,'Finnish','fi','fi_FI',NULL,0,0,52,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (676,85,'French (Canada)','fr','fr_CA',NULL,0,0,53,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (677,85,'French (France)','fr','fr_FR',NULL,0,0,54,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (678,85,'Fula; Fulah; Pulaar; Pular','ff','ff_SN',NULL,0,0,55,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (679,85,'Galician','gl','gl_ES',NULL,0,0,56,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (680,85,'Georgian','ka','ka_GE',NULL,0,0,57,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (681,85,'German','de','de_DE',NULL,0,0,58,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (682,85,'German (Swiss)','de','de_CH',NULL,0,0,59,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (683,85,'Greek, Modern','el','el_GR',NULL,0,0,60,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (684,85,'GuaraniÂ','gn','gn_PY',NULL,0,0,61,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (685,85,'Gujarati','gu','gu_IN',NULL,0,0,62,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (686,85,'Haitian; Haitian Creole','ht','ht_HT',NULL,0,0,63,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (687,85,'Hausa','ha','ha_NG',NULL,0,0,64,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (688,85,'Hebrew (modern)','he','he_IL',NULL,0,0,65,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (689,85,'Herero','hz','hz_NA',NULL,0,0,66,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (690,85,'Hindi','hi','hi_IN',NULL,0,0,67,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (691,85,'Hiri Motu','ho','ho_PG',NULL,0,0,68,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (692,85,'Hungarian','hu','hu_HU',NULL,0,0,69,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (693,85,'Interlingua','ia','ia_XX',NULL,0,0,70,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (694,85,'Indonesian','id','id_ID',NULL,0,0,71,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (695,85,'Interlingue','ie','ie_XX',NULL,0,0,72,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (696,85,'Irish','ga','ga_IE',NULL,0,0,73,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (697,85,'Igbo','ig','ig_NG',NULL,0,0,74,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (698,85,'Inupiaq','ik','ik_US',NULL,0,0,75,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (699,85,'Ido','io','io_XX',NULL,0,0,76,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (700,85,'Icelandic','is','is_IS',NULL,0,0,77,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (701,85,'Italian','it','it_IT',NULL,0,0,78,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (702,85,'Inuktitut','iu','iu_CA',NULL,0,0,79,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (703,85,'Japanese','ja','ja_JP',NULL,0,0,80,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (704,85,'Javanese','jv','jv_ID',NULL,0,0,81,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (705,85,'Kalaallisut, Greenlandic','kl','kl_GL',NULL,0,0,82,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (706,85,'Kannada','kn','kn_IN',NULL,0,0,83,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (707,85,'Kanuri','kr','kr_NE',NULL,0,0,84,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (708,85,'Kashmiri','ks','ks_IN',NULL,0,0,85,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (709,85,'Kazakh','kk','kk_KZ',NULL,0,0,86,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (710,85,'Khmer','km','km_KH',NULL,0,0,87,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (711,85,'Kikuyu, Gikuyu','ki','ki_KE',NULL,0,0,88,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (712,85,'Kinyarwanda','rw','rw_RW',NULL,0,0,89,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (713,85,'Kirghiz, Kyrgyz','ky','ky_KG',NULL,0,0,90,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (714,85,'Komi','kv','kv_RU',NULL,0,0,91,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (715,85,'Kongo','kg','kg_CD',NULL,0,0,92,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (716,85,'Korean','ko','ko_KR',NULL,0,0,93,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (717,85,'Kurdish','ku','ku_IQ',NULL,0,0,94,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (718,85,'Kwanyama, Kuanyama','kj','kj_NA',NULL,0,0,95,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (719,85,'Latin','la','la_VA',NULL,0,0,96,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (720,85,'Luxembourgish, Letzeburgesch','lb','lb_LU',NULL,0,0,97,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (721,85,'Luganda','lg','lg_UG',NULL,0,0,98,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (722,85,'Limburgish, Limburgan, Limburger','li','li_NL',NULL,0,0,99,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (723,85,'Lingala','ln','ln_CD',NULL,0,0,100,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (724,85,'Lao','lo','lo_LA',NULL,0,0,101,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (725,85,'Lithuanian','lt','lt_LT',NULL,0,0,102,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (726,85,'Luba-Katanga','lu','lu_CD',NULL,0,0,103,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (727,85,'Latvian','lv','lv_LV',NULL,0,0,104,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (728,85,'Manx','gv','gv_IM',NULL,0,0,105,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (729,85,'Macedonian','mk','mk_MK',NULL,0,0,106,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (730,85,'Malagasy','mg','mg_MG',NULL,0,0,107,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (731,85,'Malay','ms','ms_MY',NULL,0,0,108,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (732,85,'Malayalam','ml','ml_IN',NULL,0,0,109,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (733,85,'Maltese','mt','mt_MT',NULL,0,0,110,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (734,85,'MÄori','mi','mi_NZ',NULL,0,0,111,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (735,85,'Marathi','mr','mr_IN',NULL,0,0,112,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (736,85,'Marshallese','mh','mh_MH',NULL,0,0,113,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (737,85,'Mongolian','mn','mn_MN',NULL,0,0,114,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (738,85,'Nauru','na','na_NR',NULL,0,0,115,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (739,85,'Navajo, Navaho','nv','nv_US',NULL,0,0,116,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (740,85,'Norwegian Bokmål','nb','nb_NO',NULL,0,0,117,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (741,85,'North Ndebele','nd','nd_ZW',NULL,0,0,118,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (742,85,'Nepali','ne','ne_NP',NULL,0,0,119,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (743,85,'Ndonga','ng','ng_NA',NULL,0,0,120,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (744,85,'Norwegian Nynorsk','nn','nn_NO',NULL,0,0,121,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (745,85,'Norwegian','no','no_NO',NULL,0,0,122,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (746,85,'Nuosu','ii','ii_CN',NULL,0,0,123,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (747,85,'South Ndebele','nr','nr_ZA',NULL,0,0,124,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (748,85,'Occitan (after 1500)','oc','oc_FR',NULL,0,0,125,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (749,85,'Ojibwa','oj','oj_CA',NULL,0,0,126,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (750,85,'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic','cu','cu_BG',NULL,0,0,127,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (751,85,'Oromo','om','om_ET',NULL,0,0,128,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (752,85,'Oriya','or','or_IN',NULL,0,0,129,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (753,85,'Ossetian, Ossetic','os','os_GE',NULL,0,0,130,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (754,85,'Panjabi, Punjabi','pa','pa_IN',NULL,0,0,131,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (755,85,'Pali','pi','pi_KH',NULL,0,0,132,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (756,85,'Persian (Iran)','fa','fa_IR',NULL,0,0,133,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (757,85,'Polish','pl','pl_PL',NULL,0,0,134,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (758,85,'Pashto, Pushto','ps','ps_AF',NULL,0,0,135,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (759,85,'Portuguese (Brazil)','pt','pt_BR',NULL,0,0,136,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (760,85,'Portuguese (Portugal)','pt','pt_PT',NULL,0,0,137,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (761,85,'Quechua','qu','qu_PE',NULL,0,0,138,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (762,85,'Romansh','rm','rm_CH',NULL,0,0,139,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (763,85,'Kirundi','rn','rn_BI',NULL,0,0,140,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (764,85,'Romanian, Moldavian, Moldovan','ro','ro_RO',NULL,0,0,141,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (765,85,'Russian','ru','ru_RU',NULL,0,0,142,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (766,85,'Sanskrit','sa','sa_IN',NULL,0,0,143,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (767,85,'Sardinian','sc','sc_IT',NULL,0,0,144,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (768,85,'Sindhi','sd','sd_IN',NULL,0,0,145,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (769,85,'Northern Sami','se','se_NO',NULL,0,0,146,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (770,85,'Samoan','sm','sm_WS',NULL,0,0,147,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (771,85,'Sango','sg','sg_CF',NULL,0,0,148,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (772,85,'Serbian','sr','sr_RS',NULL,0,0,149,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (773,85,'Scottish Gaelic; Gaelic','gd','gd_GB',NULL,0,0,150,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (774,85,'Shona','sn','sn_ZW',NULL,0,0,151,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (775,85,'Sinhala, Sinhalese','si','si_LK',NULL,0,0,152,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (776,85,'Slovak','sk','sk_SK',NULL,0,0,153,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (777,85,'Slovene','sl','sl_SI',NULL,0,0,154,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (778,85,'Somali','so','so_SO',NULL,0,0,155,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (779,85,'Southern Sotho','st','st_ZA',NULL,0,0,156,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (780,85,'Spanish; Castilian (Spain)','es','es_ES',NULL,0,0,157,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (781,85,'Spanish; Castilian (Mexico)','es','es_MX',NULL,0,0,158,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (782,85,'Spanish; Castilian (Puerto Rico)','es','es_PR',NULL,0,0,159,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (783,85,'Sundanese','su','su_ID',NULL,0,0,160,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (784,85,'Swahili','sw','sw_TZ',NULL,0,0,161,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (785,85,'Swati','ss','ss_ZA',NULL,0,0,162,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (786,85,'Swedish','sv','sv_SE',NULL,0,0,163,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (787,85,'Tamil','ta','ta_IN',NULL,0,0,164,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (788,85,'Telugu','te','te_IN',NULL,0,0,165,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (789,85,'Tajik','tg','tg_TJ',NULL,0,0,166,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (790,85,'Thai','th','th_TH',NULL,0,0,167,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (791,85,'Tigrinya','ti','ti_ET',NULL,0,0,168,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (792,85,'Tibetan Standard, Tibetan, Central','bo','bo_CN',NULL,0,0,169,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (793,85,'Turkmen','tk','tk_TM',NULL,0,0,170,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (794,85,'Tagalog','tl','tl_PH',NULL,0,0,171,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (795,85,'Tswana','tn','tn_ZA',NULL,0,0,172,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (796,85,'Tonga (Tonga Islands)','to','to_TO',NULL,0,0,173,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (797,85,'Turkish','tr','tr_TR',NULL,0,0,174,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (798,85,'Tsonga','ts','ts_ZA',NULL,0,0,175,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (799,85,'Tatar','tt','tt_RU',NULL,0,0,176,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (800,85,'Twi','tw','tw_GH',NULL,0,0,177,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (801,85,'Tahitian','ty','ty_PF',NULL,0,0,178,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (802,85,'Uighur, Uyghur','ug','ug_CN',NULL,0,0,179,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (803,85,'Ukrainian','uk','uk_UA',NULL,0,0,180,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (804,85,'Urdu','ur','ur_PK',NULL,0,0,181,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (805,85,'Uzbek','uz','uz_UZ',NULL,0,0,182,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (806,85,'Venda','ve','ve_ZA',NULL,0,0,183,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (807,85,'Vietnamese','vi','vi_VN',NULL,0,0,184,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (808,85,'Volapük','vo','vo_XX',NULL,0,0,185,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (809,85,'Walloon','wa','wa_BE',NULL,0,0,186,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (810,85,'Welsh','cy','cy_GB',NULL,0,0,187,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (811,85,'Wolof','wo','wo_SN',NULL,0,0,188,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (812,85,'Western Frisian','fy','fy_NL',NULL,0,0,189,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (813,85,'Xhosa','xh','xh_ZA',NULL,0,0,190,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (814,85,'Yiddish','yi','yi_US',NULL,0,0,191,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (815,85,'Yoruba','yo','yo_NG',NULL,0,0,192,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (816,85,'Zhuang, Chuang','za','za_CN',NULL,0,0,193,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (817,85,'Zulu','zu','zu_ZA',NULL,0,0,194,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
- (818,86,'In Person','1','in_person',NULL,0,0,1,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (819,86,'Phone','2','phone',NULL,0,1,2,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (820,86,'Email','3','email',NULL,0,0,3,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (821,86,'Fax','4','fax',NULL,0,0,4,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (822,86,'Letter Mail','5','letter_mail',NULL,0,0,5,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (823,87,'Cases - Send Copy of an Activity','1','case_activity',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (824,88,'Contributions - Duplicate Organization Alert','1','contribution_dupalert',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (825,88,'Contributions - Receipt (off-line)','2','contribution_offline_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (826,88,'Contributions - Receipt (on-line)','3','contribution_online_receipt',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (827,88,'Contributions - Invoice','4','contribution_invoice_receipt',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (828,88,'Contributions - Recurring Start and End Notification','5','contribution_recurring_notify',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (829,88,'Contributions - Recurring Cancellation Notification','6','contribution_recurring_cancelled',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (830,88,'Contributions - Recurring Billing Updates','7','contribution_recurring_billing',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (831,88,'Contributions - Recurring Updates','8','contribution_recurring_edit',NULL,0,0,8,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (832,88,'Personal Campaign Pages - Admin Notification','9','pcp_notify',NULL,0,0,9,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (833,88,'Personal Campaign Pages - Supporter Status Change Notification','10','pcp_status_change',NULL,0,0,10,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (834,88,'Personal Campaign Pages - Supporter Welcome','11','pcp_supporter_notify',NULL,0,0,11,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (835,88,'Personal Campaign Pages - Owner Notification','12','pcp_owner_notify',NULL,0,0,12,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (836,88,'Additional Payment Receipt or Refund Notification','13','payment_or_refund_notification',NULL,0,0,13,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (837,89,'Events - Registration Confirmation and Receipt (off-line)','1','event_offline_receipt',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (838,89,'Events - Registration Confirmation and Receipt (on-line)','2','event_online_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (839,89,'Events - Receipt only','3','event_registration_receipt',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (840,89,'Events - Registration Cancellation Notice','4','participant_cancelled',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (841,89,'Events - Registration Confirmation Invite','5','participant_confirm',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (842,89,'Events - Pending Registration Expiration Notice','6','participant_expired',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (843,89,'Events - Registration Transferred Notice','7','participant_transferred',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (844,90,'Tell-a-Friend Email','1','friend',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (845,91,'Memberships - Signup and Renewal Receipts (off-line)','1','membership_offline_receipt',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (846,91,'Memberships - Receipt (on-line)','2','membership_online_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (847,91,'Memberships - Auto-renew Cancellation Notification','3','membership_autorenew_cancelled',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (848,91,'Memberships - Auto-renew Billing Updates','4','membership_autorenew_billing',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (849,92,'Test-drive - Receipt Header','1','test_preview',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (850,93,'Pledges - Acknowledgement','1','pledge_acknowledge',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (851,93,'Pledges - Payment Reminder','2','pledge_reminder',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (852,94,'Profiles - Admin Notification','1','uf_notify',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (853,95,'Petition - signature added','1','petition_sign',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (854,95,'Petition - need verification','2','petition_confirmation_needed',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (855,96,'In Honor of','1','in_honor_of',NULL,0,0,1,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (856,96,'In Memory of','2','in_memory_of',NULL,0,0,2,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (857,96,'Solicited','3','solicited',NULL,0,1,3,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (858,96,'Household','4','household',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (859,96,'Workplace Giving','5','workplace',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (860,96,'Foundation Affiliate','6','foundation_affiliate',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (861,96,'3rd-party Service','7','3rd-party_service',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (862,96,'Donor-advised Fund','8','donor-advised_fund',NULL,0,0,8,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (863,96,'Matched Gift','9','matched_gift',NULL,0,0,9,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
- (864,96,'Personal Campaign Page','10','pcp',NULL,0,0,10,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (865,96,'Gift','11','gift',NULL,0,0,11,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
- (866,2,'Interview','55','Interview',NULL,0,NULL,55,'Conduct a phone or in person interview.',0,0,1,NULL,NULL,NULL,'fa-comment-o',NULL);
+ (614,85,'Financial Transactions','civicrm_financial_trxn','civicrm_financial_trxn',NULL,0,1,1,NULL,0,0,1,2,NULL,NULL,NULL,NULL),
+ (615,31,'\"FIXME\" <info@EXAMPLE.ORG>','1','\"FIXME\" <info@EXAMPLE.ORG>',NULL,0,1,1,'Default domain email address and from name.',0,0,1,NULL,1,NULL,NULL,NULL),
+ (616,24,'Emergency','1','Emergency',NULL,0,1,1,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
+ (617,24,'Family Support','2','Family Support',NULL,0,NULL,2,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
+ (618,24,'General Protection','3','General Protection',NULL,0,NULL,3,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
+ (619,24,'Impunity','4','Impunity',NULL,0,NULL,4,NULL,0,0,1,NULL,1,NULL,NULL,NULL),
+ (620,56,'Approved','1','Approved',NULL,0,1,1,NULL,0,1,1,4,1,NULL,NULL,NULL),
+ (621,56,'Rejected','2','Rejected',NULL,0,0,2,NULL,0,1,1,4,1,NULL,NULL,NULL),
+ (622,56,'None','3','None',NULL,0,0,3,NULL,0,1,1,4,1,NULL,NULL,NULL),
+ (623,58,'Survey','Survey','civicrm_survey',NULL,0,NULL,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (624,58,'Cases','Case','civicrm_case',NULL,0,NULL,2,'CRM_Case_PseudoConstant::caseType;',0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (625,86,'Abkhaz','ab','ab_GE',NULL,0,0,1,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (626,86,'Afar','aa','aa_ET',NULL,0,0,2,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (627,86,'Afrikaans','af','af_ZA',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (628,86,'Akan','ak','ak_GH',NULL,0,0,4,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (629,86,'Albanian','sq','sq_AL',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (630,86,'Amharic','am','am_ET',NULL,0,0,6,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (631,86,'Arabic','ar','ar_EG',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (632,86,'Aragonese','an','an_ES',NULL,0,0,8,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (633,86,'Armenian','hy','hy_AM',NULL,0,0,9,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (634,86,'Assamese','as','as_IN',NULL,0,0,10,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (635,86,'Avaric','av','av_RU',NULL,0,0,11,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (636,86,'Avestan','ae','ae_XX',NULL,0,0,12,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (637,86,'Aymara','ay','ay_BO',NULL,0,0,13,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (638,86,'Azerbaijani','az','az_AZ',NULL,0,0,14,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (639,86,'Bambara','bm','bm_ML',NULL,0,0,15,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (640,86,'Bashkir','ba','ba_RU',NULL,0,0,16,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (641,86,'Basque','eu','eu_ES',NULL,0,0,17,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (642,86,'Belarusian','be','be_BY',NULL,0,0,18,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (643,86,'Bengali','bn','bn_BD',NULL,0,0,19,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (644,86,'Bihari','bh','bh_IN',NULL,0,0,20,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (645,86,'Bislama','bi','bi_VU',NULL,0,0,21,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (646,86,'Bosnian','bs','bs_BA',NULL,0,0,22,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (647,86,'Breton','br','br_FR',NULL,0,0,23,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (648,86,'Bulgarian','bg','bg_BG',NULL,0,0,24,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (649,86,'Burmese','my','my_MM',NULL,0,0,25,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (650,86,'Catalan; Valencian','ca','ca_ES',NULL,0,0,26,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (651,86,'Chamorro','ch','ch_GU',NULL,0,0,27,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (652,86,'Chechen','ce','ce_RU',NULL,0,0,28,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (653,86,'Chichewa; Chewa; Nyanja','ny','ny_MW',NULL,0,0,29,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (654,86,'Chinese (China)','zh','zh_CN',NULL,0,0,30,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (655,86,'Chinese (Taiwan)','zh','zh_TW',NULL,0,0,31,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (656,86,'Chuvash','cv','cv_RU',NULL,0,0,32,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (657,86,'Cornish','kw','kw_GB',NULL,0,0,33,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (658,86,'Corsican','co','co_FR',NULL,0,0,34,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (659,86,'Cree','cr','cr_CA',NULL,0,0,35,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (660,86,'Croatian','hr','hr_HR',NULL,0,0,36,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (661,86,'Czech','cs','cs_CZ',NULL,0,0,37,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (662,86,'Danish','da','da_DK',NULL,0,0,38,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (663,86,'Divehi; Dhivehi; Maldivian;','dv','dv_MV',NULL,0,0,39,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (664,86,'Dutch (Netherlands)','nl','nl_NL',NULL,0,0,40,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (665,86,'Dutch (Belgium)','nl','nl_BE',NULL,0,0,41,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (666,86,'Dzongkha','dz','dz_BT',NULL,0,0,42,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (667,86,'English (Australia)','en','en_AU',NULL,0,0,43,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (668,86,'English (Canada)','en','en_CA',NULL,0,0,44,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (669,86,'English (United Kingdom)','en','en_GB',NULL,0,0,45,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (670,86,'English (United States)','en','en_US',NULL,0,1,46,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (671,86,'Esperanto','eo','eo_XX',NULL,0,0,47,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (672,86,'Estonian','et','et_EE',NULL,0,0,48,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (673,86,'Ewe','ee','ee_GH',NULL,0,0,49,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (674,86,'Faroese','fo','fo_FO',NULL,0,0,50,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (675,86,'Fijian','fj','fj_FJ',NULL,0,0,51,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (676,86,'Finnish','fi','fi_FI',NULL,0,0,52,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (677,86,'French (Canada)','fr','fr_CA',NULL,0,0,53,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (678,86,'French (France)','fr','fr_FR',NULL,0,0,54,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (679,86,'Fula; Fulah; Pulaar; Pular','ff','ff_SN',NULL,0,0,55,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (680,86,'Galician','gl','gl_ES',NULL,0,0,56,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (681,86,'Georgian','ka','ka_GE',NULL,0,0,57,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (682,86,'German','de','de_DE',NULL,0,0,58,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (683,86,'German (Swiss)','de','de_CH',NULL,0,0,59,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (684,86,'Greek, Modern','el','el_GR',NULL,0,0,60,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (685,86,'GuaraniÂ','gn','gn_PY',NULL,0,0,61,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (686,86,'Gujarati','gu','gu_IN',NULL,0,0,62,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (687,86,'Haitian; Haitian Creole','ht','ht_HT',NULL,0,0,63,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (688,86,'Hausa','ha','ha_NG',NULL,0,0,64,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (689,86,'Hebrew (modern)','he','he_IL',NULL,0,0,65,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (690,86,'Herero','hz','hz_NA',NULL,0,0,66,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (691,86,'Hindi','hi','hi_IN',NULL,0,0,67,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (692,86,'Hiri Motu','ho','ho_PG',NULL,0,0,68,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (693,86,'Hungarian','hu','hu_HU',NULL,0,0,69,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (694,86,'Interlingua','ia','ia_XX',NULL,0,0,70,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (695,86,'Indonesian','id','id_ID',NULL,0,0,71,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (696,86,'Interlingue','ie','ie_XX',NULL,0,0,72,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (697,86,'Irish','ga','ga_IE',NULL,0,0,73,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (698,86,'Igbo','ig','ig_NG',NULL,0,0,74,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (699,86,'Inupiaq','ik','ik_US',NULL,0,0,75,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (700,86,'Ido','io','io_XX',NULL,0,0,76,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (701,86,'Icelandic','is','is_IS',NULL,0,0,77,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (702,86,'Italian','it','it_IT',NULL,0,0,78,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (703,86,'Inuktitut','iu','iu_CA',NULL,0,0,79,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (704,86,'Japanese','ja','ja_JP',NULL,0,0,80,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (705,86,'Javanese','jv','jv_ID',NULL,0,0,81,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (706,86,'Kalaallisut, Greenlandic','kl','kl_GL',NULL,0,0,82,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (707,86,'Kannada','kn','kn_IN',NULL,0,0,83,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (708,86,'Kanuri','kr','kr_NE',NULL,0,0,84,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (709,86,'Kashmiri','ks','ks_IN',NULL,0,0,85,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (710,86,'Kazakh','kk','kk_KZ',NULL,0,0,86,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (711,86,'Khmer','km','km_KH',NULL,0,0,87,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (712,86,'Kikuyu, Gikuyu','ki','ki_KE',NULL,0,0,88,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (713,86,'Kinyarwanda','rw','rw_RW',NULL,0,0,89,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (714,86,'Kirghiz, Kyrgyz','ky','ky_KG',NULL,0,0,90,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (715,86,'Komi','kv','kv_RU',NULL,0,0,91,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (716,86,'Kongo','kg','kg_CD',NULL,0,0,92,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (717,86,'Korean','ko','ko_KR',NULL,0,0,93,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (718,86,'Kurdish','ku','ku_IQ',NULL,0,0,94,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (719,86,'Kwanyama, Kuanyama','kj','kj_NA',NULL,0,0,95,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (720,86,'Latin','la','la_VA',NULL,0,0,96,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (721,86,'Luxembourgish, Letzeburgesch','lb','lb_LU',NULL,0,0,97,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (722,86,'Luganda','lg','lg_UG',NULL,0,0,98,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (723,86,'Limburgish, Limburgan, Limburger','li','li_NL',NULL,0,0,99,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (724,86,'Lingala','ln','ln_CD',NULL,0,0,100,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (725,86,'Lao','lo','lo_LA',NULL,0,0,101,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (726,86,'Lithuanian','lt','lt_LT',NULL,0,0,102,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (727,86,'Luba-Katanga','lu','lu_CD',NULL,0,0,103,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (728,86,'Latvian','lv','lv_LV',NULL,0,0,104,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (729,86,'Manx','gv','gv_IM',NULL,0,0,105,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (730,86,'Macedonian','mk','mk_MK',NULL,0,0,106,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (731,86,'Malagasy','mg','mg_MG',NULL,0,0,107,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (732,86,'Malay','ms','ms_MY',NULL,0,0,108,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (733,86,'Malayalam','ml','ml_IN',NULL,0,0,109,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (734,86,'Maltese','mt','mt_MT',NULL,0,0,110,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (735,86,'MÄori','mi','mi_NZ',NULL,0,0,111,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (736,86,'Marathi','mr','mr_IN',NULL,0,0,112,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (737,86,'Marshallese','mh','mh_MH',NULL,0,0,113,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (738,86,'Mongolian','mn','mn_MN',NULL,0,0,114,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (739,86,'Nauru','na','na_NR',NULL,0,0,115,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (740,86,'Navajo, Navaho','nv','nv_US',NULL,0,0,116,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (741,86,'Norwegian Bokmål','nb','nb_NO',NULL,0,0,117,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (742,86,'North Ndebele','nd','nd_ZW',NULL,0,0,118,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (743,86,'Nepali','ne','ne_NP',NULL,0,0,119,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (744,86,'Ndonga','ng','ng_NA',NULL,0,0,120,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (745,86,'Norwegian Nynorsk','nn','nn_NO',NULL,0,0,121,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (746,86,'Norwegian','no','no_NO',NULL,0,0,122,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (747,86,'Nuosu','ii','ii_CN',NULL,0,0,123,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (748,86,'South Ndebele','nr','nr_ZA',NULL,0,0,124,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (749,86,'Occitan (after 1500)','oc','oc_FR',NULL,0,0,125,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (750,86,'Ojibwa','oj','oj_CA',NULL,0,0,126,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (751,86,'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic','cu','cu_BG',NULL,0,0,127,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (752,86,'Oromo','om','om_ET',NULL,0,0,128,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (753,86,'Oriya','or','or_IN',NULL,0,0,129,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (754,86,'Ossetian, Ossetic','os','os_GE',NULL,0,0,130,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (755,86,'Panjabi, Punjabi','pa','pa_IN',NULL,0,0,131,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (756,86,'Pali','pi','pi_KH',NULL,0,0,132,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (757,86,'Persian (Iran)','fa','fa_IR',NULL,0,0,133,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (758,86,'Polish','pl','pl_PL',NULL,0,0,134,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (759,86,'Pashto, Pushto','ps','ps_AF',NULL,0,0,135,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (760,86,'Portuguese (Brazil)','pt','pt_BR',NULL,0,0,136,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (761,86,'Portuguese (Portugal)','pt','pt_PT',NULL,0,0,137,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (762,86,'Quechua','qu','qu_PE',NULL,0,0,138,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (763,86,'Romansh','rm','rm_CH',NULL,0,0,139,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (764,86,'Kirundi','rn','rn_BI',NULL,0,0,140,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (765,86,'Romanian, Moldavian, Moldovan','ro','ro_RO',NULL,0,0,141,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (766,86,'Russian','ru','ru_RU',NULL,0,0,142,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (767,86,'Sanskrit','sa','sa_IN',NULL,0,0,143,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (768,86,'Sardinian','sc','sc_IT',NULL,0,0,144,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (769,86,'Sindhi','sd','sd_IN',NULL,0,0,145,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (770,86,'Northern Sami','se','se_NO',NULL,0,0,146,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (771,86,'Samoan','sm','sm_WS',NULL,0,0,147,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (772,86,'Sango','sg','sg_CF',NULL,0,0,148,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (773,86,'Serbian','sr','sr_RS',NULL,0,0,149,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (774,86,'Scottish Gaelic; Gaelic','gd','gd_GB',NULL,0,0,150,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (775,86,'Shona','sn','sn_ZW',NULL,0,0,151,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (776,86,'Sinhala, Sinhalese','si','si_LK',NULL,0,0,152,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (777,86,'Slovak','sk','sk_SK',NULL,0,0,153,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (778,86,'Slovene','sl','sl_SI',NULL,0,0,154,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (779,86,'Somali','so','so_SO',NULL,0,0,155,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (780,86,'Southern Sotho','st','st_ZA',NULL,0,0,156,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (781,86,'Spanish; Castilian (Spain)','es','es_ES',NULL,0,0,157,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (782,86,'Spanish; Castilian (Mexico)','es','es_MX',NULL,0,0,158,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (783,86,'Spanish; Castilian (Puerto Rico)','es','es_PR',NULL,0,0,159,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (784,86,'Sundanese','su','su_ID',NULL,0,0,160,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (785,86,'Swahili','sw','sw_TZ',NULL,0,0,161,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (786,86,'Swati','ss','ss_ZA',NULL,0,0,162,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (787,86,'Swedish','sv','sv_SE',NULL,0,0,163,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (788,86,'Tamil','ta','ta_IN',NULL,0,0,164,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (789,86,'Telugu','te','te_IN',NULL,0,0,165,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (790,86,'Tajik','tg','tg_TJ',NULL,0,0,166,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (791,86,'Thai','th','th_TH',NULL,0,0,167,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (792,86,'Tigrinya','ti','ti_ET',NULL,0,0,168,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (793,86,'Tibetan Standard, Tibetan, Central','bo','bo_CN',NULL,0,0,169,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (794,86,'Turkmen','tk','tk_TM',NULL,0,0,170,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (795,86,'Tagalog','tl','tl_PH',NULL,0,0,171,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (796,86,'Tswana','tn','tn_ZA',NULL,0,0,172,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (797,86,'Tonga (Tonga Islands)','to','to_TO',NULL,0,0,173,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (798,86,'Turkish','tr','tr_TR',NULL,0,0,174,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (799,86,'Tsonga','ts','ts_ZA',NULL,0,0,175,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (800,86,'Tatar','tt','tt_RU',NULL,0,0,176,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (801,86,'Twi','tw','tw_GH',NULL,0,0,177,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (802,86,'Tahitian','ty','ty_PF',NULL,0,0,178,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (803,86,'Uighur, Uyghur','ug','ug_CN',NULL,0,0,179,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (804,86,'Ukrainian','uk','uk_UA',NULL,0,0,180,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (805,86,'Urdu','ur','ur_PK',NULL,0,0,181,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (806,86,'Uzbek','uz','uz_UZ',NULL,0,0,182,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (807,86,'Venda','ve','ve_ZA',NULL,0,0,183,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (808,86,'Vietnamese','vi','vi_VN',NULL,0,0,184,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (809,86,'Volapük','vo','vo_XX',NULL,0,0,185,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (810,86,'Walloon','wa','wa_BE',NULL,0,0,186,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (811,86,'Welsh','cy','cy_GB',NULL,0,0,187,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (812,86,'Wolof','wo','wo_SN',NULL,0,0,188,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (813,86,'Western Frisian','fy','fy_NL',NULL,0,0,189,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (814,86,'Xhosa','xh','xh_ZA',NULL,0,0,190,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (815,86,'Yiddish','yi','yi_US',NULL,0,0,191,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (816,86,'Yoruba','yo','yo_NG',NULL,0,0,192,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (817,86,'Zhuang, Chuang','za','za_CN',NULL,0,0,193,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (818,86,'Zulu','zu','zu_ZA',NULL,0,0,194,NULL,0,0,0,NULL,NULL,NULL,NULL,NULL),
+ (819,87,'In Person','1','in_person',NULL,0,0,1,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (820,87,'Phone','2','phone',NULL,0,1,2,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (821,87,'Email','3','email',NULL,0,0,3,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (822,87,'Fax','4','fax',NULL,0,0,4,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (823,87,'Letter Mail','5','letter_mail',NULL,0,0,5,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (824,88,'Cases - Send Copy of an Activity','1','case_activity',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (825,89,'Contributions - Duplicate Organization Alert','1','contribution_dupalert',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (826,89,'Contributions - Receipt (off-line)','2','contribution_offline_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (827,89,'Contributions - Receipt (on-line)','3','contribution_online_receipt',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (828,89,'Contributions - Invoice','4','contribution_invoice_receipt',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (829,89,'Contributions - Recurring Start and End Notification','5','contribution_recurring_notify',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (830,89,'Contributions - Recurring Cancellation Notification','6','contribution_recurring_cancelled',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (831,89,'Contributions - Recurring Billing Updates','7','contribution_recurring_billing',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (832,89,'Contributions - Recurring Updates','8','contribution_recurring_edit',NULL,0,0,8,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (833,89,'Personal Campaign Pages - Admin Notification','9','pcp_notify',NULL,0,0,9,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (834,89,'Personal Campaign Pages - Supporter Status Change Notification','10','pcp_status_change',NULL,0,0,10,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (835,89,'Personal Campaign Pages - Supporter Welcome','11','pcp_supporter_notify',NULL,0,0,11,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (836,89,'Personal Campaign Pages - Owner Notification','12','pcp_owner_notify',NULL,0,0,12,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (837,89,'Additional Payment Receipt or Refund Notification','13','payment_or_refund_notification',NULL,0,0,13,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (838,90,'Events - Registration Confirmation and Receipt (off-line)','1','event_offline_receipt',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (839,90,'Events - Registration Confirmation and Receipt (on-line)','2','event_online_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (840,90,'Events - Receipt only','3','event_registration_receipt',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (841,90,'Events - Registration Cancellation Notice','4','participant_cancelled',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (842,90,'Events - Registration Confirmation Invite','5','participant_confirm',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (843,90,'Events - Pending Registration Expiration Notice','6','participant_expired',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (844,90,'Events - Registration Transferred Notice','7','participant_transferred',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (845,91,'Tell-a-Friend Email','1','friend',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (846,92,'Memberships - Signup and Renewal Receipts (off-line)','1','membership_offline_receipt',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (847,92,'Memberships - Receipt (on-line)','2','membership_online_receipt',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (848,92,'Memberships - Auto-renew Cancellation Notification','3','membership_autorenew_cancelled',NULL,0,0,3,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (849,92,'Memberships - Auto-renew Billing Updates','4','membership_autorenew_billing',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (850,93,'Test-drive - Receipt Header','1','test_preview',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (851,94,'Pledges - Acknowledgement','1','pledge_acknowledge',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (852,94,'Pledges - Payment Reminder','2','pledge_reminder',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (853,95,'Profiles - Admin Notification','1','uf_notify',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (854,96,'Petition - signature added','1','petition_sign',NULL,0,0,1,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (855,96,'Petition - need verification','2','petition_confirmation_needed',NULL,0,0,2,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (856,97,'In Honor of','1','in_honor_of',NULL,0,0,1,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (857,97,'In Memory of','2','in_memory_of',NULL,0,0,2,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (858,97,'Solicited','3','solicited',NULL,0,1,3,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (859,97,'Household','4','household',NULL,0,0,4,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (860,97,'Workplace Giving','5','workplace',NULL,0,0,5,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (861,97,'Foundation Affiliate','6','foundation_affiliate',NULL,0,0,6,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (862,97,'3rd-party Service','7','3rd-party_service',NULL,0,0,7,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (863,97,'Donor-advised Fund','8','donor-advised_fund',NULL,0,0,8,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (864,97,'Matched Gift','9','matched_gift',NULL,0,0,9,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL),
+ (865,97,'Personal Campaign Page','10','pcp',NULL,0,0,10,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (866,97,'Gift','11','gift',NULL,0,0,11,NULL,0,1,1,NULL,NULL,NULL,NULL,NULL),
+ (867,2,'Interview','55','Interview',NULL,0,NULL,55,'Conduct a phone or in person interview.',0,0,1,NULL,NULL,NULL,'fa-comment-o',NULL);
/*!40000 ALTER TABLE `civicrm_option_value` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Admin/Page/ExtensionDetails.tpl b/civicrm/templates/CRM/Admin/Page/ExtensionDetails.tpl
index 8ca42764d1..c28c33f566 100644
--- a/civicrm/templates/CRM/Admin/Page/ExtensionDetails.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ExtensionDetails.tpl
@@ -1,7 +1,9 @@
<table class="crm-info-panel">
+ {if !empty($extension.urls)}
{foreach from=$extension.urls key=label item=url}
<tr><td class="label">{$label|escape}</td><td><a href="{$url|escape}">{$url|escape}</a></td></tr>
{/foreach}
+ {/if}
<tr>
<td class="label">{ts}Author{/ts}</td>
<td>
@@ -15,29 +17,33 @@
{/foreach}
</td>
</tr>
+ {if !empty($extension.comments)}
<tr>
<td class="label">{ts}Comments{/ts}</td><td>{$extension.comments|escape}</td>
</tr>
+ {/if}
<tr>
- <td class="label">{ts}Version{/ts}</td><td>{$extension.version|escape}</td>
+ <td class="label">{ts}Version{/ts}</td><td>{$extension.version|escape}</td>
</tr>
<tr>
- <td class="label">{ts}Released on{/ts}</td><td>{$extension.releaseDate|escape}</td>
+ <td class="label">{ts}Released on{/ts}</td><td>{$extension.releaseDate|escape}</td>
</tr>
<tr>
- <td class="label">{ts}License{/ts}</td><td>{$extension.license|escape}</td>
+ <td class="label">{ts}License{/ts}</td><td>{$extension.license|escape}</td>
</tr>
+ {if !empty($extension.develStage)}
<tr>
- <td class="label">{ts}Development stage{/ts}</td><td>{$extension.develStage|escape}</td>
+ <td class="label">{ts}Development stage{/ts}</td><td>{$extension.develStage|escape}</td>
</tr>
+ {/if}
<tr>
<td class="label">{ts}Requires{/ts}</td>
<td>
{foreach from=$extension.requires item=ext}
{if array_key_exists($ext, $localExtensionRows)}
- {$localExtensionRows.$ext.name} (already downloaded - {$ext})
+ {$localExtensionRows.$ext.label|escape} (already downloaded)
{elseif array_key_exists($ext, $remoteExtensionRows)}
- {$remoteExtensionRows.$ext.name} (not downloaded - {$ext})
+ {$remoteExtensionRows.$ext.label|escape} (not downloaded)
{else}
{$ext} {ts}(not available){/ts}
{/if}
@@ -56,10 +62,9 @@
<tr>
<td class="label">{ts}Local path{/ts}</td><td>{$extension.path|escape}</td>
</tr>
+ {if !empty($extension.downloadUrl)}
<tr>
<td class="label">{ts}Download location{/ts}</td><td>{$extension.downloadUrl|escape}</td>
</tr>
- <tr>
- <td class="label">{ts}Key{/ts}</td><td>{$extension.key|escape}</td>
- </tr>
+ {/if}
</table>
diff --git a/civicrm/templates/CRM/Case/Form/Search/Common.tpl b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
index 6b5edd73ce..84bf8a8a1d 100644
--- a/civicrm/templates/CRM/Case/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
@@ -22,10 +22,10 @@
</tr>
<tr>
- {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_start_date"}
+ {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_start_date" hideRelativeLabel=0}
</tr>
<tr>
- {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date"}
+ {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date" hideRelativeLabel=0}
</tr>
<tr id='case_search_form'>
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
index 97780b9880..4c4988f17e 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -26,8 +26,8 @@
<tr id="Email_Block_{$blockId}">
<td>{$form.email.$blockId.email.html|crmAddClass:email} {$form.email.$blockId.location_type_id.html}
- <div class="clear"></div>
- {if $className eq 'CRM_Contact_Form_Contact'}
+ {if $className eq 'CRM_Contact_Form_Contact' and !empty($form.email.$blockId.signature_html.html)}
+ <div class="clear"></div>
<div class="email-signature crm-collapsible collapsed">
<div class="collapsible-title">
{ts}Signature{/ts}
diff --git a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 8c7807c4b0..3dbdecafc3 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -76,11 +76,11 @@ CRM.$(function($) {
</script>
{/literal}
-{if $context EQ 'smog' || $context EQ 'amtg' || $savedSearch}
+{if $context EQ 'smog' || $context EQ 'amtg' || !empty($savedSearch)}
<h3>
{if $context EQ 'smog'}{ts}Find Contacts within this Group{/ts}
{elseif $context EQ 'amtg'}{ts}Find Contacts to Add to this Group{/ts}
- {elseif $savedSearch}{ts 1=$savedSearch.name}%1 Smart Group Criteria{/ts} {help id='id-advanced-smart'}
+ {elseif !empty($savedSearch)}{ts 1=$savedSearch.name}%1 Smart Group Criteria{/ts} {help id='id-advanced-smart'}
{/if}
</h3>
{/if}
@@ -111,7 +111,7 @@ CRM.$(function($) {
</div>
</div>
{foreach from=$allPanes key=paneName item=paneValue}
- <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || $openedPanes.$paneName} {else}collapsed{/if}">
+ <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || !empty($openedPanes.$paneName)} {else}collapsed{/if}">
<div class="crm-accordion-header" id="{$paneValue.id}">
{$paneName}
</div>
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 8c1a39568c..2f605153cd 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -11,26 +11,26 @@
{foreach from=$basicSearchFields item=fieldSpec}
{assign var=field value=$form[$fieldSpec.name]}
{if $field && !in_array($fieldSpec.name, array('first_name', 'last_name'))}
- <div class="search-field {$fieldSpec.class|escape}">
- {if $fieldSpec.template}
+ <div class="search-field {if !empty($fieldSpec.class)}{$fieldSpec.class|escape}{/if}">
+ {if !empty($fieldSpec.template)}
{include file=$fieldSpec.template}
{else}
{$field.label}
- {if $fieldSpec.help}
+ {if !empty($fieldSpec.help)}
{assign var=help value=$fieldSpec.help}
{capture assign=helpFile}{if $fieldSpec.help}{$fieldSpec.help}{else}''{/if}{/capture}
{help id=$help.id file=$help.file}
{/if}
<br />
{$field.html}
- {if $fieldSpec.description}
+ {if !empty($fieldSpec.description)}
<div class="description font-italic">
{$fieldSpec.description}
</div>
{/if}
{/if}
</div>
- {elseif $fieldSpec.is_custom}
+ {elseif !empty($fieldSpec.is_custom)}
{include file=$fieldSpec.template}
{/if}
{/foreach}
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
index 8cbfb012cf..9b95ef688b 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -10,19 +10,24 @@
{* $context indicates where we are searching, values = "search,advanced,smog,amtg" *}
{* smog = 'show members of group'; amtg = 'add members to group' *}
{if $context EQ 'smog'}
+ <div class="crm-submit-buttons">
+
{* Provide link to modify smart group search criteria if we are viewing a smart group (ssID = saved search ID) *}
{if $permissionEditSmartGroup && !empty($editSmartGroupURL)}
- <div class="crm-submit-buttons">
- <a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
- {help id="id-edit-smartGroup"}
- </div>
+ <a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
+ {help id="id-edit-smartGroup"}
{/if}
{if $permissionedForGroup}
{capture assign=addMembersURL}{crmURL q="context=amtg&amtgID=`$group.id`&reset=1"}{/capture}
- <div class="crm-submit-buttons">
<a href="{$addMembersURL}" class="button no-popup"><span><i class="crm-i fa-user-plus" aria-hidden="true"></i> {ts 1=$group.title}Add Contacts to %1{/ts}</span></a>
{if $ssID}{help id="id-add-to-smartGroup"}{/if}
- </div>
{/if}
+ {if $permissionEditSmartGroup}
+ {capture assign=groupSettingsURL}{crmURL p='civicrm/group' q="action=update&id=`$group.id`&reset=1"}{/capture}
+ <a href="{$groupSettingsURL}" class="action-item button"><span><i class="crm-i fa-wrench" aria-hidden="true"></i> {ts}Edit Group Settings{/ts}</span></a>
+ {/if}
+ </div>
{/if}
+
+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
index b4d143ca67..9e21ef1fae 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
@@ -124,8 +124,7 @@ CRM.$(function($) {
}
{/literal}
- var toContact = {if $toContact}{$toContact}{else}''{/if},
- ccContact = {if $ccContact}{$ccContact}{else}''{/if};
+ var toContact = {if $toContact}{$toContact}{else}''{/if};
{literal}
emailSelect('#to', toContact);
});
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
index ed8b3d7855..b9eadf760c 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
@@ -22,10 +22,10 @@
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-contribution-contributionpage-settings-form-block-title"><td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='title' id=$contributionPageID}{/if}</td><td>{$form.title.html}<br/>
- <span class="description">{ts}This title will be displayed at the top of the page unless the frontend title field is filled out.<br />Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}</td>
+ <span class="description">{ts}This title will be displayed at the top of the page unless the frontend title field is filled out.<br />Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}</span></td>
</tr>
<tr class="crm-contribution-contributionpage-settings-form-block-frontend-title"><td class="label">{$form.contribution_page_frontend_title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='frontend_title' id=$contributionPageID}{/if}</td><td>{$form.contribution_page_frontend_title.html}<br/>
- <span class="description">{ts}This title will be displayed at the top of the page.<br />Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}</td>
+ <span class="description">{ts}This title will be displayed at the top of the page.<br />Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}</span></td>
</tr>
<tr class="crm-contribution-contributionpage-settings-form-block-financial_type_id"><td class="label">{$form.financial_type_id.label}</td><td>{$form.financial_type_id.html}<br />
<span class="description">{ts}Select the corresponding financial type for contributions made using this page.{/ts}</span> {help id="id-financial_type"}</td>
@@ -154,9 +154,9 @@
{elseif $config->userFramework EQ 'Joomla'}
{ts 1=$title}When your page is active, create front-end links to the contribution page using the Menu Manager. Select <strong>Administer CiviCRM » CiviContribute » Manage Contribution Pages</strong> and select <strong>%1</strong> for the contribution page.{/ts}
{/if}
- {/if}
</td>
</tr>
+ {/if}
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
index 5cc3f25ac6..377ea50554 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -75,33 +75,18 @@
<td>{if $receive_date}{$receive_date|crmDate}{else}({ts}not available{/ts}){/if}</td>
</tr>
{/if}
- {if $displayLineItems}
- <tr>
- <td class="label">{ts}Contribution Amount{/ts}</td>
- <td>{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
- {if $contribution_recur_id}
- <a class="open-inline action-item crm-hover-button" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contact_id`&context=contribution"}'>
- {ts}View Recurring Contribution{/ts}
- </a>
- <br/>
- {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
- {/if}
- </td>
- </tr>
- {else}
- <tr>
- <td class="label">{ts}Total Amount{/ts}</td>
- <td><strong>{$total_amount|crmMoney:$currency}</strong>
+ <tr>
+ <td class="label">{ts}Contribution Amount{/ts}</td>
+ <td>{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
{if $contribution_recur_id}
<a class="open-inline action-item crm-hover-button" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contact_id`&context=contribution"}'>
- {ts}View Recurring Contribution{/ts}
+ {ts}View Recurring Contribution{/ts}
</a>
<br/>
- {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
+ {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
{/if}
- </td>
- </tr>
- {/if}
+ </td>
+ </tr>
{if $invoicing && $tax_amount}
<tr>
<td class="label">{ts 1=$taxTerm}Total %1 Amount{/ts}</td>
diff --git a/civicrm/templates/CRM/Core/Form/Field.tpl b/civicrm/templates/CRM/Core/Form/Field.tpl
index 1d59c0e3c3..d6d99d35e1 100644
--- a/civicrm/templates/CRM/Core/Form/Field.tpl
+++ b/civicrm/templates/CRM/Core/Form/Field.tpl
@@ -15,7 +15,7 @@
{$fieldSpec.help}
{else}''{/if}
{/capture}{help id=$help.id file=$help.file}{/if}
- {if $action == 2 && $fieldSpec.is_add_translate_dialog}{include file='CRM/Core/I18n/Dialog.tpl' table=$entityTable field=$fieldName id=$entityID}{/if}
+ {if $action == 2 && !empty($fieldSpec.is_add_translate_dialog)}{include file='CRM/Core/I18n/Dialog.tpl' table=$entityTable field=$fieldName id=$entityID}{/if}
</td>
<td>{if !empty($fieldSpec.pre_html_text)}{$fieldSpec.pre_html_text}{/if}{if $form.$fieldName.html}{$form.$fieldName.html}{else}{$fieldSpec.place_holder}{/if}{if !empty($fieldSpec.post_html_text)}{$fieldSpec.post_html_text}{/if}<br />
{if !empty($fieldSpec.description)}<span class="description">{$fieldSpec.description}</span>{/if}
diff --git a/civicrm/templates/CRM/Form/basicFormFields.tpl b/civicrm/templates/CRM/Form/basicFormFields.tpl
index a884f4ff3d..ada6e58dab 100644
--- a/civicrm/templates/CRM/Form/basicFormFields.tpl
+++ b/civicrm/templates/CRM/Form/basicFormFields.tpl
@@ -12,7 +12,7 @@
{foreach from=$fields item=fieldSpec}
{assign var=fieldName value=$fieldSpec.name}
- <tr class="crm-{$entityInClassFormat}-form-block-{$fieldName}">
+ <tr class="crm-{if !empty($entityInClassFormat)}{$entityInClassFormat}{/if}-form-block-{$fieldName}">
{include file="CRM/Core/Form/Field.tpl"}
</tr>
{/foreach}
diff --git a/civicrm/templates/CRM/Group/Form/Search.tpl b/civicrm/templates/CRM/Group/Form/Search.tpl
index 6363fba591..6f24d0f67a 100644
--- a/civicrm/templates/CRM/Group/Form/Search.tpl
+++ b/civicrm/templates/CRM/Group/Form/Search.tpl
@@ -111,6 +111,7 @@
// also to handle search filtering for initial load of same page.
var parentsOnly = 1
var ZeroRecordText = {/literal}'{ts escape="js"}<div class="status messages">None found.{/ts}</div>'{literal};
+ var smartGroupText = {/literal}'<span>({ts escape="js"}Smart Group{/ts})</span>'{literal};
$('table.crm-group-selector').data({
"ajax": {
"url": {/literal}'{crmURL p="civicrm/ajax/grouplist" h=0 q="snippet=4"}'{literal},
@@ -157,15 +158,16 @@
});
//Reload table after draw
$(settings.nTable).trigger('crmLoad');
- if (parentsOnly) {
- CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmEditable.js').done(function () {
+ CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmEditable.js').done(function () {
+ if (parentsOnly) {
$('tbody tr.crm-group-parent', settings.nTable).each(function () {
$(this).find('td:first')
.prepend('{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span>{literal}')
.find('div').css({'display': 'inline'});
});
- });
- }
+ }
+ $('tbody tr.crm-smart-group > td.crm-group-name', settings.nTable).append(smartGroupText);
+ });
}
});
$(function($) {
@@ -236,13 +238,16 @@
];
if ('DT_RowClass' in val) {
val.row_classes = val.row_classes.concat(val.DT_RowClass.split(' ').filter((item) => val.row_classes.indexOf(item) < 0));
+ if (val.DT_RowClass.indexOf('crm-smart-group') == -1) {
+ smartGroupText = '';
+ }
}
appendHTML += '<tr id="row_'+val.group_id+'_'+parent_id+'" data-entity="group" data-id="'+val.group_id+'" class="' + val.row_classes.join(' ') + '">';
if ( val.is_parent ) {
- appendHTML += '<td class="crm-group-name crmf-title ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><div class="crmf-title {$editableClass}" style="display:inline">{literal}' + val.title + '</div></td>';
+ appendHTML += '<td class="crm-group-name crmf-title ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><div class="crmf-title {$editableClass}" style="display:inline">{literal}' + val.title + '</div>' + smartGroupText + '</td>';
}
else {
- appendHTML += '<td class="crm-group-name crmf-title {/literal}{$editableClass}{literal} ' + levelClass + '"><span class="crm-no-children"></span>' + val.title + '</td>';
+ appendHTML += '<td class="crm-group-name' + levelClass + '"><div class="crmf-title {/literal}{$editableClass}{literal}"><span class="crm-no-children"></span>' + val.title + '</div>' + smartGroupText + '</td>';
}
appendHTML += '<td class="right">' + val.count + "</td>";
appendHTML += "<td>" + val.created_by + "</td>";
diff --git a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
index c09e892462..be341b04bd 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -43,7 +43,7 @@
<td class="nowrap crmf-start_event crm-editable" data-type="select" data-empty-option="{ts}- none -{/ts}">{if !empty($row.start_event)}{$row.start_event}{/if}</td>
<td class="nowrap crmf-start_event_adjust_unit_interval">{if !empty($row.start_event_adjust_unit_interval)}{$row.start_event_adjust_unit_interval}{/if}</td>
<td class="nowrap crmf-end_event crm-editable" data-type="select" data-empty-option="{ts}- none -{/ts}">{if !empty($row.end_event)}{$row.end_event}{/if}</td>
- <td class="nowrap crmf-end_event_adjust_interval">{if !empty($row.end_event_adjust_unit_interval)}{$row.end_event_adjust_interval}{/if}</td>
+ <td class="nowrap crmf-end_event_adjust_interval">{if !empty($row.end_event_adjust_interval)}{$row.end_event_adjust_interval}{/if}</td>
<td class="crmf-is_current_member crm-editable" data-type="boolean">{if $row.is_current_member eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
<td class="crmf-is_admin crm-editable" data-type="boolean">{if $row.is_admin eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
<td class="nowrap crmf-weight">{$row.weight}</td>
diff --git a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
index 04deb6cd1b..1f0916095f 100644
--- a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
+++ b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
@@ -75,7 +75,7 @@
{foreach from=$records key=recId item=rows}
<tr class="{cycle values="odd-row,even-row"}">
{foreach from=$headers key=hrecId item=head}
- <td {crmAttributes a=$attributes.$hrecId.$recId}>{$rows.$hrecId}</td>
+ <td {if !empty($dateFieldsVals.$hrecId)}data-order="{$dateFieldsVals.$hrecId.$recId|crmDate:'%Y-%m-%d'}"{/if} {crmAttributes a=$attributes.$hrecId.$recId}>{$rows.$hrecId}</td>
{/foreach}
<td>{$rows.action}</td>
{foreach from=$dateFieldsVals key=fid item=rec}
diff --git a/civicrm/templates/CRM/common/customDataBlock.tpl b/civicrm/templates/CRM/common/customDataBlock.tpl
index eb7c73ccd2..a8195f064e 100644
--- a/civicrm/templates/CRM/common/customDataBlock.tpl
+++ b/civicrm/templates/CRM/common/customDataBlock.tpl
@@ -7,7 +7,7 @@
<script type="text/javascript">
CRM.$(function($) {
{/literal}
- {if $customDataSubType}
+ {if !empty($customDataSubType)}
CRM.buildCustomData('{$customDataType}', {$customDataSubType}, false, false, false, false, false, {$cid});
{else}
CRM.buildCustomData('{$customDataType}', false, false, false, false, false, false, {$cid});
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 217f9b02ed..1917126a7c 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34::getLoader();
+return ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index eb1ebb3392..cc10747caa 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34
+class ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit44feec73fa7cf97106f6eca405484cfa', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit36163a5870b8f0be1632b26ad3943b34
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire36163a5870b8f0be1632b26ad3943b34($fileIdentifier, $file);
+ composerRequire44feec73fa7cf97106f6eca405484cfa($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire36163a5870b8f0be1632b26ad3943b34($fileIdentifier, $file)
+function composerRequire44feec73fa7cf97106f6eca405484cfa($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 3636e0e698..33048aff0d 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit36163a5870b8f0be1632b26ad3943b34
+class ComposerStaticInit44feec73fa7cf97106f6eca405484cfa
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -572,11 +572,11 @@ class ComposerStaticInit36163a5870b8f0be1632b26ad3943b34
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit36163a5870b8f0be1632b26ad3943b34::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit44feec73fa7cf97106f6eca405484cfa::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/vendor/composer/installed.json b/civicrm/vendor/composer/installed.json
index 494f0f004d..2996b25aa5 100644
--- a/civicrm/vendor/composer/installed.json
+++ b/civicrm/vendor/composer/installed.json
@@ -1479,27 +1479,27 @@
},
{
"name": "pear/db",
- "version": "v1.10.0",
- "version_normalized": "1.10.0.0",
+ "version": "v1.11.0",
+ "version_normalized": "1.11.0.0",
"source": {
"type": "git",
"url": "https://github.com/pear/DB.git",
- "reference": "e158c3a48246b67cd8c95856ffbb93de4ef380fe"
+ "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/DB/zipball/e158c3a48246b67cd8c95856ffbb93de4ef380fe",
- "reference": "e158c3a48246b67cd8c95856ffbb93de4ef380fe",
+ "url": "https://api.github.com/repos/pear/DB/zipball/7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
+ "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
"shasum": ""
},
"require": {
"pear/pear-core-minimal": "*"
},
- "time": "2020-04-19T19:45:59+00:00",
+ "time": "2021-08-11T00:24:34+00:00",
"type": "library",
"extra": {
"patches_applied": {
- "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch"
+ "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
}
},
"installation-source": "dist",
@@ -1513,7 +1513,7 @@
"./"
],
"license": [
- "PHP License v3.01"
+ "PHP-3.01"
],
"authors": [
{
@@ -1537,7 +1537,11 @@
"role": "Developer"
}
],
- "description": "More info available on: http://pear.php.net/package/DB"
+ "description": "More info available on: http://pear.php.net/package/DB",
+ "support": {
+ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=DB",
+ "source": "https://github.com/pear/DB"
+ }
},
{
"name": "pear/log",
diff --git a/civicrm/vendor/pear/db/DB.php b/civicrm/vendor/pear/db/DB.php
index cfac8ee2e6..53a044e834 100644
--- a/civicrm/vendor/pear/db/DB.php
+++ b/civicrm/vendor/pear/db/DB.php
@@ -181,11 +181,6 @@ define('DB_ERROR_NOSUCHDB', -27);
*/
define('DB_ERROR_CONSTRAINT_NOT_NULL',-29);
-/**
- * Invalid view or no permissions
- */
-define('DB_ERROR_INVALID_VIEW', -100);
-
/**
* Database lock timeout exceeded.
*/
@@ -195,6 +190,11 @@ define('DB_ERROR_LOCK_TIMEOUT', -30);
* Database deadlock encountered.
*/
define('DB_ERROR_DEADLOCK', -31);
+
+/**
+ * Invalid View found
+ */
+define('DB_ERROR_INVALID_VIEW', '-32');
/**#@-*/
// }}}
diff --git a/civicrm/vendor/pear/db/PATCHES.txt b/civicrm/vendor/pear/db/PATCHES.txt
index 5885f7128c..c17a786ed5 100644
--- a/civicrm/vendor/pear/db/PATCHES.txt
+++ b/civicrm/vendor/pear/db/PATCHES.txt
@@ -2,6 +2,6 @@ This file was automatically generated by Composer Patches (https://github.com/cw
Patches applied to this directory:
Apply CiviCRM Customisations for the pear:db package
-Source: https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch
+Source: https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch
diff --git a/civicrm/vendor/pear/db/composer.json b/civicrm/vendor/pear/db/composer.json
index dff216a9d0..05d12a7376 100644
--- a/civicrm/vendor/pear/db/composer.json
+++ b/civicrm/vendor/pear/db/composer.json
@@ -30,7 +30,7 @@
"include-path": [
"./"
],
- "license": "PHP License v3.01",
+ "license": "PHP-3.01",
"name": "pear/db",
"support": {
"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=DB",
diff --git a/civicrm/xml/schema/Activity/Activity.xml b/civicrm/xml/schema/Activity/Activity.xml
index e2ace4d164..2b6c5195c9 100644
--- a/civicrm/xml/schema/Activity/Activity.xml
+++ b/civicrm/xml/schema/Activity/Activity.xml
@@ -361,6 +361,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Batch/EntityBatch.xml b/civicrm/xml/schema/Batch/EntityBatch.xml
index 324db5b5a1..130993d2d5 100644
--- a/civicrm/xml/schema/Batch/EntityBatch.xml
+++ b/civicrm/xml/schema/Batch/EntityBatch.xml
@@ -28,6 +28,9 @@
<length>64</length>
<comment>physical tablename for entity being joined to file, e.g. civicrm_contact</comment>
<add>3.3</add>
+ <pseudoconstant>
+ <optionGroupName>entity_batch_extends</optionGroupName>
+ </pseudoconstant>
</field>
<field>
<name>entity_id</name>
diff --git a/civicrm/xml/schema/Campaign/CampaignGroup.xml b/civicrm/xml/schema/Campaign/CampaignGroup.xml
index 6d3880d3fd..317c9ee506 100644
--- a/civicrm/xml/schema/Campaign/CampaignGroup.xml
+++ b/civicrm/xml/schema/Campaign/CampaignGroup.xml
@@ -33,6 +33,12 @@
<label>Campaign</label>
</html>
<add>3.3</add>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Campaign/Survey.xml b/civicrm/xml/schema/Campaign/Survey.xml
index 93398c2bba..e57a3b1f4d 100644
--- a/civicrm/xml/schema/Campaign/Survey.xml
+++ b/civicrm/xml/schema/Campaign/Survey.xml
@@ -47,6 +47,12 @@
<label>Campaign</label>
</html>
<add>3.3</add>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Contact/SavedSearch.xml b/civicrm/xml/schema/Contact/SavedSearch.xml
index 1be44e62ff..77f5b37229 100644
--- a/civicrm/xml/schema/Contact/SavedSearch.xml
+++ b/civicrm/xml/schema/Contact/SavedSearch.xml
@@ -49,6 +49,7 @@
<default>NULL</default>
<comment>Administrative label for search</comment>
<html>
+ <label>Label</label>
<type>Text</type>
</html>
<add>5.32</add>
@@ -126,6 +127,9 @@
<length>255</length>
<comment>Entity name for API based search</comment>
<add>5.24</add>
+ <pseudoconstant>
+ <callback>CRM_Contact_BAO_SavedSearch::getApiEntityOptions</callback>
+ </pseudoconstant>
</field>
<field>
diff --git a/civicrm/xml/schema/Contribute/Contribution.xml b/civicrm/xml/schema/Contribute/Contribution.xml
index b8ac6f0792..8fde13a20f 100644
--- a/civicrm/xml/schema/Contribute/Contribution.xml
+++ b/civicrm/xml/schema/Contribute/Contribution.xml
@@ -471,6 +471,12 @@
<import>true</import>
<comment>The campaign for which this contribution has been triggered.</comment>
<add>3.4</add>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
<html>
<type>EntityRef</type>
<label>Campaign</label>
diff --git a/civicrm/xml/schema/Contribute/ContributionPage.xml b/civicrm/xml/schema/Contribute/ContributionPage.xml
index 9e7423608e..3402bb63fb 100644
--- a/civicrm/xml/schema/Contribute/ContributionPage.xml
+++ b/civicrm/xml/schema/Contribute/ContributionPage.xml
@@ -445,6 +445,12 @@
<label>Campaign</label>
</html>
<add>3.4</add>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Contribute/ContributionRecur.xml b/civicrm/xml/schema/Contribute/ContributionRecur.xml
index e8782fe16b..bc8e0eafe0 100644
--- a/civicrm/xml/schema/Contribute/ContributionRecur.xml
+++ b/civicrm/xml/schema/Contribute/ContributionRecur.xml
@@ -428,6 +428,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Core/Address.xml b/civicrm/xml/schema/Core/Address.xml
index 9eb295ad22..1ee08b9816 100644
--- a/civicrm/xml/schema/Core/Address.xml
+++ b/civicrm/xml/schema/Core/Address.xml
@@ -265,6 +265,7 @@
<table>civicrm_county</table>
<keyColumn>id</keyColumn>
<labelColumn>name</labelColumn>
+ <abbrColumn>abbreviation</abbrColumn>
</pseudoconstant>
<html>
<type>ChainSelect</type>
@@ -292,6 +293,7 @@
<table>civicrm_state_province</table>
<keyColumn>id</keyColumn>
<labelColumn>name</labelColumn>
+ <abbrColumn>abbreviation</abbrColumn>
</pseudoconstant>
<localize_context>province</localize_context>
<html>
diff --git a/civicrm/xml/schema/Core/County.xml b/civicrm/xml/schema/Core/County.xml
index b679f62af9..47a28a22ad 100644
--- a/civicrm/xml/schema/Core/County.xml
+++ b/civicrm/xml/schema/Core/County.xml
@@ -54,6 +54,7 @@
<table>civicrm_state_province</table>
<keyColumn>id</keyColumn>
<labelColumn>name</labelColumn>
+ <abbrColumn>abbreviation</abbrColumn>
</pseudoconstant>
</field>
<foreignKey>
diff --git a/civicrm/xml/schema/Core/Email.xml b/civicrm/xml/schema/Core/Email.xml
index 00ab390502..ddb0678f61 100644
--- a/civicrm/xml/schema/Core/Email.xml
+++ b/civicrm/xml/schema/Core/Email.xml
@@ -143,6 +143,8 @@
<comment>When the address went on bounce hold</comment>
<html>
<label>Hold Date</label>
+ <type>Select Date</type>
+ <formatType>activityDateTime</formatType>
</html>
<add>1.1</add>
</field>
@@ -152,6 +154,8 @@
<comment>When the address bounce status was last reset</comment>
<html>
<label>Reset Date</label>
+ <type>Select Date</type>
+ <formatType>activityDateTime</formatType>
</html>
<add>1.1</add>
</field>
diff --git a/civicrm/xml/schema/Event/Event.xml b/civicrm/xml/schema/Event/Event.xml
index 10c768ca80..a90b01446b 100644
--- a/civicrm/xml/schema/Event/Event.xml
+++ b/civicrm/xml/schema/Event/Event.xml
@@ -797,6 +797,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Event/Participant.xml b/civicrm/xml/schema/Event/Participant.xml
index 4899849f95..e06493f302 100644
--- a/civicrm/xml/schema/Event/Participant.xml
+++ b/civicrm/xml/schema/Event/Participant.xml
@@ -272,6 +272,12 @@
<label>Campaign</label>
</html>
<add>3.4</add>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Mailing/Mailing.xml b/civicrm/xml/schema/Mailing/Mailing.xml
index c5e65fe046..0cddc59635 100644
--- a/civicrm/xml/schema/Mailing/Mailing.xml
+++ b/civicrm/xml/schema/Mailing/Mailing.xml
@@ -465,6 +465,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Member/Membership.xml b/civicrm/xml/schema/Member/Membership.xml
index 06f6a75c53..3ed25d6adc 100644
--- a/civicrm/xml/schema/Member/Membership.xml
+++ b/civicrm/xml/schema/Member/Membership.xml
@@ -288,6 +288,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/schema/Member/MembershipStatus.xml b/civicrm/xml/schema/Member/MembershipStatus.xml
index 7fbe3e04e2..2bf75d8ad6 100644
--- a/civicrm/xml/schema/Member/MembershipStatus.xml
+++ b/civicrm/xml/schema/Member/MembershipStatus.xml
@@ -31,6 +31,7 @@
<type>varchar</type>
<import>true</import>
<length>128</length>
+ <required>true</required>
<comment>Name for Membership Status</comment>
<add>1.5</add>
</field>
diff --git a/civicrm/xml/schema/Member/MembershipType.xml b/civicrm/xml/schema/Member/MembershipType.xml
index 47e28d4642..189712ce83 100644
--- a/civicrm/xml/schema/Member/MembershipType.xml
+++ b/civicrm/xml/schema/Member/MembershipType.xml
@@ -135,6 +135,7 @@
<title>Membership Type Duration Unit</title>
<type>varchar</type>
<length>8</length>
+ <required>true</required>
<comment>Unit in which membership period is expressed.</comment>
<pseudoconstant>
<callback>CRM_Core_SelectValues::membershipTypeUnitList</callback>
diff --git a/civicrm/xml/schema/Pledge/Pledge.xml b/civicrm/xml/schema/Pledge/Pledge.xml
index 9cd1566999..6f3a9a840e 100644
--- a/civicrm/xml/schema/Pledge/Pledge.xml
+++ b/civicrm/xml/schema/Pledge/Pledge.xml
@@ -341,6 +341,12 @@
<type>EntityRef</type>
<label>Campaign</label>
</html>
+ <pseudoconstant>
+ <table>civicrm_campaign</table>
+ <keyColumn>id</keyColumn>
+ <labelColumn>title</labelColumn>
+ <prefetch>FALSE</prefetch>
+ </pseudoconstant>
</field>
<foreignKey>
<name>campaign_id</name>
diff --git a/civicrm/xml/templates/civicrm_data.tpl b/civicrm/xml/templates/civicrm_data.tpl
index 485509d346..4d91916da1 100644
--- a/civicrm/xml/templates/civicrm_data.tpl
+++ b/civicrm/xml/templates/civicrm_data.tpl
@@ -199,7 +199,8 @@ VALUES
('pledge_status' , '{ts escape="sql"}Pledge Status{/ts}' , NULL, 1, 1, 1),
('contribution_recur_status' , '{ts escape="sql"}Recurring Contribution Status{/ts}' , NULL, 1, 1, 1),
('environment' , '{ts escape="sql"}Environment{/ts}' , NULL, 1, 1, 0),
- ('activity_default_assignee' , '{ts escape="sql"}Activity default assignee{/ts}' , NULL, 1, 1, 0);
+ ('activity_default_assignee' , '{ts escape="sql"}Activity default assignee{/ts}' , NULL, 1, 1, 0),
+ ('entity_batch_extends' , '{ts escape="sql"}Entity Batch Extends{/ts}' , NULL, 1, 1, 0);
SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method';
SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type';
@@ -284,6 +285,7 @@ SELECT @option_group_id_ps := max(id) from civicrm_option_group where name =
SELECT @option_group_id_crs := max(id) from civicrm_option_group where name = 'contribution_recur_status';
SELECT @option_group_id_env := max(id) from civicrm_option_group where name = 'environment';
SELECT @option_group_id_default_assignee := max(id) from civicrm_option_group where name = 'activity_default_assignee';
+SELECT @option_group_id_entity_batch_extends := max(id) from civicrm_option_group where name = 'entity_batch_extends';
SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute';
SELECT @eventCompId := max(id) FROM civicrm_component where name = 'CiviEvent';
@@ -571,7 +573,7 @@ VALUES
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PostalMailing' , 5, 'CRM_Contact_Form_Search_Custom_PostalMailing', NULL, 0, NULL, 5, '{ts escape="sql"}Postal Mailing{/ts}', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Proximity' , 6, 'CRM_Contact_Form_Search_Custom_Proximity', NULL, 0, NULL, 6, '{ts escape="sql"}Proximity Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_EventAggregate' , 7, 'CRM_Contact_Form_Search_Custom_EventAggregate', NULL, 0, NULL, 7, '{ts escape="sql"}Event Aggregate{/ts}', 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch' , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, NULL, 8, '{ts escape="sql"}Activity Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch' , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, NULL, 8, '{ts escape="sql"}Activity Search{/ts}', 0, 0, 0, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PriceSet' , 9, 'CRM_Contact_Form_Search_Custom_PriceSet', NULL, 0, NULL, 9, '{ts escape="sql"}Price Set Details for Event Participants{/ts}', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ZipCodeRange' ,10, 'CRM_Contact_Form_Search_Custom_ZipCodeRange', NULL, 0, NULL, 10, '{ts escape="sql"}Zip Code Range{/ts}', 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_DateAdded' ,11, 'CRM_Contact_Form_Search_Custom_DateAdded', NULL, 0, NULL, 11, '{ts escape="sql"}Date Added to CiviCRM{/ts}', 0, 0, 1, NULL, NULL, NULL),
@@ -1054,7 +1056,12 @@ VALUES
(@option_group_id_default_assignee, '{ts escape="sql"}None{/ts}', '1', 'NONE', NULL, 0, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_default_assignee, '{ts escape="sql"}By relationship to case client{/ts}', '2', 'BY_RELATIONSHIP', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_default_assignee, '{ts escape="sql"}Specific contact{/ts}', '3', 'SPECIFIC_CONTACT', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-(@option_group_id_default_assignee, '{ts escape="sql"}User creating the case{/ts}', '4', 'USER_CREATING_THE_CASE', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL);
+(@option_group_id_default_assignee, '{ts escape="sql"}User creating the case{/ts}', '4', 'USER_CREATING_THE_CASE', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+-- Entity Batch options
+-- (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
+(@option_group_id_entity_batch_extends, '{ts escape="sql"}Financial Transactions{/ts}', 'civicrm_financial_trxn', 'civicrm_financial_trxn', NULL, 0, 1, 1, NULL, 0, 0, 1, @contributeCompId, NULL, NULL);
+
-- financial accounts
SELECT @opval := value FROM civicrm_option_value WHERE name = 'Revenue' and option_group_id = @option_group_id_fat;
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 8d8fc668f4..ea759bb5b7 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.41.2</version_no>
+ <version_no>5.42.0</version_no>
</version>
--
GitLab