eileen [Tue, 25 Aug 2020 20:48:12 +0000 (08:48 +1200)]
Remove last pass-by-reference in completeOrder signature
ids is now only referred to once in the function & never altered. I have assigned that value to
a param & unset ids after that to make that clear
colemanw [Mon, 24 Aug 2020 15:46:26 +0000 (11:46 -0400)]
Merge pull request #18236 from mattwire/crmregion_notyou
Wrap "not you" message in crmRegion
Matthew Wire [Mon, 24 Aug 2020 10:24:34 +0000 (11:24 +0100)]
Merge pull request #18243 from eileenmcnaughton/static
Do not pass by reference for createRelatedMemberships
Matthew Wire [Mon, 24 Aug 2020 10:21:08 +0000 (11:21 +0100)]
Merge pull request #18242 from eileenmcnaughton/dep
Remove 2019 deprecated function
Seamus Lee [Mon, 24 Aug 2020 10:18:24 +0000 (20:18 +1000)]
Merge pull request #18118 from artfulrobot/artfulrobot-msgtpl-disable-smarty
Add disable_smarty option to MessageTemplate.send API
Rich Lott / Artful Robot [Mon, 10 Aug 2020 16:33:56 +0000 (17:33 +0100)]
Add disable_smarty option to MessageTemplate.send API
eileen [Mon, 24 Aug 2020 01:11:07 +0000 (13:11 +1200)]
Do not pass by reference for createRelatedMemberships
There are 2 parameters passed by reference to this function
1) dao - this is not altered
2) params - this IS altered but the calling function (create) does not use it again. While it's
possible a function that calls create uses it again the idea that they would want the params
to have been altered to refer to a different related relationship does not seem probable.
Tests on this are in JobTest & apiv3_MembershipTest
Eileen McNaughton [Sun, 23 Aug 2020 22:29:45 +0000 (10:29 +1200)]
Merge pull request #18229 from totten/master-patchset
distmaker - Autogenerate civicrm-*-patchset.tar.gz
eileen [Sun, 23 Aug 2020 22:22:44 +0000 (10:22 +1200)]
Remove 2019 deprecated function
We stopped using this in core & deprecated it in 5.16
Seamus Lee [Sun, 23 Aug 2020 21:32:54 +0000 (07:32 +1000)]
Merge pull request #18153 from larssg-wildsight/patch-1
dev/core#1950 Update help text and description for the profile add to groups setting
Seamus Lee [Sun, 23 Aug 2020 21:32:02 +0000 (07:32 +1000)]
Merge pull request #18221 from civicrm/eileenmcnaughton-patch-1
Remove ref to logging time
Seamus Lee [Sun, 23 Aug 2020 21:28:36 +0000 (07:28 +1000)]
Merge pull request #18240 from demeritcowboy/deprecated-RID
Replace deprecated Drupal 8 constants
Eileen McNaughton [Sun, 23 Aug 2020 21:08:55 +0000 (09:08 +1200)]
Merge pull request #18234 from pradpnayak/dedupeTrim
trim white space when checking dedupe
Seamus Lee [Sun, 23 Aug 2020 20:40:18 +0000 (06:40 +1000)]
Merge pull request #18238 from agileware/separator-not-seperator
Spelling mistake "separator" not "seperator"
Seamus Lee [Sun, 23 Aug 2020 20:23:14 +0000 (06:23 +1000)]
Merge pull request #18239 from demeritcowboy/gencode-checksum
[NFC] Some DAO checksums not updated
demeritcowboy [Sun, 23 Aug 2020 13:44:59 +0000 (09:44 -0400)]
deprecated constants
demeritcowboy [Sun, 23 Aug 2020 13:33:26 +0000 (09:33 -0400)]
checksums not updated
Justin Freeman [Sun, 23 Aug 2020 04:32:31 +0000 (14:32 +1000)]
Global spelling mistake "separator" not "seperator"
Tim Otten [Sat, 22 Aug 2020 23:28:10 +0000 (16:28 -0700)]
(NFC) distmaker - More comments
Seamus Lee [Sat, 22 Aug 2020 22:49:34 +0000 (08:49 +1000)]
Merge pull request #18231 from civicrm/5.29
5.29
Seamus Lee [Sat, 22 Aug 2020 20:29:10 +0000 (06:29 +1000)]
Merge pull request #18230 from seamuslee001/5.29
Update contributor key for Andrew
Matthew Wire [Sat, 22 Aug 2020 14:02:04 +0000 (15:02 +0100)]
Wrap not you message in crmRegion
Pradeep Nayak [Sat, 22 Aug 2020 13:06:48 +0000 (14:06 +0100)]
trim white space when checking dedupe
Seamus Lee [Sat, 22 Aug 2020 09:32:19 +0000 (19:32 +1000)]
Update contributor key for Andrew
Tim Otten [Sat, 22 Aug 2020 09:32:32 +0000 (02:32 -0700)]
Merge pull request #18228 from seamuslee001/5.29
5.28.2 & 5.29.3 Release Notes
Tim Otten [Sat, 22 Aug 2020 09:08:19 +0000 (02:08 -0700)]
distmaker - Autogenerate civicrm-*-patchset.tar.gz
Tim Otten [Thu, 20 Aug 2020 05:34:44 +0000 (22:34 -0700)]
Add release-notes/5.28.2.md
Tim Otten [Sat, 22 Aug 2020 08:29:31 +0000 (01:29 -0700)]
Add release-notes/5.28.3.md
Seamus Lee [Sat, 22 Aug 2020 08:30:13 +0000 (18:30 +1000)]
Merge pull request #18226 from civicrm/5.29
5.29
Seamus Lee [Sat, 22 Aug 2020 06:46:03 +0000 (16:46 +1000)]
Merge pull request #18223 from eileenmcnaughton/529deupe
dev/core#1964 Fix regression bug on deduping contacts with dedupe_exception matches
Seamus Lee [Fri, 21 Aug 2020 23:05:46 +0000 (09:05 +1000)]
Merge pull request #18222 from civicrm/5.29
5.29 to master
eileen [Fri, 21 Aug 2020 22:36:18 +0000 (10:36 +1200)]
dev/core#1964 Fix regression bug on deduping contacts with dedupe_exception matches
I want to do another pass on this & do more SELECT queries & less UPDATE queries so we are doing
less locking - but for now this should get us past the logged regression
Eileen McNaughton [Fri, 21 Aug 2020 21:54:20 +0000 (09:54 +1200)]
Merge pull request #18214 from eileenmcnaughton/dedupe
Fix dedupe regression whereby deleted contacts are found
Eileen McNaughton [Fri, 21 Aug 2020 21:49:36 +0000 (09:49 +1200)]
Merge pull request #18136 from demeritcowboy/deprecated-hook-invoke
[Test framework] - Remove test for deprecated way of calling hook invoke
Eileen McNaughton [Fri, 21 Aug 2020 21:13:37 +0000 (09:13 +1200)]
Merge pull request #18208 from mattwire/contribregister_clean
Cleanup contactID variables in event/contribution register buildQuickForm
Eileen McNaughton [Fri, 21 Aug 2020 20:54:39 +0000 (08:54 +1200)]
Merge pull request #18209 from mattwire/repeattransaction_cleanup
Remove unused variables from repeatTransaction
Seamus Lee [Fri, 21 Aug 2020 20:53:51 +0000 (06:53 +1000)]
Merge pull request #18216 from eileenmcnaughton/meta
Metadata fix in activity search
Eileen McNaughton [Fri, 21 Aug 2020 20:25:02 +0000 (08:25 +1200)]
Remove ref to logging time
The page is not anon accessible & I think we don't do this now - @joshgowans ?
Eileen McNaughton [Fri, 21 Aug 2020 19:43:05 +0000 (07:43 +1200)]
Merge pull request #18217 from mattwire/orderapicleanup
Minor code cleanup to Order API
Matthew Wire [Fri, 21 Aug 2020 10:42:13 +0000 (11:42 +0100)]
Minor code cleanup to Order API
eileen [Fri, 21 Aug 2020 03:40:07 +0000 (15:40 +1200)]
Fix dedupe regression whereby deleted contacts are found
This affects api calls where check_permissions = TRUE and getduplicates is called. This can be
done via the api (per this test) or ann easy UI way is with the deduper extension but it should
also affect the 'normal' dedupe screen.
Note that there can be cases where the dedupe results are cached into prevnext cache to hide this
Eileen McNaughton [Fri, 21 Aug 2020 06:32:31 +0000 (18:32 +1200)]
Merge pull request #18215 from civicrm/5.29
5.29
eileen [Fri, 21 Aug 2020 05:20:58 +0000 (17:20 +1200)]
Metadata fix in activity search
This fixes it such that even if the pseudofield (activity_type) has a 'type' the 'type'
from the 'real field' is used in the WHERE query. This mostly prevents a test fail per
https://github.com/civicrm/civicrm-core/pull/18147
if we improve the metadata. It's a bit of a non-fail fail - ie we are checking the where
clause has activity_type_id = 3 vs '3' and my testing has not shown a performance difference
but we don't want the test to be changed to the less good version
Seamus Lee [Fri, 21 Aug 2020 04:27:45 +0000 (14:27 +1000)]
Merge pull request #18206 from chamilwijesooriya/issue-1959
dev/core#1959 Brick\Math\Exception\RoundingNecessaryException
Seamus Lee [Fri, 21 Aug 2020 04:27:13 +0000 (14:27 +1000)]
Merge pull request #18213 from eileenmcnaughton/is_deleted
Fix regression whereby deleted contacts are in quicksearch results
eileen [Fri, 21 Aug 2020 02:37:10 +0000 (14:37 +1200)]
Fix regression whereby deleted contacts are in quicksearch results
Chamil Wijesooriya [Thu, 20 Aug 2020 15:15:56 +0000 (16:15 +0100)]
dev/core#1959 Brick\Math\Exception\RoundingNecessaryException
Seamus Lee [Fri, 21 Aug 2020 01:31:06 +0000 (11:31 +1000)]
Merge pull request #18211 from totten/master-resg
(NFC) Add some tests to the `resources` group
Eileen McNaughton [Thu, 20 Aug 2020 22:41:53 +0000 (10:41 +1200)]
Merge pull request #18210 from civicrm/5.29
5.29
Tim Otten [Tue, 18 Aug 2020 02:37:42 +0000 (19:37 -0700)]
(NFC) Add some tests to the `resources` group
Seamus Lee [Thu, 20 Aug 2020 20:51:08 +0000 (06:51 +1000)]
Merge pull request #18205 from demeritcowboy/expandy
dev/core#1963 - Expanded icon on manage groups appears as unknown icon
Seamus Lee [Thu, 20 Aug 2020 20:50:03 +0000 (06:50 +1000)]
Merge pull request #18204 from eileenmcnaughton/529
dev/core#1961 Fix regression - cancel button not working on recurring contributions
Matthew Wire [Thu, 20 Aug 2020 20:38:03 +0000 (21:38 +0100)]
Remove unused variables from repeatTransaction
Matthew Wire [Thu, 20 Aug 2020 20:35:47 +0000 (21:35 +0100)]
Cleanup variables in event/contribution register forms
demeritcowboy [Thu, 20 Aug 2020 15:23:29 +0000 (11:23 -0400)]
specify font
eileen [Thu, 20 Aug 2020 11:08:27 +0000 (23:08 +1200)]
dev/core#1961 Fix regression - cancel button not working on recurring contributions
Note this form only shows for some processors. To test an easy way is to edit
CRM_Core_Payment::supportsCancelRecurring to return FALSE
Then attempt to cancel a recurring contribution - the cancel button does not launch a form
without this.
Regression from
https://github.com/civicrm/civicrm-core/pull/17178/files#diff-63d76bd172c85725aaf2e76247b86354L11
https://lab.civicrm.org/dev/core/-/issues/1961
Eileen McNaughton [Thu, 20 Aug 2020 06:59:06 +0000 (18:59 +1200)]
Merge pull request #18203 from civicrm/5.29
5.29
Seamus Lee [Thu, 20 Aug 2020 06:49:09 +0000 (16:49 +1000)]
Merge pull request #18200 from seamuslee001/5.29
(dev/core#1846) Container, ClassLoader Caches - Separate caches by ve…
Tim Otten [Thu, 2 Jul 2020 21:03:34 +0000 (14:03 -0700)]
(dev/core#1846) Container, ClassLoader Caches - Separate caches by version number
Before
------
If you load a new version of the CiviCRM codebase, then a freshness check
should cause the container cache to reset automatically (based on the fact
that various files have new timestamps).
However, it's possible that some kind of bug or omission prevents this from working.
Many developers won't notice such a bug because they're obsessive-compulsive
about clearing caches anyway.
After
-----
If you load a new version of the CiviCRM codebase, then it should use a new
container cache - regardless of how well the freshness check works.
Seamus Lee [Thu, 20 Aug 2020 03:30:21 +0000 (13:30 +1000)]
Merge pull request #18195 from colemanw/customValueSave
APIv4 - Fix output of CustomValue create/save/update
Seamus Lee [Thu, 20 Aug 2020 03:13:51 +0000 (13:13 +1000)]
Merge pull request #18199 from civicrm/5.29
5.29
Seamus Lee [Thu, 20 Aug 2020 02:48:58 +0000 (12:48 +1000)]
Jenkins style fix
Coleman Watts [Wed, 19 Aug 2020 20:04:34 +0000 (16:04 -0400)]
APIv4 - Fix output of CustomValue create/save/update
Before: output contained no useful data
After: output contains values and id
Tim Otten [Thu, 20 Aug 2020 00:40:15 +0000 (17:40 -0700)]
Copy-edits for 5.28.1.md
Seamus Lee [Wed, 19 Aug 2020 07:41:16 +0000 (17:41 +1000)]
Add in release notes for 5.28.1
Seamus Lee [Thu, 20 Aug 2020 00:02:34 +0000 (10:02 +1000)]
Merge pull request #18197 from mattwire/removefirstcontribution
Remove first_contribution key from repeattransaction
Matthew Wire [Wed, 19 Aug 2020 22:33:37 +0000 (23:33 +0100)]
Remove first_contribution key from repeattransaction
colemanw [Wed, 19 Aug 2020 21:22:23 +0000 (17:22 -0400)]
Merge pull request #18182 from colemanw/severity
Remove unnecessary transformation of upgrade msg severity
colemanw [Wed, 19 Aug 2020 21:19:31 +0000 (17:19 -0400)]
Merge pull request #18114 from eileenmcnaughton/phone
Metadata fix - phone_type_id, location_type_id, gender_id
colemanw [Wed, 19 Aug 2020 14:13:12 +0000 (10:13 -0400)]
Merge pull request #18168 from twocs/patch-4
Check if $post defined before trying to use its field values.
Seamus Lee [Wed, 5 Aug 2020 20:31:22 +0000 (06:31 +1000)]
security/core#95 Purify Summary and description fields for events on the event info and event cart screens
Seamus Lee [Wed, 5 Aug 2020 23:46:33 +0000 (09:46 +1000)]
security/core#96 Escape the profile description field
Seamus Lee [Wed, 5 Aug 2020 23:57:26 +0000 (09:57 +1000)]
Apply edit groups permission check to the button not the generaal permissionedForGroup check
Seamus Lee [Tue, 28 Jul 2020 03:48:39 +0000 (13:48 +1000)]
[REF] Only show button to edit smart group if user has permissions
Seamus Lee [Wed, 29 Apr 2020 07:53:46 +0000 (17:53 +1000)]
Security/core#61 Limit Access to update smart group task to only if the logged in user has edit groups permission.
Put a permission restriction on loading page without manage groups permission when saved search id is specified in the URL
Seamus Lee [Wed, 15 Jul 2020 03:00:33 +0000 (13:00 +1000)]
security/core#94 Escape subject content when loading the Activity list for a contact
Coleman Watts [Fri, 3 Jul 2020 02:37:03 +0000 (22:37 -0400)]
Fix auto-refresh of CKEditor configurator form
Coleman Watts [Thu, 28 May 2020 20:26:47 +0000 (16:26 -0400)]
Convert CK Config form to quickform
Coleman Watts [Thu, 28 May 2020 19:15:26 +0000 (15:15 -0400)]
CKEditor Config - Validate input before saving config file
Also removes support for 'customConfig' supplimental file.
Coleman Watts [Thu, 28 May 2020 19:08:43 +0000 (15:08 -0400)]
CRM_Utils_JS - Improve validation of strings
Runs strings through json_decode to ensure they are valid.
Optionally throws an exception on error.
Seamus Lee [Fri, 29 May 2020 07:17:04 +0000 (17:17 +1000)]
security/core#78 Purify HTML of activity details field when viewing the activity
Tim Otten [Mon, 6 Apr 2020 08:07:12 +0000 (01:07 -0700)]
CRM_Core_Key - Strengthen signature algorithm
This alters the qfKey signature algorithm, with a few aims:
1. If someone wants to perform a brute-force to figure the per-session
private-key, we want it go slow. Therefore, use a slower hash (ie
HMAC-SHA256 instead of MD5).
2. If someone performs a timing attack aimed at figuring a passable qfKey,
the execution-time for `validate()` should not provide any hints.
3. If someone finds a way to manipulate one of the constituent parts
($sessionID, $name, $privateKey), we want it to be hard to create a
collsion. So... (a) Use HMAC instead of a vanilla hash. (b) Use delimiters
between the data sections ($sessionID, $name).
Tim Otten [Mon, 6 Apr 2020 06:33:55 +0000 (23:33 -0700)]
CRM_Core_Key - Improve entropy of "privateKey"
In PHP 4/5, there was no good, universal source of entropy. The old code
mitigated this by aggregating mediocre sources. On my system, it appears
to be roughly:
* 2^31 for each `mt_rand()`
* 10^8 =~ 2^26 for each `uniqid(...TRUE)` (after discounting the non-random right half of the uniqid).
So that's ~114 bits (albeit low-quality bits).
In PHP 7, the docs describe `random_bytes()` as "generat[ing] cryptographically secure pseudo-random bytes."
Seamus Lee [Thu, 28 May 2020 07:46:06 +0000 (17:46 +1000)]
Additional code from Drupal's implementation
Seamus Lee [Thu, 28 May 2020 07:43:19 +0000 (17:43 +1000)]
Update to use code from Drupal's patch
Seamus Lee [Thu, 28 May 2020 06:00:57 +0000 (16:00 +1000)]
Patch jQuery for CVE-2020-11022 and CVE-2020-11023
Coleman Watts [Tue, 12 May 2020 14:14:32 +0000 (10:14 -0400)]
security/core#81 Escape html in CRM_Core_LegacyErrorHandler messages
Seamus Lee [Tue, 12 May 2020 05:07:32 +0000 (15:07 +1000)]
security/core#74 Prevent CSRF in CKEditor Config screen by switching to using Quickform built form
Eileen McNaughton [Wed, 19 Aug 2020 04:13:07 +0000 (16:13 +1200)]
Merge pull request #18193 from civicrm/5.29
5.29 to master
Eileen McNaughton [Wed, 19 Aug 2020 03:47:37 +0000 (15:47 +1200)]
Merge pull request #18180 from eileenmcnaughton/recur
dev/core#1945 Fix recur access regression
Seamus Lee [Wed, 19 Aug 2020 03:03:05 +0000 (13:03 +1000)]
Merge pull request #18188 from demeritcowboy/mysqli-mysql
Put mysql back in civicrm.settings.php template
eileen [Mon, 17 Aug 2020 09:17:09 +0000 (21:17 +1200)]
dev/core#1945 Fix recur access regression
Eileen McNaughton [Tue, 18 Aug 2020 19:29:03 +0000 (07:29 +1200)]
Merge pull request #18189 from demeritcowboy/widget-notice
E_NOTICE on contribution page widget tab
demeritcowboy [Tue, 18 Aug 2020 14:27:12 +0000 (10:27 -0400)]
e_notice on widget tab
demeritcowboy [Tue, 18 Aug 2020 12:35:29 +0000 (08:35 -0400)]
put mysql back
Eileen McNaughton [Tue, 18 Aug 2020 06:25:52 +0000 (18:25 +1200)]
Merge pull request #18183 from colemanw/versionCheck
CRM_Utils_VersionCheck - respect force param
Eileen McNaughton [Tue, 18 Aug 2020 04:20:46 +0000 (16:20 +1200)]
Merge pull request #18174 from demeritcowboy/d8-upgrade-warning
dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings
Eileen McNaughton [Tue, 18 Aug 2020 04:19:11 +0000 (16:19 +1200)]
Merge pull request #18187 from seamuslee001/master
5.29
Seamus Lee [Tue, 18 Aug 2020 03:26:48 +0000 (13:26 +1000)]
Merge in 5.29
Eileen McNaughton [Tue, 18 Aug 2020 03:24:14 +0000 (15:24 +1200)]
Merge pull request #18185 from civicrm/revert-18091-xbutton-529
Revert "Swap out button/submit inputs for button elements"