eileen [Thu, 16 Apr 2020 06:04:27 +0000 (18:04 +1200)]
[NFC] Remove all the places where tests unnecessarily pass to Membership::create
The param is deprecated - no reasonn to pass in the tests
Seamus Lee [Thu, 16 Apr 2020 02:12:23 +0000 (12:12 +1000)]
Merge pull request #17083 from seamuslee001/master
5.25
Seamus Lee [Thu, 16 Apr 2020 02:11:08 +0000 (12:11 +1000)]
Merge 5.25
CiviCRM [Thu, 16 Apr 2020 02:04:24 +0000 (02:04 +0000)]
Set version to 5.25.beta2
Tim Otten [Thu, 16 Apr 2020 01:28:50 +0000 (18:28 -0700)]
release-notes - Small copy edits
Seamus Lee [Thu, 16 Apr 2020 01:02:23 +0000 (11:02 +1000)]
Add in release notes for 5.24.3
Tim Otten [Fri, 3 Apr 2020 02:45:21 +0000 (19:45 -0700)]
Update composer.lock (`composer update --lock`)
Tim Otten [Fri, 3 Apr 2020 02:34:00 +0000 (19:34 -0700)]
[MOSS] CIV-01-001 - Display sensible error if someone tries to use "qunit" when it's missing
Tim Otten [Fri, 3 Apr 2020 02:23:03 +0000 (19:23 -0700)]
[MOSS] CIV-01-001 - Remove more unnecessary files from google-code-prettifier
Seamus Lee [Wed, 18 Mar 2020 01:25:01 +0000 (12:25 +1100)]
[MOSS] CIV-01-001 Remove Qunit and google-code-prettifier demo html file
Seamus Lee [Thu, 12 Dec 2019 20:08:34 +0000 (07:08 +1100)]
Include the job name and job details on the popup notice and also on the form asking if your sure about executing it
Allow disabled jobs to be executed and fix copy
Seamus Lee [Tue, 10 Dec 2019 20:07:57 +0000 (07:07 +1100)]
security/core#10 Ensure there is CSRF Protection when running Scheduled Jobs from the Admin scheduled jobs UI
Seamus Lee [Sun, 29 Mar 2020 21:23:33 +0000 (08:23 +1100)]
Remove code handling for profile search listing
Seamus Lee [Sun, 29 Mar 2020 20:55:14 +0000 (07:55 +1100)]
Also escape when value starts with a [ and validate the negative operation as well
Seamus Lee [Tue, 3 Mar 2020 20:48:35 +0000 (07:48 +1100)]
[MOSS] CIV-01-020 Validate value in the query building logic for privacy flag fields
Seamus Lee [Sat, 29 Feb 2020 22:32:21 +0000 (09:32 +1100)]
[MOSS] CIV-01-014 Validate status_id and campaign_type_id for camapginSummary function and the source_record_id and activity_type_id for Activity delete function
Seamus Lee [Sun, 9 Feb 2020 08:32:48 +0000 (19:32 +1100)]
security/core#40 Purify activity details when viewing case activities and case reports
Patrick Figel [Tue, 18 Feb 2020 19:44:11 +0000 (20:44 +0100)]
security/core#60 - Fix PHP Object Injection via Phar Deserialization
This mitigates Phar deserialization vulnerabilities by registering an
alternative Phar stream wrapper that filters out insecure Phar files.
PHP makes it possible to trigger Object Injection vulnerabilities by using
a side-effect of the phar:// stream wrapper that unserializes Phar
metadata. To mitigate this vulnerability, projects such as TYPO3 and Drupal
have implemented an alternative Phar stream wrapper that disallows
inclusion of phar files based on certain parameters. This change implements
a similar approach for Civi in environments where the vulnerability isn't
mitigated by the CMS.
Fixes security/core#60
Tim Otten [Wed, 4 Mar 2020 02:54:50 +0000 (18:54 -0800)]
CIV-01-021 - Improve entity name sanitization
Before
------
* There exist two functions which purport to take an API entity name and sanitize it,
producing a canonical API entity name. (`\Civi\API\Request::normalizeEntityName`
and `_civicrm_api_get_camel_name`)
* The two functions are identical for typical inputs. Both call `convertStringToCamel()`.
* The difference relates to unusual/unspecified input characters like `/` or `.` or `+`.
* `_civicrm_api_get_camel_name()` allows/returns unusual characters.
* `normalizeEntityName()` filters them out via `\CRM_Utils_String::munge()`
After
-----
* `_civicrm_api_get_camel_name()` just calls `normalizeEntityName()`
* A unit-test provides some comparison/contrast between the old+new behaviors.
Comments
--------
I came into this because CIV-01-021 pointed out that `_civicrm_api_get_camel_name()` had
insufficient sanitization of wonky inputs and could potentially lead to unexpected file-reads.
You can potentially address those wonky inputs by filtering them out or by throwing an exception.
I initially started doing an exception... but it turned out that `normalizeEntityName()` was already
filtering out and didn't really need a change. Also, regardless of the policy, the functions should be
brought into alignment.
Anyway, it seemed like this was the simpler change - it keeps `normalizeEntityName()` working exactly
as before, and only changes `_civicrm_api_get_camel_name()` to match.
Patrick Figel [Tue, 18 Feb 2020 20:54:05 +0000 (21:54 +0100)]
security/core#73 - Fix Contact.getquick API key exposure
This fixes an issue where API keys can be exposed via the field_name
parameter of the Contact.getquick API. Since there is no valid use-case
for requesting API keys via getquick, the fix simply triggers an API
error if the API key is requested.
Eileen McNaughton [Wed, 15 Apr 2020 21:10:52 +0000 (09:10 +1200)]
Merge pull request #17066 from mattwire/fixselectedchild
Fix 'selectedChild' parameter for pages with tabs
colemanw [Wed, 15 Apr 2020 20:41:34 +0000 (16:41 -0400)]
Merge pull request #17055 from mattwire/customgroupfield_id
Add ID to custom group/field admin forms
Matthew Wire [Wed, 15 Apr 2020 09:28:45 +0000 (10:28 +0100)]
Merge pull request #17076 from agh1/cancelnotban
Export: use X icon `fa-times` for closing things
Eileen McNaughton [Wed, 15 Apr 2020 02:16:35 +0000 (14:16 +1200)]
Merge pull request #16756 from eileenmcnaughton/memtest
[NFC] Improve cleanup on membershipStatus to cope with undeleted memberships
colemanw [Wed, 15 Apr 2020 00:30:01 +0000 (20:30 -0400)]
Merge pull request #17077 from eileenmcnaughton/dedup
Follow up fix on change to merge sqls
eileen [Tue, 14 Apr 2020 21:43:48 +0000 (09:43 +1200)]
Follow up fix on change to merge sqls
This turns out to have been a missing piece from
https://github.com/civicrm/civicrm-core/pull/17060 as revealed from
https://github.com/civicrm/civicrm-core/pull/17072
Andrew Hunt [Tue, 14 Apr 2020 21:36:45 +0000 (17:36 -0400)]
Export: use X icon `fa-times` for closing things
See https://docs.civicrm.org/dev/en/latest/framework/ui/#icon-meaning-and-consistency
colemanw [Tue, 14 Apr 2020 15:06:55 +0000 (11:06 -0400)]
Merge pull request #16998 from lcdservices/dev-core-1693
dev/core#1693 inline text title override
Eileen McNaughton [Tue, 14 Apr 2020 01:04:38 +0000 (13:04 +1200)]
Merge pull request #17070 from eileenmcnaughton/msg_template
[NFC] Remove a handful of legacy svn notations
colemanw [Mon, 13 Apr 2020 23:55:56 +0000 (19:55 -0400)]
Merge pull request #17060 from eileenmcnaughton/dupefix
Dupe improve custom data handling
eileen [Mon, 13 Apr 2020 23:16:59 +0000 (11:16 +1200)]
[NFC] Remove a handful of legacy svn notations
eileen [Thu, 9 Apr 2020 05:58:31 +0000 (17:58 +1200)]
Dupe improve custom data handling
The current custom data handling code does the following
1) For normal single rows it first inserts a row. This has the impact of rendering the
update that follows meaningless (this was an intentional change). It then deletes the row.
Hence the upshot is simply that it deletes the row. A separate process transfers the custom
data for the row. In other words we are engaging in 3 queries with a fairly high chance of
causing deadlocks in order to just delete the row.
2) For single rows where the entity reference refers to the merged contact the row is
updated to refer to the merged contact (without the insert this works) and a further unnecessary delete follows
3) For custom groups supporting multiple rows the rows are updated to have the new entity id. An unnecessary delete follows.
This change only affects the first of these. I would like to, in a future PR, change UPDATE IGNORE to just UPDATE &
remove the unnecessary delete - with more testing.
Note that this does include a slight change of behaviour. Currently if ANY fields in a custom group
are transferred from one contact to another during merge the row is deleted (with all the custom fields in it).
However, if no fields in a set are deleted then the row is not deleted.
This felt like it was a bit short on consistency. If has a potential advantage from a DB size point of view (any
deleting is better than none) but it also increases the number of locking queries in a process that is fairly
prone to cause DB locks. Based on these considerations I didn't think it worth re-adding code complexity to
retain inconsistent deletion.
A note on tests - I pre-added a bunch of tests into _api3_ContactTest to cover the 3 scenarios above.
Eileen McNaughton [Mon, 13 Apr 2020 20:03:48 +0000 (08:03 +1200)]
Merge pull request #17063 from colemanw/api4limit
APIv4 - Fix setting offset with no limit
Matthew Wire [Mon, 13 Apr 2020 14:42:55 +0000 (15:42 +0100)]
Fix 'selectedChild' parameter for pages with tabs
Coleman Watts [Mon, 13 Apr 2020 02:34:32 +0000 (22:34 -0400)]
APIv4 - Fix setting offset with no limit
The API treats 0 as "no limit" but mysql does not.
This allows setting an offset with no limit but applying the maximum possible row count, as mysql does not allow LIMIT NULL.
See https://stackoverflow.com/questions/255517/mysql-offset-infinite-rows
Eileen McNaughton [Mon, 13 Apr 2020 00:36:27 +0000 (12:36 +1200)]
Merge pull request #17057 from eileenmcnaughton/email3
[REF] move all functions associated with the submit function onto the Trait
eileen [Wed, 1 Apr 2020 03:52:20 +0000 (16:52 +1300)]
[REF] move all functions associated with the submit function onto the Trait
colemanw [Sat, 11 Apr 2020 23:22:53 +0000 (19:22 -0400)]
Merge pull request #17058 from eileenmcnaughton/mem
[NFC] Code cleanup around comments, strict comparison, formatting
colemanw [Sat, 11 Apr 2020 17:56:33 +0000 (13:56 -0400)]
Merge pull request #17050 from colemanw/one-time-binding
Improve AngularJS performance with one-time binding for static strings
eileen [Sat, 11 Apr 2020 03:15:34 +0000 (15:15 +1200)]
[NFC] Code cleanup around comments, strict comparison, formatting
Coleman Watts [Fri, 10 Apr 2020 01:47:43 +0000 (21:47 -0400)]
Improve AngularJS performance with one-time binding for static strings
Use one-time binding for all static strings being passed through ts().
This prevents unnecessary $watch expressions, making the digest loop faster.
See https://docs.angularjs.org/guide/expression#one-time-binding
Eileen McNaughton [Fri, 10 Apr 2020 22:31:00 +0000 (10:31 +1200)]
Merge pull request #17052 from eileenmcnaughton/email5
Duplicate EmailCommon::buildQuickForm onto the trait
Matthew Wire [Fri, 10 Apr 2020 17:54:52 +0000 (18:54 +0100)]
Add ID to custom group/field admin forms
Matthew Wire [Fri, 10 Apr 2020 14:15:38 +0000 (15:15 +0100)]
Merge pull request #17053 from eileenmcnaughton/ipn
Make transaction param optional in completeOrder
eileen [Fri, 10 Apr 2020 07:13:22 +0000 (19:13 +1200)]
Make transaction param optional in completeOrder
In all the places I checked passing in this param achieved nothing. Let's start by making it optional
Eileen McNaughton [Fri, 10 Apr 2020 05:25:00 +0000 (17:25 +1200)]
Merge pull request #17037 from eileenmcnaughton/dupe
[Test] Extend custom field test trait & some related tests
Eileen McNaughton [Fri, 10 Apr 2020 04:15:18 +0000 (16:15 +1200)]
Merge pull request #16957 from pradpnayak/importMappings
fixed mapping when using custom field for contact sub type
eileen [Thu, 9 Apr 2020 05:57:51 +0000 (17:57 +1200)]
[Test] Extend custom field test trait & some related tests
eileen [Wed, 1 Apr 2020 02:21:52 +0000 (15:21 +1300)]
Duplicate EmailCommon::buildQuickForm onto the trait
I have duplicated this code rather than moving it in case any non-core code calls it. We can remove in a bit
Eileen McNaughton [Fri, 10 Apr 2020 03:31:56 +0000 (15:31 +1200)]
Merge pull request #17049 from eileenmcnaughton/phone_array
[NFC] Fix use of pattern-hated-by-Coleman
Eileen McNaughton [Fri, 10 Apr 2020 01:40:26 +0000 (13:40 +1200)]
Merge pull request #17044 from yashodha/error
add filter for receipt date in contribution reports
eileen [Fri, 10 Apr 2020 01:38:07 +0000 (13:38 +1200)]
[NFC] Fix use of pattern-hated-by-Coleman
Since I tried to use this as an example of a 'tidy' hook call I'd better fix it
Eileen McNaughton [Fri, 10 Apr 2020 01:27:05 +0000 (13:27 +1200)]
Merge pull request #17048 from totten/master-upgr-nl-be
dev/translation#4 - Refine upgrade steps for modifying nl_NL
Seamus Lee [Fri, 10 Apr 2020 00:52:06 +0000 (10:52 +1000)]
Merge pull request #16772 from eileenmcnaughton/mem_tax
Fix bug where tax_amount is miscalculated on membership renewals
Eileen McNaughton [Thu, 9 Apr 2020 23:30:24 +0000 (11:30 +1200)]
Merge pull request #17047 from colemanw/api4exp
dev/report#31 - Api4 Explorer: Support SQL functions and HAVING clause
davejenx [Thu, 9 Apr 2020 10:01:29 +0000 (11:01 +0100)]
Update 5.24.2.md
Fix version number in title.
Tim Otten [Thu, 9 Apr 2020 22:28:48 +0000 (15:28 -0700)]
Merge pull request #17043 from davejenx/patch-1
Update 5.24.2.md - Fix version number in title.
Eileen McNaughton [Thu, 9 Apr 2020 21:45:36 +0000 (09:45 +1200)]
Merge pull request #17046 from MegaphoneJon/fix-ftaclcheck
core#1700 - Fix Financial ACL Report check
Tim Otten [Thu, 9 Apr 2020 21:41:08 +0000 (14:41 -0700)]
dev/translation#4 - Refine upgrade steps for modifying nl_NL
1. This adds a filter on `option_group_id` so that we don't modify unrelated OGs/OVs
2. Use simpler SQL semantics per https://docs.civicrm.org/dev/en/latest/framework/upgrade/#tips-prefer-simple-sql-semantics-over-apibaodao
Tim Otten [Thu, 9 Apr 2020 21:38:45 +0000 (14:38 -0700)]
CRM_Util_SQL - Add `interpolate()` helper
The `interpolate()` function is already available as the heart of
`CRM_Util_SQL_Insert` and `CRM_Utils_SQL_Select`, etc. This just makes it
easier to use for random SQL statements that don't have a full OOP model.
Seamus Lee [Thu, 9 Apr 2020 21:01:35 +0000 (07:01 +1000)]
Merge pull request #17027 from demeritcowboy/nl-be-upgrade
dev/translation#4 - Upgrade script for nl_BE
Matthew Wire [Thu, 9 Apr 2020 20:59:04 +0000 (21:59 +0100)]
Merge pull request #17011 from colemanw/noCount
Simplify groupContactCache - remove redundant query
Mathieu Lu [Thu, 9 Apr 2020 20:57:45 +0000 (16:57 -0400)]
Merge pull request #16987 from mattwire/casemissingtranslation
Add missing translations to case activity revisions
Seamus Lee [Thu, 9 Apr 2020 20:45:54 +0000 (06:45 +1000)]
Merge pull request #17024 from jitendrapurohit/core-1696
dev/core#1696 - Update attachment message on mailing form.
Coleman Watts [Thu, 9 Apr 2020 20:14:50 +0000 (16:14 -0400)]
APIv4 Explorer: support HAVING
Seamus Lee [Thu, 9 Apr 2020 20:41:09 +0000 (06:41 +1000)]
Merge pull request #17025 from civicrm/1697-set-is_deceased-to-not-null-in-schema-and-upgrade-script
set is_deceased to not null in schema and upgrade script dev/core#1697
Coleman Watts [Wed, 8 Apr 2020 20:34:57 +0000 (16:34 -0400)]
APIv4 Explorer - Support SQL functions
Adding "track by" to the loops is necessary so they aren't re-drawn during typing (causing the input to lose focus on every keystroke)
Jon Goldberg [Thu, 9 Apr 2020 20:19:26 +0000 (16:19 -0400)]
core#1700 - Fix Financial ACL Report check
Matthew Wire [Sat, 4 Jan 2020 12:59:39 +0000 (12:59 +0000)]
Add missing translations to case activity revisions
colemanw [Thu, 9 Apr 2020 16:35:56 +0000 (12:35 -0400)]
Merge pull request #17038 from totten/master-vermsg
Mitigate flaky test failure about "CRM_Utils_Check_Component_Env->checkVersion()"
Coleman Watts [Wed, 8 Apr 2020 18:37:55 +0000 (14:37 -0400)]
APIv4 Explorer - Use standard widget for SELECT
Coleman Watts [Wed, 8 Apr 2020 18:11:46 +0000 (14:11 -0400)]
APIv4 Explorer - Whitespace fix
Coleman Watts [Wed, 8 Apr 2020 18:07:29 +0000 (14:07 -0400)]
APIv4 Explorer - Get list of SQL functions
Coleman Watts [Wed, 8 Apr 2020 16:08:40 +0000 (12:08 -0400)]
APIv4 Explorer - Make WHERE clause code more generic, toward supporting HAVING
Coleman Watts [Wed, 8 Apr 2020 14:23:02 +0000 (10:23 -0400)]
APIv4 Explorer - Improve display of limit & offset params
colemanw [Thu, 9 Apr 2020 16:06:34 +0000 (12:06 -0400)]
Merge pull request #16888 from mattwire/addvarsanyregion
Allow adding variables to CRM.vars in any region
Michael McAndrew [Wed, 8 Apr 2020 09:40:14 +0000 (10:40 +0100)]
dev/core#1697 set is_deceased to not null in schema and upgrade script
yashodha [Thu, 9 Apr 2020 12:04:39 +0000 (17:34 +0530)]
add filter and sorting for receipt date in contribution reports
Jitendra Purohit [Wed, 8 Apr 2020 08:40:06 +0000 (14:10 +0530)]
dev/core#1696 - Update attachment message on mailing form.
davejenx [Thu, 9 Apr 2020 10:01:29 +0000 (11:01 +0100)]
Update 5.24.2.md
Fix version number in title.
Seamus Lee [Thu, 9 Apr 2020 09:33:06 +0000 (19:33 +1000)]
Merge pull request #17042 from civicrm/5.25
5.25
Tim Otten [Thu, 9 Apr 2020 07:21:03 +0000 (00:21 -0700)]
Merge pull request #17041 from seamuslee001/5.25
Add release-notes/5.24.2
Tim Otten [Thu, 9 Apr 2020 06:22:33 +0000 (23:22 -0700)]
Add release-notes/5.24.2
Tim Otten [Thu, 9 Apr 2020 04:20:40 +0000 (21:20 -0700)]
Mitigate flaky test failure about "CRM_Utils_Check_Component_Env->checkVersion()"
This function relies on an external data feed. If it fails to fetch the feed, then we
wind up with a PHP warning:
```
Invalid argument supplied for foreach() in CRM_Utils_Check_Component_Env->checkVersion()
(line 475 of /home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Check/Component/Env.php).
```
In certain unit-tests, this warning becomes a false-negative test-failure.
I saw these tests failing recently:
```
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributionsWithInvoicingEnabled
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributions
CRM_Core_Page_HookTest.testFormsCallBuildFormOnce
CRM_Core_Page_HookTest.testPagesCallPageRunOnce
```
Note that it is legit to have some QA signals if the web-service fials, but
that's more of a monitoring issue for the web-service. It shouldn't
manifest in random unit-tests or random page-views.
Eileen McNaughton [Thu, 9 Apr 2020 02:42:33 +0000 (14:42 +1200)]
Merge pull request #16976 from eileenmcnaughton/xfer
[REF] Extract transferParticipantRegistration function
Seamus Lee [Thu, 9 Apr 2020 01:35:07 +0000 (11:35 +1000)]
Merge pull request #16903 from eileenmcnaughton/settting_better
Allow setting metadata to use the `table` option. Update example setting `default_invoice_page`.
colemanw [Wed, 8 Apr 2020 23:29:38 +0000 (19:29 -0400)]
Merge pull request #16993 from eileenmcnaughton/emailget
Add / make fit for purpose email.getlist api call
Seamus Lee [Wed, 8 Apr 2020 23:28:03 +0000 (09:28 +1000)]
Merge pull request #17034 from mattwire/removeparamfromcompleteorder
REF Remove redundant param from completeOrder
Coleman Watts [Tue, 7 Apr 2020 17:33:58 +0000 (13:33 -0400)]
Simplify groupContactCache - remove redundant query
This was essentially running the same query twice, once with COUNT and then again with INSERT.
Should be ok to skip the count as the INSERT will do nothing if there are no results.
colemanw [Wed, 8 Apr 2020 23:20:07 +0000 (19:20 -0400)]
Merge pull request #17031 from eileenmcnaughton/email4
[REF] Update Contact email form to use the trait for EmailCommon functions
Seamus Lee [Wed, 8 Apr 2020 23:16:37 +0000 (09:16 +1000)]
Merge pull request #17035 from civicrm/5.25
5.25
Eileen McNaughton [Wed, 8 Apr 2020 22:27:21 +0000 (10:27 +1200)]
Merge pull request #17015 from colemanw/having
APIv4 - Add support for HAVING clause
Eileen McNaughton [Wed, 8 Apr 2020 22:12:09 +0000 (10:12 +1200)]
Merge pull request #17033 from seamuslee001/5.25
Revert "temp workaround for dev/core#1675"
Seamus Lee [Wed, 8 Apr 2020 22:04:50 +0000 (08:04 +1000)]
Merge pull request #17029 from eileenmcnaughton/email3
[REF] Move generic instances of listTokens to trait
Matthew Wire [Wed, 8 Apr 2020 17:01:36 +0000 (18:01 +0100)]
contribution is available in objects so use that instead of passing separately - it does not need to be passed by reference
Eileen McNaughton [Wed, 8 Apr 2020 21:49:04 +0000 (09:49 +1200)]
Merge pull request #16959 from ray-wright/patch-4
Add email link in case summary
Seamus Lee [Wed, 8 Apr 2020 21:28:14 +0000 (07:28 +1000)]
Merge pull request #17021 from totten/5.25-language-labels
CRM_Core_I18n - Provide a better label for new/unknown locales
Seamus Lee [Wed, 8 Apr 2020 21:20:48 +0000 (07:20 +1000)]
Revert "temp workaround for dev/core#1675"
This reverts commit
fcd23b884537a19ff2acbc98ca20a43f292c4c42.
Eileen McNaughton [Wed, 8 Apr 2020 21:05:07 +0000 (09:05 +1200)]
Merge pull request #17020 from eileenmcnaughton/dedupe1
Start using apiv4 in test setup
eileen [Wed, 1 Apr 2020 02:14:37 +0000 (15:14 +1300)]
[REF] Update Contact email form to use the trait for EmailCommon functions